aboutsummaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
Diffstat (limited to 'src')
-rw-r--r--src/empathy.c14
1 files changed, 10 insertions, 4 deletions
diff --git a/src/empathy.c b/src/empathy.c
index d5149a3d2..a716afbd8 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,