diff options
Diffstat (limited to 'modules/calendar/e-memo-shell-view-actions.c')
| -rw-r--r-- | modules/calendar/e-memo-shell-view-actions.c | 30 |
1 files changed, 2 insertions, 28 deletions
diff --git a/modules/calendar/e-memo-shell-view-actions.c b/modules/calendar/e-memo-shell-view-actions.c index 991c99b5d1..99761b2c74 100644 --- a/modules/calendar/e-memo-shell-view-actions.c +++ b/modules/calendar/e-memo-shell-view-actions.c @@ -554,33 +554,11 @@ action_memo_view_cb (GtkRadioAction *action, } static void -action_search_execute_cb (GtkAction *action, - EMemoShellView *memo_shell_view) -{ - EShellView *shell_view; - - /* All shell views respond to the activation of this action, - * which is defined by EShellWindow. But only the currently - * active shell view proceeds with executing the search. */ - shell_view = E_SHELL_VIEW (memo_shell_view); - if (!e_shell_view_is_active (shell_view)) - return; - - e_memo_shell_view_execute_search (memo_shell_view); -} - -static void action_search_filter_cb (GtkRadioAction *action, GtkRadioAction *current, - EMemoShellView *memo_shell_view) + EShellView *shell_view) { - EShellView *shell_view; - EShellWindow *shell_window; - - shell_view = E_SHELL_VIEW (memo_shell_view); - shell_window = e_shell_view_get_shell_window (shell_view); - - gtk_action_activate (ACTION (SEARCH_EXECUTE)); + e_shell_view_execute_search (shell_view); } static GtkActionEntry memo_entries[] = { @@ -930,10 +908,6 @@ e_memo_shell_view_actions_init (EMemoShellView *memo_shell_view) ACTION (GAL_SAVE_CUSTOM_VIEW), "activate", G_CALLBACK (action_gal_save_custom_view_cb), memo_shell_view); - g_signal_connect ( - ACTION (SEARCH_EXECUTE), "activate", - G_CALLBACK (action_search_execute_cb), memo_shell_view); - e_binding_new ( ACTION (MEMO_PREVIEW), "active", ACTION (MEMO_VIEW_CLASSIC), "sensitive"); |