diff options
| author | Matthew Barnes <mbarnes@src.gnome.org> | 2009-01-29 01:19:34 +0800 |
|---|---|---|
| committer | Matthew Barnes <mbarnes@src.gnome.org> | 2009-01-29 01:19:34 +0800 |
| commit | 533d59e2cd30ba79a99a71907ffdda65505e633a (patch) | |
| tree | ba6f611ce6a1bb9d3dfb98a6a6a670cf99a55b9d /mail | |
| parent | 3e339d5ecc63d912840c6f885460c58f60eb85e0 (diff) | |
| download | gsoc2013-evolution-533d59e2cd30ba79a99a71907ffdda65505e633a.tar gsoc2013-evolution-533d59e2cd30ba79a99a71907ffdda65505e633a.tar.gz gsoc2013-evolution-533d59e2cd30ba79a99a71907ffdda65505e633a.tar.bz2 gsoc2013-evolution-533d59e2cd30ba79a99a71907ffdda65505e633a.tar.lz gsoc2013-evolution-533d59e2cd30ba79a99a71907ffdda65505e633a.tar.xz gsoc2013-evolution-533d59e2cd30ba79a99a71907ffdda65505e633a.tar.zst gsoc2013-evolution-533d59e2cd30ba79a99a71907ffdda65505e633a.zip | |
Add unique-1.0 requirement (blessed external dependency).
Make EShell a subclass of UniqueApp and handle single-instance negotiation.
When another Evolution process is running:
- Running "evolution" will simply present the existing windows.
- Running "evolution -c <view>" will open a shell window set to <view>.
- Running "evolution <uri>" will open an appropriate window for <uri>.
The second process will then terminate immediately.
svn path=/branches/kill-bonobo/; revision=37147
Diffstat (limited to 'mail')
| -rw-r--r-- | mail/em-mailer-prefs.c | 17 | ||||
| -rw-r--r-- | mail/em-mailer-prefs.h | 1 |
2 files changed, 0 insertions, 18 deletions
diff --git a/mail/em-mailer-prefs.c b/mail/em-mailer-prefs.c index 984dbad429..d02a469072 100644 --- a/mail/em-mailer-prefs.c +++ b/mail/em-mailer-prefs.c @@ -52,7 +52,6 @@ static void em_mailer_prefs_class_init (EMMailerPrefsClass *class); static void em_mailer_prefs_init (EMMailerPrefs *dialog); -static void em_mailer_prefs_dispose (GObject *object); static void em_mailer_prefs_finalize (GObject *object); static GtkVBoxClass *parent_class = NULL; @@ -129,7 +128,6 @@ em_mailer_prefs_class_init (EMMailerPrefsClass *klass) object_class = (GObjectClass *) klass; parent_class = g_type_class_ref (gtk_vbox_get_type ()); - object_class->dispose = em_mailer_prefs_dispose; object_class->finalize = em_mailer_prefs_finalize; } @@ -140,20 +138,6 @@ em_mailer_prefs_init (EMMailerPrefs *preferences) } static void -em_mailer_prefs_dispose (GObject *object) -{ - EMMailerPrefs *prefs = (EMMailerPrefs *) object; - - if (prefs->shell != NULL) { - g_object_unref (prefs->shell); - prefs->shell = NULL; - } - - /* Chain up to parent's dispose() method. */ - G_OBJECT_CLASS (parent_class)->dispose (object); -} - -static void em_mailer_prefs_finalize (GObject *obj) { EMMailerPrefs *prefs = (EMMailerPrefs *) obj; @@ -1107,7 +1091,6 @@ em_mailer_prefs_construct (EMMailerPrefs *prefs, GSList *l; char *gladefile; - prefs->shell = g_object_ref (shell); shell_settings = e_shell_get_shell_settings (shell); gladefile = g_build_filename (EVOLUTION_GLADEDIR, diff --git a/mail/em-mailer-prefs.h b/mail/em-mailer-prefs.h index 89f361133a..ba7a62dcbd 100644 --- a/mail/em-mailer-prefs.h +++ b/mail/em-mailer-prefs.h @@ -62,7 +62,6 @@ struct _EMMailerPrefsHeader { struct _EMMailerPrefs { GtkVBox parent_object; - EShell *shell; GladeXML *gui; GConfClient *gconf; |