Merge lp:~3v1n0/bamf/view-children-avoid-reload into lp:bamf

[Marco Trevisan (Treviño)]

BamfView: don't try to reload the children if they're empty but we already tried once

This finally mutes the "Unable to fetch children" warning... \o/

If the children list of an bamf-view is empty because we've just removed the last children on a "children-removed" signal, we shouldn't try to ask again to the deaemon if it is really the case, we can trust to the signal and avoid to do further requests until the daemon lives.

[Andrea Azzarone (azzar1)]

review: Approve

[PS Jenkins bot (ps-jenkins)]

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

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

review: Approve (continuous-integration)

=== modified file 'lib/libbamf/bamf-view.c'
--- lib/libbamf/bamf-view.c	2013-06-13 15:54:29 +0000
+++ lib/libbamf/bamf-view.c	2013-06-13 16:59:27 +0000
@@ -85,9 +85,10 @@
   gchar            *type;
   gchar            *local_icon;
   gchar            *local_name;
+  GList            *cached_children;
+  gboolean          reload_children;
   gboolean          is_closed;
   gboolean          sticky;
-  GList            *cached_children;
 };
 
 static void bamf_view_unset_proxy (BamfView *self);
@@ -121,7 +122,7 @@
 
   priv = view->priv;
 
-  if (priv->cached_children)
+  if (priv->cached_children || !priv->reload_children)
     return g_list_copy (priv->cached_children);
 
   if (!_bamf_dbus_item_view_call_children_sync (priv->proxy, &children, CANCELLABLE (view), &error))
@@ -146,7 +147,9 @@
         }
     }
 
+  priv->reload_children = FALSE;
   priv->cached_children = results;
+
   return g_list_copy (priv->cached_children);
 }
 
@@ -534,6 +537,7 @@
       if (self->priv->cached_children)
         {
           g_list_free_full (self->priv->cached_children, g_object_unref);
+          self->priv->reload_children = TRUE;
           self->priv->cached_children = NULL;
         }
 
@@ -963,4 +967,5 @@
   priv = self->priv = BAMF_VIEW_GET_PRIVATE (self);
   priv->cancellable = g_cancellable_new ();
   priv->is_closed = TRUE;
+  priv->reload_children = TRUE;
 }