From 533d59e2cd30ba79a99a71907ffdda65505e633a Mon Sep 17 00:00:00 2001 From: Matthew Barnes Date: Wed, 28 Jan 2009 17:19:34 +0000 Subject: 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 " will open a shell window set to . - Running "evolution " will open an appropriate window for . The second process will then terminate immediately. svn path=/branches/kill-bonobo/; revision=37147 --- mail/em-mailer-prefs.c | 17 ----------------- mail/em-mailer-prefs.h | 1 - 2 files changed, 18 deletions(-) (limited to 'mail') 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; } @@ -139,20 +137,6 @@ em_mailer_prefs_init (EMMailerPrefs *preferences) preferences->gconf = mail_config_get_gconf_client (); } -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) { @@ -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; -- cgit v1.2.3