Merge lp:~3v1n0/bamf/correctly-remove-cached-children into lp:bamf/0.4

[Marco Trevisan (Treviño)]

Fixed bug #919366 that was caused by the fact that the list of the cached children were not correctly updated on children removal.

Reffing the objects on the list and manually looking for the removed one, does the work.
In the case we can't find the removed object, we just free the cached list, that will be eventually repopulated on next request.

[Jason Smith (jassmith)]

Good work dude, thanks a lot!

review: Approve

=== modified file 'lib/libbamf/Makefile.am'
--- lib/libbamf/Makefile.am	2012-01-19 20:29:47 +0000
+++ lib/libbamf/Makefile.am	2012-01-27 23:24:23 +0000
@@ -35,7 +35,6 @@
   bamf-window.h \
   bamf-tab-source.h \
   bamf-tab.h \
-  bamf-marshal.h \
   libbamf.h \
   $(NULL)
 
@@ -45,6 +44,7 @@
   $(sources_h) \
   $(libbamf_sources) \
   bamf-tab-source-glue.h \
+  bamf-marshal.h \
   $(NULL)
 
 libbamf_la_LIBADD = \

=== modified file 'lib/libbamf/bamf-matcher.c'
--- lib/libbamf/bamf-matcher.c	2012-01-10 18:20:26 +0000
+++ lib/libbamf/bamf-matcher.c	2012-01-27 23:24:23 +0000
@@ -477,7 +477,7 @@
   g_return_val_if_fail (array, NULL);
 
   len = g_strv_length (array);
-  for (i = 0; i < len; i++)
+  for (i = len-1; i >= 0; i--)
     {
       view = bamf_factory_view_for_path (bamf_factory_get_default (), array[i]);
 
@@ -518,7 +518,7 @@
   g_return_val_if_fail (array, NULL);
 
   len = g_strv_length (array);
-  for (i = 0; i < len; i++)
+  for (i = len-1; i >= 0; i--)
     {
       view = bamf_factory_view_for_path (bamf_factory_get_default (), array[i]);
 
@@ -619,7 +619,7 @@
   g_return_val_if_fail (array, NULL);
 
   len = g_strv_length (array);
-  for (i = 0; i < len; i++)
+  for (i = len-1; i >= 0; i--)
     {
       view = bamf_factory_view_for_path (bamf_factory_get_default (), array[i]);
 

=== modified file 'lib/libbamf/bamf-view.c'
--- lib/libbamf/bamf-view.c	2012-01-24 23:18:17 +0000
+++ lib/libbamf/bamf-view.c	2012-01-27 23:24:23 +0000
@@ -160,7 +160,7 @@
   priv = view->priv;
 
   if (priv->cached_children)
-    return g_list_copy(priv->cached_children);
+    return g_list_copy (priv->cached_children);
 
   if (!dbus_g_proxy_call (priv->proxy,
                           "Children",
@@ -178,14 +178,14 @@
 
   len = g_strv_length (children);
 
-  for (i = 0; i < len; i++)
+  for (i = len-1; i >= 0; i--)
     {
       BamfView *view = bamf_factory_view_for_path (bamf_factory_get_default (), children[i]);
-      results = g_list_prepend (results, view);
+      results = g_list_prepend (results, g_object_ref (view));
     }
-  
+
   priv->cached_children = results;
-  return g_list_copy(priv->cached_children);
+  return g_list_copy (priv->cached_children);
 }
 
 static gboolean
@@ -197,7 +197,7 @@
 
   g_return_val_if_fail (BAMF_IS_VIEW (self), FALSE);
   priv = self->priv;
-  
+
   if (bamf_view_flag_is_set (self, flag))
     return bamf_view_get_flag (self, flag);
 
@@ -213,10 +213,10 @@
     {
       g_warning ("Failed to fetch boolean: %s", error->message);
       g_error_free (error);
-      
+
       return FALSE;
     }
-  
+
   bamf_view_set_flag (self, flag, result);
   return result;
 }
@@ -225,7 +225,7 @@
 bamf_view_is_closed (BamfView *view)
 {
   g_return_val_if_fail (BAMF_IS_VIEW (view), TRUE);
-  
+
   return view->priv->is_closed;
 }
 
@@ -233,7 +233,7 @@
 bamf_view_is_active (BamfView *view)
 {
   g_return_val_if_fail (BAMF_IS_VIEW (view), FALSE);
-  
+
   if (BAMF_VIEW_GET_CLASS (view)->is_active)
     return BAMF_VIEW_GET_CLASS (view)->is_active (view);
 
@@ -468,8 +468,11 @@
   priv = self->priv;
 
   if (priv->cached_children)
-    priv->cached_children = g_list_prepend(priv->cached_children, view);
-  
+    {
+      g_object_ref (view);
+      priv->cached_children = g_list_prepend (priv->cached_children, view);
+    }
+
   g_signal_emit (G_OBJECT (self), view_signals[CHILD_ADDED], 0, view);
 }
 
@@ -478,14 +481,34 @@
 {
   BamfView *view;
   BamfViewPrivate *priv;
-
-  view = bamf_factory_view_for_path (bamf_factory_get_default (), path);
+  view = NULL;
   priv = self->priv;
 
   if (priv->cached_children)
-    priv->cached_children = g_list_remove(priv->cached_children, view);
-  
+    {
+      GList *l;
+      for (l = priv->cached_children; l; l = l->next)
+        {
+          BamfView *cur_view = BAMF_VIEW (l->data);
+          if (g_strcmp0 (bamf_view_get_path (cur_view), path) == 0)
+            {
+              view = cur_view;
+              priv->cached_children = g_list_delete_link (priv->cached_children, l);
+              break;
+            }
+        }
+
+      if (!BAMF_IS_VIEW (view))
+        {
+          g_list_free_full (priv->cached_children, g_object_unref);
+          priv->cached_children = NULL;
+        }
+    }
+
   g_signal_emit (G_OBJECT (self), view_signals[CHILD_REMOVED], 0, view);
+
+  if (BAMF_IS_VIEW (view))
+    g_object_unref (view);
 }
 
 static void
@@ -540,19 +563,19 @@
 bamf_view_on_closed (DBusGProxy *proxy, BamfView *self)
 {
   BamfViewPrivate *priv;
-  
+
   priv = self->priv;
 
   priv->is_closed = TRUE;
-  
+
   if (priv->sticky && priv->proxy)
     {
       if (priv->cached_children)
-      {
-        g_list_free(priv->cached_children);
-        priv->cached_children = NULL;
-      }
-      
+        {
+          g_list_free_full (priv->cached_children, g_object_unref);
+          priv->cached_children = NULL;
+        }
+
       dbus_g_proxy_disconnect_signal (priv->proxy,
                                       "ActiveChanged",
                                       (GCallback) bamf_view_on_active_changed,
@@ -658,14 +681,13 @@
   view = BAMF_VIEW (object);
 
   priv = view->priv;
-  
+
   if (priv->path)
     {
       g_free (priv->path);
       priv->path = NULL;
     }
-  
-    
+
   if (priv->type)
     {
       g_free (priv->type);
@@ -673,10 +695,10 @@
     }
 
   if (priv->cached_children)
-  {
-    g_list_free(priv->cached_children);
-    priv->cached_children = NULL;
-  }
+    {
+      g_list_free_full (priv->cached_children, g_object_unref);
+      priv->cached_children = NULL;
+    }
 
   if (priv->proxy)
     {

=== modified file 'lib/libbamf/bamf-window.c'
--- lib/libbamf/bamf-window.c	2012-01-10 15:06:05 +0000
+++ lib/libbamf/bamf-window.c	2012-01-27 23:24:23 +0000
@@ -37,6 +37,7 @@
 #include "bamf-view-private.h"
 #include "bamf-window.h"
 #include "bamf-factory.h"
+#include "bamf-marshal.h"
 #include <dbus/dbus.h>
 #include <dbus/dbus-glib.h>
 #include <dbus/dbus-glib-lowlevel.h>

=== modified file 'lib/libbamf/bamf-window.h'
--- lib/libbamf/bamf-window.h	2012-01-19 20:29:47 +0000
+++ lib/libbamf/bamf-window.h	2012-01-27 23:24:23 +0000
@@ -31,8 +31,6 @@
 #include <glib-object.h>
 #include <libbamf/bamf-view.h>
 
-#include "bamf-marshal.h"
-
 G_BEGIN_DECLS
 
 #define BAMF_TYPE_WINDOW (bamf_window_get_type ())