summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorCarlos Soriano <csoriano@gnome.org>2015-09-22 23:35:00 +0200
committerCarlos Soriano <csoriano@gnome.org>2015-09-22 23:35:00 +0200
commit07d53b03477ad769986061ea6c6abb4e87bf0952 (patch)
tree45be793f5adeb2ce40c650a93738939de08edcf0
parentf03ab5c8e145307dff914ee8334e475d83c8d46d (diff)
downloadnautilus-07d53b03477ad769986061ea6c6abb4e87bf0952.tar.gz
gtkplacesview: update to master
-rw-r--r--src/gtk/gtkplacesview.c11
1 files changed, 6 insertions, 5 deletions
diff --git a/src/gtk/gtkplacesview.c b/src/gtk/gtkplacesview.c
index da5c19f10..1efa91582 100644
--- a/src/gtk/gtkplacesview.c
+++ b/src/gtk/gtkplacesview.c
@@ -958,7 +958,6 @@ network_enumeration_next_files_finished (GObject *source_object,
priv = gtk_places_view_get_instance_private (view);
error = NULL;
- gtk_places_view_set_fetching_networks (view, FALSE);
detected_networks = g_file_enumerator_next_files_finish (G_FILE_ENUMERATOR (source_object),
res, &error);
@@ -971,16 +970,18 @@ network_enumeration_next_files_finished (GObject *source_object,
}
else
{
+ gtk_places_view_set_fetching_networks (view, FALSE);
populate_networks (view, G_FILE_ENUMERATOR (source_object), detected_networks);
g_list_free_full (detected_networks, g_object_unref);
}
- /* avoid to update widgets if the operation was cancelled in finalize */
- if (priv->listbox != NULL)
+ /* avoid to update widgets if the operation was cancelled in finalize */
+ if (priv->listbox != NULL)
+ {
update_network_state (view);
-
- update_loading (view);
+ update_loading (view);
+ }
}
static void