summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAnders Carlsson <andersca@gnome.org>2004-11-16 21:58:17 +0000
committerAnders Carlsson <andersca@src.gnome.org>2004-11-16 21:58:17 +0000
commitfd171d56d12770f5c653c12a4995b00c5fdc8ec7 (patch)
tree274dc7838662f5103060e07af67b310dcb9ef94b
parent14fb42319787120558791dca2bc5472ee0205a48 (diff)
downloadnautilus-fd171d56d12770f5c653c12a4995b00c5fdc8ec7.tar.gz
It's NULL now, not CORBA_OBJECT_NIL.
2004-11-16 Anders Carlsson <andersca@gnome.org> * libnautilus-private/nautilus-window-info.c: (nautilus_window_info_get_ui_manager): It's NULL now, not CORBA_OBJECT_NIL.
-rw-r--r--ChangeLog6
-rw-r--r--libnautilus-private/nautilus-window-info.c2
2 files changed, 7 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index 7398e9d12..2784bbd7a 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2004-11-16 Anders Carlsson <andersca@gnome.org>
+
+ * libnautilus-private/nautilus-window-info.c:
+ (nautilus_window_info_get_ui_manager):
+ It's NULL now, not CORBA_OBJECT_NIL.
+
2004-11-16 Alexander Larsson <alexl@redhat.com>
* libnautilus-private/nautilus-view.h:
diff --git a/libnautilus-private/nautilus-window-info.c b/libnautilus-private/nautilus-window-info.c
index cc2e98298..3ea5b89ac 100644
--- a/libnautilus-private/nautilus-window-info.c
+++ b/libnautilus-private/nautilus-window-info.c
@@ -254,7 +254,7 @@ nautilus_window_info_set_hidden_files_mode (NautilusWindowInfo *window,
GtkUIManager *
nautilus_window_info_get_ui_manager (NautilusWindowInfo *window)
{
- g_return_val_if_fail (NAUTILUS_IS_WINDOW_INFO (window), CORBA_OBJECT_NIL);
+ g_return_val_if_fail (NAUTILUS_IS_WINDOW_INFO (window), NULL);
return (* NAUTILUS_WINDOW_INFO_GET_IFACE (window)->get_ui_manager) (window);
}