Merge lp:~3v1n0/bamf/view-icon-property into lp:bamf

[Marco Trevisan (Treviño)]

BamfDaemon, LibBamf: add icon property to store the BamfView icon and notify about its changes.

New tests added.

Move icon of BamfView to a property, so that it can change and we can our clients about it... It will allow to fix bugs such as #1007383

[lp:~3v1n0/bamf/view-icon-property]

577. By Marco Trevisan (Treviño) on 2013-06-19

BamfView: remove the useless getters from Class

Also properly initialize signals adding default handlers

[PS Jenkins bot (ps-jenkins)]

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

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

review: Approve (continuous-integration)

[PS Jenkins bot (ps-jenkins)]

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

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

review: Approve (continuous-integration)

[Brandon Schaefer (brandontschaefer)]

LGTM

review: Approve

=== modified file 'lib/libbamf-private/bamf-private.h'
--- lib/libbamf-private/bamf-private.h	2013-06-18 14:43:55 +0000
+++ lib/libbamf-private/bamf-private.h	2013-06-19 20:08:28 +0000
@@ -31,6 +31,12 @@
 
 #define BAMF_DBUS_DEFAULT_TIMEOUT 500
 
+/* GLib doesn't provide this by default */
+#ifndef G_KEY_FILE_DESKTOP_KEY_FULLNAME
+#define G_KEY_FILE_DESKTOP_KEY_FULLNAME "X-GNOME-FullName"
+#endif
+
+#define BAMF_APPLICATION_DEFAULT_ICON "application-default-icon"
 
 /* GCC Macros to handle warnings
  * Authored by: Patrick Horgan <[e-mail]>

=== modified file 'lib/libbamf-private/org.ayatana.bamf.view.xml'
--- lib/libbamf-private/org.ayatana.bamf.view.xml	2013-06-19 16:19:46 +0000
+++ lib/libbamf-private/org.ayatana.bamf.view.xml	2013-06-19 20:08:28 +0000
@@ -6,6 +6,7 @@
       <arg name="view_type" type="s" direction="out"/>
     </method>
     <method name="Icon">
+      <annotation name="org.freedesktop.DBus.Deprecated" value="true"/>
       <arg name="name" type="s" direction="out"/>
     </method>
     <method name="Name">
@@ -64,6 +65,7 @@
     <signal name="Closed">
     </signal>
     <property name="Name" type="s" access="read"/>
+    <property name="Icon" type="s" access="read"/>
     <property name="UserVisible" type="b" access="read"/>
     <property name="Running" type="b" access="read"/>
     <property name="Urgent" type="b" access="read"/>

=== modified file 'lib/libbamf/bamf-application.c'
--- lib/libbamf/bamf-application.c	2013-06-19 13:35:50 +0000
+++ lib/libbamf/bamf-application.c	2013-06-19 20:08:28 +0000
@@ -621,11 +621,6 @@
 
   name = g_strdup (g_app_info_get_name (G_APP_INFO (desktop_info)));
 
-/* GLib doesn't provide this by default */
-#ifndef G_KEY_FILE_DESKTOP_KEY_FULLNAME
-#define G_KEY_FILE_DESKTOP_KEY_FULLNAME "X-GNOME-FullName"
-#endif
-
   /* Grab the better name if its available */
   fullname = g_key_file_get_locale_string (keyfile, G_KEY_FILE_DESKTOP_GROUP,
                                            G_KEY_FILE_DESKTOP_KEY_FULLNAME, NULL, NULL);
@@ -648,9 +643,9 @@
   icon = gicon ? g_icon_to_string (gicon) : NULL;
 
   if (!icon)
-    icon = g_strdup ("application-default-icon");
+    icon = g_strdup (BAMF_APPLICATION_DEFAULT_ICON);
 
-  _bamf_view_set_icon (BAMF_VIEW (self), icon);
+  _bamf_view_set_cached_icon (BAMF_VIEW (self), icon);
 
   self->priv->cached_mimes = g_key_file_get_string_list (keyfile, G_KEY_FILE_DESKTOP_GROUP,
                                                          G_KEY_FILE_DESKTOP_KEY_MIME_TYPE, NULL, NULL);

=== modified file 'lib/libbamf/bamf-view-private.h'
--- lib/libbamf/bamf-view-private.h	2013-06-19 13:35:50 +0000
+++ lib/libbamf/bamf-view-private.h	2013-06-19 20:08:28 +0000
@@ -45,7 +45,7 @@
 
 void _bamf_view_set_cached_name (BamfView *view, const char *name);
 
-void _bamf_view_set_icon (BamfView *view, const char *icon);
+void _bamf_view_set_cached_icon (BamfView *view, const char *icon);
 
 void _bamf_view_set_closed (BamfView *view, gboolean closed);
 

=== modified file 'lib/libbamf/bamf-view.c'
--- lib/libbamf/bamf-view.c	2013-06-19 13:35:50 +0000
+++ lib/libbamf/bamf-view.c	2013-06-19 20:08:28 +0000
@@ -59,6 +59,7 @@
   URGENT_CHANGED,
   VISIBLE_CHANGED,
   NAME_CHANGED,
+  ICON_CHANGED,
   LAST_SIGNAL
 };
 
@@ -82,8 +83,8 @@
   BamfDBusItemView *proxy;
   GCancellable     *cancellable;
   gchar            *type;
-  gchar            *local_icon;
   gchar            *cached_name;
+  gchar            *cached_icon;
   GList            *cached_children;
   gboolean          reload_children;
   gboolean          is_closed;
@@ -282,16 +283,19 @@
 }
 
 void
-_bamf_view_set_icon (BamfView *view, const char *icon)
+_bamf_view_set_cached_icon (BamfView *view, const char *icon)
 {
   g_return_if_fail (BAMF_IS_VIEW (view));
 
-  g_free (view->priv->local_icon);
-  view->priv->local_icon = NULL;
+  if (!icon || g_strcmp0 (icon, view->priv->cached_icon) == 0)
+    return;
+
+  g_free (view->priv->cached_icon);
+  view->priv->cached_icon = NULL;
 
   if (icon && icon[0] != '\0')
     {
-      view->priv->local_icon = g_strdup (icon);
+      view->priv->cached_icon = g_strdup (icon);
     }
 }
 
@@ -336,8 +340,6 @@
 bamf_view_get_icon (BamfView *self)
 {
   BamfViewPrivate *priv;
-  char *icon = NULL;
-  GError *error = NULL;
 
   g_return_val_if_fail (BAMF_IS_VIEW (self), NULL);
   priv = self->priv;
@@ -346,20 +348,9 @@
     return BAMF_VIEW_GET_CLASS (self)->get_icon (self);
 
   if (!_bamf_view_remote_ready (self))
-    return g_strdup (priv->local_icon);
-
-  if (!_bamf_dbus_item_view_call_icon_sync (priv->proxy, &icon, CANCELLABLE (self), &error))
-    {
-      g_warning ("Failed to fetch icon: %s", error ? error->message : "");
-      g_error_free (error);
-
-      return NULL;
-    }
-
-  _bamf_view_set_icon (self, icon);
-  g_free (icon);
-
-  return g_strdup (priv->local_icon);
+    return g_strdup (priv->cached_icon);
+
+  return _bamf_dbus_item_view_dup_icon (priv->proxy);
 }
 
 /**
@@ -372,7 +363,6 @@
 bamf_view_get_name (BamfView *self)
 {
   BamfViewPrivate *priv;
-  gchar *name;
 
   g_return_val_if_fail (BAMF_IS_VIEW (self), NULL);
   priv = self->priv;
@@ -383,9 +373,7 @@
   if (!_bamf_view_remote_ready (self))
     return g_strdup (priv->cached_name);
 
-  name = _bamf_dbus_item_view_dup_name (priv->proxy);
-
-  return name;
+  return _bamf_dbus_item_view_dup_name (priv->proxy);
 }
 
 gboolean
@@ -536,6 +524,12 @@
           g_signal_emit (G_OBJECT (self), view_signals[NAME_CHANGED], 0, NULL, cached_name);
         }
 
+      if (self->priv->cached_icon)
+        {
+          const char *cached_icon = self->priv->cached_icon;
+          g_signal_emit (G_OBJECT (self), view_signals[ICON_CHANGED], 0, cached_icon);
+        }
+
       _bamf_view_set_closed (self, TRUE);
       g_signal_emit (G_OBJECT (self), view_signals[CLOSED], 0);
     }
@@ -561,6 +555,14 @@
 }
 
 static void
+bamf_view_on_icon_changed (BamfDBusItemView *proxy, GParamSpec *param, BamfView *self)
+{
+  const char *icon = _bamf_dbus_item_view_get_icon (proxy);
+  g_signal_emit (self, view_signals[ICON_CHANGED], 0, icon);
+  _bamf_view_set_cached_icon (self, icon);
+}
+
+static void
 bamf_view_on_running_changed (BamfDBusItemView *proxy, GParamSpec *param, BamfView *self)
 {
   gboolean running = _bamf_dbus_item_view_get_running (proxy);
@@ -708,10 +710,10 @@
       priv->type = NULL;
     }
 
-  if (priv->local_icon)
+  if (priv->cached_icon)
     {
-      g_free (priv->local_icon);
-      priv->local_icon = NULL;
+      g_free (priv->cached_icon);
+      priv->cached_icon = NULL;
     }
 
   if (priv->cached_name)
@@ -808,6 +810,9 @@
   g_signal_connect (priv->proxy, "notify::name",
                     G_CALLBACK (bamf_view_on_name_changed), view);
 
+  g_signal_connect (priv->proxy, "notify::icon",
+                    G_CALLBACK (bamf_view_on_icon_changed), view);
+
   g_signal_connect (priv->proxy, "child-added",
                     G_CALLBACK (bamf_view_on_child_added), view);
 
@@ -929,6 +934,15 @@
                   G_TYPE_NONE, 2,
                   G_TYPE_STRING,
                   G_TYPE_STRING);
+
+  view_signals [ICON_CHANGED] =
+    g_signal_new (BAMF_VIEW_SIGNAL_ICON_CHANGED,
+                  G_OBJECT_CLASS_TYPE (klass),
+                  0,
+                  G_STRUCT_OFFSET (BamfViewClass, icon_changed),
+                  NULL, NULL, NULL,
+                  G_TYPE_NONE, 1,
+                  G_TYPE_STRING);
 }
 
 static void

=== modified file 'lib/libbamf/bamf-view.h'
--- lib/libbamf/bamf-view.h	2013-06-08 13:54:06 +0000
+++ lib/libbamf/bamf-view.h	2013-06-19 20:08:28 +0000
@@ -54,6 +54,7 @@
 #define BAMF_VIEW_SIGNAL_URGENT_CHANGED       "urgent-changed"
 #define BAMF_VIEW_SIGNAL_USER_VISIBLE_CHANGED "user-visible-changed"
 #define BAMF_VIEW_SIGNAL_NAME_CHANGED         "name-changed"
+#define BAMF_VIEW_SIGNAL_ICON_CHANGED         "icon-changed"
 #define BAMF_VIEW_SIGNAL_CHILD_ADDED          "child-added"
 #define BAMF_VIEW_SIGNAL_CHILD_REMOVED        "child-removed"
 #define BAMF_VIEW_SIGNAL_CHILD_MOVED          "child-moved"
@@ -107,13 +108,13 @@
   void (*urgent_changed)              (BamfView *view, gboolean urgent);
   void (*user_visible_changed)        (BamfView *view, gboolean user_visible);
   void (*name_changed)                (BamfView *view, gchar* old_name, gchar* new_name);
+  void (*icon_changed)                (BamfView *view, gchar* icon);
   void (*child_moved)                 (BamfView *view, BamfView *child);
 
   /*< private >*/
   void (*_view_padding1) (void);
   void (*_view_padding2) (void);
   void (*_view_padding3) (void);
-  void (*_view_padding4) (void);
 };
 
 GType      bamf_view_get_type             (void) G_GNUC_CONST;

=== modified file 'src/bamf-application.c'
--- src/bamf-application.c	2013-06-18 17:55:15 +0000
+++ src/bamf-application.c	2013-06-19 20:08:28 +0000
@@ -41,7 +41,6 @@
   char * desktop_file;
   GList * desktop_file_list;
   char * app_type;
-  char * icon;
   char * wmclass;
   char ** mimes;
   gboolean is_tab_container;
@@ -58,14 +57,6 @@
 
 #define STUB_KEY  "X-Ayatana-Appmenu-Show-Stubs"
 
-static const char *
-bamf_application_get_icon (BamfView *view)
-{
-  g_return_val_if_fail (BAMF_IS_APPLICATION (view), NULL);
-
-  return BAMF_APPLICATION (view)->priv->icon;
-}
-
 void
 bamf_application_supported_mime_types_changed (BamfApplication *application,
                                                const gchar **new_mimes)
@@ -213,16 +204,16 @@
 
   g_return_if_fail (BAMF_IS_APPLICATION (self));
 
-  if (self->priv->icon && bamf_view_get_name (BAMF_VIEW (self)))
+  if (bamf_view_get_icon (BAMF_VIEW (self)) && bamf_view_get_name (BAMF_VIEW (self)))
     return;
 
   if (self->priv->desktop_file)
     {
-      keyfile = g_key_file_new();
+      keyfile = g_key_file_new ();
 
-      if (!g_key_file_load_from_file(keyfile, self->priv->desktop_file, G_KEY_FILE_NONE, NULL))
+      if (!g_key_file_load_from_file (keyfile, self->priv->desktop_file, G_KEY_FILE_NONE, NULL))
         {
-          g_key_file_free(keyfile);
+          g_key_file_free (keyfile);
           return;
         }
 
@@ -235,7 +226,6 @@
         }
 
       gicon = g_app_info_get_icon (G_APP_INFO (desktop));
-
       name = g_strdup (g_app_info_get_display_name (G_APP_INFO (desktop)));
 
       if (gicon)
@@ -244,7 +234,7 @@
         }
       else
         {
-          icon = g_strdup ("application-default-icon");
+          icon = g_strdup (BAMF_APPLICATION_DEFAULT_ICON);
         }
 
       if (g_key_file_has_key(keyfile, G_KEY_FILE_DESKTOP_GROUP, STUB_KEY, NULL))
@@ -257,20 +247,19 @@
                                                            STUB_KEY, NULL);
         }
 
-      if (g_key_file_has_key (keyfile, G_KEY_FILE_DESKTOP_GROUP, "X-GNOME-FullName", NULL))
+      if (g_key_file_has_key (keyfile, G_KEY_FILE_DESKTOP_GROUP, G_KEY_FILE_DESKTOP_KEY_FULLNAME, NULL))
         {
           /* Grab the better name if its available */
           gchar *fullname = NULL;
           error = NULL;
           fullname = g_key_file_get_locale_string (keyfile,
                                                    G_KEY_FILE_DESKTOP_GROUP,
-                                                   "X-GNOME-FullName", NULL,
-                                                   &error);
+                                                   G_KEY_FILE_DESKTOP_KEY_FULLNAME,
+                                                   NULL, &error);
           if (error != NULL)
             {
               g_error_free (error);
-              if (fullname)
-                g_free (fullname);
+              g_free (fullname);
             }
           else
             {
@@ -327,7 +316,7 @@
 
           if (!icon)
             {
-              icon = g_strdup ("application-default-icon");
+              icon = g_strdup (BAMF_APPLICATION_DEFAULT_ICON);
             }
         }
     }
@@ -337,12 +326,7 @@
     }
 
   if (icon)
-    {
-      if (self->priv->icon)
-        g_free (self->priv->icon);
-
-      self->priv->icon = icon;
-    }
+    bamf_view_set_icon (BAMF_VIEW (self), icon);
 
   if (name)
     bamf_view_set_name (BAMF_VIEW (self), name);
@@ -910,12 +894,6 @@
       priv->app_type = NULL;
     }
 
-  if (priv->icon)
-    {
-      g_free (priv->icon);
-      priv->icon = NULL;
-    }
-
   if (priv->wmclass)
     {
       g_free (priv->wmclass);
@@ -1008,7 +986,6 @@
   view_class->view_type = bamf_application_get_view_type;
   view_class->child_added = bamf_application_child_added;
   view_class->child_removed = bamf_application_child_removed;
-  view_class->get_icon = bamf_application_get_icon;
   view_class->stable_bus_name = bamf_application_get_stable_bus_name;
 
   klass->get_supported_mime_types = bamf_application_default_get_supported_mime_types;
@@ -1083,8 +1060,8 @@
 gboolean
 bamf_application_get_show_stubs (BamfApplication *application)
 {
-    g_return_val_if_fail(BAMF_IS_APPLICATION(application), TRUE);
-    return application->priv->show_stubs;
+  g_return_val_if_fail (BAMF_IS_APPLICATION(application), TRUE);
+  return application->priv->show_stubs;
 }
 
 

=== modified file 'src/bamf-view.c'
--- src/bamf-view.c	2013-06-19 13:09:00 +0000
+++ src/bamf-view.c	2013-06-19 20:08:28 +0000
@@ -33,6 +33,7 @@
   PROP_0,
 
   PROP_NAME,
+  PROP_ICON,
   PROP_ACTIVE,
   PROP_RUNNING,
   PROP_URGENT,
@@ -62,6 +63,7 @@
   gboolean active;
 
   gchar *name;
+  gchar *icon;
 } BamfViewPropCache;
 
 struct _BamfViewPrivate
@@ -121,6 +123,12 @@
 }
 
 static void
+bamf_view_icon_changed (BamfView *view, const gchar *new_icon)
+{
+  g_object_notify (G_OBJECT (view), "icon");
+}
+
+static void
 bamf_view_user_visible_changed (BamfView *view, gboolean user_visible)
 {
   g_return_if_fail (BAMF_IS_VIEW (view));
@@ -439,28 +447,23 @@
 const char *
 bamf_view_get_icon (BamfView *view)
 {
-  g_return_val_if_fail (BAMF_IS_VIEW (view), NULL);
-
-  if (BAMF_VIEW_GET_CLASS (view)->get_icon)
-    return BAMF_VIEW_GET_CLASS (view)->get_icon (view);
-
-  return NULL;
+  BAMF_VIEW_GET_PROPERTY (view, icon, NULL);
+}
+
+void
+bamf_view_set_icon (BamfView *view, const char *icon)
+{
+  BAMF_VIEW_SET_STRING_PROPERTY (view, icon);
 }
 
 const char *
 bamf_view_get_name (BamfView *view)
 {
-  g_return_val_if_fail (BAMF_IS_VIEW (view), NULL);
-
-  if (BAMF_VIEW_GET_CLASS (view)->get_name)
-    return BAMF_VIEW_GET_CLASS (view)->get_name (view);
-
   BAMF_VIEW_GET_PROPERTY (view, name, NULL);
 }
 
 void
-bamf_view_set_name (BamfView *view,
-                    const char * name)
+bamf_view_set_name (BamfView *view, const char *name)
 {
   BAMF_VIEW_SET_STRING_PROPERTY (view, name);
 }
@@ -494,6 +497,7 @@
     return;
 
   g_free (view->priv->props->name);
+  g_free (view->priv->props->icon);
   g_free (view->priv->props);
   view->priv->props = NULL;
 }
@@ -509,6 +513,7 @@
   view->priv->props = NULL;
 
   bamf_view_set_name (view, cache->name);
+  bamf_view_set_icon (view, cache->icon);
   bamf_view_set_active (view, cache->active);
   bamf_view_set_running (view, cache->running);
   bamf_view_set_user_visible (view, cache->user_visible);
@@ -811,6 +816,9 @@
       case PROP_NAME:
         g_value_set_string (value, bamf_view_get_name (view));
         break;
+      case PROP_ICON:
+        g_value_set_string (value, bamf_view_get_icon (view));
+        break;
       case PROP_ACTIVE:
         g_value_set_boolean (value, bamf_view_is_active (view));
         break;
@@ -911,6 +919,7 @@
   /* Overriding the properties defined in the interface, this is needed
    * but we actually don't use these properties, as we act like a proxy       */
   g_object_class_override_property (object_class, PROP_NAME, "name");
+  g_object_class_override_property (object_class, PROP_ICON, "icon");
   g_object_class_override_property (object_class, PROP_ACTIVE, "active");
   g_object_class_override_property (object_class, PROP_URGENT, "urgent");
   g_object_class_override_property (object_class, PROP_RUNNING, "running");
@@ -919,24 +928,32 @@
   view_signals [CLOSED_INTERNAL] =
     g_signal_new ("closed-internal",
                   G_OBJECT_CLASS_TYPE (klass),
-                  0, 0, NULL, NULL, NULL,
+                  G_SIGNAL_RUN_LAST,
+                  G_STRUCT_OFFSET (BamfViewClass, closed_internal),
+                  NULL, NULL, NULL,
                   G_TYPE_NONE, 0);
 
   view_signals [CHILD_ADDED_INTERNAL] =
     g_signal_new ("child-added-internal",
                   G_OBJECT_CLASS_TYPE (klass),
-                  0, 0, NULL, NULL, NULL,
+                  G_SIGNAL_RUN_FIRST,
+                  G_STRUCT_OFFSET (BamfViewClass, child_added_internal),
+                  NULL, NULL, NULL,
                   G_TYPE_NONE, 1, BAMF_TYPE_VIEW);
 
   view_signals [CHILD_REMOVED_INTERNAL] =
     g_signal_new ("child-removed-internal",
                   G_OBJECT_CLASS_TYPE (klass),
-                  0, 0, NULL, NULL, NULL,
+                  G_SIGNAL_RUN_FIRST,
+                  G_STRUCT_OFFSET (BamfViewClass, child_removed_internal),
+                  NULL, NULL, NULL,
                   G_TYPE_NONE, 1, BAMF_TYPE_VIEW);
 
   view_signals [EXPORTED] =
     g_signal_new ("exported",
                   G_OBJECT_CLASS_TYPE (klass),
-                  0, 0, NULL, NULL, NULL,
+                  G_SIGNAL_RUN_FIRST,
+                  G_STRUCT_OFFSET (BamfViewClass, exported),
+                  NULL, NULL, NULL,
                   G_TYPE_NONE, 0);
 }

=== modified file 'src/bamf-view.h'
--- src/bamf-view.h	2013-06-18 17:55:15 +0000
+++ src/bamf-view.h	2013-06-19 20:08:28 +0000
@@ -42,10 +42,8 @@
   GList *names;
 
   /*< methods >*/
-  const char * (*view_type)                 (BamfView *view);
-  char *       (*stable_bus_name)           (BamfView *view);
-  const char * (*get_name)                  (BamfView *view);
-  const char * (*get_icon)                  (BamfView *view);
+  const char * (*view_type)         (BamfView *view);
+  char *       (*stable_bus_name)   (BamfView *view);
 
   /*< random stuff >*/
   gboolean (* urgent_changed)       (BamfView *view, gboolean urgent);
@@ -53,12 +51,14 @@
   gboolean (* active_changed)       (BamfView *view, gboolean active);
   gboolean (* user_visible_changed) (BamfView *view, gboolean visible);
   gboolean (* closed)               (BamfView *view);
+  void     (* child_added)          (BamfView *view, BamfView *child);
+  void     (* child_removed)        (BamfView *view, BamfView *child);
 
   /*< signals >*/
-  void   (*child_added)   (BamfView *view, BamfView *child);
-  void   (*child_removed) (BamfView *view, BamfView *child);
-  void   (*exported)      (BamfView *view);
-  void   (*name_changed)  (BamfView *view, const gchar* old_name, const gchar* new_name);
+  void (* closed_internal)          (BamfView *view);
+  void (* child_added_internal)     (BamfView *view, BamfView *child);
+  void (* child_removed_internal)   (BamfView *view, BamfView *child);
+  void (* exported)                 (BamfView *view);
 };
 
 struct _BamfView
@@ -98,10 +98,11 @@
 gboolean      bamf_view_is_urgent          (BamfView *view);
 void          bamf_view_set_urgent         (BamfView *view, gboolean urgent);
 
+void          bamf_view_set_icon           (BamfView *view, const char *icon);
 const char  * bamf_view_get_icon           (BamfView *view);
 
 const char  * bamf_view_get_name           (BamfView *view);
-void          bamf_view_set_name           (BamfView *view, const char * name);
+void          bamf_view_set_name           (BamfView *view, const char *name);
 
 const char  * bamf_view_get_parent_path    (BamfView *view);
 

=== modified file 'tests/bamfdaemon/test-view.c'
--- tests/bamfdaemon/test-view.c	2013-06-19 15:44:52 +0000
+++ tests/bamfdaemon/test-view.c	2013-06-19 20:08:28 +0000
@@ -35,43 +35,59 @@
   g_object_unref (G_OBJECT (view));
 }
 
-static void
-test_name (void)
-{
-  BamfView *view;
-
-  view = g_object_new (BAMF_TYPE_VIEW, NULL);
-
-  g_assert (bamf_view_get_name (view) == NULL);
-
-  bamf_view_set_name (view, "SomeName");
-
-  g_assert_cmpstr (bamf_view_get_name (view), ==, "SomeName");
-
-  g_object_unref (view);
-}
-
-static void
-test_name_exported (void)
-{
-  BamfView *view;
-
-  view = g_object_new (BAMF_TYPE_VIEW, NULL);
-
-  bamf_view_set_name (view, "SomeName");
-  bamf_view_export_on_bus (view, gdbus_connection);
-  g_assert_cmpstr (bamf_view_get_name (view), ==, "SomeName");
-
-  bamf_view_set_name (view, "AnotherName");
-  g_assert_cmpstr (bamf_view_get_name (view), ==, "AnotherName");
-
-  g_object_unref (view);
-}
+#define test_string_property(prop) test_##prop
+#define declare_test_string_property(prop)                         \
+  static void                                                      \
+  test_string_property (prop) (void)                               \
+  {                                                                \
+    BamfView *view;                                                \
+                                                                   \
+    view = g_object_new (BAMF_TYPE_VIEW, NULL);                    \
+    g_assert (!bamf_view_get_##prop (view));                       \
+                                                                   \
+    const gchar *new_##prop = "Some" #prop;                        \
+    bamf_view_set_##prop (view, new_##prop);                       \
+    g_assert_cmpstr (bamf_view_get_##prop (view), ==, new_##prop); \
+                                                                   \
+    new_##prop = "Another" #prop;                                  \
+    bamf_view_set_##prop (view, new_##prop);                       \
+    g_assert_cmpstr (bamf_view_get_##prop (view), ==, new_##prop); \
+                                                                   \
+    g_object_unref (view);                                         \
+  }
+
+declare_test_string_property (name);
+declare_test_string_property (icon);
+
+#define test_string_property_exported(prop) test_##prop##_exported
+#define declare_test_string_property_exported(prop)                \
+  static void                                                      \
+  test_string_property_exported (prop) (void)                      \
+  {                                                                \
+    BamfView *view;                                                \
+                                                                   \
+    view = g_object_new (BAMF_TYPE_VIEW, NULL);                    \
+    g_assert (!bamf_view_get_##prop (view));                       \
+                                                                   \
+    const gchar *new_##prop = "Some" #prop;                        \
+    bamf_view_set_##prop (view, new_##prop);                       \
+    bamf_view_export_on_bus (view, gdbus_connection);              \
+    g_assert_cmpstr (bamf_view_get_##prop (view), ==, new_##prop); \
+                                                                   \
+    new_##prop = "Another" #prop;                                  \
+    bamf_view_set_##prop (view, new_##prop);                       \
+    g_assert_cmpstr (bamf_view_get_##prop (view), ==, new_##prop); \
+                                                                   \
+    g_object_unref (view);                                         \
+  }
+
+declare_test_string_property_exported (name);
+declare_test_string_property_exported (icon);
 
 #define test_boolean_property(prop) test_##prop
 #define declare_test_boolean_property(prop)     \
   static void                                   \
-  test_##prop (void)                            \
+  test_boolean_property (prop) (void)           \
   {                                             \
     BamfView *view;                             \
                                                 \
@@ -95,7 +111,7 @@
 #define test_boolean_property_exported(prop) test_##prop##_exported
 #define declare_test_boolean_property_exported(prop)  \
   static void                                         \
-  test_##prop##_exported (void)                       \
+  test_boolean_property_exported(prop) (void)         \
   {                                                   \
     BamfView *view;                                   \
                                                       \
@@ -295,7 +311,7 @@
 #define test_boolean_property_event(prop) test_##prop##_event
 #define declare_test_boolean_property_event(prop)                                \
   static void                                                                    \
-  test_##prop##_event (void)                                                     \
+  test_boolean_property_event (prop) (void)                                      \
   {                                                                              \
     BamfView *view;                                                              \
                                                                                  \
@@ -332,7 +348,7 @@
 declare_test_boolean_property_event (user_visible);
 
 static gboolean string_event_fired = FALSE;
-static char * string_event_result = FALSE;
+static char * string_event_result = NULL;
 
 static void
 on_string_event (BamfView *view, const gchar *oval, const gchar *nval, gpointer pointer)
@@ -374,11 +390,53 @@
   g_object_unref (view);
 }
 
+static gboolean property_event_fired = FALSE;
+static char * property_event_name = NULL;
+
+static void
+on_property_changed (BamfView *view, GParamSpec *param, BamfView *self)
+{
+  g_free (property_event_name);
+  property_event_fired = TRUE;
+  property_event_name = g_strdup (param->name);
+}
+
+static void
+test_icon_event (void)
+{
+  BamfView *view;
+
+  view = g_object_new (BAMF_TYPE_VIEW, NULL);
+  g_assert (!bamf_view_get_icon (view));
+
+  g_signal_connect (G_OBJECT (view), "notify::icon",
+        (GCallback) on_property_changed, NULL);
+
+  property_event_fired = FALSE;
+  property_event_name = NULL;
+
+  bamf_view_set_icon (view, "NewIcon");
+
+  while (g_main_context_pending (NULL)) g_main_context_iteration (NULL, TRUE);
+  g_assert (property_event_fired);
+  g_assert_cmpstr (property_event_name, ==, "icon");
+
+  property_event_fired = FALSE;
+  bamf_view_set_icon (view, "AnotherIcon");
+  g_assert_cmpstr (bamf_view_get_icon (view), ==, "AnotherIcon");
+
+  while (g_main_context_pending (NULL)) g_main_context_iteration (NULL, TRUE);
+  g_assert (property_event_fired);
+  g_assert_cmpstr (property_event_name, ==, "icon");
+
+  g_object_unref (view);
+}
+
 
 #define test_boolean_property_event_exported(prop) test_##prop##_event_exported
 #define declare_test_boolean_property_event_exported(prop)                       \
   static void                                                                    \
-  test_##prop##_event_exported (void)                                            \
+  test_boolean_property_event_exported (prop) (void)                             \
   {                                                                              \
     BamfView *view;                                                              \
                                                                                  \
@@ -460,6 +518,45 @@
 }
 
 static void
+test_icon_event_exported (void)
+{
+  BamfView *view;
+
+  view = g_object_new (BAMF_TYPE_VIEW, NULL);
+  g_assert (!bamf_view_get_icon (view));
+
+
+  g_signal_connect (G_OBJECT (view), "notify::icon",
+        (GCallback) on_property_changed, NULL);
+
+  property_event_fired = FALSE;
+  property_event_name = NULL;
+
+  bamf_view_set_icon (view, "NewIcon");
+
+  while (g_main_context_pending (NULL)) g_main_context_iteration (NULL, TRUE);
+  g_assert (property_event_fired);
+  g_assert_cmpstr (property_event_name, ==, "icon");
+  property_event_fired = FALSE;
+  g_free (property_event_name);
+  property_event_name = NULL;
+
+  bamf_view_export_on_bus (view, gdbus_connection);
+  while (g_main_context_pending (NULL)) g_main_context_iteration (NULL, TRUE);
+  g_assert (property_event_fired);
+  g_assert_cmpstr (property_event_name, ==, "icon");
+
+  property_event_fired = FALSE;
+  bamf_view_set_icon (view, "AnotherIcon");
+  g_assert_cmpstr (bamf_view_get_icon (view), ==, "AnotherIcon");
+
+  while (g_main_context_pending (NULL)) g_main_context_iteration (NULL, TRUE);
+  g_assert (property_event_fired);
+  g_assert_cmpstr (property_event_name, ==, "icon");
+  g_object_unref (view);
+}
+
+static void
 on_boolean_event_count (BamfView *view, gboolean event, gpointer pointer)
 {
   boolean_event_calls++;
@@ -625,8 +722,10 @@
   gdbus_connection = connection;
 
   g_test_add_func (DOMAIN"/Allocation", test_allocation);
-  g_test_add_func (DOMAIN"/Name", test_name);
-  g_test_add_func (DOMAIN"/Name/Exported", test_name_exported);
+  g_test_add_func (DOMAIN"/Name", test_string_property (name));
+  g_test_add_func (DOMAIN"/Name/Exported", test_string_property_exported (name));
+  g_test_add_func (DOMAIN"/Icon", test_string_property (icon));
+  g_test_add_func (DOMAIN"/Icon/Exported", test_string_property_exported (icon));
   g_test_add_func (DOMAIN"/Active", test_boolean_property (active));
   g_test_add_func (DOMAIN"/Active/Exported", test_boolean_property_exported (active));
   g_test_add_func (DOMAIN"/Running", test_boolean_property (running));
@@ -641,6 +740,8 @@
   g_test_add_func (DOMAIN"/Events/Active", test_boolean_property_event (active));
   g_test_add_func (DOMAIN"/Events/Name", test_name_event);
   g_test_add_func (DOMAIN"/Events/Name/Exported", test_name_event_exported);
+  g_test_add_func (DOMAIN"/Events/Icon", test_icon_event);
+  g_test_add_func (DOMAIN"/Events/Icon/Exported", test_icon_event_exported);
   g_test_add_func (DOMAIN"/Events/Active/Count", test_active_event_count);
   g_test_add_func (DOMAIN"/Events/Active/Exported", test_boolean_property_event_exported (active));
   g_test_add_func (DOMAIN"/Events/Running", test_boolean_property_event (running));

=== modified file 'tests/libbamf/test-application.c'
--- tests/libbamf/test-application.c	2013-06-08 13:54:06 +0000
+++ tests/libbamf/test-application.c	2013-06-19 20:08:28 +0000
@@ -20,6 +20,7 @@
 #include <stdlib.h>
 #include <glib.h>
 #include <glib-object.h>
+#include <libbamf-private/bamf-private.h>
 #include "bamf-view-private.h"
 
 #define DATA_DIR TESTDIR "/data"
@@ -86,7 +87,7 @@
   BamfApplication *application;
 
   application = bamf_application_new_favorite (DATA_DIR"/no-icon.desktop");
-  g_assert_cmpstr (bamf_view_get_icon (BAMF_VIEW (application)), ==, "application-default-icon");
+  g_assert_cmpstr (bamf_view_get_icon (BAMF_VIEW (application)), ==, BAMF_APPLICATION_DEFAULT_ICON);
 
   g_object_unref (application);
 }