From e39dd931bcff0dfd6964a75c5b23c8e89f75d297 Mon Sep 17 00:00:00 2001 From: Milan Crha Date: Thu, 25 Nov 2010 18:10:14 +0100 Subject: Bug #207580 - Allow new mail check on individual accounts --- shell/e-shell-view.c | 1 - shell/e-shell-window-actions.c | 27 --------------------------- shell/e-shell-window-actions.h | 2 -- shell/e-shell-window-private.c | 7 ------- shell/e-shell.c | 36 ------------------------------------ shell/e-shell.h | 4 ---- shell/test/e-test-shell-backend.c | 12 ------------ 7 files changed, 89 deletions(-) (limited to 'shell') diff --git a/shell/e-shell-view.c b/shell/e-shell-view.c index e07b76213a..26b22645c4 100644 --- a/shell/e-shell-view.c +++ b/shell/e-shell-view.c @@ -724,7 +724,6 @@ shell_view_toggled (EShellView *shell_view) priv->merge_id = e_ui_manager_add_ui_from_file ( E_UI_MANAGER (ui_manager), basename); e_plugin_ui_enable_manager (ui_manager, id); - } else if (!view_is_active && priv->merge_id != 0) { e_plugin_ui_disable_manager (ui_manager, id); gtk_ui_manager_remove_ui (ui_manager, priv->merge_id); diff --git a/shell/e-shell-window-actions.c b/shell/e-shell-window-actions.c index a77bd35e97..949183133d 100644 --- a/shell/e-shell-window-actions.c +++ b/shell/e-shell-window-actions.c @@ -1152,24 +1152,6 @@ action_search_save_cb (GtkAction *action, e_shell_window_update_search_menu (shell_window); } -/** - * E_SHELL_WINDOW_ACTION_SEND_RECEIVE: - * @window: an #EShellWindow - * - * Activation of this action opens the Send & Receive Mail dialog. - * - * Main menu item: File -> Send / Receive - **/ -static void -action_send_receive_cb (GtkAction *action, - EShellWindow *shell_window) -{ - EShell *shell; - - shell = e_shell_window_get_shell (shell_window); - e_shell_send_receive (shell, GTK_WINDOW (shell_window)); -} - /** * E_SHELL_WINDOW_ACTION_SHOW_SIDEBAR: * @window: an #EShellWindow @@ -1571,13 +1553,6 @@ static GtkActionEntry shell_entries[] = { N_("Select all text"), NULL }, /* Handled by EFocusTracker */ - { "send-receive", - "mail-send-receive", - N_("Send / _Receive"), - "F9", - N_("Send queued items and retrieve new items"), - G_CALLBACK (action_send_receive_cb) }, - { "submit-bug", NULL, N_("Submit _Bug Report..."), @@ -1933,8 +1908,6 @@ e_shell_window_actions_init (EShellWindow *shell_window) gtk_action_set_sensitive (ACTION (SEARCH_QUICK), FALSE); - g_object_set (ACTION (SEND_RECEIVE), "is-important", TRUE, NULL); - g_object_bind_property ( shell_window, "sidebar-visible", ACTION (SHOW_SIDEBAR), "active", diff --git a/shell/e-shell-window-actions.h b/shell/e-shell-window-actions.h index a3f752c15e..3746fe92c8 100644 --- a/shell/e-shell-window-actions.h +++ b/shell/e-shell-window-actions.h @@ -79,8 +79,6 @@ E_SHELL_WINDOW_ACTION ((window), "search-save") #define E_SHELL_WINDOW_ACTION_SELECT_ALL(window) \ E_SHELL_WINDOW_ACTION ((window), "select-all") -#define E_SHELL_WINDOW_ACTION_SEND_RECEIVE(window) \ - E_SHELL_WINDOW_ACTION ((window), "send-receive") #define E_SHELL_WINDOW_ACTION_SHOW_SIDEBAR(window) \ E_SHELL_WINDOW_ACTION ((window), "show-sidebar") #define E_SHELL_WINDOW_ACTION_SHOW_SWITCHER(window) \ diff --git a/shell/e-shell-window-private.c b/shell/e-shell-window-private.c index 39c6ca971d..cf0ee93df2 100644 --- a/shell/e-shell-window-private.c +++ b/shell/e-shell-window-private.c @@ -390,13 +390,6 @@ e_shell_window_private_constructed (EShellWindow *shell_window) /* Bind GObject properties to GObject properties. */ - action = ACTION (SEND_RECEIVE); - - g_object_bind_property ( - shell, "online", - action, "sensitive", - G_BINDING_SYNC_CREATE); - action = ACTION (WORK_OFFLINE); g_object_bind_property ( diff --git a/shell/e-shell.c b/shell/e-shell.c index b983b18403..7ffe91b40d 100644 --- a/shell/e-shell.c +++ b/shell/e-shell.c @@ -96,7 +96,6 @@ enum { PREPARE_FOR_ONLINE, PREPARE_FOR_QUIT, QUIT_REQUESTED, - SEND_RECEIVE, WINDOW_CREATED, WINDOW_DESTROYED, LAST_SIGNAL @@ -1108,24 +1107,6 @@ e_shell_class_init (EShellClass *class) G_TYPE_NONE, 1, E_TYPE_SHELL_QUIT_REASON); - /** - * EShell::send-receive - * @shell: the #EShell which emitted the signal - * @parent: a parent #GtkWindow - * - * Emitted when the user chooses the "Send / Receive" action. - * The parent window can be used for showing transient windows. - **/ - signals[SEND_RECEIVE] = g_signal_new ( - "send-receive", - G_OBJECT_CLASS_TYPE (object_class), - G_SIGNAL_RUN_LAST | G_SIGNAL_ACTION, - G_STRUCT_OFFSET (EShellClass, send_receive), - NULL, NULL, - g_cclosure_marshal_VOID__OBJECT, - G_TYPE_NONE, 1, - GTK_TYPE_WINDOW); - /** * EShell::window-created * @shell: the #EShell which emitted the signal @@ -1688,23 +1669,6 @@ e_shell_get_active_window (EShell *shell) return GTK_WINDOW (watched_windows->data); } -/** - * e_shell_send_receive: - * @shell: an #EShell - * @parent: the parent #GtkWindow - * - * Emits the #EShell::send-receive signal. - **/ -void -e_shell_send_receive (EShell *shell, - GtkWindow *parent) -{ - g_return_if_fail (E_IS_SHELL (shell)); - g_return_if_fail (GTK_IS_WINDOW (parent)); - - g_signal_emit (shell, signals[SEND_RECEIVE], 0, parent); -} - /** * e_shell_get_express_mode: * @shell: an #EShell diff --git a/shell/e-shell.h b/shell/e-shell.h index 15bcbb3694..3f037ba2d6 100644 --- a/shell/e-shell.h +++ b/shell/e-shell.h @@ -106,8 +106,6 @@ struct _EShellClass { EActivity *activity); void (*quit_requested) (EShell *shell, EShellQuitReason reason); - void (*send_receive) (EShell *shell, - GtkWindow *parent); void (*window_created) (EShell *shell, GtkWindow *window); void (*window_destroyed) (EShell *shell); @@ -134,8 +132,6 @@ void e_shell_watch_window (EShell *shell, GtkWindow *window); GList * e_shell_get_watched_windows (EShell *shell); GtkWindow * e_shell_get_active_window (EShell *shell); -void e_shell_send_receive (EShell *shell, - GtkWindow *parent); gboolean e_shell_get_meego_mode (EShell *shell); gboolean e_shell_get_express_mode (EShell *shell); gboolean e_shell_get_small_screen_mode (EShell *shell); diff --git a/shell/test/e-test-shell-backend.c b/shell/test/e-test-shell-backend.c index 58fe1aa17f..cbbd07cdb8 100644 --- a/shell/test/e-test-shell-backend.c +++ b/shell/test/e-test-shell-backend.c @@ -100,13 +100,6 @@ test_shell_backend_handle_uri_cb (EShellBackend *shell_backend, return FALSE; } -static void -test_shell_backend_send_receive_cb (EShellBackend *shell_backend, - GtkWindow *parent_window) -{ - g_debug ("%s (window=%p)", G_STRFUNC, parent_window); -} - static void test_shell_backend_window_created_cb (EShellBackend *shell_backend, GtkWindow *window) @@ -149,11 +142,6 @@ test_shell_backend_constructed (GObject *object) G_CALLBACK (test_shell_backend_handle_uri_cb), shell_backend); - g_signal_connect_swapped ( - shell, "send-receive", - G_CALLBACK (test_shell_backend_send_receive_cb), - shell_backend); - g_signal_connect_swapped ( shell, "window-created", G_CALLBACK (test_shell_backend_window_created_cb), -- cgit v1.2.3