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:28:21 +0800 |
| commit | e1e7dde31143a916e804980bb5baf0d32060ad8d (patch) | |
| tree | bcbfec54483314f4cec65da9659c2ca8d8989b55 | |
| parent | 3af2b86ec550ae1f37f25504afb95c590e7dd085 (diff) | |
| download | gsoc2013-empathy-e1e7dde31143a916e804980bb5baf0d32060ad8d.tar gsoc2013-empathy-e1e7dde31143a916e804980bb5baf0d32060ad8d.tar.gz gsoc2013-empathy-e1e7dde31143a916e804980bb5baf0d32060ad8d.tar.bz2 gsoc2013-empathy-e1e7dde31143a916e804980bb5baf0d32060ad8d.tar.lz gsoc2013-empathy-e1e7dde31143a916e804980bb5baf0d32060ad8d.tar.xz gsoc2013-empathy-e1e7dde31143a916e804980bb5baf0d32060ad8d.tar.zst gsoc2013-empathy-e1e7dde31143a916e804980bb5baf0d32060ad8d.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
| -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 90370e621..c36f2a2d7 100644 --- a/src/empathy.c +++ b/src/empathy.c @@ -354,11 +354,17 @@ empathy_app_command_line (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, |