[empathy] empathy: don't detect GNOME Flashback as GNOME Shell

[Michael Catanzaro <mcatanzaro src gnome org>]

commit 1eabf36302473fb22de75f754568a77e24fc6562
Author: Alberts Muktupāvels <alberts muktupavels gmail com>
Date:   Mon Jul 25 15:13:27 2016 +0300

    empathy: don't detect GNOME Flashback as GNOME Shell
    
    https://bugzilla.gnome.org/show_bug.cgi?id=754956

 configure.ac  |    4 ++--
 src/empathy.c |   11 ++++-------
 2 files changed, 6 insertions(+), 9 deletions(-)
---
diff --git a/configure.ac b/configure.ac
index 588573a..aa42276 100644
--- a/configure.ac
+++ b/configure.ac
@@ -37,9 +37,9 @@ AC_COPYRIGHT([
 FOLKS_REQUIRED=0.9.5
 GNUTLS_REQUIRED=2.8.5
 
-GLIB_REQUIRED=2.37.6
+GLIB_REQUIRED=2.44.0
 AC_DEFINE(GLIB_VERSION_MIN_REQUIRED, GLIB_VERSION_2_30, [Ignore post 2.30 deprecations])
-AC_DEFINE(GLIB_VERSION_MAX_ALLOWED, GLIB_VERSION_2_38, [Prevent post 2.38 APIs])
+AC_DEFINE(GLIB_VERSION_MAX_ALLOWED, GLIB_VERSION_2_44, [Prevent post 2.44 APIs])
 
 GTK_REQUIRED=3.9.4
 AC_DEFINE(GDK_VERSION_MIN_REQUIRED, GDK_VERSION_3_8, [Ignore post 3.8 deprecations])
diff --git a/src/empathy.c b/src/empathy.c
index a3ce499..9978bd5 100644
--- a/src/empathy.c
+++ b/src/empathy.c
@@ -217,6 +217,7 @@ empathy_presence_manager_set_auto_away_cb (GSettings *gsettings,
 }
 
 #define GNOME_SHELL_BUS_NAME "org.gnome.Shell"
+#define GNOME_FLASHBACK_BUS_NAME "org.gnome.Flashback"
 
 static void
 list_names_cb (TpDBusDaemon *bus_daemon,
@@ -226,18 +227,14 @@ list_names_cb (TpDBusDaemon *bus_daemon,
         GObject *weak_object)
 {
   EmpathyApp *self = (EmpathyApp *) weak_object;
-  guint i;
 
   if (error != NULL)
       goto out;
 
-  for (i = 0; names[i] != NULL; i++)
+  if (g_strv_contains (names, GNOME_SHELL_BUS_NAME) &&
+      !g_strv_contains (names, GNOME_FLASHBACK_BUS_NAME))
     {
-      if (!tp_strdiff (names[i], GNOME_SHELL_BUS_NAME))
-        {
-          self->shell_running = TRUE;
-          break;
-        }
+      self->shell_running = TRUE;
     }
 
 out: