Merge lp:~3v1n0/bamf/libbamf-sticky-proxy-keep-alive into lp:bamf/0.4

[Marco Trevisan (Treviño)]

libbamf, bamf-view: don't unset the proxy on closed sticky views

Also, don't reset the proxy if the current one is still valid.

When a sticky bamf view is closed, libbamf used to unset its dbus proxy; this is generally right, but in some tricky cases (hard to debug, mostly timing dependent) it caused that when the same application was opened again, the newly set proxy was not notified when a signal was emitted by the server.
This lead to bug #978401

To fix this, we don't unset the proxy of a sticky application when the related dbus object is closed, so that it will stay alive and will automatically reconnect to signals when the object will be exported again.

Also, now if we try to set the path of a view without changing it, we just ignore the request and we continue with the proxy that we already have.

[Jason Smith (jassmith)]

Works fine

review: Approve

[Unity Merger (unity-merger)]

The Jenkins job https://jenkins.qa.ubuntu.com/job/automerge-bamf/71/console reported an error when processing this lp:~3v1n0/bamf/libbamf-sticky-proxy-keep-alive branch.
Not merging it.

[Unity Merger (unity-merger)]

The Jenkins job https://jenkins.qa.ubuntu.com/job/automerge-bamf/72/console reported an error when processing this lp:~3v1n0/bamf/libbamf-sticky-proxy-keep-alive branch.
Not merging it.

[Unity Merger (unity-merger)]

The Jenkins job https://jenkins.qa.ubuntu.com/job/automerge-bamf/73/console reported an error when processing this lp:~3v1n0/bamf/libbamf-sticky-proxy-keep-alive branch.
Not merging it.

[Unity Merger (unity-merger)]

The Jenkins job https://jenkins.qa.ubuntu.com/job/automerge-bamf/74/console reported an error when processing this lp:~3v1n0/bamf/libbamf-sticky-proxy-keep-alive branch.
Not merging it.

[Unity Merger (unity-merger)]

The Jenkins job https://jenkins.qa.ubuntu.com/job/automerge-bamf/75/console reported an error when processing this lp:~3v1n0/bamf/libbamf-sticky-proxy-keep-alive branch.
Not merging it.

=== modified file 'lib/libbamf/bamf-factory.c'
--- lib/libbamf/bamf-factory.c	2012-05-24 20:25:51 +0000
+++ lib/libbamf/bamf-factory.c	2012-06-15 15:29:24 +0000
@@ -107,6 +107,7 @@
 {
   g_return_if_fail (BAMF_IS_FACTORY (self));
   self->priv->local_views = g_list_remove (self->priv->local_views, view);
+  self->priv->registered_views = g_list_remove (self->priv->registered_views, view);
 }
 
 static void
@@ -204,9 +205,9 @@
   return _bamf_factory_view_for_path_type (factory, path, factory_type);
 }
 
-BamfView * 
+BamfView *
 _bamf_factory_view_for_path_type (BamfFactory * factory, const char * path,
-                                                        BamfFactoryViewType type)
+                                                         BamfFactoryViewType type)
 {
   GHashTable *views;
   BamfView *view;

=== modified file 'lib/libbamf/bamf-view.c'
--- lib/libbamf/bamf-view.c	2012-05-24 20:25:51 +0000
+++ lib/libbamf/bamf-view.c	2012-06-15 15:29:24 +0000
@@ -67,7 +67,7 @@
   URGENT_CHANGED,
   VISIBLE_CHANGED,
   NAME_CHANGED,
- 
+
   LAST_SIGNAL,
 };
 
@@ -415,7 +415,10 @@
 gboolean 
 _bamf_view_remote_ready (BamfView *view)
 {
-  return BAMF_IS_VIEW (view) && view->priv->proxy;
+  if (BAMF_IS_VIEW (view) && view->priv->proxy)
+    return !view->priv->is_closed;
+
+  return FALSE;
 }
 
 const gchar *
@@ -552,6 +555,9 @@
 
   view->priv->checked_flags = 0x0;
   view->priv->proxy = NULL;
+
+  g_free (view->priv->path);
+  view->priv->path = NULL;
 }
 
 static void
@@ -569,22 +575,9 @@
       priv->cached_children = NULL;
     }
 
-  if (priv->sticky)
-    {
-      bamf_view_unset_proxy (self);
-    }
-  
   g_object_ref (self);
-  
-  // must be emitted before path is cleared as path is utilized in cleanup
+
   g_signal_emit (G_OBJECT (self), view_signals[CLOSED], 0);
-
-  if (priv->path)
-    {
-      g_free (priv->path);
-      priv->path = NULL;
-    }
-    
   g_object_unref (self);
 }
 
@@ -608,7 +601,7 @@
   switch (property_id)
     {
       case PROP_PATH:
-        g_value_set_string (value, self->priv->path);
+        g_value_set_string (value, self->priv->is_closed ? NULL : self->priv->path);
         break;
       
       case PROP_ACTIVE:
@@ -728,11 +721,11 @@
   G_OBJECT_CLASS (bamf_view_parent_class)->dispose (object);
 }
 
-const char * 
+const char *
 _bamf_view_get_path (BamfView *view)
 {
   g_return_val_if_fail (BAMF_IS_VIEW (view), NULL);
-  
+
   return view->priv->path;
 }
 
@@ -774,17 +767,20 @@
 _bamf_view_set_path (BamfView *view, const char *path)
 {
   BamfViewPrivate *priv;
-  
+
   g_return_if_fail (BAMF_IS_VIEW (view));
-  
+  g_return_if_fail (path);
+
   priv = view->priv;
   priv->is_closed = FALSE;
 
-  if (priv->path)
+  if (priv->proxy && g_strcmp0 (priv->path, path) == 0)
     {
-      g_free (priv->path);
+      // The proxy path has not been changed, no need to unset and re-set it again
+      return;
     }
 
+  g_free (priv->path);
   bamf_view_unset_proxy (view);
 
   priv->path = g_strdup (path);
@@ -824,15 +820,15 @@
                            "RunningChanged",
                            G_TYPE_BOOLEAN,
                            G_TYPE_INVALID);
-  
+
   dbus_g_proxy_add_signal (priv->proxy,
                            "UrgentChanged",
-                           G_TYPE_BOOLEAN, 
+                           G_TYPE_BOOLEAN,
                            G_TYPE_INVALID);
-  
+
   dbus_g_proxy_add_signal (priv->proxy,
                            "UserVisibleChanged",
-                           G_TYPE_BOOLEAN, 
+                           G_TYPE_BOOLEAN,
                            G_TYPE_INVALID);
 
   dbus_g_proxy_add_signal (priv->proxy,
@@ -876,7 +872,7 @@
                                (GCallback) bamf_view_on_urgent_changed,
                                view,
                                NULL);
-  
+
   dbus_g_proxy_connect_signal (priv->proxy,
                                "UserVisibleChanged",
                                (GCallback) bamf_view_on_user_visible_changed,