Merge lp:~3v1n0/bamf/libreoffice-base-and-tests into lp:bamf/0.4

[Marco Trevisan (Treviño)]

BamfMatcher: add support for libreoffice Base, and libreoffice matching tests

Added libreoffice base support to BAMF, at this point I've decided to add tests for the libreoffice matching in bamfdaemon; this required some refactoring in BamfLegacyWindow, adding an overridable setter/getter for the window hint (and that BamfLegacyWindowTest overrides).

[Brandon Schaefer (brandontschaefer)]

Confirmed works, tests pass and code looks good! +1

review: Approve

=== modified file 'src/bamf-legacy-window-test.c'
--- src/bamf-legacy-window-test.c	2012-07-31 15:11:20 +0000
+++ src/bamf-legacy-window-test.c	2012-10-10 17:32:43 +0000
@@ -127,16 +127,32 @@
 }
 
 void
-bamf_legacy_window_test_set_name (BamfLegacyWindowTest *self, char *val)
+bamf_legacy_window_test_set_name (BamfLegacyWindowTest *self, const char *val)
 {
   if (g_strcmp0 (self->name, val) == 0)
     return;
 
-  self->name = val;
+  self->name = g_strdup (val);
 
   g_signal_emit_by_name (self, "name-changed");
 }
 
+void
+bamf_legacy_window_test_set_wmclass (BamfLegacyWindowTest *self, const char *class_name, const char *instance_name)
+{
+  if (g_strcmp0 (self->wm_class_name, class_name) != 0)
+    {
+      g_free (self->wm_class_name);
+      self->wm_class_name = g_strdup (class_name);
+    }
+
+  if (g_strcmp0 (self->wm_class_instance, instance_name) != 0)
+    {
+      g_free (self->wm_class_instance);
+      self->wm_class_instance = g_strdup (instance_name);
+    }
+}
+
 static const char *
 bamf_legacy_window_test_get_name (BamfLegacyWindow *legacy_window)
 {
@@ -154,7 +170,7 @@
 
   self = BAMF_LEGACY_WINDOW_TEST (legacy_window);
 
-  return  self->wm_class_name;
+  return self->wm_class_name;
 }
 
 static const char *
@@ -164,7 +180,7 @@
 
   self = BAMF_LEGACY_WINDOW_TEST (legacy_window);
 
-  return  self->wm_class_instance;
+  return self->wm_class_instance;
 }
 
 char *
@@ -174,7 +190,7 @@
 
   self = BAMF_LEGACY_WINDOW_TEST (legacy_window);
 
-  return self->exec;
+  return g_strdup (self->exec);
 }
 
 char *
@@ -185,7 +201,7 @@
 
   self = BAMF_LEGACY_WINDOW_TEST (legacy_window);
 
-  return self->application_id;
+  return g_strdup (self->application_id);
 }
 
 char *
@@ -196,7 +212,7 @@
 
   self = BAMF_LEGACY_WINDOW_TEST (legacy_window);
 
-  return self->unique_bus_name;
+  return g_strdup (self->unique_bus_name);
 }
 
 char *
@@ -207,7 +223,7 @@
 
   self = BAMF_LEGACY_WINDOW_TEST (legacy_window);
 
-  return self->dbus_menu_object_path;
+  return g_strdup (self->dbus_menu_object_path);
 }
 
 void
@@ -328,10 +344,39 @@
   return self->window_type;
 }
 
+char *
+bamf_legacy_window_test_get_hint (BamfLegacyWindow *window, const char *name)
+{
+  g_return_val_if_fail (BAMF_IS_LEGACY_WINDOW_TEST (window), NULL);
+  BamfLegacyWindowTest *self = BAMF_LEGACY_WINDOW_TEST (window);
+
+  return g_strdup (g_hash_table_lookup (self->hints, name));
+}
+
 void
-bamf_legacy_window_test_dispose (GObject *object)
-{
-  G_OBJECT_CLASS (bamf_legacy_window_test_parent_class)->dispose (object);
+bamf_legacy_window_test_set_hint (BamfLegacyWindow *window, const char *name, const char *value)
+{
+  g_return_if_fail (BAMF_IS_LEGACY_WINDOW_TEST (window));
+  BamfLegacyWindowTest *self = BAMF_LEGACY_WINDOW_TEST (window);
+
+  return g_hash_table_insert (self->hints, g_strdup (name), g_strdup (value));
+}
+
+static void
+bamf_legacy_window_test_finalize (GObject *object)
+{
+  BamfLegacyWindowTest *self = BAMF_LEGACY_WINDOW_TEST (object);
+
+  g_free (self->name);
+  g_free (self->wm_class_name);
+  g_free (self->wm_class_instance);
+  g_free (self->exec);
+  g_free (self->application_id);
+  g_free (self->unique_bus_name);
+  g_free (self->dbus_menu_object_path);
+  g_hash_table_unref (self->hints);
+
+  G_OBJECT_CLASS (bamf_legacy_window_test_parent_class)->finalize (object);
 }
 
 void
@@ -340,7 +385,7 @@
   BamfLegacyWindowClass *win_class = BAMF_LEGACY_WINDOW_CLASS (klass);
   GObjectClass *obj_class = G_OBJECT_CLASS (klass);
 
-  obj_class->dispose          = bamf_legacy_window_test_dispose;
+  obj_class->finalize         = bamf_legacy_window_test_finalize;
   win_class->get_name         = bamf_legacy_window_test_get_name;
   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;
@@ -358,6 +403,8 @@
   win_class->get_window_type  = bamf_legacy_window_test_get_window_type;
   win_class->maximized        = bamf_legacy_window_test_maximized;
   win_class->is_closed        = bamf_legacy_window_test_is_closed;
+  win_class->get_hint         = bamf_legacy_window_test_get_hint;
+  win_class->set_hint         = bamf_legacy_window_test_set_hint;
   win_class->reopen           = bamf_legacy_window_test_reopen;
 }
 
@@ -368,6 +415,7 @@
   self->pid = g_random_int_range (1, 100000);
   self->maximized = BAMF_WINDOW_FLOATING;
   self->is_closed = FALSE;
+  self->hints = g_hash_table_new_full (g_str_hash, g_str_equal, g_free, g_free);
 }
 
 
@@ -394,12 +442,13 @@
   copy->geometry = self->geometry;
   copy->maximized = self->maximized;
   copy->window_type = self->window_type;
+  copy->hints = g_hash_table_ref (self->hints);
 
   return copy;
 }
 
 BamfLegacyWindowTest *
-bamf_legacy_window_test_new (guint32 xid, gchar *name, gchar *wmclass_name, gchar *exec)
+bamf_legacy_window_test_new (guint32 xid, const gchar *name, const gchar *wmclass_name, const gchar *exec)
 {
   BamfLegacyWindowTest *self;
 

=== modified file 'src/bamf-legacy-window-test.h'
--- src/bamf-legacy-window-test.h	2012-08-21 22:01:48 +0000
+++ src/bamf-legacy-window-test.h	2012-10-10 17:32:43 +0000
@@ -68,6 +68,7 @@
   GdkRectangle geometry;
   BamfWindowMaximizationType maximized;
   BamfWindowType window_type;
+  GHashTable * hints;
 };
 
 struct _BamfLegacyWindowTestClass
@@ -116,7 +117,7 @@
 bamf_legacy_window_test_is_skip_tasklist (BamfLegacyWindow *legacy_window);
 
 void
-bamf_legacy_window_test_set_name (BamfLegacyWindowTest *self, char *val);
+bamf_legacy_window_test_set_name (BamfLegacyWindowTest *self, const char *val);
 
 void
 bamf_legacy_window_test_set_geometry (BamfLegacyWindowTest *self, int x, int y,
@@ -136,10 +137,13 @@
 bamf_legacy_window_test_set_dbus_menu_object_path (BamfLegacyWindowTest *self, const char *object_path);
 
 void
+bamf_legacy_window_test_set_wmclass (BamfLegacyWindowTest *self, const char *class_name, const char *instance_name);
+
+void
 bamf_legacy_window_test_close (BamfLegacyWindowTest *self);
 
 BamfLegacyWindowTest *
-bamf_legacy_window_test_new (guint32 xid, gchar *name, gchar *wmclass_name, gchar *exec);
+bamf_legacy_window_test_new (guint32 xid, const gchar *name, const gchar *wmclass_name, const gchar *exec);
 
 BamfLegacyWindowTest *
 bamf_legacy_window_copy (BamfLegacyWindowTest *self);

=== modified file 'src/bamf-legacy-window.c'
--- src/bamf-legacy-window.c	2012-07-27 17:46:22 +0000
+++ src/bamf-legacy-window.c	2012-10-10 17:32:43 +0000
@@ -429,15 +429,35 @@
 }
 
 char *
-bamf_legacy_window_get_utf8_xprop (BamfLegacyWindow *self, const char* prop)
+bamf_legacy_window_get_hint (BamfLegacyWindow *self, const char *name)
 {
   g_return_val_if_fail (BAMF_IS_LEGACY_WINDOW (self), NULL);
-
-  if (!self->priv->legacy_window)
-    return NULL;
-
-  guint xid = bamf_legacy_window_get_xid (self);
-  return bamf_xutils_get_window_hint (xid, prop, XInternAtom(gdk_x11_get_default_xdisplay (), "UTF8_STRING", False));
+  g_return_val_if_fail (name, NULL);
+
+  if (BAMF_LEGACY_WINDOW_GET_CLASS (self)->get_hint)
+    return BAMF_LEGACY_WINDOW_GET_CLASS (self)->get_hint (self, name);
+
+  g_return_val_if_fail (WNCK_IS_WINDOW (self->priv->legacy_window), NULL);
+
+  guint xid = bamf_legacy_window_get_xid (self);
+
+  return bamf_xutils_get_string_window_hint (xid, name);
+}
+
+void
+bamf_legacy_window_set_hint (BamfLegacyWindow *self, const char *name, const char *value)
+{
+  g_return_if_fail (BAMF_IS_LEGACY_WINDOW (self));
+  g_return_if_fail (name);
+
+  if (BAMF_LEGACY_WINDOW_GET_CLASS (self)->set_hint)
+    return BAMF_LEGACY_WINDOW_GET_CLASS (self)->set_hint (self, name, value);
+
+  g_return_if_fail (WNCK_IS_WINDOW (self->priv->legacy_window));
+
+  guint xid = bamf_legacy_window_get_xid (self);
+
+  bamf_xutils_set_string_window_hint (xid, name, value);
 }
 
 static void

=== modified file 'src/bamf-legacy-window.h'
--- src/bamf-legacy-window.h	2012-08-21 22:01:48 +0000
+++ src/bamf-legacy-window.h	2012-10-10 17:32:43 +0000
@@ -77,6 +77,8 @@
   char       * (*get_app_id)              (BamfLegacyWindow *legacy_window);
   char       * (*get_unique_bus_name)     (BamfLegacyWindow *legacy_window);
   char       * (*get_menu_object_path)    (BamfLegacyWindow *legacy_window);
+  char       * (*get_hint)                (BamfLegacyWindow *legacy_window,
+                                           const gchar *name);
   gint         (*get_pid)                 (BamfLegacyWindow *legacy_window);
   guint32      (*get_xid)                 (BamfLegacyWindow *legacy_window);
   gboolean     (*needs_attention)         (BamfLegacyWindow *legacy_window);
@@ -88,8 +90,9 @@
   BamfWindowMaximizationType (*maximized) (BamfLegacyWindow *legacy_window);
   BamfWindowType (*get_window_type)       (BamfLegacyWindow *legacy_window);
   void         (*get_geometry)            (BamfLegacyWindow *legacy_window,
-                                           gint *x, gint *y,
-                                           gint *width, gint *height);
+                                           gint *x, gint *y, gint *w, gint *h);
+  void         (*set_hint)                (BamfLegacyWindow *legacy_window,
+                                           const gchar *name, const gchar *value);
   void         (*reopen)                  (BamfLegacyWindow *legacy_window);
 
   /*< signals >*/
@@ -141,7 +144,12 @@
 
 BamfLegacyWindow * bamf_legacy_window_get_transient        (BamfLegacyWindow *self);
 
-char             * bamf_legacy_window_get_utf8_xprop       (BamfLegacyWindow *self, const char* prop);
+char             * bamf_legacy_window_get_hint             (BamfLegacyWindow *self,
+                                                            const char *name);
+
+void               bamf_legacy_window_set_hint             (BamfLegacyWindow *self,
+                                                            const char *name,
+                                                            const char *value);
 
 gint               bamf_legacy_window_get_stacking_position (BamfLegacyWindow *self);
 

=== modified file 'src/bamf-matcher.c'
--- src/bamf-matcher.c	2012-10-08 10:24:47 +0000
+++ src/bamf-matcher.c	2012-10-10 17:32:43 +0000
@@ -26,7 +26,6 @@
 #include "bamf-window.h"
 #include "bamf-legacy-screen.h"
 #include "bamf-indicator-source.h"
-#include "bamf-xutils.h"
 
 #ifdef HAVE_WEBAPPS
 #include "bamf-unity-webapps-application.h"
@@ -370,6 +369,11 @@
       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";
@@ -403,6 +407,11 @@
       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";
@@ -437,6 +446,11 @@
             binary = "libreoffice";
             parameter = "draw";
           }
+        else if (g_strcmp0 (class, "libreoffice-base") == 0)
+          {
+            binary = "libreoffice";
+            parameter = "base";
+          }
       }
 
       if (!binary)
@@ -1398,24 +1412,6 @@
 }
 
 static char *
-get_window_hint (BamfLegacyWindow *window, const char *atom_name)
-{
-  g_return_val_if_fail (BAMF_IS_LEGACY_WINDOW (window), NULL);
-
-  Window xid = bamf_legacy_window_get_xid (window);
-  return bamf_xutils_get_window_hint (xid, atom_name, XA_STRING);
-}
-
-static void
-set_window_hint (BamfLegacyWindow * window, const char *atom_name, const char *data)
-{
-  g_return_if_fail (BAMF_LEGACY_WINDOW (window));
-
-  Window xid = bamf_legacy_window_get_xid (window);
-  bamf_xutils_set_window_hint (xid, atom_name, XA_STRING, data);
-}
-
-static char *
 process_exec_string (gint pid)
 {
   gchar *result = NULL;
@@ -1655,7 +1651,7 @@
 
   priv = self->priv;
   window = bamf_window_get_window (bamf_window);
-  desktop_file = get_window_hint (window, _NET_WM_DESKTOP_FILE);
+  desktop_file = bamf_legacy_window_get_hint (window, _NET_WM_DESKTOP_FILE);
   class_name = bamf_legacy_window_get_class_name (window);
   instance_name = bamf_legacy_window_get_class_instance_name (window);
 
@@ -1972,7 +1968,7 @@
       return;
     }
 
-  desktop_file_hint = get_window_hint (window, _NET_WM_DESKTOP_FILE);
+  desktop_file_hint = bamf_legacy_window_get_hint (window, _NET_WM_DESKTOP_FILE);
 
   if (desktop_file_hint)
     {
@@ -2009,7 +2005,7 @@
   g_array_free (pids, TRUE);
 
   if (desktop_file_hint)
-    set_window_hint (window, _NET_WM_DESKTOP_FILE, desktop_file_hint);
+    bamf_legacy_window_set_hint (window, _NET_WM_DESKTOP_FILE, desktop_file_hint);
 }
 
 static void
@@ -2054,7 +2050,7 @@
   char *old_hint;
   const char *new_hint;
 
-  old_hint = get_window_hint (window, _NET_WM_DESKTOP_FILE);
+  old_hint = bamf_legacy_window_get_hint (window, _NET_WM_DESKTOP_FILE);
   new_hint = get_open_office_window_hint (self, window);
 
   if (new_hint && g_strcmp0 (new_hint, old_hint) != 0)
@@ -2083,7 +2079,7 @@
   g_return_val_if_fail (BAMF_IS_MATCHER (self), NULL);
   g_return_val_if_fail (BAMF_IS_LEGACY_WINDOW (window), NULL);
 
-  role = get_window_hint (window, WM_WINDOW_ROLE);
+  role = bamf_legacy_window_get_hint (window, WM_WINDOW_ROLE);
   exec = g_strconcat ("gnome-control-center", (role ? " " : NULL), role, NULL);
 
   desktopFileTable = self->priv->desktop_file_table;
@@ -2109,7 +2105,7 @@
   char *old_hint;
   const char *new_hint;
 
-  old_hint = get_window_hint (window, _NET_WM_DESKTOP_FILE);
+  old_hint = bamf_legacy_window_get_hint (window, _NET_WM_DESKTOP_FILE);
   new_hint = get_gnome_control_center_window_hint (self, window);
 
   if (new_hint && g_strcmp0 (new_hint, old_hint) != 0)
@@ -2150,12 +2146,12 @@
           return;
         }
 
-      char *old_hint = get_window_hint (window, _NET_WM_DESKTOP_FILE);
+      char *old_hint = bamf_legacy_window_get_hint (window, _NET_WM_DESKTOP_FILE);
       const char *new_hint = get_open_office_window_hint (self, window);
 
       if (new_hint && g_strcmp0 (old_hint, new_hint) != 0)
         {
-          set_window_hint (window, _NET_WM_DESKTOP_FILE, new_hint);
+          bamf_legacy_window_set_hint (window, _NET_WM_DESKTOP_FILE, new_hint);
         }
 
       g_object_ref (window);
@@ -2166,12 +2162,12 @@
     }
   else if (g_strcmp0 (bamf_legacy_window_get_class_name (window), "Gnome-control-center") == 0)
     {
-      char *old_hint = get_window_hint (window, _NET_WM_DESKTOP_FILE);
+      char *old_hint = bamf_legacy_window_get_hint (window, _NET_WM_DESKTOP_FILE);
       const char *new_hint = get_gnome_control_center_window_hint (self, window);
 
       if (new_hint && g_strcmp0 (old_hint, new_hint) != 0)
         {
-          set_window_hint (window, _NET_WM_DESKTOP_FILE, new_hint);
+          bamf_legacy_window_set_hint (window, _NET_WM_DESKTOP_FILE, new_hint);
         }
 
       g_object_ref (window);

=== modified file 'src/bamf-unity-webapps-tab.c'
--- src/bamf-unity-webapps-tab.c	2012-08-21 22:01:48 +0000
+++ src/bamf-unity-webapps-tab.c	2012-10-10 17:32:43 +0000
@@ -21,7 +21,6 @@
 #include "bamf-unity-webapps-tab.h"
 #include "bamf-matcher.h"
 
-#include "bamf-xutils.h"
 #include "bamf-legacy-window.h"
 #include "bamf-legacy-screen.h"
 

=== modified file 'src/bamf-window.c'
--- src/bamf-window.c	2012-07-28 12:58:30 +0000
+++ src/bamf-window.c	2012-10-10 17:32:43 +0000
@@ -232,10 +232,10 @@
 }
 
 char *
-bamf_window_get_xprop (BamfWindow *self, const char* prop)
+bamf_window_get_string_hint (BamfWindow *self, const char* prop)
 {
   g_return_val_if_fail (BAMF_IS_WINDOW (self), NULL);
-  return bamf_legacy_window_get_utf8_xprop(self->priv->legacy_window, prop);
+  return bamf_legacy_window_get_hint (self->priv->legacy_window, prop);
 }
 
 BamfWindowMaximizationType
@@ -334,11 +334,11 @@
                       const gchar *prop,
                       BamfWindow *self)
 {
-  char *bus_name = bamf_window_get_xprop (self, prop);
+  char *hint = bamf_window_get_string_hint (self, prop);
   g_dbus_method_invocation_return_value (invocation,
-                                         g_variant_new ("(s)", bus_name ? bus_name : ""));
+                                         g_variant_new ("(s)", hint ? hint : ""));
 
-  g_free (bus_name);
+  g_free (hint);
 
   return TRUE;
 }

=== modified file 'src/bamf-window.h'
--- src/bamf-window.h	2012-08-21 22:01:48 +0000
+++ src/bamf-window.h	2012-10-10 17:32:43 +0000
@@ -76,7 +76,7 @@
 
 gint               bamf_window_get_stack_position (BamfWindow *window);
 
-char             * bamf_window_get_xprop (BamfWindow *self, const char* prop);
+char             * bamf_window_get_string_hint (BamfWindow *self, const char* prop);
 
 BamfWindowMaximizationType bamf_window_maximized (BamfWindow *self);
 

=== modified file 'src/bamf-xutils.c'
--- src/bamf-xutils.c	2012-04-19 18:58:57 +0000
+++ src/bamf-xutils.c	2012-10-10 17:32:43 +0000
@@ -44,69 +44,80 @@
   return xdisplay;
 }
 
-char *
-bamf_xutils_get_window_hint (Window xid, const char *atom_name, Atom type)
+static void
+bamf_xutils_get_string_window_hint_and_type (Window xid, const char *atom_name,
+                                             gchar** return_hint, Atom* return_type)
 {
   Display *XDisplay;
-  Atom atom;
-  char *hint = NULL;
-  Atom result_type;
   gint format;
   gulong numItems;
   gulong bytesAfter;
+  Atom type;
   unsigned char *buffer;
-  gboolean close_display = FALSE;
-
-  g_return_val_if_fail ((xid != 0), NULL);
-  g_return_val_if_fail (atom_name, NULL);
-
+  gboolean close_display;
+
+  if (return_hint)
+    *return_hint = NULL;
+
+  if (return_type)
+    *return_type = AnyPropertyType;
+
+  g_return_if_fail (xid != 0);
+  g_return_if_fail (return_hint || return_type);
+
+  close_display = FALSE;
   XDisplay = get_xdisplay (&close_display);
 
   if (!XDisplay)
   {
     g_warning ("%s: Unable to get a valid XDisplay", G_STRFUNC);
-    return NULL;
+    return;
   }
 
-  atom = XInternAtom (XDisplay, atom_name, FALSE);
-
-  int result = XGetWindowProperty (XDisplay,
-                                   xid,
-                                   atom,
-                                   0,
-                                   G_MAXINT,
-                                   FALSE,
-                                   type,
-                                   &result_type,
-                                   &format,
-                                   &numItems,
-                                   &bytesAfter,
-                                   &buffer);
+  int result = XGetWindowProperty (XDisplay,  xid,
+                                   gdk_x11_get_xatom_by_name (atom_name),
+                                   0,  G_MAXINT, False, AnyPropertyType,
+                                   &type, &format, &numItems,
+                                   &bytesAfter, &buffer);
 
   if (close_display)
     XCloseDisplay (XDisplay);
 
   if (result == Success && numItems > 0)
     {
-      if (buffer && buffer[0] != '\0')
-        hint = g_strdup ((char*) buffer);
+      if (return_type)
+        *return_type = type;
+
+      if (return_hint && buffer && buffer[0] != '\0')
+        {
+          if (type == XA_STRING || type == gdk_x11_get_xatom_by_name("UTF8_STRING"))
+            *return_hint = g_strdup ((char*) buffer);
+        }
 
       XFree (buffer);
     }
+}
+
+char *
+bamf_xutils_get_string_window_hint (Window xid, const char *atom_name)
+{
+  gchar *hint = NULL;
+  bamf_xutils_get_string_window_hint_and_type (xid, atom_name, &hint, NULL);
 
   return hint;
 }
 
 void
-bamf_xutils_set_window_hint (Window xid, const char *atom_name, Atom type, const char *data)
+bamf_xutils_set_string_window_hint (Window xid, const char *atom_name, const char *value)
 {
   Display *XDisplay;
+  Atom type;
   gboolean close_display = FALSE;
 
   g_return_if_fail (xid != 0);
   g_return_if_fail (atom_name);
-  g_return_if_fail (data);
-  
+  g_return_if_fail (value);
+
   XDisplay = get_xdisplay (&close_display);
 
   if (!XDisplay)
@@ -115,16 +126,20 @@
     return;
   }
 
-  XChangeProperty (XDisplay,
-                   xid,
-                   XInternAtom (XDisplay,
-                   atom_name,
-                   FALSE),
-                   type,
-                   8,
-                   PropModeReplace,
-                   (unsigned char *) data,
-                   strlen (data));
+  bamf_xutils_get_string_window_hint_and_type (xid, atom_name, NULL, &type);
+
+  if (type == AnyPropertyType)
+    {
+      type = XA_STRING;
+    }
+  else if (type != XA_STRING && type != gdk_x11_get_xatom_by_name("UTF8_STRING"))
+    {
+      g_error ("Impossible to set the atom %s on Window %lu", atom_name, xid);
+      return;
+    }
+
+  XChangeProperty (XDisplay, xid, gdk_x11_get_xatom_by_name (atom_name),
+                   type, 8, PropModeReplace, (unsigned char *) value, strlen (value));
 
   if (close_display)
     XCloseDisplay (XDisplay);

=== modified file 'src/bamf-xutils.h'
--- src/bamf-xutils.h	2012-04-18 20:12:33 +0000
+++ src/bamf-xutils.h	2012-10-10 17:32:43 +0000
@@ -26,8 +26,8 @@
 #include <X11/Xlib.h>
 #include <gdk/gdkx.h>
 
-void  bamf_xutils_set_window_hint (Window xid, const char *atom_name, Atom type, const char *data);
-char* bamf_xutils_get_window_hint (Window xid, const char *atom_name, Atom type);
+void  bamf_xutils_set_string_window_hint (Window xid, const char *atom_name, const char *value);
+char* bamf_xutils_get_string_window_hint (Window xid, const char *atom_name);
 
 void  bamf_xutils_get_window_class_hints (Window xid, char **class_instance_name, char **class_name);
 

=== added file 'tests/bamfdaemon/data/libreoffice-base.desktop'
--- tests/bamfdaemon/data/libreoffice-base.desktop	1970-01-01 00:00:00 +0000
+++ tests/bamfdaemon/data/libreoffice-base.desktop	2012-10-10 17:32:43 +0000
@@ -0,0 +1,7 @@
+[Desktop Entry]
+Version=1.0
+Terminal=false
+Icon=libreoffice-base
+Type=Application
+Exec=libreoffice --base %U
+Name=LibreOffice Base

=== added file 'tests/bamfdaemon/data/libreoffice-calc.desktop'
--- tests/bamfdaemon/data/libreoffice-calc.desktop	1970-01-01 00:00:00 +0000
+++ tests/bamfdaemon/data/libreoffice-calc.desktop	2012-10-10 17:32:43 +0000
@@ -0,0 +1,7 @@
+[Desktop Entry]
+Version=1.0
+Terminal=false
+Icon=libreoffice-calc
+Type=Application
+Exec=libreoffice --calc %U
+Name=LibreOffice Calc

=== added file 'tests/bamfdaemon/data/libreoffice-draw.desktop'
--- tests/bamfdaemon/data/libreoffice-draw.desktop	1970-01-01 00:00:00 +0000
+++ tests/bamfdaemon/data/libreoffice-draw.desktop	2012-10-10 17:32:43 +0000
@@ -0,0 +1,7 @@
+[Desktop Entry]
+Version=1.0
+Terminal=false
+Icon=libreoffice-draw
+Type=Application
+Exec=libreoffice --draw %U
+Name=LibreOffice Draw

=== added file 'tests/bamfdaemon/data/libreoffice-impress.desktop'
--- tests/bamfdaemon/data/libreoffice-impress.desktop	1970-01-01 00:00:00 +0000
+++ tests/bamfdaemon/data/libreoffice-impress.desktop	2012-10-10 17:32:43 +0000
@@ -0,0 +1,7 @@
+[Desktop Entry]
+Version=1.0
+Terminal=false
+Icon=libreoffice-impress
+Type=Application
+Exec=libreoffice --impress %U
+Name=LibreOffice Impress

=== added file 'tests/bamfdaemon/data/libreoffice-math.desktop'
--- tests/bamfdaemon/data/libreoffice-math.desktop	1970-01-01 00:00:00 +0000
+++ tests/bamfdaemon/data/libreoffice-math.desktop	2012-10-10 17:32:43 +0000
@@ -0,0 +1,7 @@
+[Desktop Entry]
+Version=1.0
+Terminal=false
+Icon=libreoffice-math
+Type=Application
+Exec=libreoffice --math %U
+Name=LibreOffice Math

=== added file 'tests/bamfdaemon/data/libreoffice-startcenter.desktop'
--- tests/bamfdaemon/data/libreoffice-startcenter.desktop	1970-01-01 00:00:00 +0000
+++ tests/bamfdaemon/data/libreoffice-startcenter.desktop	2012-10-10 17:32:43 +0000
@@ -0,0 +1,7 @@
+[Desktop Entry]
+Version=1.0
+Terminal=false
+Icon=libreoffice-startcenter
+Type=Application
+Exec=libreoffice %U
+Name=LibreOffice

=== added file 'tests/bamfdaemon/data/libreoffice-writer.desktop'
--- tests/bamfdaemon/data/libreoffice-writer.desktop	1970-01-01 00:00:00 +0000
+++ tests/bamfdaemon/data/libreoffice-writer.desktop	2012-10-10 17:32:43 +0000
@@ -0,0 +1,7 @@
+[Desktop Entry]
+Version=1.0
+Terminal=false
+Icon=libreoffice-writer
+Type=Application
+Exec=libreoffice --writer %U
+Name=LibreOffice Writer

=== modified file 'tests/bamfdaemon/test-matcher.c'
--- tests/bamfdaemon/test-matcher.c	2012-07-30 03:00:23 +0000
+++ tests/bamfdaemon/test-matcher.c	2012-10-10 17:32:43 +0000
@@ -31,6 +31,7 @@
 static void test_open_windows (void);
 static void test_match_desktopless_application (void);
 static void test_match_desktop_application (void);
+static void test_match_libreoffice_windows (void);
 static void test_new_desktop_matches_unmatched_windows (void);
 
 static GDBusConnection *gdbus_connection = NULL;
@@ -47,9 +48,10 @@
   g_test_add_func (DOMAIN"/Allocation", test_allocation);
   g_test_add_func (DOMAIN"/LoadDesktopFile", test_load_desktop_file);
   g_test_add_func (DOMAIN"/OpenWindows", test_open_windows);
-  g_test_add_func (DOMAIN"/MatchDesktopLessApplication", test_match_desktopless_application);
-  g_test_add_func (DOMAIN"/MatchDesktopApplication", test_match_desktop_application);
-  g_test_add_func (DOMAIN"/NewMatchesUnmatchedWindows", test_new_desktop_matches_unmatched_windows);
+  g_test_add_func (DOMAIN"/Matching/Application/DesktopLess", test_match_desktopless_application);
+  g_test_add_func (DOMAIN"/Matching/Application/Desktop", test_match_desktop_application);
+  g_test_add_func (DOMAIN"/Matching/Application/LibreOffice", test_match_libreoffice_windows);
+  g_test_add_func (DOMAIN"/Matching/Windows/UnmatchedOnNewDesktop", test_new_desktop_matches_unmatched_windows);
 }
 
 static void
@@ -66,6 +68,34 @@
   g_clear_error (&error);
 }
 
+static void
+cleanup_matcher_tables (BamfMatcher *matcher)
+{
+  g_return_if_fail (BAMF_IS_MATCHER (matcher));
+
+  g_hash_table_destroy (matcher->priv->desktop_file_table);
+  g_hash_table_destroy (matcher->priv->desktop_id_table);
+  g_hash_table_destroy (matcher->priv->desktop_class_table);
+
+  matcher->priv->desktop_file_table =
+    g_hash_table_new_full ((GHashFunc) g_str_hash,
+                           (GEqualFunc) g_str_equal,
+                           (GDestroyNotify) g_free,
+                           NULL);
+
+  matcher->priv->desktop_id_table =
+    g_hash_table_new_full ((GHashFunc) g_str_hash,
+                           (GEqualFunc) g_str_equal,
+                           (GDestroyNotify) g_free,
+                           NULL);
+
+  matcher->priv->desktop_class_table =
+    g_hash_table_new_full ((GHashFunc) g_str_hash,
+                           (GEqualFunc) g_str_equal,
+                           (GDestroyNotify) g_free,
+                           (GDestroyNotify) g_free);
+}
+
 static BamfWindow *
 find_window_in_matcher (BamfMatcher *matcher, BamfLegacyWindow *legacy)
 {
@@ -93,6 +123,8 @@
   GList *l;
   BamfWindow *found_window = NULL;
 
+  g_return_val_if_fail (BAMF_IS_APPLICATION (app), NULL);
+
   for (l = bamf_view_get_children (BAMF_VIEW (app)); l; l = l->next)
     {
       if (!BAMF_IS_WINDOW (l->data))
@@ -125,6 +157,7 @@
   BamfMatcher *matcher = bamf_matcher_get_default ();
   BamfMatcherPrivate *priv = matcher->priv;
 
+  cleanup_matcher_tables (matcher);
   bamf_matcher_load_desktop_file (matcher, TEST_BAMF_APP_DESKTOP);
 
   GList *l = g_hash_table_lookup (priv->desktop_file_table, "testbamfapp");
@@ -150,6 +183,7 @@
   screen = bamf_legacy_screen_get_default();
   matcher = bamf_matcher_get_default ();
 
+  cleanup_matcher_tables (matcher);
   export_matcher_on_bus (matcher);
 
   for (xid = G_MAXUINT; xid > G_MAXUINT-window_count; xid--)
@@ -194,9 +228,10 @@
 
   screen = bamf_legacy_screen_get_default();
   matcher = bamf_matcher_get_default ();
-  char *exec = "test-bamf-app";
-  char *class = "test-bamf-app";
+  const char *exec = "test-bamf-app";
+  const char *class = "test-bamf-app";
 
+  cleanup_matcher_tables (matcher);
   export_matcher_on_bus (matcher);
 
   for (xid = G_MAXUINT; xid > G_MAXUINT-window_count; xid--)
@@ -241,9 +276,10 @@
 
   screen = bamf_legacy_screen_get_default();
   matcher = bamf_matcher_get_default ();
-  char *exec = "testbamfapp";
-  char *class = "test_bamf_app";
+  const char *exec = "testbamfapp";
+  const char *class = "test_bamf_app";
 
+  cleanup_matcher_tables (matcher);
   export_matcher_on_bus (matcher);
   bamf_matcher_load_desktop_file (matcher, TEST_BAMF_APP_DESKTOP);
 
@@ -290,9 +326,10 @@
 
   screen = bamf_legacy_screen_get_default();
   matcher = bamf_matcher_get_default ();
-  char *exec = "testbamfapp";
-  char *class = "test_bamf_app";
+  const char *exec = "testbamfapp";
+  const char *class = "test_bamf_app";
 
+  cleanup_matcher_tables (matcher);
   export_matcher_on_bus (matcher);
   g_assert (!bamf_matcher_get_application_by_desktop_file (matcher, TEST_BAMF_APP_DESKTOP));
 
@@ -323,3 +360,123 @@
   g_object_unref (screen);
 }
 
+static void
+test_match_libreoffice_windows (void)
+{
+  BamfMatcher *matcher;
+  BamfWindow *window;
+  BamfLegacyScreen *screen;
+  BamfLegacyWindowTest *test_win;
+  BamfApplication *app;
+  char *hint;
+
+  screen = bamf_legacy_screen_get_default ();
+  matcher = bamf_matcher_get_default ();
+  guint xid = g_random_int ();
+  const char *exec = "soffice.bin";
+  const char *class_instance = "VCLSalFrame.DocumentWindow";
+
+  cleanup_matcher_tables (matcher);
+  export_matcher_on_bus (matcher);
+
+  bamf_matcher_load_desktop_file (matcher, DATA_DIR"/libreoffice-startcenter.desktop");
+  bamf_matcher_load_desktop_file (matcher, DATA_DIR"/libreoffice-base.desktop");
+  bamf_matcher_load_desktop_file (matcher, DATA_DIR"/libreoffice-calc.desktop");
+  bamf_matcher_load_desktop_file (matcher, DATA_DIR"/libreoffice-draw.desktop");
+  bamf_matcher_load_desktop_file (matcher, DATA_DIR"/libreoffice-impress.desktop");
+  bamf_matcher_load_desktop_file (matcher, DATA_DIR"/libreoffice-math.desktop");
+  bamf_matcher_load_desktop_file (matcher, DATA_DIR"/libreoffice-writer.desktop");
+
+  test_win = bamf_legacy_window_test_new (xid, "LibreOffice", "libreoffice-startcenter", exec);
+  bamf_legacy_window_test_set_wmclass (test_win, "libreoffice-startcenter", class_instance);
+  _bamf_legacy_screen_open_test_window (screen, test_win);
+
+  hint = bamf_legacy_window_get_hint (BAMF_LEGACY_WINDOW (test_win), _NET_WM_DESKTOP_FILE);
+  g_assert_cmpstr (hint, ==, DATA_DIR"/libreoffice-startcenter.desktop");
+  g_free (hint);
+  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_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);
+  window = BAMF_WINDOW (bamf_view_get_children (BAMF_VIEW (app))->data);
+  test_win = BAMF_LEGACY_WINDOW_TEST (bamf_window_get_window (window));
+  hint = bamf_legacy_window_get_hint (BAMF_LEGACY_WINDOW (test_win), _NET_WM_DESKTOP_FILE);
+  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");
+  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);
+  window = BAMF_WINDOW (bamf_view_get_children (BAMF_VIEW (app))->data);
+  test_win = BAMF_LEGACY_WINDOW_TEST (bamf_window_get_window (window));
+  hint = bamf_legacy_window_get_hint (BAMF_LEGACY_WINDOW (test_win), _NET_WM_DESKTOP_FILE);
+  g_assert_cmpstr (hint, ==, DATA_DIR"/libreoffice-calc.desktop");
+  g_free (hint);
+
+  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);
+  window = BAMF_WINDOW (bamf_view_get_children (BAMF_VIEW (app))->data);
+  test_win = BAMF_LEGACY_WINDOW_TEST (bamf_window_get_window (window));
+  hint = bamf_legacy_window_get_hint (BAMF_LEGACY_WINDOW (test_win), _NET_WM_DESKTOP_FILE);
+  g_assert_cmpstr (hint, ==, DATA_DIR"/libreoffice-draw.desktop");
+  g_free (hint);
+
+  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);
+  window = BAMF_WINDOW (bamf_view_get_children (BAMF_VIEW (app))->data);
+  test_win = BAMF_LEGACY_WINDOW_TEST (bamf_window_get_window (window));
+  hint = bamf_legacy_window_get_hint (BAMF_LEGACY_WINDOW (test_win), _NET_WM_DESKTOP_FILE);
+  g_assert_cmpstr (hint, ==, DATA_DIR"/libreoffice-impress.desktop");
+  g_free (hint);
+
+  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);
+  window = BAMF_WINDOW (bamf_view_get_children (BAMF_VIEW (app))->data);
+  test_win = BAMF_LEGACY_WINDOW_TEST (bamf_window_get_window (window));
+  hint = bamf_legacy_window_get_hint (BAMF_LEGACY_WINDOW (test_win), _NET_WM_DESKTOP_FILE);
+  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");
+  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);
+  window = BAMF_WINDOW (bamf_view_get_children (BAMF_VIEW (app))->data);
+  test_win = BAMF_LEGACY_WINDOW_TEST (bamf_window_get_window (window));
+  hint = bamf_legacy_window_get_hint (BAMF_LEGACY_WINDOW (test_win), _NET_WM_DESKTOP_FILE);
+  g_assert_cmpstr (hint, ==, DATA_DIR"/libreoffice-writer.desktop");
+  g_free (hint);
+
+  xid = g_random_int ();
+  test_win = bamf_legacy_window_test_new (xid, "BarDoc.odt - LibreOffice Writer", "libreoffice-writer", exec);
+  bamf_legacy_window_test_set_wmclass (test_win, "libreoffice-writer", class_instance);
+  _bamf_legacy_screen_open_test_window (screen, test_win);
+
+  g_assert_cmpuint (g_list_length (bamf_view_get_children (BAMF_VIEW (app))), ==, 2);
+
+  xid = g_random_int ();
+  test_win = bamf_legacy_window_test_new (xid, "BarDoc.ods - LibreOffice Calc", "libreoffice-calc", exec);
+  bamf_legacy_window_test_set_wmclass (test_win, "libreoffice-calc", class_instance);
+  _bamf_legacy_screen_open_test_window (screen, test_win);
+  g_assert (bamf_matcher_get_application_by_desktop_file (matcher, DATA_DIR"/libreoffice-calc.desktop"));
+
+  g_object_unref (matcher);
+  g_object_unref (screen);
+}
+

=== modified file 'tests/bamfdaemon/test-window.c'
--- tests/bamfdaemon/test-window.c	2012-02-10 18:30:25 +0000
+++ tests/bamfdaemon/test-window.c	2012-10-10 17:32:43 +0000
@@ -25,6 +25,7 @@
 
 static void test_allocation    (void);
 static void test_xid           (void);
+static void test_hints         (void);
 static void test_active        (void);
 static void test_urgent        (void);
 static void test_user_visible  (void);
@@ -43,6 +44,7 @@
 
   g_test_add_func (DOMAIN"/Allocation", test_allocation);
   g_test_add_func (DOMAIN"/Xid", test_xid);
+  g_test_add_func (DOMAIN"/Hints", test_hints);
   g_test_add_func (DOMAIN"/Events/Active", test_active);
   g_test_add_func (DOMAIN"/Events/Urgent", test_urgent);
   g_test_add_func (DOMAIN"/Events/UserVisible", test_user_visible);
@@ -71,6 +73,24 @@
 }
 
 void
+test_hints (void)
+{
+  BamfWindow *window;
+  BamfLegacyWindowTest *test;
+
+  test = bamf_legacy_window_test_new (20,"Window X", "class", "exec");
+  window = bamf_window_new (BAMF_LEGACY_WINDOW (test));
+
+  bamf_legacy_window_set_hint (BAMF_LEGACY_WINDOW (test), "HINT_NAME", "HINT_VALUE");
+
+  g_assert_cmpstr (bamf_window_get_string_hint (window, "HINT_NAME"), ==, "HINT_VALUE");
+  g_assert_cmpstr (bamf_window_get_string_hint (window, "INVALID_HINT_NAME"), ==, NULL);
+
+  g_object_unref (window);
+  g_object_unref (test);
+}
+
+void
 test_xid (void)
 {
   BamfWindow *window;