diff options
| author | Matthew Barnes <mbarnes@redhat.com> | 2011-09-04 21:48:24 +0800 |
|---|---|---|
| committer | Matthew Barnes <mbarnes@redhat.com> | 2011-10-06 20:16:21 +0800 |
| commit | 224f26b84d9c12b0dd1d337f51c14b6ebb901007 (patch) | |
| tree | c88109d0fe00df4b14dcf1ce641cd5ed91013f0f /modules/mail | |
| parent | da3e201c064f877c884befc0a0b434619b056e09 (diff) | |
| download | gsoc2013-evolution-224f26b84d9c12b0dd1d337f51c14b6ebb901007.tar.gz gsoc2013-evolution-224f26b84d9c12b0dd1d337f51c14b6ebb901007.tar.zst gsoc2013-evolution-224f26b84d9c12b0dd1d337f51c14b6ebb901007.zip | |
GtkApplication has some new EShell-like features.
I pushed a few EShell features up to GtkApplication for GTK+ 3.2,
so we can now trim off the redundancies in EShell.
1) GtkApplication has a new "window-added" signal which replaces
EShell's own "window-created" signal.
2) GtkApplication has a new "window-removed" signal which replaces
EShell's own "window-destroyed" signal.
3) gtk_application_get_windows() now returns a list of windows sorted
by most recently focused, replacing e_shell_get_watched_windows().
4) GtkApplication now provides enough hooks to subclasses that we can
remove e_shell_watch_window() and call gtk_application_add_window()
directly.
Diffstat (limited to 'modules/mail')
| -rw-r--r-- | modules/mail/e-mail-shell-backend.c | 11 | ||||
| -rw-r--r-- | modules/mail/em-composer-prefs.c | 4 |
2 files changed, 8 insertions, 7 deletions
diff --git a/modules/mail/e-mail-shell-backend.c b/modules/mail/e-mail-shell-backend.c index 4cf3cb78a5..ba812c1440 100644 --- a/modules/mail/e-mail-shell-backend.c +++ b/modules/mail/e-mail-shell-backend.c @@ -298,10 +298,11 @@ mail_shell_backend_window_weak_notify_cb (EShell *shell, } static void -mail_shell_backend_window_created_cb (EShell *shell, - GtkWindow *window, - EShellBackend *shell_backend) +mail_shell_backend_window_added_cb (GtkApplication *application, + GtkWindow *window, + EShellBackend *shell_backend) { + EShell *shell = E_SHELL (application); const gchar *backend_name; /* This applies to both the composer and signature editor. */ @@ -392,8 +393,8 @@ mail_shell_backend_constructed (GObject *object) shell_backend); g_signal_connect ( - shell, "window-created", - G_CALLBACK (mail_shell_backend_window_created_cb), + shell, "window-added", + G_CALLBACK (mail_shell_backend_window_added_cb), shell_backend); e_mail_shell_settings_init (shell_backend); diff --git a/modules/mail/em-composer-prefs.c b/modules/mail/em-composer-prefs.c index 12a521b454..8453b88540 100644 --- a/modules/mail/em-composer-prefs.c +++ b/modules/mail/em-composer-prefs.c @@ -547,11 +547,11 @@ em_composer_prefs_construct (EMComposerPrefs *prefs, gtk_container_add (GTK_CONTAINER (container), widget); gtk_widget_show (widget); - /* The mail shell backend responds to the "window-created" signal + /* The mail shell backend responds to the "window-added" signal * that this triggers and configures it with composer preferences. */ g_signal_connect_swapped ( widget, "editor-created", - G_CALLBACK (e_shell_watch_window), shell); + G_CALLBACK (gtk_application_add_window), shell); /* Express mode does not honor this setting. */ if (!e_shell_get_express_mode (shell)) |