Merge lp:~3v1n0/bamf/app-icon-fallback-improved into lp:bamf

[Marco Trevisan (Treviño)]

BamfApplication: try to use a window icon if the computed icon belongs to a "generic" app

Added a bunch of new BamfApplication tests for icon.

Improve the code to get a fallback icon for .desktop-less applications, now if the application icon is "generic" (i.e. the one of a known loader such as python), we try instead to fetch the window icon if available and giving it higher priority.

Added a bunch of new tests.

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:587
http://jenkins.qa.ubuntu.com/job/bamf-ci/61/
Executed test runs:
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/bamf-saucy-amd64-ci/42
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/bamf-saucy-armhf-ci/42

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

review: Needs Fixing (continuous-integration)

[lp:~3v1n0/bamf/app-icon-fallback-improved]

588. By Marco Trevisan (Treviño) on 2013-06-21

TestLibBamf, Makefile.am: fix make distcheck

589. By Marco Trevisan (Treviño) on 2013-06-21

TestBamf: add local icon directory and prepend it to theme to allow testing

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:589
http://jenkins.qa.ubuntu.com/job/bamf-ci/64/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/bamf-saucy-amd64-ci/45
    SUCCESS: http://jenkins.qa.ubuntu.com/job/bamf-saucy-armhf-ci/45

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

review: Approve (continuous-integration)

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:587
http://jenkins.qa.ubuntu.com/job/bamf-ci/65/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/bamf-saucy-amd64-ci/46
    None: http://jenkins.qa.ubuntu.com/job/bamf-saucy-armhf-ci/46/console

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

review: Needs Fixing (continuous-integration)

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:587
http://jenkins.qa.ubuntu.com/job/bamf-ci/66/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/bamf-saucy-amd64-ci/47
    SUCCESS: http://jenkins.qa.ubuntu.com/job/bamf-saucy-armhf-ci/47

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

review: Approve (continuous-integration)

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:587
http://jenkins.qa.ubuntu.com/job/bamf-ci/69/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/bamf-saucy-amd64-ci/50
    SUCCESS: http://jenkins.qa.ubuntu.com/job/bamf-saucy-armhf-ci/50

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

review: Approve (continuous-integration)

[Brandon Schaefer (brandontschaefer)]

Sweet, tests pass, code looks good, and tested manually :)

review: Approve

=== modified file 'src/bamf-application.c'
--- src/bamf-application.c	2013-06-19 19:08:39 +0000
+++ src/bamf-application.c	2013-06-21 21:00:38 +0000
@@ -178,17 +178,25 @@
 }
 
 static gboolean
-icon_name_is_valid (char *name)
+icon_name_is_valid (const char *name)
 {
   GtkIconTheme *icon_theme;
 
-  if (name == NULL)
+  if (!name || name[0] == '\0')
     return FALSE;
 
   icon_theme = gtk_icon_theme_get_default ();
   return gtk_icon_theme_has_icon (icon_theme, name);
 }
 
+static gboolean
+icon_name_is_generic (const char *name)
+{
+  BamfMatcher *matcher = bamf_matcher_get_default ();
+
+  return !bamf_matcher_is_valid_process_prefix (matcher, name);
+}
+
 static void
 bamf_application_setup_icon_and_name (BamfApplication *self)
 {
@@ -199,7 +207,7 @@
   GIcon *gicon;
   GList *children, *l;
   const char *class;
-  char *icon = NULL, *name = NULL;
+  char *icon = NULL, *generic_icon = NULL, *name = NULL;
   GError *error;
 
   g_return_if_fail (BAMF_IS_APPLICATION (self));
@@ -221,7 +229,7 @@
 
       if (!G_IS_APP_INFO (desktop))
         {
-          g_key_file_free(keyfile);
+          g_key_file_free (keyfile);
           return;
         }
 
@@ -231,13 +239,20 @@
       if (gicon)
         {
           icon = g_icon_to_string (gicon);
+
+          if (!icon_name_is_valid (icon))
+            {
+              g_free (icon);
+              icon = NULL;
+            }
         }
-      else
+
+      if (!icon)
         {
           icon = g_strdup (BAMF_APPLICATION_DEFAULT_ICON);
         }
 
-      if (g_key_file_has_key(keyfile, G_KEY_FILE_DESKTOP_GROUP, STUB_KEY, NULL))
+      if (g_key_file_has_key (keyfile, G_KEY_FILE_DESKTOP_GROUP, STUB_KEY, NULL))
         {
           /* This will error to return false, which is okay as it seems
              unlikely anyone will want to set this flag except to turn
@@ -269,7 +284,7 @@
         }
 
       g_object_unref (desktop);
-      g_key_file_free(keyfile);
+      g_key_file_free (keyfile);
     }
   else if ((children = bamf_view_get_children (BAMF_VIEW (self))) != NULL)
     {
@@ -290,14 +305,34 @@
                   icon = g_utf8_strdown (class, -1);
 
                   if (icon_name_is_valid (icon))
-                    break;
+                    {
+                      if (icon_name_is_generic (icon))
+                        {
+                          generic_icon = g_strdup (icon);
+                        }
+                      else
+                        {
+                          break;
+                        }
+                    }
                 }
 
               g_free (icon);
-              icon = bamf_legacy_window_get_exec_string (bamf_window_get_window (window));
+              char *exec = bamf_legacy_window_get_exec_string (bamf_window_get_window (window));
+              icon = bamf_matcher_get_trimmed_exec (bamf_matcher_get_default (), exec);
+              g_free (exec);
 
               if (icon_name_is_valid (icon))
-                break;
+                {
+                  if (icon_name_is_generic (icon))
+                    {
+                      generic_icon = g_strdup (icon);
+                    }
+                  else
+                    {
+                      break;
+                    }
+                }
 
               g_free (icon);
               icon = NULL;
@@ -310,28 +345,31 @@
       if (!icon)
         {
           if (window)
-            {
-              icon = g_strdup (bamf_legacy_window_save_mini_icon (bamf_window_get_window (window)));
-            }
+            icon = g_strdup (bamf_legacy_window_save_mini_icon (bamf_window_get_window (window)));
 
           if (!icon)
             {
-              icon = g_strdup (BAMF_APPLICATION_DEFAULT_ICON);
+              if (generic_icon)
+                {
+                  icon = generic_icon;
+                  generic_icon = NULL;
+                }
+              else
+                {
+                  icon = g_strdup (BAMF_APPLICATION_DEFAULT_ICON);
+                }
             }
         }
-    }
-  else
-    {
-      /* we do nothing as we have nothing to go on */
-    }
-
-  if (icon)
-    bamf_view_set_icon (BAMF_VIEW (self), icon);
-
-  if (name)
-    bamf_view_set_name (BAMF_VIEW (self), name);
+
+      g_free (generic_icon);
+      generic_icon = NULL;
+    }
+
+  bamf_view_set_icon (BAMF_VIEW (self), icon);
+  bamf_view_set_name (BAMF_VIEW (self), name);
 
   g_free (name);
+  g_free (icon);
 }
 
 void

=== modified file 'src/bamf-legacy-window-test.c'
--- src/bamf-legacy-window-test.c	2013-04-18 13:57:15 +0000
+++ src/bamf-legacy-window-test.c	2013-06-21 21:00:38 +0000
@@ -139,6 +139,16 @@
 }
 
 void
+bamf_legacy_window_test_set_icon (BamfLegacyWindowTest *self, const char *val)
+{
+  if (g_strcmp0 (self->icon, val) == 0)
+    return;
+
+  g_free (self->icon);
+  self->icon = g_strdup (val);
+}
+
+void
 bamf_legacy_window_test_set_role (BamfLegacyWindowTest *self, const char *val)
 {
   if (g_strcmp0 (self->role, val) == 0)
@@ -410,12 +420,19 @@
   return g_hash_table_insert (self->hints, g_strdup (name), g_strdup (value));
 }
 
+static const char *
+bamf_legacy_window_test_save_mini_icon (BamfLegacyWindow *window)
+{
+  return BAMF_LEGACY_WINDOW_TEST (window)->icon;
+}
+
 static void
 bamf_legacy_window_test_finalize (GObject *object)
 {
   BamfLegacyWindowTest *self = BAMF_LEGACY_WINDOW_TEST (object);
 
   g_free (self->name);
+  g_free (self->icon);
   g_free (self->role);
   g_free (self->wm_class_name);
   g_free (self->wm_class_instance);
@@ -438,6 +455,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->save_mini_icon   = bamf_legacy_window_test_save_mini_icon;
   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;
@@ -481,6 +499,7 @@
   copy->xid = self->xid;
   copy->pid = self->pid;
   copy->name = g_strdup (self->name);
+  copy->icon = g_strdup (self->icon);
   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);

=== modified file 'src/bamf-legacy-window-test.h'
--- src/bamf-legacy-window-test.h	2013-04-17 00:56:22 +0000
+++ src/bamf-legacy-window-test.h	2013-06-21 21:00:38 +0000
@@ -54,6 +54,7 @@
   guint32 xid;
   guint   pid;
   char * name;
+  char * icon;
   char * role;
   char * wm_class_name;
   char * wm_class_instance;
@@ -123,6 +124,9 @@
 bamf_legacy_window_test_set_name (BamfLegacyWindowTest *self, const char *val);
 
 void
+bamf_legacy_window_test_set_icon (BamfLegacyWindowTest *self, const char *val);
+
+void
 bamf_legacy_window_test_set_role (BamfLegacyWindowTest *self, const char *val);
 
 void

=== modified file 'src/bamf-legacy-window.c'
--- src/bamf-legacy-window.c	2013-06-18 13:44:04 +0000
+++ src/bamf-legacy-window.c	2013-06-21 21:00:38 +0000
@@ -267,6 +267,9 @@
 
   g_return_val_if_fail (BAMF_IS_LEGACY_WINDOW (self), NULL);
 
+  if (BAMF_LEGACY_WINDOW_GET_CLASS (self)->save_mini_icon)
+    return BAMF_LEGACY_WINDOW_GET_CLASS (self)->save_mini_icon (self);
+
   if (self->priv->mini_icon_path)
     {
       if (g_file_test (self->priv->mini_icon_path, G_FILE_TEST_EXISTS))

=== modified file 'src/bamf-legacy-window.h'
--- src/bamf-legacy-window.h	2013-06-08 13:54:06 +0000
+++ src/bamf-legacy-window.h	2013-06-21 21:00:38 +0000
@@ -76,6 +76,7 @@
   const char * (*get_role)                (BamfLegacyWindow *legacy_window);
   const char * (*get_class_name)          (BamfLegacyWindow *legacy_window);
   const char * (*get_class_instance_name) (BamfLegacyWindow *legacy_window);
+  const char * (*save_mini_icon)          (BamfLegacyWindow *legacy_window);
   char       * (*get_exec_string)         (BamfLegacyWindow *legacy_window);
   char       * (*get_process_name)        (BamfLegacyWindow *legacy_window);
   char       * (*get_app_id)              (BamfLegacyWindow *legacy_window);

=== modified file 'src/bamf-matcher.h'
--- src/bamf-matcher.h	2013-06-08 13:54:06 +0000
+++ src/bamf-matcher.h	2013-06-21 21:00:38 +0000
@@ -108,6 +108,12 @@
 GVariant    * bamf_matcher_get_window_stack_for_monitor  (BamfMatcher *matcher,
                                                           gint monitor);
 
+gboolean      bamf_matcher_is_valid_process_prefix       (BamfMatcher *matcher,
+                                                          const char *process_name);
+
+char        * bamf_matcher_get_trimmed_exec              (BamfMatcher *matcher,
+                                                          const char *exec_string);
+
 
 BamfMatcher * bamf_matcher_get_default                   (void);
 

=== modified file 'tests/bamfdaemon/test-application.c'
--- tests/bamfdaemon/test-application.c	2013-06-18 17:55:15 +0000
+++ tests/bamfdaemon/test-application.c	2013-06-21 21:00:38 +0000
@@ -28,48 +28,11 @@
 
 #define DESKTOP_FILE "/usr/share/applications/gnome-terminal.desktop"
 
-static void test_allocation          (void);
-static void test_desktop_file        (void);
-static void test_desktop_no_icon     (void);
-static void test_get_mime_types      (void);
-static void test_get_mime_types_none (void);
-static void test_urgent              (void);
-static void test_active              (void);
-static void test_get_xids            (void);
-static void test_manages_xid         (void);
-static void test_get_window          (void);
-static void test_user_visible        (void);
-static void test_urgent              (void);
-static void test_window_added        (void);
-static void test_window_removed      (void);
-
 static gboolean          signal_seen   = FALSE;
 static gboolean          signal_result = FALSE;
 static char *            signal_window = NULL;
 static GDBusConnection * gdbus_connection = NULL;
 
-void
-test_application_create_suite (GDBusConnection *connection)
-{
-#define DOMAIN "/Application"
-
-  gdbus_connection = connection;
-
-  g_test_add_func (DOMAIN"/Allocation", test_allocation);
-  g_test_add_func (DOMAIN"/DesktopFile", test_desktop_file);
-  g_test_add_func (DOMAIN"/DesktopFile/NoIcon", test_desktop_no_icon);
-  g_test_add_func (DOMAIN"/DesktopFile/MimeTypes/Valid", test_get_mime_types);
-  g_test_add_func (DOMAIN"/DesktopFile/MimeTypes/None", test_get_mime_types_none);
-  g_test_add_func (DOMAIN"/ManagesXid", test_manages_xid);
-  g_test_add_func (DOMAIN"/GetWindow", test_get_window);
-  g_test_add_func (DOMAIN"/Xids", test_get_xids);
-  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);
-  g_test_add_func (DOMAIN"/Events/WindowAdded", test_window_added);
-  g_test_add_func (DOMAIN"/Events/WindowRemoved", test_window_removed);
-}
-
 static void
 test_allocation (void)
 {
@@ -108,16 +71,183 @@
 }
 
 static void
-test_desktop_no_icon (void)
-{
-  BamfApplication    *application;
+test_desktop_icon (void)
+{
+  BamfApplication *application;
+  const char *icon_desktop = TESTDIR"/data/icon.desktop";
+
+  application = bamf_application_new_from_desktop_file (icon_desktop);
+  g_assert_cmpstr (bamf_view_get_icon (BAMF_VIEW (application)), ==, "test-bamf-icon");
+  g_object_unref (application);
+}
+
+static void
+test_desktop_icon_empty (void)
+{
+  BamfApplication *application;
   const char no_icon_desktop[] = TESTDIR"/data/no-icon.desktop";
 
   application = bamf_application_new_from_desktop_file (no_icon_desktop);
-  g_assert (g_strcmp0 (bamf_application_get_desktop_file (application), no_icon_desktop) == 0);
-
-  g_assert (g_strcmp0(bamf_view_get_icon(BAMF_VIEW(application)), "application-default-icon") == 0);
-  g_object_unref (application);
+  g_assert_cmpstr (bamf_application_get_desktop_file (application), ==, no_icon_desktop);
+
+  g_assert_cmpstr (bamf_view_get_icon (BAMF_VIEW (application)), ==, "application-default-icon");
+  g_object_unref (application);
+}
+
+static void
+test_desktop_icon_invalid (void)
+{
+  BamfApplication *application;
+  const char *invalid_icon_desktop = TESTDIR"/data/test-bamf-app.desktop";
+
+  application = bamf_application_new_from_desktop_file (invalid_icon_desktop);
+
+  g_assert_cmpstr (bamf_view_get_icon (BAMF_VIEW (application)), ==, "application-default-icon");
+  g_object_unref (application);
+}
+
+static void
+test_icon_class_name (void)
+{
+  BamfApplication *application;
+  BamfLegacyWindowTest *lwin;
+  BamfWindow *test;
+
+  application = bamf_application_new ();
+  lwin = bamf_legacy_window_test_new (20, "window", "test-bamf-icon", "execution-binary");
+  test = bamf_window_new (BAMF_LEGACY_WINDOW (lwin));
+
+  bamf_view_add_child (BAMF_VIEW (application), BAMF_VIEW (test));
+
+  g_assert_cmpstr (bamf_view_get_icon (BAMF_VIEW (application)), ==, "test-bamf-icon");
+
+  g_object_unref (lwin);
+  g_object_unref (test);
+  g_object_unref (application);
+}
+
+static void
+test_icon_exec_string (void)
+{
+  BamfApplication *application;
+  BamfLegacyWindowTest *lwin;
+  BamfWindow *test;
+
+  application = bamf_application_new ();
+  lwin = bamf_legacy_window_test_new (20, "window", "class", "test-bamf-icon");
+  test = bamf_window_new (BAMF_LEGACY_WINDOW (lwin));
+
+  bamf_view_add_child (BAMF_VIEW (application), BAMF_VIEW (test));
+
+  g_assert_cmpstr (bamf_view_get_icon (BAMF_VIEW (application)), ==, "test-bamf-icon");
+
+  g_object_unref (lwin);
+  g_object_unref (test);
+  g_object_unref (application);
+}
+
+static void
+test_icon_embedded (void)
+{
+  BamfApplication *application;
+  BamfLegacyWindowTest *lwin;
+  BamfWindow *test;
+
+  application = bamf_application_new ();
+  lwin = bamf_legacy_window_test_new (20, "window", "class", "python execution-script.py");
+  bamf_legacy_window_test_set_icon (lwin, "test-bamf-icon");
+  test = bamf_window_new (BAMF_LEGACY_WINDOW (lwin));
+
+  bamf_view_add_child (BAMF_VIEW (application), BAMF_VIEW (test));
+
+  g_assert_cmpstr (bamf_view_get_icon (BAMF_VIEW (application)), ==, "test-bamf-icon");
+
+  g_object_unref (lwin);
+  g_object_unref (test);
+  g_object_unref (application);
+}
+
+static void
+test_icon_priority (void)
+{
+  BamfApplication *application;
+  BamfLegacyWindowTest *lwin;
+  BamfWindow *test;
+
+  lwin = bamf_legacy_window_test_new (20, "window", "test-bamf-icon", "test-bamf-pixmap");
+  bamf_legacy_window_test_set_icon (lwin, "bamf-custom-icon");
+  test = bamf_window_new (BAMF_LEGACY_WINDOW (lwin));
+
+  application = bamf_application_new ();
+  bamf_view_add_child (BAMF_VIEW (application), BAMF_VIEW (test));
+  g_assert_cmpstr (bamf_view_get_icon (BAMF_VIEW (application)), ==, "test-bamf-icon");
+  g_object_unref (application);
+
+  application = bamf_application_new ();
+  bamf_legacy_window_test_set_wmclass (lwin, NULL, NULL);
+  bamf_view_add_child (BAMF_VIEW (application), BAMF_VIEW (test));
+  g_assert_cmpstr (bamf_view_get_icon (BAMF_VIEW (application)), ==, "test-bamf-pixmap");
+  g_object_unref (application);
+
+  application = bamf_application_new ();
+  g_free (lwin->exec);
+  lwin->exec = NULL;
+  bamf_view_add_child (BAMF_VIEW (application), BAMF_VIEW (test));
+  g_assert_cmpstr (bamf_view_get_icon (BAMF_VIEW (application)), ==, "bamf-custom-icon");
+  g_object_unref (application);
+
+  g_object_unref (lwin);
+  g_object_unref (test);
+}
+
+static void
+test_icon_generic_class (void)
+{
+  BamfApplication *application;
+  BamfLegacyWindowTest *lwin;
+  BamfWindow *test;
+
+  lwin = bamf_legacy_window_test_new (20, "window", "python", "execution-script");
+  test = bamf_window_new (BAMF_LEGACY_WINDOW (lwin));
+
+  application = bamf_application_new ();
+  bamf_view_add_child (BAMF_VIEW (application), BAMF_VIEW (test));
+  g_assert_cmpstr (bamf_view_get_icon (BAMF_VIEW (application)), ==, "python");
+  g_object_unref (application);
+
+  application = bamf_application_new ();
+  bamf_legacy_window_test_set_icon (lwin, "bamf-custom-icon");
+  bamf_view_add_child (BAMF_VIEW (application), BAMF_VIEW (test));
+  g_assert_cmpstr (bamf_view_get_icon (BAMF_VIEW (application)), ==, "bamf-custom-icon");
+  g_object_unref (application);
+
+  g_object_unref (lwin);
+  g_object_unref (test);
+}
+
+static void
+test_icon_generic_exec (void)
+{
+  BamfApplication *application;
+  BamfLegacyWindowTest *lwin;
+  BamfWindow *test;
+
+  lwin = bamf_legacy_window_test_new (20, "window", "class", "python2.7");
+  test = bamf_window_new (BAMF_LEGACY_WINDOW (lwin));
+
+  application = bamf_application_new ();
+  bamf_view_add_child (BAMF_VIEW (application), BAMF_VIEW (test));
+  g_assert_cmpstr (bamf_view_get_icon (BAMF_VIEW (application)), ==, "python2.7");
+  g_object_unref (application);
+
+  application = bamf_application_new ();
+  bamf_legacy_window_test_set_icon (lwin, "bamf-custom-icon");
+  bamf_view_add_child (BAMF_VIEW (application), BAMF_VIEW (test));
+  g_assert_cmpstr (bamf_view_get_icon (BAMF_VIEW (application)), ==, "bamf-custom-icon");
+  g_object_unref (application);
+
+  g_object_unref (lwin);
+  g_object_unref (test);
 }
 
 static void
@@ -558,3 +688,35 @@
   g_object_unref (window);
   g_object_unref (test);
 }
+
+/* Initialize test suite */
+
+void
+test_application_create_suite (GDBusConnection *connection)
+{
+#define DOMAIN "/Application"
+
+  gdbus_connection = connection;
+
+  g_test_add_func (DOMAIN"/Allocation", test_allocation);
+  g_test_add_func (DOMAIN"/DesktopFile", test_desktop_file);
+  g_test_add_func (DOMAIN"/DesktopFile/Icon", test_desktop_icon);
+  g_test_add_func (DOMAIN"/DesktopFile/Icon/Empty", test_desktop_icon_empty);
+  g_test_add_func (DOMAIN"/DesktopFile/Icon/Invalid", test_desktop_icon_invalid);
+  g_test_add_func (DOMAIN"/DesktopFile/MimeTypes/Valid", test_get_mime_types);
+  g_test_add_func (DOMAIN"/DesktopFile/MimeTypes/None", test_get_mime_types_none);
+  g_test_add_func (DOMAIN"/DesktopLess/Icon/ClassName", test_icon_class_name);
+  g_test_add_func (DOMAIN"/DesktopLess/Icon/Exec", test_icon_exec_string);
+  g_test_add_func (DOMAIN"/DesktopLess/Icon/Embedded", test_icon_embedded);
+  g_test_add_func (DOMAIN"/DesktopLess/Icon/Priority", test_icon_priority);
+  g_test_add_func (DOMAIN"/DesktopLess/Icon/Generic/Class", test_icon_generic_class);
+  g_test_add_func (DOMAIN"/DesktopLess/Icon/Generic/Exec", test_icon_generic_exec);
+  g_test_add_func (DOMAIN"/ManagesXid", test_manages_xid);
+  g_test_add_func (DOMAIN"/GetWindow", test_get_window);
+  g_test_add_func (DOMAIN"/Xids", test_get_xids);
+  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);
+  g_test_add_func (DOMAIN"/Events/WindowAdded", test_window_added);
+  g_test_add_func (DOMAIN"/Events/WindowRemoved", test_window_removed);
+}

=== modified file 'tests/bamfdaemon/test-bamf.c'
--- tests/bamfdaemon/test-bamf.c	2013-06-13 17:08:07 +0000
+++ tests/bamfdaemon/test-bamf.c	2013-06-21 21:00:38 +0000
@@ -38,10 +38,14 @@
 on_bus_acquired (GDBusConnection *connection, const gchar *name, gpointer data)
 {
   GMainLoop *loop = data;
+  GtkIconTheme *icon_theme;
 
   g_setenv ("BAMF_TEST_MODE", "TRUE", TRUE);
   g_setenv ("PATH", TESTDIR"/data/bin", TRUE);
 
+  icon_theme = gtk_icon_theme_get_default ();
+  gtk_icon_theme_prepend_search_path (icon_theme, TESTDIR"/data/icons");
+
   test_matcher_create_suite (connection);
   test_view_create_suite (connection);
   test_window_create_suite ();

=== added file 'tests/data/icon.desktop'
--- tests/data/icon.desktop	1970-01-01 00:00:00 +0000
+++ tests/data/icon.desktop	2013-06-21 21:00:38 +0000
@@ -0,0 +1,7 @@
+[Desktop Entry]
+Name=Test Bamf App with Icon
+Exec=test-bamf-app
+Icon=test-bamf-icon
+Terminal=false
+Type=Application
+Categories=Graphics;

=== added directory 'tests/data/icons'
=== added file 'tests/data/icons/python.png'
=== added file 'tests/data/icons/python2.7.png'
=== added file 'tests/data/icons/test-bamf-icon.png'
=== added file 'tests/data/icons/test-bamf-pixmap.png'
=== modified file 'tests/libbamf/Makefile.am'
--- tests/libbamf/Makefile.am	2013-06-08 13:54:06 +0000
+++ tests/libbamf/Makefile.am	2013-06-21 21:00:38 +0000
@@ -9,6 +9,7 @@
 
 test_libbamf_CFLAGS = \
 	-I$(top_srcdir)/lib \
+	-I$(top_builddir)/lib \
 	-I$(top_srcdir)/lib/libbamf \
 	-I$(top_builddir)/lib/libbamf \
 	-DTESTDIR=\""$(abs_top_srcdir)/tests"\" \