summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDave Camp <dave@ximian.com>2003-11-21 03:16:26 +0000
committerDave Camp <campd@src.gnome.org>2003-11-21 03:16:26 +0000
commitb7bd48dee6ec50a5c969564a137bed7250eca1cc (patch)
treebb5b98e4eb32bbd49f07b9cb63ef7a1acb379d08
parent0d787bab7d23c700c7248a84cd2ae057cc59e540 (diff)
downloadnautilus-b7bd48dee6ec50a5c969564a137bed7250eca1cc.tar.gz
Forgot this bit of Srini's patch.
2003-11-20 Dave Camp <dave@ximian.com> * src/nautilus-navigation-window.c (real_set_content_view_widget): Forgot this bit of Srini's patch.
-rw-r--r--ChangeLog5
-rw-r--r--src/nautilus-navigation-window.c5
2 files changed, 10 insertions, 0 deletions
diff --git a/ChangeLog b/ChangeLog
index e4b8d3355..853d46087 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,10 @@
2003-11-20 Dave Camp <dave@ximian.com>
+ * src/nautilus-navigation-window.c (real_set_content_view_widget):
+ Forgot this bit of Srini's patch.
+
+2003-11-20 Dave Camp <dave@ximian.com>
+
* src/nautilus-window-manage-views.c: (handle_view_failure):
Disconnect the view. Patch from Srinivasa
Ragavan <sragavan@novell.com>.
diff --git a/src/nautilus-navigation-window.c b/src/nautilus-navigation-window.c
index b779ec984..cea7542ff 100644
--- a/src/nautilus-navigation-window.c
+++ b/src/nautilus-navigation-window.c
@@ -948,6 +948,11 @@ real_set_content_view_widget (NautilusWindow *nautilus_window,
set_content_view_widget,
(nautilus_window, new_view));
+
+ if (new_view == NULL) {
+ return;
+ }
+
connect_view (window, new_view);
nautilus_horizontal_splitter_pack2 (