Merge lp:~3v1n0/bamf/use-libwnck-matching-signals into lp:bamf/0.4

[Marco Trevisan (Treviño)]

BamfMatcher: use role and class changes signal to match LibreOffice and g-c-c

Using libwnck 3.4.5 signals to properly match Gnome-Control-Center and Libreoffice, reducing the workarounds we had to include.

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:541
http://jenkins.qa.ubuntu.com/job/bamf-ci/19/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/bamf-raring-amd64-ci/19
    SUCCESS: http://jenkins.qa.ubuntu.com/job/bamf-raring-armhf-ci/19

Click here to trigger a rebuild:
http://s-jenkins:8080/job/bamf-ci/19/rebuild

review: Approve (continuous-integration)

[lp:~3v1n0/bamf/use-libwnck-matching-signals]

542. By Marco Trevisan (Treviño) on 2013-04-18

BamfLegacyWindowTest: free previous values when setting strings

[Andrea Azzarone (azzar1)]

LGTM.

review: Approve

=== modified file 'configure.ac'
--- configure.ac	2013-01-09 23:48:57 +0000
+++ configure.ac	2013-04-18 13:59:29 +0000
@@ -67,7 +67,7 @@
 #
 # libwnck
 #
-PKG_CHECK_MODULES(WNCK, libwnck-3.0)
+PKG_CHECK_MODULES(WNCK, libwnck-3.0 >= 3.4.5)
 
 #
 # libgtop

=== modified file 'debian/changelog'
--- debian/changelog	2013-04-03 02:01:52 +0000
+++ debian/changelog	2013-04-18 13:59:29 +0000
@@ -1,3 +1,10 @@
+bamf (0.4.0daily13.04.03-0ubuntu2) UNRELEASED; urgency=low
+
+  * debian/control:
+    - Update the libwnck-3-dev dependency to 3.4.5
+
+ -- Marco Trevisan (Treviño) <[e-mail]>  Wed, 17 Apr 2013 03:37:31 +0200
+
 bamf (0.4.0daily13.04.03-0ubuntu1) raring; urgency=low
 
   [ Marco Trevisan (Treviño) ]

=== modified file 'debian/control'
--- debian/control	2013-01-09 23:51:33 +0000
+++ debian/control	2013-04-18 13:59:29 +0000
@@ -14,7 +14,7 @@
                libgtop2-dev,
                libgtk-3-dev (>= 3.0.0),
                libunity-webapps-dev (>= 2.3.3),
-               libwnck-3-dev,
+               libwnck-3-dev (>= 3.4.5),
                libgirepository1.0-dev,
                valac,
                xvfb,

=== modified file 'src/bamf-legacy-window-test.c'
--- src/bamf-legacy-window-test.c	2013-01-29 15:56:49 +0000
+++ src/bamf-legacy-window-test.c	2013-04-18 13:59:29 +0000
@@ -132,25 +132,45 @@
   if (g_strcmp0 (self->name, val) == 0)
     return;
 
+  g_free (self->name);
   self->name = g_strdup (val);
 
   g_signal_emit_by_name (self, "name-changed");
 }
 
 void
+bamf_legacy_window_test_set_role (BamfLegacyWindowTest *self, const char *val)
+{
+  if (g_strcmp0 (self->role, val) == 0)
+    return;
+
+  g_free (self->role);
+  self->role = g_strdup (val);
+
+  g_signal_emit_by_name (self, "role-changed");
+}
+
+void
 bamf_legacy_window_test_set_wmclass (BamfLegacyWindowTest *self, const char *class_name, const char *instance_name)
 {
+  gboolean changed = FALSE;
+
   if (g_strcmp0 (self->wm_class_name, class_name) != 0)
     {
       g_free (self->wm_class_name);
       self->wm_class_name = g_strdup (class_name);
+      changed = TRUE;
     }
 
   if (g_strcmp0 (self->wm_class_instance, instance_name) != 0)
     {
       g_free (self->wm_class_instance);
       self->wm_class_instance = g_strdup (instance_name);
+      changed = TRUE;
     }
+
+  if (changed)
+    g_signal_emit_by_name (self, "class-changed");
 }
 
 static const char *
@@ -163,6 +183,16 @@
   return self->name;
 }
 
+static const char *
+bamf_legacy_window_test_get_role (BamfLegacyWindow *legacy_window)
+{
+  BamfLegacyWindowTest *self;
+
+  self = BAMF_LEGACY_WINDOW_TEST (legacy_window);
+
+  return self->role;
+}
+
 static BamfLegacyWindow *
 bamf_legacy_window_test_get_transient (BamfLegacyWindow *legacy_window)
 {
@@ -386,6 +416,7 @@
   BamfLegacyWindowTest *self = BAMF_LEGACY_WINDOW_TEST (object);
 
   g_free (self->name);
+  g_free (self->role);
   g_free (self->wm_class_name);
   g_free (self->wm_class_instance);
   g_free (self->exec);
@@ -407,6 +438,7 @@
   obj_class->finalize         = bamf_legacy_window_test_finalize;
   win_class->get_transient    = bamf_legacy_window_test_get_transient;
   win_class->get_name         = bamf_legacy_window_test_get_name;
+  win_class->get_role         = bamf_legacy_window_test_get_role;
   win_class->get_class_name   = bamf_legacy_window_test_get_class_name;
   win_class->get_class_instance_name = bamf_legacy_window_test_get_class_instance_name;
   win_class->get_exec_string  = bamf_legacy_window_test_get_exec_string;
@@ -449,6 +481,7 @@
   copy->xid = self->xid;
   copy->pid = self->pid;
   copy->name = g_strdup (self->name);
+  copy->role = g_strdup (self->role);
   copy->wm_class_name = g_strdup (self->wm_class_name);
   copy->wm_class_instance = g_strdup (self->wm_class_instance);
   copy->exec = g_strdup (self->exec);

=== modified file 'src/bamf-legacy-window-test.h'
--- src/bamf-legacy-window-test.h	2013-01-29 15:56:49 +0000
+++ src/bamf-legacy-window-test.h	2013-04-18 13:59:29 +0000
@@ -54,6 +54,7 @@
   guint32 xid;
   guint   pid;
   char * name;
+  char * role;
   char * wm_class_name;
   char * wm_class_instance;
   char * exec;
@@ -122,6 +123,9 @@
 bamf_legacy_window_test_set_name (BamfLegacyWindowTest *self, const char *val);
 
 void
+bamf_legacy_window_test_set_role (BamfLegacyWindowTest *self, const char *val);
+
+void
 bamf_legacy_window_test_set_geometry (BamfLegacyWindowTest *self, int x, int y,
                                                              int width, int height);
 

=== modified file 'src/bamf-legacy-window.c'
--- src/bamf-legacy-window.c	2013-04-17 04:23:30 +0000
+++ src/bamf-legacy-window.c	2013-04-18 13:59:29 +0000
@@ -32,9 +32,13 @@
 #define BAMF_LEGACY_WINDOW_GET_PRIVATE(obj) (G_TYPE_INSTANCE_GET_PRIVATE(obj, \
 BAMF_TYPE_LEGACY_WINDOW, BamfLegacyWindowPrivate))
 
+#define WNCK_WINDOW_BAMF_DATA "bamf-legacy-window"
+
 enum
 {
   NAME_CHANGED,
+  ROLE_CHANGED,
+  CLASS_CHANGED,
   STATE_CHANGED,
   GEOMETRY_CHANGED,
   CLOSED,
@@ -146,15 +150,29 @@
 {
   g_return_val_if_fail (BAMF_IS_LEGACY_WINDOW (self), NULL);
 
-
   if (BAMF_LEGACY_WINDOW_GET_CLASS (self)->get_name)
     return BAMF_LEGACY_WINDOW_GET_CLASS (self)->get_name (self);
 
   if (!self->priv->legacy_window)
     return NULL;
+
   return wnck_window_get_name (self->priv->legacy_window);
 }
 
+const char *
+bamf_legacy_window_get_role (BamfLegacyWindow *self)
+{
+  g_return_val_if_fail (BAMF_IS_LEGACY_WINDOW (self), NULL);
+
+  if (BAMF_LEGACY_WINDOW_GET_CLASS (self)->get_role)
+    return BAMF_LEGACY_WINDOW_GET_CLASS (self)->get_role (self);
+
+  if (!self->priv->legacy_window)
+    return NULL;
+
+  return wnck_window_get_role (self->priv->legacy_window);
+}
+
 char *
 bamf_legacy_window_get_process_name (BamfLegacyWindow *self)
 {
@@ -366,11 +384,12 @@
 }
 
 static void
-handle_name_changed (WnckWindow *window, BamfLegacyWindow *self)
+handle_window_signal (WnckWindow *window, gpointer data)
 {
+  BamfLegacyWindow *self = g_object_get_data (G_OBJECT (window), WNCK_WINDOW_BAMF_DATA);
   g_return_if_fail (BAMF_IS_LEGACY_WINDOW (self));
 
-  g_signal_emit (self, legacy_window_signals[NAME_CHANGED], 0);
+  g_signal_emit (self, legacy_window_signals[GPOINTER_TO_UINT (data)], 0);
 }
 
 static void
@@ -384,14 +403,6 @@
   g_signal_emit (self, legacy_window_signals[STATE_CHANGED], 0);
 }
 
-static void
-handle_geometry_changed (WnckWindow *window, BamfLegacyWindow *self)
-{
-  g_return_if_fail (BAMF_IS_LEGACY_WINDOW (self));
-
-  g_signal_emit (self, legacy_window_signals[GEOMETRY_CHANGED], 0);
-}
-
 gboolean
 bamf_legacy_window_is_closed (BamfLegacyWindow *self)
 {
@@ -546,6 +557,7 @@
 {
   BamfLegacyWindow *self;
   GFile *file;
+  guint i;
 
   self = BAMF_LEGACY_WINDOW (object);
 
@@ -564,7 +576,15 @@
 
   if (self->priv->legacy_window)
     {
+      g_object_set_data (G_OBJECT (self->priv->legacy_window), WNCK_WINDOW_BAMF_DATA, NULL);
       g_signal_handlers_disconnect_by_data (self->priv->legacy_window, self);
+
+      for (i = 0; i < LAST_SIGNAL; ++i)
+        {
+          g_signal_handlers_disconnect_by_func (self->priv->legacy_window,
+                                                handle_window_signal,
+                                                GUINT_TO_POINTER (NAME_CHANGED));
+        }
     }
 
   G_OBJECT_CLASS (bamf_legacy_window_parent_class)->dispose (object);
@@ -593,36 +613,42 @@
                   G_OBJECT_CLASS_TYPE (klass),
                   G_SIGNAL_RUN_FIRST,
                   G_STRUCT_OFFSET (BamfLegacyWindowClass, name_changed),
-                  NULL, NULL,
-                  g_cclosure_marshal_VOID__VOID,
-                  G_TYPE_NONE, 0);
+                  NULL, NULL, NULL, G_TYPE_NONE, 0);
+
+  legacy_window_signals [ROLE_CHANGED] =
+    g_signal_new (BAMF_LEGACY_WINDOW_SIGNAL_ROLE_CHANGED,
+                  G_OBJECT_CLASS_TYPE (klass),
+                  G_SIGNAL_RUN_FIRST,
+                  G_STRUCT_OFFSET (BamfLegacyWindowClass, role_changed),
+                  NULL, NULL, NULL, G_TYPE_NONE, 0);
+
+  legacy_window_signals [CLASS_CHANGED] =
+    g_signal_new (BAMF_LEGACY_WINDOW_SIGNAL_CLASS_CHANGED,
+                  G_OBJECT_CLASS_TYPE (klass),
+                  G_SIGNAL_RUN_FIRST,
+                  G_STRUCT_OFFSET (BamfLegacyWindowClass, class_changed),
+                  NULL, NULL, NULL, G_TYPE_NONE, 0);
 
   legacy_window_signals [STATE_CHANGED] =
     g_signal_new (BAMF_LEGACY_WINDOW_SIGNAL_STATE_CHANGED,
                   G_OBJECT_CLASS_TYPE (klass),
                   G_SIGNAL_RUN_FIRST,
                   G_STRUCT_OFFSET (BamfLegacyWindowClass, state_changed),
-                  NULL, NULL,
-                  g_cclosure_marshal_VOID__VOID,
-                  G_TYPE_NONE, 0);
+                  NULL, NULL, NULL, G_TYPE_NONE, 0);
 
   legacy_window_signals [GEOMETRY_CHANGED] =
     g_signal_new (BAMF_LEGACY_WINDOW_SIGNAL_GEOMETRY_CHANGED,
                   G_OBJECT_CLASS_TYPE (klass),
                   G_SIGNAL_RUN_FIRST,
                   G_STRUCT_OFFSET (BamfLegacyWindowClass, geometry_changed),
-                  NULL, NULL,
-                  g_cclosure_marshal_VOID__VOID,
-                  G_TYPE_NONE, 0);
+                  NULL, NULL, NULL, G_TYPE_NONE, 0);
 
   legacy_window_signals [CLOSED] =
     g_signal_new (BAMF_LEGACY_WINDOW_SIGNAL_CLOSED,
                   G_OBJECT_CLASS_TYPE (klass),
                   G_SIGNAL_RUN_FIRST,
                   G_STRUCT_OFFSET (BamfLegacyWindowClass, closed),
-                  NULL, NULL,
-                  g_cclosure_marshal_VOID__VOID,
-                  G_TYPE_NONE, 0);
+                  NULL, NULL, NULL, G_TYPE_NONE, 0);
 }
 
 BamfLegacyWindow *
@@ -633,14 +659,29 @@
 
   self->priv->legacy_window = legacy_window;
 
+  g_return_val_if_fail (WNCK_IS_WINDOW (self->priv->legacy_window), self);
+  g_warn_if_fail (!g_object_get_data (G_OBJECT (legacy_window), WNCK_WINDOW_BAMF_DATA));
+
+  g_object_set_data (G_OBJECT (legacy_window), WNCK_WINDOW_BAMF_DATA, self);
+
   g_signal_connect (G_OBJECT (legacy_window), "name-changed",
-                    (GCallback) handle_name_changed, self);
+                    G_CALLBACK (handle_window_signal),
+                    GUINT_TO_POINTER (NAME_CHANGED));
+
+  g_signal_connect (G_OBJECT (legacy_window), "role-changed",
+                    G_CALLBACK (handle_window_signal),
+                    GUINT_TO_POINTER (ROLE_CHANGED));
+
+  g_signal_connect (G_OBJECT (legacy_window), "class-changed",
+                    G_CALLBACK (handle_window_signal),
+                    GUINT_TO_POINTER (CLASS_CHANGED));
+
+  g_signal_connect (G_OBJECT (legacy_window), "geometry-changed",
+                    G_CALLBACK (handle_window_signal),
+                    GUINT_TO_POINTER (GEOMETRY_CHANGED));
 
   g_signal_connect (G_OBJECT (legacy_window), "state-changed",
-                    (GCallback) handle_state_changed, self);
-
-  g_signal_connect (G_OBJECT (legacy_window), "geometry-changed",
-                    (GCallback) handle_geometry_changed, self);
+                    G_CALLBACK (handle_state_changed), self);
 
   return self;
 }

=== modified file 'src/bamf-legacy-window.h'
--- src/bamf-legacy-window.h	2013-01-29 15:56:16 +0000
+++ src/bamf-legacy-window.h	2013-04-18 13:59:29 +0000
@@ -38,6 +38,8 @@
 #define BAMF_LEGACY_WINDOW_GET_CLASS(obj)       (G_TYPE_INSTANCE_GET_CLASS ((obj), BAMF_TYPE_LEGACY_WINDOW, BamfLegacyWindowClass))
 
 #define BAMF_LEGACY_WINDOW_SIGNAL_NAME_CHANGED     "name-changed"
+#define BAMF_LEGACY_WINDOW_SIGNAL_ROLE_CHANGED     "role-changed"
+#define BAMF_LEGACY_WINDOW_SIGNAL_CLASS_CHANGED    "class-changed"
 #define BAMF_LEGACY_WINDOW_SIGNAL_STATE_CHANGED    "state-changed"
 #define BAMF_LEGACY_WINDOW_SIGNAL_GEOMETRY_CHANGED "geometry-changed"
 #define BAMF_LEGACY_WINDOW_SIGNAL_CLOSED           "closed"
@@ -72,6 +74,7 @@
 
   BamfLegacyWindow * (*get_transient)     (BamfLegacyWindow *legacy_window);
   const char * (*get_name)                (BamfLegacyWindow *legacy_window);
+  const char * (*get_role)                (BamfLegacyWindow *legacy_window);
   const char * (*get_class_name)          (BamfLegacyWindow *legacy_window);
   const char * (*get_class_instance_name) (BamfLegacyWindow *legacy_window);
   char       * (*get_exec_string)         (BamfLegacyWindow *legacy_window);
@@ -99,6 +102,8 @@
 
   /*< signals >*/
   void     (*name_changed)     (BamfLegacyWindow *legacy_window);
+  void     (*class_changed)    (BamfLegacyWindow *legacy_window);
+  void     (*role_changed)     (BamfLegacyWindow *legacy_window);
   void     (*state_changed)    (BamfLegacyWindow *legacy_window);
   void     (*geometry_changed) (BamfLegacyWindow *legacy_window);
   void     (*closed)           (BamfLegacyWindow *legacy_window);
@@ -140,6 +145,8 @@
 
 const char       * bamf_legacy_window_get_name             (BamfLegacyWindow *self);
 
+const char       * bamf_legacy_window_get_role             (BamfLegacyWindow *self);
+
 const char       * bamf_legacy_window_save_mini_icon       (BamfLegacyWindow *self);
 
 char             * bamf_legacy_window_get_exec_string      (BamfLegacyWindow *self);

=== modified file 'src/bamf-matcher.c'
--- src/bamf-matcher.c	2013-04-17 14:25:48 +0000
+++ src/bamf-matcher.c	2013-04-18 13:59:29 +0000
@@ -337,177 +337,60 @@
     }
 }
 
-static char *
-get_open_office_window_hint (BamfMatcher * self, BamfLegacyWindow * window)
+static const char *
+get_libreoffice_window_hint (BamfMatcher * self, BamfLegacyWindow * window)
 {
   gchar *exec = NULL;
-  const gchar *name;
   const gchar *class;
   const char *binary = NULL;
   const char *parameter = NULL;
-  BamfWindowType type;
+  GList *l = NULL;
 
   g_return_val_if_fail (BAMF_IS_MATCHER (self), NULL);
   g_return_val_if_fail (BAMF_IS_LEGACY_WINDOW (window), NULL);
 
-  name = bamf_legacy_window_get_name (window);
   class = bamf_legacy_window_get_class_name (window);
-  type = bamf_legacy_window_get_window_type (window);
-
-  if (name == NULL && class == NULL)
-    return NULL;
-
-  if (g_str_has_suffix (name, "LibreOffice Writer"))
-    {
-      binary = "libreoffice";
-      parameter = "writer";
-    }
-  else if (g_str_has_suffix (name, "LibreOffice Calc"))
-    {
-      binary = "libreoffice";
-      parameter = "calc";
-    }
-  else if (g_str_has_suffix (name, "LibreOffice Impress"))
-    {
-      binary = "libreoffice";
-      parameter = "impress";
-    }
-  else if (g_str_has_suffix (name, "LibreOffice Math"))
-    {
-      binary = "libreoffice";
-      parameter = "math";
-    }
-  else if (g_str_has_suffix (name, "LibreOffice Draw"))
-    {
-      binary = "libreoffice";
-      parameter = "draw";
-    }
-  else if (g_str_has_suffix (name, "LibreOffice Base"))
-    {
-      binary = "libreoffice";
-      parameter = "base";
-    }
-  else if (g_strcmp0 (class, "libreoffice-startcenter") == 0)
-    {
-      binary = "libreoffice";
-    }
-  else if (g_strcmp0 (name, "LibreOffice") == 0 && type == BAMF_WINDOW_NORMAL)
-    {
-      binary = "libreoffice";
-    }
-  else if (g_str_has_suffix (name, "OpenOffice.org Writer"))
-    {
-      binary = "ooffice";
-      parameter = "writer";
-    }
-  else if (g_str_has_suffix (name, "OpenOffice.org Calc"))
-    {
-      binary = "ooffice";
-      parameter = "calc";
-    }
-  else if (g_str_has_suffix (name, "OpenOffice.org Impress"))
-    {
-      binary = "ooffice";
-      parameter = "impress";
-    }
-  else if (g_str_has_suffix (name, "OpenOffice.org Math"))
-    {
-      binary = "ooffice";
-      parameter = "math";
-    }
-  else if (g_str_has_suffix (name, "OpenOffice.org Draw"))
-    {
-      binary = "ooffice";
-      parameter = "draw";
-    }
-  else if (g_str_has_suffix (name, "OpenOffice.org Base"))
-    {
-      binary = "ooffice";
-      parameter = "base";
-    }
-  else if (g_strcmp0 (name, "OpenOffice.org") == 0 && type == BAMF_WINDOW_NORMAL)
-    {
-      binary = "ooffice";
-    }
-  else
-    {
-      if (type != BAMF_WINDOW_NORMAL || bamf_legacy_window_get_transient (window))
-      {
-        /* Child windows can generally easily be recognized by their class */
-        if (g_strcmp0 (class, "libreoffice-writer") == 0)
-          {
-            binary = "libreoffice";
-            parameter = "writer";
-          }
-        else if (g_strcmp0 (class, "libreoffice-calc") == 0)
-          {
-            binary = "libreoffice";
-            parameter = "calc";
-          }
-        else if (g_strcmp0 (class, "libreoffice-impress") == 0)
-          {
-            binary = "libreoffice";
-            parameter = "impress";
-          }
-        else if (g_strcmp0 (class, "libreoffice-math") == 0)
-          {
-            binary = "libreoffice";
-            parameter = "math";
-          }
-        else if (g_strcmp0 (class, "libreoffice-draw") == 0)
-          {
-            binary = "libreoffice";
-            parameter = "draw";
-          }
-        else if (g_strcmp0 (class, "libreoffice-base") == 0)
-          {
-            binary = "libreoffice";
-            parameter = "base";
-          }
-      }
-
-      if (!binary)
-        {
-          /* By default fallback to the main launcher */
-          if (g_str_has_prefix (class, "OpenOffice"))
-            {
-              binary = "ooffice";
-            }
-          else
-            {
-              binary = "libreoffice";
-            }
-        }
-    }
-
-  if (!binary)
-    return NULL;
-
-  GList *l = NULL;
-
-  if (parameter)
-    {
-      exec = g_strconcat (binary, " --", parameter, NULL);
-      l = g_hash_table_lookup (self->priv->desktop_file_table, exec);
-      g_free (exec);
-
-      if (!l)
-        {
-          exec = g_strconcat (binary, " -", parameter, NULL);
-          l = g_hash_table_lookup (self->priv->desktop_file_table, exec);
-          g_free (exec);
-
-          if (!l)
-            {
-              exec = g_strconcat (binary, "-", parameter, NULL);
-              l = g_hash_table_lookup (self->priv->desktop_id_table, exec);
-              g_free (exec);
-            }
-        }
-    }
-  else
-    {
-      l = g_hash_table_lookup (self->priv->desktop_file_table, binary);
+
+  if (!class)
+    return NULL;
+
+  if (g_str_has_prefix (class, "libreoffice-"))
+    {
+      l = g_hash_table_lookup (self->priv->desktop_id_table, class);
+    }
+
+  if (!l)
+    {
+      binary = "libreoffice";
+
+      parameter = strchr(class, '-');
+
+      if (parameter)
+      {
+        parameter = parameter + 1;
+
+        exec = g_strconcat (binary, " --", parameter, NULL);
+        l = g_hash_table_lookup (self->priv->desktop_file_table, exec);
+        g_free (exec);
+
+        if (!l)
+          {
+            exec = g_strconcat (binary, " -", parameter, NULL);
+            l = g_hash_table_lookup (self->priv->desktop_file_table, exec);
+            g_free (exec);
+
+            if (!l)
+              {
+                exec = g_strconcat (binary, "-", parameter, NULL);
+                l = g_hash_table_lookup (self->priv->desktop_id_table, exec);
+                g_free (exec);
+              }
+          }
+      }
+    else
+      {
+        l = g_hash_table_lookup (self->priv->desktop_file_table, binary);
+      }
     }
 
   return (l ? (char *) l->data : NULL);
@@ -1507,7 +1390,7 @@
 }
 
 static gboolean
-is_open_office_window (BamfMatcher * self, BamfLegacyWindow * window)
+is_libreoffice_window (BamfMatcher * self, BamfLegacyWindow * window)
 {
   const char *class_name = bamf_legacy_window_get_class_name (window);
 
@@ -2131,7 +2014,7 @@
 }
 
 static void
-on_open_office_window_name_changed (BamfLegacyWindow *window, BamfMatcher* self)
+on_libreoffice_window_class_changed (BamfLegacyWindow *window, BamfMatcher* self)
 {
   g_return_if_fail (BAMF_IS_MATCHER (self));
   g_return_if_fail (BAMF_IS_LEGACY_WINDOW (window));
@@ -2140,7 +2023,7 @@
   const char *new_hint;
 
   old_hint = bamf_legacy_window_get_hint (window, _NET_WM_DESKTOP_FILE);
-  new_hint = get_open_office_window_hint (self, window);
+  new_hint = get_libreoffice_window_hint (self, window);
 
   if (new_hint && g_strcmp0 (new_hint, old_hint) != 0)
     {
@@ -2151,29 +2034,28 @@
 }
 
 static void
-on_open_office_window_closed (BamfLegacyWindow *window, BamfMatcher* self)
+on_libreoffice_window_closed (BamfLegacyWindow *window, BamfMatcher* self)
 {
-  g_signal_handlers_disconnect_by_func (window, on_open_office_window_name_changed, self);
+  g_signal_handlers_disconnect_by_func (window, on_libreoffice_window_class_changed, self);
   g_object_unref (window);
 }
 
 static char *
 get_gnome_control_center_window_hint (BamfMatcher * self, BamfLegacyWindow * window)
 {
-  gchar *role;
+  const gchar *role;
   GList *list;
 
   g_return_val_if_fail (BAMF_IS_MATCHER (self), NULL);
   g_return_val_if_fail (BAMF_IS_LEGACY_WINDOW (window), NULL);
 
-  role = bamf_legacy_window_get_hint (window, WM_WINDOW_ROLE);
+  role = bamf_legacy_window_get_role (window);
 
   if (role)
     {
       gchar *exec = g_strconcat ("gnome-control-center ", role, NULL);
       list = g_hash_table_lookup (self->priv->desktop_file_table, exec);
       g_free (exec);
-      g_free (role);
     }
 
   if (!role || !list)
@@ -2185,7 +2067,7 @@
 }
 
 static void
-on_gnome_control_center_window_name_changed (BamfLegacyWindow *window, BamfMatcher* self)
+on_gnome_control_center_window_role_changed (BamfLegacyWindow *window, BamfMatcher* self)
 {
   g_return_if_fail (BAMF_IS_MATCHER (self));
   g_return_if_fail (BAMF_IS_LEGACY_WINDOW (window));
@@ -2207,7 +2089,7 @@
 static void
 on_gnome_control_center_window_closed (BamfLegacyWindow *window, BamfMatcher* self)
 {
-  g_signal_handlers_disconnect_by_func (window, on_gnome_control_center_window_name_changed, self);
+  g_signal_handlers_disconnect_by_func (window, on_gnome_control_center_window_role_changed, self);
   g_object_unref (window);
 }
 
@@ -2226,7 +2108,7 @@
       return;
     }
 
-  if (is_open_office_window (self, window))
+  if (is_libreoffice_window (self, window))
     {
       if (win_type == BAMF_WINDOW_SPLASHSCREEN || win_type == BAMF_WINDOW_TOOLBAR)
         {
@@ -2234,7 +2116,7 @@
         }
 
       char *old_hint = bamf_legacy_window_get_hint (window, _NET_WM_DESKTOP_FILE);
-      const char *new_hint = get_open_office_window_hint (self, window);
+      const char *new_hint = get_libreoffice_window_hint (self, window);
 
       if (new_hint && g_strcmp0 (old_hint, new_hint) != 0)
         {
@@ -2242,8 +2124,8 @@
         }
 
       g_object_ref (window);
-      g_signal_connect (window, "name-changed", (GCallback) on_open_office_window_name_changed, self);
-      g_signal_connect (window, "closed", (GCallback) on_open_office_window_closed, self);
+      g_signal_connect (window, "class-changed", (GCallback) on_libreoffice_window_class_changed, self);
+      g_signal_connect (window, "closed", (GCallback) on_libreoffice_window_closed, self);
 
       g_free (old_hint);
     }
@@ -2258,7 +2140,7 @@
         }
 
       g_object_ref (window);
-      g_signal_connect (window, "name-changed", (GCallback) on_gnome_control_center_window_name_changed, self);
+      g_signal_connect (window, "role-changed", (GCallback) on_gnome_control_center_window_role_changed, self);
       g_signal_connect (window, "closed", (GCallback) on_gnome_control_center_window_closed, self);
 
       g_free (old_hint);

=== modified file 'src/bamf-matcher.h'
--- src/bamf-matcher.h	2012-10-16 17:59:37 +0000
+++ src/bamf-matcher.h	2013-04-18 13:59:29 +0000
@@ -47,7 +47,6 @@
 #define BAMF_MATCHER_GET_CLASS(obj)             (G_TYPE_INSTANCE_GET_CLASS ((obj), BAMF_TYPE_MATCHER, BamfMatcherClass))
 
 #define _NET_WM_DESKTOP_FILE "_NET_WM_DESKTOP_FILE"
-#define WM_WINDOW_ROLE       "WM_WINDOW_ROLE"
 
 typedef struct _BamfMatcher BamfMatcher;
 typedef struct _BamfMatcherClass BamfMatcherClass;

=== modified file 'tests/bamfdaemon/test-matcher.c'
--- tests/bamfdaemon/test-matcher.c	2013-03-28 21:51:16 +0000
+++ tests/bamfdaemon/test-matcher.c	2013-04-18 13:59:29 +0000
@@ -461,8 +461,8 @@
   app = bamf_matcher_get_application_by_desktop_file (matcher, DATA_DIR"/libreoffice-startcenter.desktop");
   g_assert (find_window_in_app (app, BAMF_LEGACY_WINDOW (test_win)));
 
+  bamf_legacy_window_test_set_name (test_win, "FooDoc.odb - LibreOffice Base");
   bamf_legacy_window_test_set_wmclass (test_win, "libreoffice-base", class_instance);
-  bamf_legacy_window_test_set_name (test_win, "FooDoc.odb - LibreOffice Base");
   g_assert (!bamf_matcher_get_application_by_desktop_file (matcher, DATA_DIR"/libreoffice-startcenter.desktop"));
   app = bamf_matcher_get_application_by_desktop_file (matcher, DATA_DIR"/libreoffice-base.desktop");
   g_assert (app);
@@ -472,8 +472,8 @@
   g_assert_cmpstr (hint, ==, DATA_DIR"/libreoffice-base.desktop");
   g_free (hint);
 
-  bamf_legacy_window_test_set_wmclass (test_win, "libreoffice-calc", class_instance);
   bamf_legacy_window_test_set_name (test_win, "FooDoc.ods - LibreOffice Calc");
+  bamf_legacy_window_test_set_wmclass (test_win, "libreoffice-calc", class_instance);
   g_assert (!bamf_matcher_get_application_by_desktop_file (matcher, DATA_DIR"/libreoffice-base.desktop"));
   app = bamf_matcher_get_application_by_desktop_file (matcher, DATA_DIR"/libreoffice-calc.desktop");
   g_assert (app);
@@ -483,8 +483,8 @@
   g_assert_cmpstr (hint, ==, DATA_DIR"/libreoffice-calc.desktop");
   g_free (hint);
 
+  bamf_legacy_window_test_set_name (test_win, "FooDoc.odg - LibreOffice Draw");
   bamf_legacy_window_test_set_wmclass (test_win, "libreoffice-draw", class_instance);
-  bamf_legacy_window_test_set_name (test_win, "FooDoc.odg - LibreOffice Draw");
   g_assert (!bamf_matcher_get_application_by_desktop_file (matcher, DATA_DIR"/libreoffice-calc.desktop"));
   app = bamf_matcher_get_application_by_desktop_file (matcher, DATA_DIR"/libreoffice-draw.desktop");
   g_assert (app);
@@ -494,8 +494,8 @@
   g_assert_cmpstr (hint, ==, DATA_DIR"/libreoffice-draw.desktop");
   g_free (hint);
 
+  bamf_legacy_window_test_set_name (test_win, "FooDoc.odp - LibreOffice Impress");
   bamf_legacy_window_test_set_wmclass (test_win, "libreoffice-impress", class_instance);
-  bamf_legacy_window_test_set_name (test_win, "FooDoc.odp - LibreOffice Impress");
   g_assert (!bamf_matcher_get_application_by_desktop_file (matcher, DATA_DIR"/libreoffice-draw.desktop"));
   app = bamf_matcher_get_application_by_desktop_file (matcher, DATA_DIR"/libreoffice-impress.desktop");
   g_assert (app);
@@ -505,8 +505,8 @@
   g_assert_cmpstr (hint, ==, DATA_DIR"/libreoffice-impress.desktop");
   g_free (hint);
 
+  bamf_legacy_window_test_set_name (test_win, "FooDoc.odf - LibreOffice Math");
   bamf_legacy_window_test_set_wmclass (test_win, "libreoffice-math", class_instance);
-  bamf_legacy_window_test_set_name (test_win, "FooDoc.odf - LibreOffice Math");
   g_assert (!bamf_matcher_get_application_by_desktop_file (matcher, DATA_DIR"/libreoffice-impress.desktop"));
   app = bamf_matcher_get_application_by_desktop_file (matcher, DATA_DIR"/libreoffice-math.desktop");
   g_assert (app);
@@ -516,8 +516,8 @@
   g_assert_cmpstr (hint, ==, DATA_DIR"/libreoffice-math.desktop");
   g_free (hint);
 
-  bamf_legacy_window_test_set_wmclass (test_win, "libreoffice-writer", class_instance);
   bamf_legacy_window_test_set_name (test_win, "FooDoc.odt - LibreOffice Writer");
+  bamf_legacy_window_test_set_wmclass (test_win, "libreoffice-writer", class_instance);
   g_assert (!bamf_matcher_get_application_by_desktop_file (matcher, DATA_DIR"/libreoffice-math.desktop"));
   app = bamf_matcher_get_application_by_desktop_file (matcher, DATA_DIR"/libreoffice-writer.desktop");
   g_assert (app);
@@ -570,7 +570,7 @@
 
   test_win = bamf_legacy_window_test_new (xid, "System Settings", NULL, exec);
   bamf_legacy_window_test_set_wmclass (test_win, class_name, class_instance);
-  bamf_legacy_window_set_hint (BAMF_LEGACY_WINDOW (test_win), WM_WINDOW_ROLE, NULL);
+  bamf_legacy_window_test_set_role (test_win, NULL);
   _bamf_legacy_screen_open_test_window (screen, test_win);
 
   hint = bamf_legacy_window_get_hint (BAMF_LEGACY_WINDOW (test_win), _NET_WM_DESKTOP_FILE);
@@ -579,8 +579,8 @@
   app = bamf_matcher_get_application_by_desktop_file (matcher, DATA_DIR"/gnome-control-center.desktop");
   g_assert (find_window_in_app (app, BAMF_LEGACY_WINDOW (test_win)));
 
-  bamf_legacy_window_set_hint (BAMF_LEGACY_WINDOW (test_win), WM_WINDOW_ROLE, "display");
   bamf_legacy_window_test_set_name (test_win, "Displays");
+  bamf_legacy_window_test_set_role (test_win, "display");
   g_assert (!bamf_matcher_get_application_by_desktop_file (matcher, DATA_DIR"/gnome-control-center.desktop"));
   app = bamf_matcher_get_application_by_desktop_file (matcher, DATA_DIR"/gnome-display-panel.desktop");
   g_assert (app);
@@ -590,8 +590,8 @@
   g_assert_cmpstr (hint, ==, DATA_DIR"/gnome-display-panel.desktop");
   g_free (hint);
 
-  bamf_legacy_window_set_hint (BAMF_LEGACY_WINDOW (test_win), WM_WINDOW_ROLE, "mouse");
   bamf_legacy_window_test_set_name (test_win, "Mouse and Touchpad");
+  bamf_legacy_window_test_set_role (test_win, "mouse");
   g_assert (!bamf_matcher_get_application_by_desktop_file (matcher, DATA_DIR"/gnome-display-panel.desktop"));
   app = bamf_matcher_get_application_by_desktop_file (matcher, DATA_DIR"/gnome-mouse-panel.desktop");
   g_assert (app);
@@ -601,8 +601,8 @@
   g_assert_cmpstr (hint, ==, DATA_DIR"/gnome-mouse-panel.desktop");
   g_free (hint);
 
-  bamf_legacy_window_set_hint (BAMF_LEGACY_WINDOW (test_win), WM_WINDOW_ROLE, "invalid-role");
   bamf_legacy_window_test_set_name (test_win, "Invalid Panel");
+  bamf_legacy_window_test_set_role (test_win, "invalid-role");
   g_assert (!bamf_matcher_get_application_by_desktop_file (matcher, DATA_DIR"/gnome-mouse-panel.desktop"));
   app = bamf_matcher_get_application_by_desktop_file (matcher, DATA_DIR"/gnome-control-center.desktop");
   g_assert (app);