Merge lp:~3v1n0/bamf/app-main-view into lp:bamf

[Marco Trevisan (Treviño)]

BamfApplication: keep track of the application main-window and update name and icon accordingly

Applications without a .desktop file should update their name and icon based on their children.
So now we try to compute the main window children, and we update name and icon based on it.

Add a special "main_window" children to the BamfApplication, in this way we keep track of the child that is currently leading the application window group.
Thanks to this, we can update the application name and icon whenever they change.

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:609
http://jenkins.qa.ubuntu.com/job/bamf-ci/72/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/bamf-saucy-amd64-ci/53
    SUCCESS: http://jenkins.qa.ubuntu.com/job/bamf-saucy-armhf-ci/54

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

review: Approve (continuous-integration)

[Brandon Schaefer (brandontschaefer)]

LGTM

review: Approve

=== modified file 'src/bamf-application.c'
--- src/bamf-application.c	2013-07-16 00:25:51 +0000
+++ src/bamf-application.c	2013-07-16 16:30:44 +0000
@@ -38,12 +38,12 @@
 struct _BamfApplicationPrivate
 {
   BamfDBusItemApplication *dbus_iface;
+  BamfApplicationType app_type;
+  BamfView * main_child;
   char * desktop_file;
   GList * desktop_file_list;
-  char * app_type;
   char * wmclass;
   char ** mimes;
-  gboolean is_tab_container;
   gboolean show_stubs;
 };
 
@@ -57,6 +57,8 @@
 
 #define STUB_KEY  "X-Ayatana-Appmenu-Show-Stubs"
 
+static void on_main_child_name_changed (BamfView *, const gchar *, const gchar *, BamfApplication *);
+
 void
 bamf_application_supported_mime_types_changed (BamfApplication *application,
                                                const gchar **new_mimes)
@@ -136,23 +138,21 @@
   return g_strdupv (mimes);
 }
 
-char *
+BamfApplicationType
 bamf_application_get_application_type (BamfApplication *application)
 {
-  g_return_val_if_fail (BAMF_IS_APPLICATION (application), NULL);
+  g_return_val_if_fail (BAMF_IS_APPLICATION (application), BAMF_APPLICATION_UNKNOWN);
 
-  return g_strdup (application->priv->app_type);
+  return application->priv->app_type;
 }
 
 void
-bamf_application_set_application_type (BamfApplication *application, const gchar *type)
+bamf_application_set_application_type (BamfApplication *application, BamfApplicationType type)
 {
   g_return_if_fail (BAMF_IS_APPLICATION (application));
-
-  if (application->priv->app_type)
-    g_free (application->priv->app_type);
-
-  application->priv->app_type = g_strdup (type);
+  g_return_if_fail (type >= 0 && type < BAMF_APPLICATION_UNKNOWN);
+
+  application->priv->app_type = type;
 }
 
 const char *
@@ -201,22 +201,24 @@
 }
 
 static void
-bamf_application_setup_icon_and_name (BamfApplication *self)
+bamf_application_setup_icon_and_name (BamfApplication *self, gboolean force)
 {
-  BamfView *view;
-  BamfWindow *window = NULL;
+  BamfWindow *window;
+  BamfLegacyWindow *legacy_window;
   GDesktopAppInfo *desktop;
   GKeyFile * keyfile;
   GIcon *gicon;
-  GList *children, *l;
   const char *class;
   char *icon = NULL, *generic_icon = NULL, *name = NULL;
   GError *error;
 
   g_return_if_fail (BAMF_IS_APPLICATION (self));
 
-  if (bamf_view_get_icon (BAMF_VIEW (self)) && bamf_view_get_name (BAMF_VIEW (self)))
-    return;
+  if (!force)
+    {
+      if (bamf_view_get_icon (BAMF_VIEW (self)) && bamf_view_get_name (BAMF_VIEW (self)))
+        return;
+    }
 
   if (self->priv->desktop_file)
     {
@@ -289,66 +291,57 @@
       g_object_unref (desktop);
       g_key_file_free (keyfile);
     }
-  else if ((children = bamf_view_get_children (BAMF_VIEW (self))) != NULL)
+  else if (BAMF_IS_WINDOW (self->priv->main_child))
     {
-      for (l = children; l && !icon; l = l->next)
-        {
-          view = l->data;
-          if (!BAMF_IS_WINDOW (view))
-            continue;
-
-          window = BAMF_WINDOW (view);
-
-          do
-            {
-              class = bamf_legacy_window_get_class_name (bamf_window_get_window (window));
-
-              if (class)
-                {
-                  icon = g_utf8_strdown (class, -1);
-
-                  if (icon_name_is_valid (icon))
-                    {
-                      if (icon_name_is_generic (icon))
-                        {
-                          generic_icon = g_strdup (icon);
-                        }
-                      else
-                        {
-                          break;
-                        }
-                    }
-                }
-
-              g_free (icon);
-              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))
-                {
-                  if (icon_name_is_generic (icon))
-                    {
-                      generic_icon = g_strdup (icon);
-                    }
-                  else
-                    {
-                      break;
-                    }
-                }
-
-              g_free (icon);
-              icon = NULL;
-            }
-          while (FALSE);
-
-          name = g_strdup (bamf_legacy_window_get_name (bamf_window_get_window (window)));
-        }
-
-      if (!icon)
-        {
-          if (window)
-            icon = g_strdup (bamf_legacy_window_save_mini_icon (bamf_window_get_window (window)));
+      name = g_strdup (bamf_view_get_name (self->priv->main_child));
+      window = BAMF_WINDOW (self->priv->main_child);
+      legacy_window = bamf_window_get_window (window);
+      class = bamf_legacy_window_get_class_name (legacy_window);
+
+      if (class)
+        {
+          icon = g_utf8_strdown (class, -1);
+
+          if (icon_name_is_valid (icon))
+            {
+              if (icon_name_is_generic (icon))
+                {
+                  generic_icon = icon;
+                  icon = NULL;
+                }
+            }
+          else
+            {
+              g_free (icon);
+              icon = NULL;
+            }
+        }
+
+      if (!icon)
+        {
+          char *exec = bamf_legacy_window_get_exec_string (legacy_window);
+          icon = bamf_matcher_get_trimmed_exec (bamf_matcher_get_default (), exec);
+          g_free (exec);
+
+          if (icon_name_is_valid (icon))
+            {
+              if (icon_name_is_generic (icon))
+                {
+                  g_free (generic_icon);
+                  generic_icon = icon;
+                  icon = NULL;
+                }
+            }
+          else
+            {
+              g_free (icon);
+              icon = NULL;
+            }
+        }
+
+      if (!icon)
+        {
+          icon = g_strdup (bamf_legacy_window_save_mini_icon (legacy_window));
 
           if (!icon)
             {
@@ -381,15 +374,22 @@
 {
   g_return_if_fail (BAMF_IS_APPLICATION (application));
 
-  if (application->priv->desktop_file)
-    g_free (application->priv->desktop_file);
+  if (g_strcmp0 (application->priv->desktop_file, desktop_file) == 0)
+    return;
+
+  g_free (application->priv->desktop_file);
+  application->priv->desktop_file = NULL;
 
   if (desktop_file && desktop_file[0] != '\0')
     application->priv->desktop_file = g_strdup (desktop_file);
-  else
-    application->priv->desktop_file = NULL;
-
-  bamf_application_setup_icon_and_name (application);
+
+  if (application->priv->main_child)
+    {
+      g_signal_handlers_disconnect_by_func (application->priv->main_child,
+                                            on_main_child_name_changed, application);
+    }
+
+  bamf_application_setup_icon_and_name (application, TRUE);
 }
 
 gboolean
@@ -632,25 +632,79 @@
 }
 
 static void
+on_main_child_name_changed (BamfView *child, const gchar *old_name,
+                            const gchar *new_name, BamfApplication *self)
+{
+  bamf_view_set_name (BAMF_VIEW (self), new_name);
+}
+
+static void
+bamf_application_set_main_child (BamfApplication *self, BamfView *child)
+{
+  if (self->priv->main_child == child)
+    return;
+
+  if (self->priv->main_child)
+    {
+      g_object_remove_weak_pointer (G_OBJECT (self->priv->main_child),
+                                    (gpointer*) &self->priv->main_child);
+      g_signal_handlers_disconnect_by_func (self->priv->main_child,
+                                            on_main_child_name_changed, self);
+    }
+
+  self->priv->main_child = child;
+
+  if (self->priv->main_child)
+    {
+      g_object_add_weak_pointer (G_OBJECT (self->priv->main_child),
+                                 (gpointer*) &self->priv->main_child);
+
+      if (!self->priv->desktop_file)
+        {
+          g_signal_connect (child, "name-changed",
+                            G_CALLBACK (on_main_child_name_changed), self);
+        }
+    }
+}
+
+BamfView *
+bamf_application_get_main_child (BamfApplication *self)
+{
+  g_return_val_if_fail (BAMF_IS_APPLICATION (self), NULL);
+
+  return self->priv->main_child;
+}
+
+static void
 view_exported (BamfView *view, BamfApplication *self)
 {
   g_signal_emit_by_name (self, "window-added", bamf_view_get_path (view));
+  g_signal_handlers_disconnect_by_func (view, view_exported, self);
 }
 
 static void
 bamf_application_child_added (BamfView *view, BamfView *child)
 {
   BamfApplication *application;
+  BamfWindow *window = NULL;
+  gboolean reset_emblems = FALSE;
 
   application = BAMF_APPLICATION (view);
 
   if (BAMF_IS_WINDOW (child))
     {
+      window = BAMF_WINDOW (child);
+
       if (bamf_view_is_on_bus (child))
-        g_signal_emit_by_name (BAMF_APPLICATION (view), "window-added", bamf_view_get_path (child));
+        {
+          g_signal_emit_by_name (BAMF_APPLICATION (view), "window-added",
+                                 bamf_view_get_path (child));
+        }
       else
-        g_signal_connect (G_OBJECT (child), "exported",
-                          (GCallback) view_exported, view);
+        {
+          g_signal_connect (G_OBJECT (child), "exported",
+                            (GCallback) view_exported, view);
+        }
     }
 
   g_signal_connect (G_OBJECT (child), "active-changed",
@@ -666,9 +720,30 @@
                         (GCallback) view_xid_changed, view);
     }
 
+  if (application->priv->main_child)
+    {
+      if (window && BAMF_IS_WINDOW (application->priv->main_child))
+        {
+          BamfWindow *main_window = BAMF_WINDOW (application->priv->main_child);
+
+          if (bamf_window_get_window_type (main_window) != BAMF_WINDOW_NORMAL &&
+              bamf_window_get_window_type (window) == BAMF_WINDOW_NORMAL)
+            {
+              bamf_application_set_main_child (application, child);
+            }
+        }
+    }
+  else
+    {
+      bamf_application_set_main_child (application, child);
+    }
+
   bamf_application_ensure_flags (BAMF_APPLICATION (view));
 
-  bamf_application_setup_icon_and_name (application);
+  if (!application->priv->desktop_file && application->priv->main_child == child)
+    reset_emblems = TRUE;
+
+  bamf_application_setup_icon_and_name (application, reset_emblems);
 }
 
 static char *
@@ -740,6 +815,8 @@
 bamf_application_child_removed (BamfView *view, BamfView *child)
 {
   BamfApplication *self = BAMF_APPLICATION (view);
+  GList *children, *l;
+
   if (BAMF_IS_WINDOW (child))
     {
       if (bamf_view_is_on_bus (child))
@@ -751,7 +828,35 @@
 
   bamf_application_ensure_flags (self);
 
-  if (!bamf_view_get_children (view) && bamf_application_get_close_when_empty (self))
+  children = bamf_view_get_children (view);
+
+  if (self->priv->main_child == child)
+    {
+      /* Giving priority to older windows, and BamfView has a reversed list */
+      children = g_list_last (children);
+      bamf_application_set_main_child (self, (children ? children->data : NULL));
+
+      if (self->priv->app_type == BAMF_APPLICATION_SYSTEM)
+        {
+          /* We check if we have a better target in next windows */
+          for (l = children; l; l = l->prev)
+            {
+              if (bamf_window_get_window_type (BAMF_WINDOW (l->data)) == BAMF_WINDOW_NORMAL)
+                {
+                  bamf_application_set_main_child (self, l->data);
+                  break;
+                }
+            }
+        }
+
+        if (self->priv->main_child)
+          {
+            gboolean reset_emblems = (!self->priv->desktop_file);
+            bamf_application_setup_icon_and_name (self, reset_emblems);
+          }
+    }
+
+  if (!children && bamf_application_get_close_when_empty (self))
     {
       bamf_view_close (view);
     }
@@ -901,9 +1006,21 @@
                                  GDBusMethodInvocation *invocation,
                                  BamfApplication *self)
 {
-  const char *type = self->priv->app_type ? self->priv->app_type : "";
-  g_dbus_method_invocation_return_value (invocation,
-                                         g_variant_new ("(s)", type));
+  const char *type = "";
+
+  switch (self->priv->app_type)
+    {
+      case BAMF_APPLICATION_SYSTEM:
+        type = "system";
+        break;
+      case BAMF_APPLICATION_WEB:
+        type = "webapp";
+        break;
+      default:
+        type = "unknown";
+    }
+
+  g_dbus_method_invocation_return_value (invocation, g_variant_new ("(s)", type));
 
   return TRUE;
 }
@@ -929,18 +1046,20 @@
       priv->desktop_file_list = NULL;
     }
 
-  if (priv->app_type)
-    {
-      g_free (priv->app_type);
-      priv->app_type = NULL;
-    }
-
   if (priv->wmclass)
     {
       g_free (priv->wmclass);
       priv->wmclass = NULL;
     }
 
+  if (priv->main_child)
+    {
+      g_object_remove_weak_pointer (G_OBJECT (priv->main_child),
+                                    (gpointer*) &priv->main_child);
+      g_signal_handlers_disconnect_by_data (priv->main_child, app);
+      priv->main_child = NULL;
+    }
+
   g_strfreev (priv->mimes);
   priv->mimes = NULL;
 
@@ -967,10 +1086,8 @@
   BamfApplicationPrivate *priv;
   priv = self->priv = BAMF_APPLICATION_GET_PRIVATE (self);
 
-  priv->is_tab_container = FALSE;
-  priv->app_type = g_strdup ("system");
+  priv->app_type = BAMF_APPLICATION_SYSTEM;
   priv->show_stubs = TRUE;
-  priv->wmclass = NULL;
 
   /* Initializing the dbus interface */
   priv->dbus_iface = _bamf_dbus_item_application_skeleton_new ();
@@ -1087,17 +1204,6 @@
   return application;
 }
 
-/**
-    bamf_application_get_show_stubs:
-    @application: Application to check for menu stubs
-
-    Checks to see if the application should show menu stubs or not.
-    This is specified with the "X-Ayatana-Appmenu-Show-Stubs" desktop
-    file key.
-
-    Return Value: Defaults to TRUE, else FALSE if specified in
-      .desktop file.
-*/
 gboolean
 bamf_application_get_show_stubs (BamfApplication *application)
 {
@@ -1105,7 +1211,6 @@
   return application->priv->show_stubs;
 }
 
-
 gboolean
 bamf_application_get_close_when_empty (BamfApplication *application)
 {

=== modified file 'src/bamf-application.h'
--- src/bamf-application.h	2013-06-18 13:44:04 +0000
+++ src/bamf-application.h	2013-07-16 16:30:44 +0000
@@ -56,6 +56,13 @@
   BamfApplicationPrivate *priv;
 };
 
+typedef enum
+{
+  BAMF_APPLICATION_SYSTEM,  /* BamfWindow container */
+  BAMF_APPLICATION_WEB,     /* BamfTab container */
+  BAMF_APPLICATION_UNKNOWN,
+} BamfApplicationType;
+
 GType             bamf_application_get_type                   (void) G_GNUC_CONST;
 
 void              bamf_application_emit_supported_mime_types_changed     (BamfApplication *application);
@@ -64,7 +71,7 @@
 void              bamf_application_set_desktop_file           (BamfApplication *application,
                                                                const char * desktop_file);
 
-char           ** bamf_application_get_supported_mime_types              (BamfApplication *application);
+char           ** bamf_application_get_supported_mime_types   (BamfApplication *application);
 
 GVariant        * bamf_application_get_xids                   (BamfApplication *application);
 
@@ -90,11 +97,16 @@
 
 BamfApplication * bamf_application_new_with_wmclass           (const char *wmclass);
 
-void bamf_application_set_application_type (BamfApplication *application, const gchar *type);
-
-void bamf_application_get_application_menu (BamfApplication *application, gchar **name, gchar **object_path);
-
-BamfView        * bamf_application_get_focusable_child             (BamfApplication *application);
+void              bamf_application_set_application_type       (BamfApplication *application,
+                                                               BamfApplicationType type);
+BamfApplicationType bamf_application_get_application_type     (BamfApplication *application);
+
+void              bamf_application_get_application_menu       (BamfApplication *application,
+                                                               gchar **name, gchar **object_path);
+
+BamfView        * bamf_application_get_focusable_child        (BamfApplication *application);
+
+BamfView        * bamf_application_get_main_child             (BamfApplication *application);
 
 gboolean bamf_application_get_close_when_empty (BamfApplication *application);
 gboolean bamf_application_set_desktop_file_from_id (BamfApplication *application, const char *id);

=== modified file 'src/bamf-unity-webapps-application.c'
--- src/bamf-unity-webapps-application.c	2013-06-13 18:40:56 +0000
+++ src/bamf-unity-webapps-application.c	2013-07-16 16:30:44 +0000
@@ -267,7 +267,7 @@
 {
   self->priv = BAMF_UNITY_WEBAPPS_APPLICATION_GET_PRIVATE (self);
 
-  bamf_application_set_application_type (BAMF_APPLICATION (self), "webapp");
+  bamf_application_set_application_type (BAMF_APPLICATION (self), BAMF_APPLICATION_WEB);
 
 }
 

=== modified file 'src/bamf-unity-webapps-observer.c'
--- src/bamf-unity-webapps-observer.c	2013-06-13 18:40:56 +0000
+++ src/bamf-unity-webapps-observer.c	2013-07-16 16:30:44 +0000
@@ -204,7 +204,10 @@
 
   g_hash_table_destroy (observer->priv->applications_by_context_name);
 
-  g_bus_unwatch_name (observer->priv->service_watch_id);
+  if (observer->priv->service_watch_id)
+    {
+      g_bus_unwatch_name (observer->priv->service_watch_id);
+    }
 
   if (observer->priv->service)
     {
@@ -225,6 +228,9 @@
       G_OBJECT_CLASS (bamf_unity_webapps_observer_parent_class)->constructed (object);
     }
 
+  if (g_strcmp0 (g_getenv ("BAMF_TEST_MODE"), "TRUE") == 0)
+    return;
+
   observer->priv->service_watch_id = g_bus_watch_name (G_BUS_TYPE_SESSION,
                                                        "com.canonical.Unity.Webapps.Service",
                                                        G_BUS_NAME_WATCHER_FLAGS_NONE,

=== modified file 'tests/bamfdaemon/test-application.c'
--- tests/bamfdaemon/test-application.c	2013-07-16 00:27:11 +0000
+++ tests/bamfdaemon/test-application.c	2013-07-16 16:30:44 +0000
@@ -27,7 +27,9 @@
 #include "bamf-legacy-window.h"
 #include "bamf-legacy-window-test.h"
 
-#define DESKTOP_FILE "/usr/share/applications/gnome-terminal.desktop"
+#define DESKTOP_FILE TESTDIR"/data/test-bamf-app.desktop"
+
+void ignore_fatal_errors (void);
 
 static gboolean          signal_seen   = FALSE;
 static gboolean          signal_result = FALSE;
@@ -66,7 +68,7 @@
 static void
 test_allocation (void)
 {
-  BamfApplication    *application;
+  BamfApplication *application;
 
   /* Check it allocates */
   application = bamf_application_new ();
@@ -81,12 +83,47 @@
 }
 
 static void
+test_type (void)
+{
+  BamfApplication *application = bamf_application_new ();
+  g_assert_cmpuint (bamf_application_get_application_type (application), ==, BAMF_APPLICATION_SYSTEM);
+
+  g_object_unref (application);
+}
+
+static void
+test_type_set (void)
+{
+  BamfApplication *application = bamf_application_new ();
+
+  bamf_application_set_application_type (application, BAMF_APPLICATION_WEB);
+  g_assert_cmpuint (bamf_application_get_application_type (application), ==, BAMF_APPLICATION_WEB);
+
+  bamf_application_set_application_type (application, BAMF_APPLICATION_SYSTEM);
+  g_assert_cmpuint (bamf_application_get_application_type (application), ==, BAMF_APPLICATION_SYSTEM);
+
+  g_object_unref (application);
+}
+
+static void
+test_type_set_invalid (void)
+{
+  ignore_fatal_errors();
+  BamfApplication *application = bamf_application_new ();
+
+  bamf_application_set_application_type (application, BAMF_APPLICATION_UNKNOWN);
+  g_assert_cmpuint (bamf_application_get_application_type (application), ==, BAMF_APPLICATION_SYSTEM);
+
+  bamf_application_set_application_type (application, -1);
+  g_assert_cmpuint (bamf_application_get_application_type (application), ==, BAMF_APPLICATION_SYSTEM);
+
+  g_object_unref (application);
+}
+
+static void
 test_desktop_file (void)
 {
-  BamfApplication    *application;
-
-  /* Check it allocates */
-  application = bamf_application_new ();
+  BamfApplication *application = bamf_application_new ();
   g_assert (bamf_application_get_desktop_file (application) == NULL);
 
   bamf_application_set_desktop_file (application, DESKTOP_FILE);
@@ -733,6 +770,7 @@
 
   g_object_unref (window);
   g_object_unref (test);
+  g_object_unref (application);
 }
 
 static void
@@ -777,6 +815,287 @@
 
   g_object_unref (window);
   g_object_unref (test);
+  g_object_unref (application);
+}
+
+static void
+test_desktop_app_main_child (void)
+{
+  BamfApplication *application;
+  BamfLegacyWindowTest *lwin;
+  BamfWindow *win;
+
+  application = bamf_application_new_from_desktop_file (DESKTOP_FILE);
+  lwin = bamf_legacy_window_test_new (20, "window", "test-bamf-icon", "execution-binary");
+  win = bamf_window_new (BAMF_LEGACY_WINDOW (lwin));
+
+  g_assert (!bamf_application_get_main_child (application));
+  bamf_view_add_child (BAMF_VIEW (application), BAMF_VIEW (win));
+  g_assert (bamf_application_get_main_child (application) == BAMF_VIEW (win));
+
+  g_object_unref (lwin);
+  g_object_unref (win);
+  g_object_unref (application);
+}
+
+static void
+test_desktop_app_main_child_doesnt_match_emblems (void)
+{
+  BamfApplication *application;
+  BamfLegacyWindowTest *lwin;
+  BamfWindow *win;
+
+  application = bamf_application_new_from_desktop_file (DESKTOP_FILE);
+  lwin = bamf_legacy_window_test_new (20, "window", "python", "execution-binary");
+  win = bamf_window_new (BAMF_LEGACY_WINDOW (lwin));
+
+  bamf_view_add_child (BAMF_VIEW (application), BAMF_VIEW (win));
+  g_assert_cmpstr (bamf_view_get_name (BAMF_VIEW (application)), !=, "window");
+  g_assert_cmpstr (bamf_view_get_icon (BAMF_VIEW (application)), !=, "python");
+
+  g_object_unref (lwin);
+  g_object_unref (win);
+  g_object_unref (application);
+}
+
+static void
+test_desktop_app_main_child_doesnt_update_emblems (void)
+{
+  BamfApplication *application;
+  BamfLegacyWindowTest *lwin;
+  BamfWindow *win;
+
+  application = bamf_application_new_from_desktop_file (DESKTOP_FILE);
+  lwin = bamf_legacy_window_test_new (20, "window", "python", "execution-binary");
+  win = bamf_window_new (BAMF_LEGACY_WINDOW (lwin));
+
+  bamf_view_add_child (BAMF_VIEW (application), BAMF_VIEW (win));
+  bamf_legacy_window_test_set_name (lwin, "New Window Name");
+  g_assert_cmpstr (bamf_view_get_name (BAMF_VIEW (application)), !=, "New Window Name");
+
+  bamf_legacy_window_test_set_name (lwin, "even-new-name");
+  g_assert_cmpstr (bamf_view_get_name (BAMF_VIEW (application)), !=, "even-new-name");
+
+  g_object_unref (lwin);
+  g_object_unref (win);
+  g_object_unref (application);
+}
+
+static void
+test_app_main_child (void)
+{
+  BamfApplication *application;
+  BamfLegacyWindowTest *lwin;
+  BamfWindow *win;
+
+  application = bamf_application_new ();
+  lwin = bamf_legacy_window_test_new (20, "window", "test-bamf-icon", "execution-binary");
+  win = bamf_window_new (BAMF_LEGACY_WINDOW (lwin));
+
+  g_assert (!bamf_application_get_main_child (application));
+  bamf_view_add_child (BAMF_VIEW (application), BAMF_VIEW (win));
+  g_assert (bamf_application_get_main_child (application) == BAMF_VIEW (win));
+
+  g_object_unref (lwin);
+  g_object_unref (win);
+
+  g_assert (!bamf_application_get_main_child (application));
+  g_object_unref (application);
+}
+
+static void
+test_app_main_child_matches_emblems (void)
+{
+  BamfApplication *application;
+  BamfLegacyWindowTest *lwin;
+  BamfWindow *win;
+
+  application = bamf_application_new ();
+  lwin = bamf_legacy_window_test_new (20, "window", "test-bamf-icon", "execution-binary");
+  win = bamf_window_new (BAMF_LEGACY_WINDOW (lwin));
+
+  bamf_view_add_child (BAMF_VIEW (application), BAMF_VIEW (win));
+  g_assert_cmpstr (bamf_view_get_name (BAMF_VIEW (application)), ==, "window");
+  g_assert_cmpstr (bamf_view_get_icon (BAMF_VIEW (application)), ==, "test-bamf-icon");
+
+  g_object_unref (lwin);
+  g_object_unref (win);
+  g_object_unref (application);
+}
+
+static void
+test_app_main_child_updates_emblems (void)
+{
+  BamfApplication *application;
+  BamfLegacyWindowTest *lwin;
+  BamfWindow *win;
+
+  application = bamf_application_new ();
+  lwin = bamf_legacy_window_test_new (20, "window", "test-bamf-icon", "execution-binary");
+  win = bamf_window_new (BAMF_LEGACY_WINDOW (lwin));
+
+  bamf_view_add_child (BAMF_VIEW (application), BAMF_VIEW (win));
+  bamf_legacy_window_test_set_name (lwin, "New Window Name");
+  g_assert_cmpstr (bamf_view_get_name (BAMF_VIEW (application)), ==, "New Window Name");
+
+  bamf_legacy_window_test_set_name (lwin, "even-new-name");
+  g_assert_cmpstr (bamf_view_get_name (BAMF_VIEW (application)), ==, "even-new-name");
+
+  g_object_unref (lwin);
+  g_object_unref (win);
+  g_object_unref (application);
+}
+
+static void
+test_app_main_child_multiple_children (void)
+{
+  BamfApplication *application;
+  BamfLegacyWindowTest *lwin;
+  BamfWindow *win1;
+  GList *wins = NULL;
+  GList *lwins = NULL;
+  int i;
+
+  application = bamf_application_new ();
+  lwin = bamf_legacy_window_test_new (20, "window", "test-bamf-icon", "execution-binary");
+  win1 = bamf_window_new (BAMF_LEGACY_WINDOW (lwin));
+  g_object_unref (lwin);
+
+  bamf_view_add_child (BAMF_VIEW (application), BAMF_VIEW (win1));
+
+  for (i = 0; i < 10; ++i)
+    {
+      lwin = bamf_legacy_window_test_new (i, "other-window", "", "execution-binary");
+      lwins = g_list_prepend (lwins, lwin);
+      wins = g_list_prepend (wins, bamf_window_new (BAMF_LEGACY_WINDOW (lwin)));
+      bamf_view_add_child (BAMF_VIEW (application), BAMF_VIEW (wins->data));
+
+      g_assert (bamf_application_get_main_child (application) == BAMF_VIEW (win1));
+      g_assert_cmpstr (bamf_view_get_name (BAMF_VIEW (application)), ==, "window");
+      g_assert_cmpstr (bamf_view_get_icon (BAMF_VIEW (application)), ==, "test-bamf-icon");
+    }
+
+  g_assert (bamf_application_get_main_child (application) == BAMF_VIEW (win1));
+
+  g_object_unref (win1);
+  g_object_unref (application);
+  g_list_free_full (wins, g_object_unref);
+  g_list_free_full (lwins, g_object_unref);
+}
+
+static void
+test_app_main_child_normal_priority (void)
+{
+  BamfApplication *application;
+  BamfLegacyWindowTest *lwin;
+  BamfWindow *dialog, *win;
+
+  application = bamf_application_new ();
+  lwin = bamf_legacy_window_test_new (10, "dialog", "python", "execution-binary");
+  lwin->window_type = BAMF_WINDOW_DIALOG;
+  dialog = bamf_window_new (BAMF_LEGACY_WINDOW (lwin));
+  g_object_unref (lwin);
+
+  bamf_view_add_child (BAMF_VIEW (application), BAMF_VIEW (dialog));
+  g_assert (bamf_application_get_main_child (application) == BAMF_VIEW (dialog));
+
+  g_assert_cmpstr (bamf_view_get_name (BAMF_VIEW (application)), ==, "dialog");
+  g_assert_cmpstr (bamf_view_get_icon (BAMF_VIEW (application)), ==, "python");
+
+  lwin = bamf_legacy_window_test_new (20, "window", "test-bamf-icon", "execution-binary");
+  win = bamf_window_new (BAMF_LEGACY_WINDOW (lwin));
+  g_object_unref (lwin);
+
+  bamf_view_add_child (BAMF_VIEW (application), BAMF_VIEW (win));
+  g_assert (bamf_application_get_main_child (application) == BAMF_VIEW (win));
+
+  g_assert_cmpstr (bamf_view_get_name (BAMF_VIEW (application)), ==, "window");
+  g_assert_cmpstr (bamf_view_get_icon (BAMF_VIEW (application)), ==, "test-bamf-icon");
+
+  g_object_unref (dialog);
+  g_object_unref (win);
+  g_object_unref (application);
+}
+
+static void
+test_app_main_child_on_window_removal (void)
+{
+  BamfApplication *application;
+  BamfLegacyWindowTest *lwin;
+  BamfWindow *win1, *win2, *win3, *win4, *dialog;
+
+  application = bamf_application_new ();
+  lwin = bamf_legacy_window_test_new (10, "window1", NULL, "execution-binary");
+  win1 = bamf_window_new (BAMF_LEGACY_WINDOW (lwin));
+  bamf_view_add_child (BAMF_VIEW (application), BAMF_VIEW (win1));
+  g_object_unref (lwin);
+
+  lwin = bamf_legacy_window_test_new (20, "window2", NULL, "execution-binary");
+  win2 = bamf_window_new (BAMF_LEGACY_WINDOW (lwin));
+  bamf_view_add_child (BAMF_VIEW (application), BAMF_VIEW (win2));
+  g_object_unref (lwin);
+
+  lwin = bamf_legacy_window_test_new (21, "dialog", NULL, "execution-binary");
+  lwin->window_type = BAMF_WINDOW_DIALOG;
+  dialog = bamf_window_new (BAMF_LEGACY_WINDOW (lwin));
+  bamf_view_add_child (BAMF_VIEW (application), BAMF_VIEW (dialog));
+  g_object_unref (lwin);
+
+  lwin = bamf_legacy_window_test_new (30, "window3", NULL, "execution-binary");
+  win3 = bamf_window_new (BAMF_LEGACY_WINDOW (lwin));
+  bamf_view_add_child (BAMF_VIEW (application), BAMF_VIEW (win3));
+  g_object_unref (lwin);
+
+  lwin = bamf_legacy_window_test_new (40, "window4", NULL, "execution-binary");
+  win4 = bamf_window_new (BAMF_LEGACY_WINDOW (lwin));
+  bamf_view_add_child (BAMF_VIEW (application), BAMF_VIEW (win4));
+  g_object_unref (lwin);
+
+  g_assert (bamf_application_get_main_child (application) == BAMF_VIEW (win1));
+
+  bamf_view_remove_child (BAMF_VIEW (application), BAMF_VIEW (win4));
+  g_assert (bamf_application_get_main_child (application) == BAMF_VIEW (win1));
+
+  bamf_view_remove_child (BAMF_VIEW (application), BAMF_VIEW (win1));
+  g_assert (bamf_application_get_main_child (application) == BAMF_VIEW (win2));
+
+  bamf_view_remove_child (BAMF_VIEW (application), BAMF_VIEW (win2));
+  g_assert (bamf_application_get_main_child (application) == BAMF_VIEW (win3));
+
+  bamf_view_remove_child (BAMF_VIEW (application), BAMF_VIEW (win3));
+  g_assert (bamf_application_get_main_child (application) == BAMF_VIEW (dialog));
+
+  bamf_view_remove_child (BAMF_VIEW (application), BAMF_VIEW (dialog));
+  g_assert (!bamf_application_get_main_child (application));
+
+  g_object_unref (win1);
+  g_object_unref (win2);
+  g_object_unref (win3);
+  g_object_unref (win4);
+  g_object_unref (dialog);
+  g_object_unref (application);
+}
+
+static void
+test_app_main_child_on_window_replace_on_removal (void)
+{
+  BamfApplication *application;
+  BamfLegacyWindowTest *lwin;
+  BamfWindow *win;
+
+  application = bamf_application_new ();
+  lwin = bamf_legacy_window_test_new (20, "window", "test-bamf-icon", "execution-binary");
+  win = bamf_window_new (BAMF_LEGACY_WINDOW (lwin));
+
+  bamf_view_add_child (BAMF_VIEW (application), BAMF_VIEW (win));
+  g_assert (bamf_application_get_main_child (application) == BAMF_VIEW (win));
+  bamf_view_remove_child (BAMF_VIEW (application), BAMF_VIEW (win));
+  g_assert (!bamf_application_get_main_child (application));
+  bamf_legacy_window_test_set_name (lwin, "don't crash here!");
+
+  g_object_unref (lwin);
+  g_object_unref (win);
+  g_object_unref (application);
 }
 
 /* Initialize test suite */
@@ -789,6 +1108,9 @@
   gdbus_connection = connection;
 
   g_test_add_func (DOMAIN"/Allocation", test_allocation);
+  g_test_add_func (DOMAIN"/Type", test_type);
+  g_test_add_func (DOMAIN"/Type/Set", test_type_set);
+  g_test_add_func (DOMAIN"/Type/Set/Invalid", test_type_set_invalid);
   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);
@@ -797,12 +1119,22 @@
   g_test_add_func (DOMAIN"/DesktopFile/Icon/FullPath/Invalid", test_icon_full_path_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"/DesktopFile/MainChild", test_desktop_app_main_child);
+  g_test_add_func (DOMAIN"/DesktopFile/MainChild/NotMatchEmblems", test_desktop_app_main_child_doesnt_match_emblems);
+  g_test_add_func (DOMAIN"/DesktopFile/MainChild/NotUpdatesEmblems", test_desktop_app_main_child_doesnt_update_emblems);
   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"/DesktopLess/MainChild", test_app_main_child);
+  g_test_add_func (DOMAIN"/DesktopLess/MainChild/MatchesEmblems", test_app_main_child_matches_emblems);
+  g_test_add_func (DOMAIN"/DesktopLess/MainChild/UpdatesEmblems", test_app_main_child_updates_emblems);
+  g_test_add_func (DOMAIN"/DesktopLess/MainChild/MultipleChildren", test_app_main_child_multiple_children);
+  g_test_add_func (DOMAIN"/DesktopLess/MainChild/NormalPriority", test_app_main_child_normal_priority);
+  g_test_add_func (DOMAIN"/DesktopLess/MainChild/Removal", test_app_main_child_on_window_removal);
+  g_test_add_func (DOMAIN"/DesktopLess/MainChild/ReplaceOnRemoval", test_app_main_child_on_window_replace_on_removal);
   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);

=== modified file 'tests/bamfdaemon/test-bamf.c'
--- tests/bamfdaemon/test-bamf.c	2013-06-21 20:58:53 +0000
+++ tests/bamfdaemon/test-bamf.c	2013-07-16 16:30:44 +0000
@@ -34,6 +34,20 @@
 
 static int result = 1;
 
+static gboolean
+not_fatal_log_handler (const gchar *log_domain, GLogLevelFlags log_level,
+                       const gchar *message, gpointer user_data)
+{
+  // Don't crash if used
+  return FALSE;
+}
+
+void
+ignore_fatal_errors (void)
+{
+  g_test_log_set_fatal_handler (not_fatal_log_handler, NULL);
+}
+
 static void
 on_bus_acquired (GDBusConnection *connection, const gchar *name, gpointer data)
 {