Merge lp:~darkxst/ubuntu/saucy/empathy/lp1203955 into lp:~ubuntu-desktop/empathy/ubuntu

[Tim Lunn]

[Martin Pitt (pitti)]

LGTM, thank you!

review: Approve

=== modified file 'debian/changelog'
--- debian/changelog	2013-07-22 03:08:58 +0000
+++ debian/changelog	2013-07-23 04:53:29 +0000
@@ -1,9 +1,14 @@
-empathy (3.8.3-0ubuntu4) UNRELEASED; urgency=low
+empathy (3.8.3-0ubuntu5) UNRELEASED; urgency=low
 
+  [ Jeremy Bicha ]
   * debian/control:
     - Drop gnome-doc-utils and rarian from build-dependencies
 
- -- Jeremy Bicha <[e-mail]>  Sun, 21 Jul 2013 22:47:54 -0400
+  [ Tim Lunn ]
+  * debian/patches/ubuntu_launch_uoa_panel.patch:
+    - Only launch UOA panel when running a Unity session. (LP: #1203955) 
+
+ -- Tim Lunn <[e-mail]>  Tue, 23 Jul 2013 14:40:10 +1000
 
 empathy (3.8.3-0ubuntu3) saucy; urgency=low
 

=== modified file 'debian/patches/series'
--- debian/patches/series	2013-05-31 10:25:14 +0000
+++ debian/patches/series	2013-07-23 04:53:29 +0000
@@ -9,3 +9,4 @@
 43_quicklists.patch
 47_git_activate_with_platform_data.patch
 include-empathy-keyring.h
+ubuntu_launch_uoa_panel.patch

=== added file 'debian/patches/ubuntu_launch_uoa_panel.patch'
--- debian/patches/ubuntu_launch_uoa_panel.patch	1970-01-01 00:00:00 +0000
+++ debian/patches/ubuntu_launch_uoa_panel.patch	2013-07-23 04:53:29 +0000
@@ -0,0 +1,54 @@
+From 906eb708198b655eb04a3eda08cdce58e8558b0c Mon Sep 17 00:00:00 2001
+From: Tim Lunn <[e-mail]>
+Date: Tue, 23 Jul 2013 12:30:11 +1000
+Subject: [PATCH] Check desktop session to determine which accounts panel to
+ launch
+
+---
+ src/empathy-accounts-dialog.c | 14 ++++++++++----
+ 1 file changed, 10 insertions(+), 4 deletions(-)
+
+diff --git a/src/empathy-accounts-dialog.c b/src/empathy-accounts-dialog.c
+index a6a45f2..f4ea626 100644
+--- a/src/empathy-accounts-dialog.c
++++ b/src/empathy-accounts-dialog.c
+@@ -2702,8 +2702,9 @@ launch_uoa_panel (TpAccount *selected_account,
+   g_object_unref (manager);
+ }
+ 
+-#else /* HAVE_UOA */
++#endif /* HAVE_UOA */
+ 
++#ifdef HAVE_GOA
+ static void
+ launch_empathy_accounts (TpAccount *selected_account,
+     gboolean if_needed,
+@@ -2734,7 +2735,7 @@ launch_empathy_accounts (TpAccount *selected_account,
+ 
+   g_string_free (args, TRUE);
+ }
+-#endif /* HAVE_UOA */
++#endif /* HAVE_GOA */
+ 
+ void
+ empathy_accounts_dialog_show_application (GdkScreen *screen,
+@@ -2743,8 +2744,13 @@ empathy_accounts_dialog_show_application (GdkScreen *screen,
+     gboolean hidden)
+ {
+ #ifdef HAVE_UOA
+-  launch_uoa_panel (selected_account, if_needed, hidden);
+-#else
++  if (!g_strcmp0 (g_getenv ("XDG_CURRENT_DESKTOP"), "Unity")) {
++    launch_uoa_panel (selected_account, if_needed, hidden);
++    return;
++  }
++#endif
++
++#ifdef HAVE_GOA
+   launch_empathy_accounts (selected_account, if_needed, hidden);
+ #endif
+ }
+-- 
+1.8.3.2
+
+