From 569fc6d306d3eda566845666495bd7e34d197f9d Mon Sep 17 00:00:00 2001 From: =?utf8?q?Marco=20Trevisan=20=28Trevi=C3=B1o=29?= Date: Thu, 4 Apr 2013 17:55:32 +0200 Subject: [PATCH] EmpathyApp: don't open the main instance if only the preferences are requested Fixes bug https://bugzilla.gnome.org/show_bug.cgi?id=697254 --- src/empathy.c | 14 ++++++++++---- 1 file changed, 10 insertions(+), 4 deletions(-) diff --git a/src/empathy.c b/src/empathy.c index d5149a3d..a716afbd 100644 --- a/src/empathy.c +++ b/src/empathy.c @@ -332,11 +332,17 @@ empathy_app_activate (GApplication *app) } if (self->show_preferences) - empathy_roster_window_show_preferences ( - EMPATHY_ROSTER_WINDOW (self->window), self->preferences_tab); + { + empathy_roster_window_show_preferences ( + EMPATHY_ROSTER_WINDOW (self->window), self->preferences_tab); - if (!self->start_hidden) - empathy_window_present (GTK_WINDOW (self->window)); + self->show_preferences = FALSE; + } + else + { + if (!self->start_hidden) + empathy_window_present (GTK_WINDOW (self->window)); + } /* Display the accounts dialog if needed */ tp_proxy_prepare_async (self->account_manager, NULL, -- 2.39.2