[seahorse] Update combined view when places are loaded

[Stefan Walter <stefw src gnome org>]

commit 0d1b117c051a271b1a3d1f651f500bba182bcf6c
Author: Stef Walter <stefw collabora co uk>
Date:   Wed Dec 14 07:30:00 2011 +0100

    Update combined view when places are loaded
    
     * Previously if places weren't selected, then on startup, certain
       objects wouldn't show up.

 src/seahorse-key-manager.c |    6 +++---
 src/seahorse-sidebar.c     |    3 +++
 2 files changed, 6 insertions(+), 3 deletions(-)
---
diff --git a/src/seahorse-key-manager.c b/src/seahorse-key-manager.c
index e69c4a3..b65c3e6 100644
--- a/src/seahorse-key-manager.c
+++ b/src/seahorse-key-manager.c
@@ -613,15 +613,15 @@ setup_sidebar (SeahorseKeyManager *self)
 	gtk_action_group_add_toggle_actions (actions, SIDEBAR_ACTIONS,
 	                                     G_N_ELEMENTS (SIDEBAR_ACTIONS), self);
 	action = gtk_action_group_get_action (actions, "view-places");
+	g_settings_bind (self->pv->settings, "sidebar-visible",
+	                 action, "active",
+	                 G_SETTINGS_BIND_DEFAULT);
 	g_object_bind_property (action, "active",
 	                        area, "visible",
 	                        G_BINDING_SYNC_CREATE);
 	g_object_bind_property (action, "active",
 	                        self->pv->sidebar, "combined",
 	                        G_BINDING_INVERT_BOOLEAN | G_BINDING_SYNC_CREATE);
-	g_settings_bind (self->pv->settings, "sidebar-visible",
-	                 action, "active",
-	                 G_SETTINGS_BIND_DEFAULT);
 	seahorse_catalog_include_actions (SEAHORSE_CATALOG (self), actions);
 	g_object_unref (actions);
 
diff --git a/src/seahorse-sidebar.c b/src/seahorse-sidebar.c
index a3253fc..eabe4d6 100644
--- a/src/seahorse-sidebar.c
+++ b/src/seahorse-sidebar.c
@@ -509,6 +509,9 @@ update_places (SeahorseSidebar *self)
 
 	/* Update selection */
 	update_objects_for_chosen (self, self->chosen);
+
+	if (self->combined)
+		update_objects_in_collection (self, FALSE);
 }
 
 static gboolean