nautilus r13969 - in branches/multiview: . src
- From: cneumair svn gnome org
- To: svn-commits-list gnome org
- Subject: nautilus r13969 - in branches/multiview: . src
- Date: Sat, 22 Mar 2008 18:29:13 +0000 (GMT)
Author: cneumair
Date: Sat Mar 22 18:29:13 2008
New Revision: 13969
URL: http://svn.gnome.org/viewvc/nautilus?rev=13969&view=rev
Log:
2008-03-22 Christian Neumair <cneumair gnome org>
* src/nautilus-navigation-window.c: (real_disconnect_content_view):
Do not try to hide zoom control if we are already destroyed.
* src/nautilus-spatial-window.c (real_close_slot):
Do not assert that the slot is currently active.
* src/nautilus-window.c (nautilus_window_destroy),
(nautilus_window_close):
Move slot close code from close() to destroy().
Modified:
branches/multiview/ChangeLog
branches/multiview/src/nautilus-navigation-window.c
branches/multiview/src/nautilus-spatial-window.c
branches/multiview/src/nautilus-window.c
Modified: branches/multiview/src/nautilus-navigation-window.c
==============================================================================
--- branches/multiview/src/nautilus-navigation-window.c (original)
+++ branches/multiview/src/nautilus-navigation-window.c Sat Mar 22 18:29:13 2008
@@ -1042,7 +1042,12 @@
G_CALLBACK (zoom_level_changed_callback),
window);
- gtk_widget_hide (window->zoom_control);
+ if (window->zoom_control != NULL) {
+ /* if we run in destroy(), the
+ * zoom control is already gone
+ */
+ gtk_widget_hide (window->zoom_control);
+ }
}
static void
Modified: branches/multiview/src/nautilus-spatial-window.c
==============================================================================
--- branches/multiview/src/nautilus-spatial-window.c (original)
+++ branches/multiview/src/nautilus-spatial-window.c Sat Mar 22 18:29:13 2008
@@ -520,7 +520,6 @@
real_close_slot (NautilusWindow *window,
NautilusWindowSlot *slot)
{
- g_assert (window->details->active_slot == slot);
g_assert (g_list_length (window->details->slots) == 1);
/* nothing to do */
Modified: branches/multiview/src/nautilus-window.c
==============================================================================
--- branches/multiview/src/nautilus-window.c (original)
+++ branches/multiview/src/nautilus-window.c Sat Mar 22 18:29:13 2008
@@ -646,9 +646,21 @@
nautilus_window_destroy (GtkObject *object)
{
NautilusWindow *window;
+ NautilusWindowSlot *slot;
+ GList *l, *slots;
window = NAUTILUS_WINDOW (object);
+ nautilus_window_set_active_slot (window, NULL);
+
+ /* close all slots */
+ slots = g_list_copy (window->details->slots);
+ for (l = slots; l != NULL; l = l->next) {
+ slot = NAUTILUS_WINDOW_SLOT (l->data);
+ nautilus_window_close_slot (window, slot);
+ }
+ g_list_free (slots);
+
nautilus_window_manage_views_destroy (window);
GTK_OBJECT_CLASS (nautilus_window_parent_class)->destroy (object);
@@ -728,20 +740,8 @@
void
nautilus_window_close (NautilusWindow *window)
{
- NautilusWindowSlot *slot;
- GList *l, *slots;
-
g_return_if_fail (NAUTILUS_IS_WINDOW (window));
- nautilus_window_set_active_slot (window, NULL);
-
- slots = g_list_copy (window->details->slots);
- for (l = slots; l != NULL; l = l->next) {
- slot = NAUTILUS_WINDOW_SLOT (l->data);
- nautilus_window_close_slot (window, slot);
- }
- g_list_free (slots);
-
EEL_CALL_METHOD (NAUTILUS_WINDOW_CLASS, window,
close, (window));
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]