Merge lp:~3v1n0/bamf/libbamf-avoid-closed-views into lp:bamf/0.4

[Marco Trevisan (Treviño)]

BamfMatcher: force a view as closed or not-closed on proper signals.

  This avoids that a view that is opened is actually marked as closed when
  really it's running. Fixes #925421

Sometimes it happens that sticked views are marked as closed even if they're currently running.
This can be caused by the fact that the factory doesn't always call the _bamf_view_set_path function (where the is_closed parameter is set to FALSE) after being (re-)opened.

To prevent this when the matcher records that a view has been opened or closed, we force it as closed through the new private function _bamf_view_set_closed.

[Jason Smith (jassmith)]

Works fine when tested with pre-req branch

review: Approve

[Unity Merger (unity-merger)]

The prerequisite lp:~3v1n0/bamf/libbamf-sticky-proxy-keep-alive has not yet been merged into lp:bamf.

=== modified file 'lib/libbamf/bamf-matcher.c'
--- lib/libbamf/bamf-matcher.c	2012-05-24 20:25:51 +0000
+++ lib/libbamf/bamf-matcher.c	2012-06-14 00:41:19 +0000
@@ -151,6 +151,8 @@
   if (!BAMF_IS_VIEW (view))
     return;
 
+  /* We manually set the view as not closed, to avoid issues like bug #925421 */
+  _bamf_view_set_closed (view, FALSE);
   g_signal_emit (matcher, matcher_signals[VIEW_OPENED], 0, view);
 }
 
@@ -168,6 +170,8 @@
   if (!BAMF_IS_VIEW (view))
     return;
 
+  /* We manually set the view as closed, to avoid issues like bug #925421 */
+  _bamf_view_set_closed (view, TRUE);
   g_signal_emit (matcher, matcher_signals[VIEW_CLOSED], 0, view);
 }
 

=== modified file 'lib/libbamf/bamf-view-private.h'
--- lib/libbamf/bamf-view-private.h	2012-05-24 20:25:51 +0000
+++ lib/libbamf/bamf-view-private.h	2012-06-14 00:41:19 +0000
@@ -36,4 +36,7 @@
 void _bamf_view_set_name (BamfView *view, const char *name);
 
 void _bamf_view_set_icon (BamfView *view, const char *icon);
+
+void _bamf_view_set_closed (BamfView *view, gboolean closed);
+
 #endif

=== modified file 'lib/libbamf/bamf-view.c'
--- lib/libbamf/bamf-view.c	2012-06-14 00:41:19 +0000
+++ lib/libbamf/bamf-view.c	2012-06-14 00:41:19 +0000
@@ -557,23 +557,32 @@
   view->priv->path = NULL;
 }
 
+void
+_bamf_view_set_closed (BamfView *view, gboolean closed)
+{
+  BamfViewPrivate *priv;
+  g_return_if_fail (BAMF_IS_VIEW (view));
+
+  priv = view->priv;
+
+  if (priv->is_closed != closed)
+    {
+      priv->is_closed = closed;
+
+      if (closed && priv->cached_children)
+        {
+          g_list_free_full (priv->cached_children, g_object_unref);
+          priv->cached_children = NULL;
+        }
+    }
+}
+
 static void
 bamf_view_on_closed (DBusGProxy *proxy, BamfView *self)
 {
-  BamfViewPrivate *priv;
-
-  priv = self->priv;
-
-  priv->is_closed = TRUE;
-
-  if (priv->cached_children)
-    {
-      g_list_free_full (priv->cached_children, g_object_unref);
-      priv->cached_children = NULL;
-    }
+  _bamf_view_set_closed (self, TRUE);
 
   g_object_ref (self);
-
   g_signal_emit (G_OBJECT (self), view_signals[CLOSED], 0);
   g_object_unref (self);
 }
@@ -769,7 +778,8 @@
   g_return_if_fail (path);
 
   priv = view->priv;
-  priv->is_closed = FALSE;
+
+  _bamf_view_set_closed (view, FALSE);
 
   if (priv->proxy && g_strcmp0 (priv->path, path) == 0)
     {
@@ -1014,8 +1024,7 @@
   GError *error = NULL;
 
   priv = self->priv = BAMF_VIEW_GET_PRIVATE (self);
-
-  priv->is_closed = TRUE;
+  _bamf_view_set_closed (self, TRUE);
 
   priv->connection = dbus_g_bus_get (DBUS_BUS_SESSION, &error);
   if (priv->connection == NULL)

=== modified file 'src/bamf-view.c'
--- src/bamf-view.c	2012-04-19 18:01:35 +0000
+++ src/bamf-view.c	2012-06-14 00:41:19 +0000
@@ -683,7 +683,8 @@
       if (g_dbus_interface_skeleton_get_object_path (iface))
         g_dbus_interface_skeleton_unexport (iface);
     }
-  g_list_free (ifaces);
+
+  g_list_free_full (ifaces, g_object_unref);
 
   if (priv->name)
     {