summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorCosimo Cecchi <cosimoc@gnome.org>2012-09-19 00:12:23 -0400
committerCosimo Cecchi <cosimoc@gnome.org>2012-09-25 11:22:24 -0400
commit6c5b8dce2f5dadc473c52332b1209087ba3b0a73 (patch)
treec96ea8a71b443b271430e4c2de32c3ee353fc1c5 /src
parentf2258d9e52401261d1f230a7ffd202097a46335c (diff)
downloadnautilus-6c5b8dce2f5dadc473c52332b1209087ba3b0a73.tar.gz
slot: ensure the floating bar is hidden when loading finishes
Since in case of loading error we don't go through the same code path than in case of success; by using the connection to the end_loading signal, we can ensure the floating bar is removed also in case of error. https://bugzilla.gnome.org/show_bug.cgi?id=684218
Diffstat (limited to 'src')
-rw-r--r--src/nautilus-window-slot.c8
1 files changed, 8 insertions, 0 deletions
diff --git a/src/nautilus-window-slot.c b/src/nautilus-window-slot.c
index b57db28d1..0ed23bdd8 100644
--- a/src/nautilus-window-slot.c
+++ b/src/nautilus-window-slot.c
@@ -381,6 +381,14 @@ view_end_loading_cb (NautilusView *view,
nautilus_window_slot_queue_reload (slot);
slot->needs_reload = FALSE;
}
+
+ if (slot->loading_timeout_id != 0) {
+ g_source_remove (slot->loading_timeout_id);
+ slot->loading_timeout_id = 0;
+ }
+
+ gtk_widget_hide (slot->floating_bar);
+ nautilus_floating_bar_cleanup_actions (NAUTILUS_FLOATING_BAR (slot->floating_bar));
}
static void