diff options
| author | Matthew Barnes <mbarnes@redhat.com> | 2010-10-16 02:51:13 +0800 |
|---|---|---|
| committer | Matthew Barnes <mbarnes@redhat.com> | 2010-10-19 00:32:36 +0800 |
| commit | 51ebf20237270a785af0aa0e614db42275a05c62 (patch) | |
| tree | 328b2fe9b7aa111f0cb21f23b11bc2eaf6da3ac8 /shell/e-shell-window-private.c | |
| parent | 2197e6401ec8c5e1b77fa51e085ac068daa39e6a (diff) | |
| download | gsoc2013-evolution-51ebf20237270a785af0aa0e614db42275a05c62.tar.gz gsoc2013-evolution-51ebf20237270a785af0aa0e614db42275a05c62.tar.zst gsoc2013-evolution-51ebf20237270a785af0aa0e614db42275a05c62.zip | |
EAlert: Allow arbitrary actions to be added.
You can now amend the predefined actions in an EAlert by calling
e_alert_add_action(). Useful for adding actions from an existing
GtkUIManager.
Call e_alert_peek_actions() to obtain a combined list of predefined
and custom actions. These will typically serve as "related" actions
for GtkButtons (cf. gtk_activatable_set_related_action()).
Also, both EShellWindow and EShellView now implement EAlertSink. Use
EShellWindow for application-wide alerts, EShellView for view-specific
alerts.
Diffstat (limited to 'shell/e-shell-window-private.c')
| -rw-r--r-- | shell/e-shell-window-private.c | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/shell/e-shell-window-private.c b/shell/e-shell-window-private.c index 5c4e1217ca..dee6450bcd 100644 --- a/shell/e-shell-window-private.c +++ b/shell/e-shell-window-private.c @@ -289,10 +289,6 @@ e_shell_window_private_constructed (EShellWindow *shell_window) e_shell_window_actions_init (shell_window); - /* Do this after intializing actions because it - * triggers shell_window_update_close_action_cb(). */ - e_shell_watch_window (shell, window); - accel_group = gtk_ui_manager_get_accel_group (ui_manager); gtk_window_add_accel_group (GTK_WINDOW (shell_window), accel_group); @@ -481,6 +477,8 @@ e_shell_window_private_constructed (EShellWindow *shell_window) id = "org.gnome.evolution.shell"; e_plugin_ui_register_manager (ui_manager, id, shell_window); e_plugin_ui_enable_manager (ui_manager, id); + + e_shell_watch_window (shell, window); } void @@ -514,6 +512,7 @@ e_shell_window_private_dispose (EShellWindow *shell_window) g_hash_table_remove_all (priv->loaded_views); + DISPOSE (priv->alert_bar); DISPOSE (priv->content_pane); DISPOSE (priv->content_notebook); DISPOSE (priv->sidebar_notebook); |