diff options
| author | Marco Trevisan (Treviño) <mail@3v1n0.net> | 2013-04-04 23:55:32 +0800 |
|---|---|---|
| committer | Marco Trevisan (Treviño) <mail@3v1n0.net> | 2013-04-05 20:10:43 +0800 |
| commit | 569fc6d306d3eda566845666495bd7e34d197f9d (patch) | |
| tree | c0eefaefacbc89f38b872bfa5d3b928c6ce85e08 /src | |
| parent | 0f64b475daf19bd7167fe22354880c604152ec8b (diff) | |
| download | gsoc2013-empathy-569fc6d306d3eda566845666495bd7e34d197f9d.tar.gz gsoc2013-empathy-569fc6d306d3eda566845666495bd7e34d197f9d.tar.zst gsoc2013-empathy-569fc6d306d3eda566845666495bd7e34d197f9d.zip | |
EmpathyApp: don't open the main instance if only the preferences are requested
Fixes bug https://bugzilla.gnome.org/show_bug.cgi?id=697254
Diffstat (limited to 'src')
| -rw-r--r-- | src/empathy.c | 14 |
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, |