diff options
Diffstat (limited to 'debian/patches/34_start_raised_execpt_in_session.patch')
| -rw-r--r-- | debian/patches/34_start_raised_execpt_in_session.patch | 37 |
1 files changed, 37 insertions, 0 deletions
diff --git a/debian/patches/34_start_raised_execpt_in_session.patch b/debian/patches/34_start_raised_execpt_in_session.patch new file mode 100644 index 000000000..f7cc2cf82 --- /dev/null +++ b/debian/patches/34_start_raised_execpt_in_session.patch @@ -0,0 +1,37 @@ +Description: If not started with the session, we should always raise +Bug: bugs.launchpad.net/bugs/503052 + +=== modified file 'src/empathy-status-icon.c' +Index: empathy-2.33.1/src/empathy-status-icon.c +=================================================================== +--- empathy-2.33.1.orig/src/empathy-status-icon.c 2011-02-02 11:22:44.251459011 -0500 ++++ empathy-2.33.1/src/empathy-status-icon.c 2011-02-02 11:22:52.711459000 -0500 +@@ -865,6 +865,9 @@ + #ifdef HAVE_LIBINDICATE + gboolean use_libindicate; + #endif ++ const gchar *desktop_autostart_id; ++ ++ desktop_autostart_id = g_getenv ("DESKTOP_AUTOSTART_ID"); + + g_return_val_if_fail (GTK_IS_WINDOW (window), NULL); + +@@ -900,8 +903,16 @@ + icon); + + if (!hide_contact_list) { +- should_hide = g_settings_get_boolean (priv->gsettings_ui, +- EMPATHY_PREFS_UI_MAIN_WINDOW_HIDDEN); ++ /* If not started with the session, we should raise the window. ++ https://bugs.launchpad.net/ubuntu/+source/empathy/+bug/503052 */ ++ if (desktop_autostart_id == NULL) { ++ DEBUG ("Not started with session, showing contact list"); ++ should_hide = FALSE; ++ } else { ++ DEBUG ("Auto-started with session, so honor the previous known state"); ++ should_hide = g_settings_get_boolean (priv->gsettings_ui, ++ EMPATHY_PREFS_UI_MAIN_WINDOW_HIDDEN); ++ } + } else { + should_hide = TRUE; + } |