Turned on more warnings; fixed all warnings.

43 files changed, 143 insertions, 91 deletions

diff --git a/ChangeLog-20000414 b/ChangeLog-20000414
index e78e19b8b..97c9e4400 100644
--- a/ChangeLog-20000414
+++ b/ChangeLog-20000414
@@ -1,3 +1,32 @@
+1999-12-14  Darin Adler  <darin@eazel.com>
+
+	* configure.in: Turned on more warnings, including -Werror.
+	  I found one or two real bugs, and made some minor changes
+	  to quiet the compiler so I could turn on some useful warnings
+	  that triggered on the existing code.
+	
+	* src/file-manager/dfos-xfer.c: (handle_xfer_vfs_error):
+	  Fixed a place where it was calling the gnome error(), but using
+	  the parameters from the old gnome-fm error() function.
+
+	* libnautilus/ntl-meta-view-client.c:
+	  (nautilus_meta_view_set_label): Fixed a place where we
+	  were passing in string literals to code that will free them.
+	  We need to call g_strdup before passing them to gnome_property_bag_add.
+
+	* libnautilus/gnome-icon-container.c: Fixed a warning.
+	* libnautilus/gtkscrollframe.c: Fixed a warning.
+	* libnautilus/ntl-content-view-client.c: Fixed a warning.
+	* libnautilus/ntl-view-client.c: Fixed a warning.
+	* libnautilus/ntl-content-view.c: Fixed a warning.
+	* src/ntl-main.c: Fixed a warning.
+	* src/ntl-meta-view.c: Fixed a warning.
+	* src/ntl-types.h: Fixed a warning.
+	* src/ntl-view.c: Fixed a warning.
+	* src/ntl-window.c: Fixed a warning.
+	* src/file-manager/dfos-xfer-progress-dialog.c: Fixed a warning.
+	* src/file-manager/fm-icon-cache.c: Fixed a warning.
+
 1999-12-14  Elliot Lee  <sopwith@redhat.com>
 
 	* src/*.c: Restructure the whole NautilusWindow code for sanity's sake.
diff --git a/configure.in b/configure.in
index 798ab0804..ed5c8f8c7 100644
--- a/configure.in
+++ b/configure.in
@@ -42,6 +42,21 @@ AM_PATH_LIBGLADE(,AC_MSG_ERROR([*** Libglade 0.7 or better is needed.]), gnome)
 dnl Checks for typedefs, structures, and compiler characteristics.
 AC_C_CONST
 
+dnl Some additional warning options.
+CFLAGS="$CFLAGS \
+-W \
+-Wcast-align \
+-Wchar-subscripts \
+-Werror \
+-Wmissing-declarations \
+-Wmissing-prototypes \
+-Wnested-externs \
+-Wpointer-arith \
+-Wno-sign-compare \
+-Wsign-promo \
+-trigraphs \
+"
+
 AC_OUTPUT([
 Makefile
 icons/Makefile
diff --git a/libnautilus-extensions/gnome-icon-container.c b/libnautilus-extensions/gnome-icon-container.c
index 421c36858..876b74e2e 100644
--- a/libnautilus-extensions/gnome-icon-container.c
+++ b/libnautilus-extensions/gnome-icon-container.c
@@ -2388,8 +2388,9 @@ gnome_icon_container_get_type (void)
 			sizeof (GnomeIconContainerClass),
 			(GtkClassInitFunc) class_init,
 			(GtkObjectInitFunc) init,
-			(GtkArgSetFunc) NULL,
-			(GtkArgGetFunc) NULL
+			NULL,
+			NULL,
+			NULL
 		};
 
 		type = gtk_type_unique (gnome_canvas_get_type (), &type_info);
@@ -2426,7 +2427,7 @@ gnome_icon_container_set_icon_mode (GnomeIconContainer *container,
 {
 	g_return_if_fail (container != NULL);
 
-	if (mode < 0 || mode >= NUM_ICON_MODES) {
+	if (mode >= NUM_ICON_MODES) {
 		g_warning ("Unknown icon mode %d", mode);
 		return;
 	}
diff --git a/libnautilus-extensions/gtkscrollframe.c b/libnautilus-extensions/gtkscrollframe.c
index a0c6de3f2..c7ef7d329 100644
--- a/libnautilus-extensions/gtkscrollframe.c
+++ b/libnautilus-extensions/gtkscrollframe.c
@@ -1137,7 +1137,7 @@ gtk_scroll_frame_set_shadow_type (GtkScrollFrame *sf, GtkShadowType shadow_type)
 
 	g_return_if_fail (sf != NULL);
 	g_return_if_fail (GTK_IS_SCROLL_FRAME (sf));
-	g_return_if_fail (shadow_type >= GTK_SHADOW_NONE && shadow_type <= GTK_SHADOW_ETCHED_OUT);
+	g_return_if_fail (shadow_type <= GTK_SHADOW_ETCHED_OUT);
 
 	priv = sf->priv;
 
diff --git a/libnautilus-extensions/nautilus-file-operations-progress.c b/libnautilus-extensions/nautilus-file-operations-progress.c
index 81b3b8b8b..2c9467d93 100644
--- a/libnautilus-extensions/nautilus-file-operations-progress.c
+++ b/libnautilus-extensions/nautilus-file-operations-progress.c
@@ -234,6 +234,7 @@ dfos_xfer_progress_dialog_get_type (void)
 			(GtkClassInitFunc) class_init,
 			(GtkObjectInitFunc) init,
 			NULL,
+			NULL,
 			NULL
 		};
 
diff --git a/libnautilus-extensions/nautilus-file-operations.c b/libnautilus-extensions/nautilus-file-operations.c
index 881850515..db6b34d26 100644
--- a/libnautilus-extensions/nautilus-file-operations.c
+++ b/libnautilus-extensions/nautilus-file-operations.c
@@ -31,8 +31,6 @@
 
 #include "dfos-xfer.h"
 
-#define error(x...)
-
 
 struct _XferInfo {
 	GnomeVFSAsyncHandle *handle;
@@ -164,7 +162,7 @@ handle_xfer_vfs_error (const GnomeVFSXferProgressInfo *progress_info,
 	default:
 		dfos_xfer_progress_dialog_freeze (DFOS_XFER_PROGRESS_DIALOG
 						  (xfer_info->progress_dialog));
-		error (xfer_info->progress_dialog,
+		error (0, 0,
 		       _("Copy operation failed:\n%s"),
 		       gnome_vfs_result_to_string (progress_info->vfs_status));
 		dfos_xfer_progress_dialog_thaw (DFOS_XFER_PROGRESS_DIALOG
diff --git a/libnautilus-extensions/nautilus-scroll-frame.c b/libnautilus-extensions/nautilus-scroll-frame.c
index a0c6de3f2..c7ef7d329 100644
--- a/libnautilus-extensions/nautilus-scroll-frame.c
+++ b/libnautilus-extensions/nautilus-scroll-frame.c
@@ -1137,7 +1137,7 @@ gtk_scroll_frame_set_shadow_type (GtkScrollFrame *sf, GtkShadowType shadow_type)
 
 	g_return_if_fail (sf != NULL);
 	g_return_if_fail (GTK_IS_SCROLL_FRAME (sf));
-	g_return_if_fail (shadow_type >= GTK_SHADOW_NONE && shadow_type <= GTK_SHADOW_ETCHED_OUT);
+	g_return_if_fail (shadow_type <= GTK_SHADOW_ETCHED_OUT);
 
 	priv = sf->priv;
 
diff --git a/libnautilus-extensions/ntl-content-view-client.c b/libnautilus-extensions/ntl-content-view-client.c
index b654bfa52..4fa7dfd8f 100644
--- a/libnautilus-extensions/ntl-content-view-client.c
+++ b/libnautilus-extensions/ntl-content-view-client.c
@@ -38,7 +38,7 @@ static POA_Nautilus_ContentView__epv impl_Nautilus_ContentView_epv = {
   NULL /* _private */
 };
 
-static PortableServer_ServantBase__epv base_epv = { NULL};
+static PortableServer_ServantBase__epv base_epv = { NULL, NULL, NULL };
 
 static POA_Nautilus_ContentView__vepv impl_Nautilus_ContentView_vepv =
 {
diff --git a/libnautilus-extensions/ntl-meta-view-client.c b/libnautilus-extensions/ntl-meta-view-client.c
index 585106504..27eaf3a19 100644
--- a/libnautilus-extensions/ntl-meta-view-client.c
+++ b/libnautilus-extensions/ntl-meta-view-client.c
@@ -38,7 +38,7 @@ static POA_Nautilus_MetaView__epv impl_Nautilus_MetaView_epv = {
   NULL /* _private */
 };
 
-static PortableServer_ServantBase__epv base_epv = { NULL};
+static PortableServer_ServantBase__epv base_epv = { NULL, NULL, NULL };
 
 static POA_Nautilus_MetaView__vepv impl_Nautilus_MetaView_vepv =
 {
@@ -110,9 +110,8 @@ nautilus_meta_view_set_label(NautilusMetaViewClient *mvc, const char *label)
   GnomePropertyBag *bag;
 
   ctl = nautilus_view_client_get_gnome_object(NAUTILUS_VIEW_CLIENT(mvc));
-  /* set description */
   bag = gnome_control_get_property_bag(GNOME_CONTROL(ctl));
-  gnome_property_bag_add(bag, "label", "string", label, label, _("Label"),
-			 GNOME_PROPERTY_READ_ONLY);
+  gnome_property_bag_add(bag, "label", "string",
+			 g_strdup(label), g_strdup(label),
+			 _("Label"), GNOME_PROPERTY_READ_ONLY);
 }
-
diff --git a/libnautilus-extensions/ntl-view-client.c b/libnautilus-extensions/ntl-view-client.c
index 5b426193d..f9827c27f 100644
--- a/libnautilus-extensions/ntl-view-client.c
+++ b/libnautilus-extensions/ntl-view-client.c
@@ -68,7 +68,7 @@ POA_Nautilus_View__epv libnautilus_Nautilus_View_epv =
   (gpointer) & impl_Nautilus_View_notify_selection_change
 };
 
-static PortableServer_ServantBase__epv base_epv = { NULL};
+static PortableServer_ServantBase__epv base_epv = { NULL, NULL, NULL };
 
 static POA_Nautilus_View__vepv impl_Nautilus_View_vepv =
 {
diff --git a/libnautilus-private/gnome-icon-container.c b/libnautilus-private/gnome-icon-container.c
index 421c36858..876b74e2e 100644
--- a/libnautilus-private/gnome-icon-container.c
+++ b/libnautilus-private/gnome-icon-container.c
@@ -2388,8 +2388,9 @@ gnome_icon_container_get_type (void)
 			sizeof (GnomeIconContainerClass),
 			(GtkClassInitFunc) class_init,
 			(GtkObjectInitFunc) init,
-			(GtkArgSetFunc) NULL,
-			(GtkArgGetFunc) NULL
+			NULL,
+			NULL,
+			NULL
 		};
 
 		type = gtk_type_unique (gnome_canvas_get_type (), &type_info);
@@ -2426,7 +2427,7 @@ gnome_icon_container_set_icon_mode (GnomeIconContainer *container,
 {
 	g_return_if_fail (container != NULL);
 
-	if (mode < 0 || mode >= NUM_ICON_MODES) {
+	if (mode >= NUM_ICON_MODES) {
 		g_warning ("Unknown icon mode %d", mode);
 		return;
 	}
diff --git a/libnautilus-private/gtkscrollframe.c b/libnautilus-private/gtkscrollframe.c
index a0c6de3f2..c7ef7d329 100644
--- a/libnautilus-private/gtkscrollframe.c
+++ b/libnautilus-private/gtkscrollframe.c
@@ -1137,7 +1137,7 @@ gtk_scroll_frame_set_shadow_type (GtkScrollFrame *sf, GtkShadowType shadow_type)
 
 	g_return_if_fail (sf != NULL);
 	g_return_if_fail (GTK_IS_SCROLL_FRAME (sf));
-	g_return_if_fail (shadow_type >= GTK_SHADOW_NONE && shadow_type <= GTK_SHADOW_ETCHED_OUT);
+	g_return_if_fail (shadow_type <= GTK_SHADOW_ETCHED_OUT);
 
 	priv = sf->priv;
 
diff --git a/libnautilus-private/nautilus-file-operations-progress.c b/libnautilus-private/nautilus-file-operations-progress.c
index 81b3b8b8b..2c9467d93 100644
--- a/libnautilus-private/nautilus-file-operations-progress.c
+++ b/libnautilus-private/nautilus-file-operations-progress.c
@@ -234,6 +234,7 @@ dfos_xfer_progress_dialog_get_type (void)
 			(GtkClassInitFunc) class_init,
 			(GtkObjectInitFunc) init,
 			NULL,
+			NULL,
 			NULL
 		};
 
diff --git a/libnautilus-private/nautilus-file-operations.c b/libnautilus-private/nautilus-file-operations.c
index 881850515..db6b34d26 100644
--- a/libnautilus-private/nautilus-file-operations.c
+++ b/libnautilus-private/nautilus-file-operations.c
@@ -31,8 +31,6 @@
 
 #include "dfos-xfer.h"
 
-#define error(x...)
-
 
 struct _XferInfo {
 	GnomeVFSAsyncHandle *handle;
@@ -164,7 +162,7 @@ handle_xfer_vfs_error (const GnomeVFSXferProgressInfo *progress_info,
 	default:
 		dfos_xfer_progress_dialog_freeze (DFOS_XFER_PROGRESS_DIALOG
 						  (xfer_info->progress_dialog));
-		error (xfer_info->progress_dialog,
+		error (0, 0,
 		       _("Copy operation failed:\n%s"),
 		       gnome_vfs_result_to_string (progress_info->vfs_status));
 		dfos_xfer_progress_dialog_thaw (DFOS_XFER_PROGRESS_DIALOG
diff --git a/libnautilus-private/nautilus-scroll-frame.c b/libnautilus-private/nautilus-scroll-frame.c
index a0c6de3f2..c7ef7d329 100644
--- a/libnautilus-private/nautilus-scroll-frame.c
+++ b/libnautilus-private/nautilus-scroll-frame.c
@@ -1137,7 +1137,7 @@ gtk_scroll_frame_set_shadow_type (GtkScrollFrame *sf, GtkShadowType shadow_type)
 
 	g_return_if_fail (sf != NULL);
 	g_return_if_fail (GTK_IS_SCROLL_FRAME (sf));
-	g_return_if_fail (shadow_type >= GTK_SHADOW_NONE && shadow_type <= GTK_SHADOW_ETCHED_OUT);
+	g_return_if_fail (shadow_type <= GTK_SHADOW_ETCHED_OUT);
 
 	priv = sf->priv;
 
diff --git a/libnautilus-private/ntl-content-view-client.c b/libnautilus-private/ntl-content-view-client.c
index b654bfa52..4fa7dfd8f 100644
--- a/libnautilus-private/ntl-content-view-client.c
+++ b/libnautilus-private/ntl-content-view-client.c
@@ -38,7 +38,7 @@ static POA_Nautilus_ContentView__epv impl_Nautilus_ContentView_epv = {
   NULL /* _private */
 };
 
-static PortableServer_ServantBase__epv base_epv = { NULL};
+static PortableServer_ServantBase__epv base_epv = { NULL, NULL, NULL };
 
 static POA_Nautilus_ContentView__vepv impl_Nautilus_ContentView_vepv =
 {
diff --git a/libnautilus-private/ntl-meta-view-client.c b/libnautilus-private/ntl-meta-view-client.c
index 585106504..27eaf3a19 100644
--- a/libnautilus-private/ntl-meta-view-client.c
+++ b/libnautilus-private/ntl-meta-view-client.c
@@ -38,7 +38,7 @@ static POA_Nautilus_MetaView__epv impl_Nautilus_MetaView_epv = {
   NULL /* _private */
 };
 
-static PortableServer_ServantBase__epv base_epv = { NULL};
+static PortableServer_ServantBase__epv base_epv = { NULL, NULL, NULL };
 
 static POA_Nautilus_MetaView__vepv impl_Nautilus_MetaView_vepv =
 {
@@ -110,9 +110,8 @@ nautilus_meta_view_set_label(NautilusMetaViewClient *mvc, const char *label)
   GnomePropertyBag *bag;
 
   ctl = nautilus_view_client_get_gnome_object(NAUTILUS_VIEW_CLIENT(mvc));
-  /* set description */
   bag = gnome_control_get_property_bag(GNOME_CONTROL(ctl));
-  gnome_property_bag_add(bag, "label", "string", label, label, _("Label"),
-			 GNOME_PROPERTY_READ_ONLY);
+  gnome_property_bag_add(bag, "label", "string",
+			 g_strdup(label), g_strdup(label),
+			 _("Label"), GNOME_PROPERTY_READ_ONLY);
 }
-
diff --git a/libnautilus-private/ntl-view-client.c b/libnautilus-private/ntl-view-client.c
index 5b426193d..f9827c27f 100644
--- a/libnautilus-private/ntl-view-client.c
+++ b/libnautilus-private/ntl-view-client.c
@@ -68,7 +68,7 @@ POA_Nautilus_View__epv libnautilus_Nautilus_View_epv =
   (gpointer) & impl_Nautilus_View_notify_selection_change
 };
 
-static PortableServer_ServantBase__epv base_epv = { NULL};
+static PortableServer_ServantBase__epv base_epv = { NULL, NULL, NULL };
 
 static POA_Nautilus_View__vepv impl_Nautilus_View_vepv =
 {
diff --git a/libnautilus/gnome-icon-container.c b/libnautilus/gnome-icon-container.c
index 421c36858..876b74e2e 100644
--- a/libnautilus/gnome-icon-container.c
+++ b/libnautilus/gnome-icon-container.c
@@ -2388,8 +2388,9 @@ gnome_icon_container_get_type (void)
 			sizeof (GnomeIconContainerClass),
 			(GtkClassInitFunc) class_init,
 			(GtkObjectInitFunc) init,
-			(GtkArgSetFunc) NULL,
-			(GtkArgGetFunc) NULL
+			NULL,
+			NULL,
+			NULL
 		};
 
 		type = gtk_type_unique (gnome_canvas_get_type (), &type_info);
@@ -2426,7 +2427,7 @@ gnome_icon_container_set_icon_mode (GnomeIconContainer *container,
 {
 	g_return_if_fail (container != NULL);
 
-	if (mode < 0 || mode >= NUM_ICON_MODES) {
+	if (mode >= NUM_ICON_MODES) {
 		g_warning ("Unknown icon mode %d", mode);
 		return;
 	}
diff --git a/libnautilus/gtkscrollframe.c b/libnautilus/gtkscrollframe.c
index a0c6de3f2..c7ef7d329 100644
--- a/libnautilus/gtkscrollframe.c
+++ b/libnautilus/gtkscrollframe.c
@@ -1137,7 +1137,7 @@ gtk_scroll_frame_set_shadow_type (GtkScrollFrame *sf, GtkShadowType shadow_type)
 
 	g_return_if_fail (sf != NULL);
 	g_return_if_fail (GTK_IS_SCROLL_FRAME (sf));
-	g_return_if_fail (shadow_type >= GTK_SHADOW_NONE && shadow_type <= GTK_SHADOW_ETCHED_OUT);
+	g_return_if_fail (shadow_type <= GTK_SHADOW_ETCHED_OUT);
 
 	priv = sf->priv;
 
diff --git a/libnautilus/nautilus-content-view-frame.c b/libnautilus/nautilus-content-view-frame.c
index b654bfa52..4fa7dfd8f 100644
--- a/libnautilus/nautilus-content-view-frame.c
+++ b/libnautilus/nautilus-content-view-frame.c
@@ -38,7 +38,7 @@ static POA_Nautilus_ContentView__epv impl_Nautilus_ContentView_epv = {
   NULL /* _private */
 };
 
-static PortableServer_ServantBase__epv base_epv = { NULL};
+static PortableServer_ServantBase__epv base_epv = { NULL, NULL, NULL };
 
 static POA_Nautilus_ContentView__vepv impl_Nautilus_ContentView_vepv =
 {
diff --git a/libnautilus/nautilus-meta-view-frame.c b/libnautilus/nautilus-meta-view-frame.c
index 585106504..27eaf3a19 100644
--- a/libnautilus/nautilus-meta-view-frame.c
+++ b/libnautilus/nautilus-meta-view-frame.c
@@ -38,7 +38,7 @@ static POA_Nautilus_MetaView__epv impl_Nautilus_MetaView_epv = {
   NULL /* _private */
 };
 
-static PortableServer_ServantBase__epv base_epv = { NULL};
+static PortableServer_ServantBase__epv base_epv = { NULL, NULL, NULL };
 
 static POA_Nautilus_MetaView__vepv impl_Nautilus_MetaView_vepv =
 {
@@ -110,9 +110,8 @@ nautilus_meta_view_set_label(NautilusMetaViewClient *mvc, const char *label)
   GnomePropertyBag *bag;
 
   ctl = nautilus_view_client_get_gnome_object(NAUTILUS_VIEW_CLIENT(mvc));
-  /* set description */
   bag = gnome_control_get_property_bag(GNOME_CONTROL(ctl));
-  gnome_property_bag_add(bag, "label", "string", label, label, _("Label"),
-			 GNOME_PROPERTY_READ_ONLY);
+  gnome_property_bag_add(bag, "label", "string",
+			 g_strdup(label), g_strdup(label),
+			 _("Label"), GNOME_PROPERTY_READ_ONLY);
 }
-
diff --git a/libnautilus/nautilus-view-frame.c b/libnautilus/nautilus-view-frame.c
index 5b426193d..f9827c27f 100644
--- a/libnautilus/nautilus-view-frame.c
+++ b/libnautilus/nautilus-view-frame.c
@@ -68,7 +68,7 @@ POA_Nautilus_View__epv libnautilus_Nautilus_View_epv =
   (gpointer) & impl_Nautilus_View_notify_selection_change
 };
 
-static PortableServer_ServantBase__epv base_epv = { NULL};
+static PortableServer_ServantBase__epv base_epv = { NULL, NULL, NULL };
 
 static POA_Nautilus_View__vepv impl_Nautilus_View_vepv =
 {
diff --git a/libnautilus/nautilus-view.c b/libnautilus/nautilus-view.c
index 5b426193d..f9827c27f 100644
--- a/libnautilus/nautilus-view.c
+++ b/libnautilus/nautilus-view.c
@@ -68,7 +68,7 @@ POA_Nautilus_View__epv libnautilus_Nautilus_View_epv =
   (gpointer) & impl_Nautilus_View_notify_selection_change
 };
 
-static PortableServer_ServantBase__epv base_epv = { NULL};
+static PortableServer_ServantBase__epv base_epv = { NULL, NULL, NULL };
 
 static POA_Nautilus_View__vepv impl_Nautilus_View_vepv =
 {
diff --git a/libnautilus/ntl-content-view-client.c b/libnautilus/ntl-content-view-client.c
index b654bfa52..4fa7dfd8f 100644
--- a/libnautilus/ntl-content-view-client.c
+++ b/libnautilus/ntl-content-view-client.c
@@ -38,7 +38,7 @@ static POA_Nautilus_ContentView__epv impl_Nautilus_ContentView_epv = {
   NULL /* _private */
 };
 
-static PortableServer_ServantBase__epv base_epv = { NULL};
+static PortableServer_ServantBase__epv base_epv = { NULL, NULL, NULL };
 
 static POA_Nautilus_ContentView__vepv impl_Nautilus_ContentView_vepv =
 {
diff --git a/libnautilus/ntl-content-view-frame.c b/libnautilus/ntl-content-view-frame.c
index b654bfa52..4fa7dfd8f 100644
--- a/libnautilus/ntl-content-view-frame.c
+++ b/libnautilus/ntl-content-view-frame.c
@@ -38,7 +38,7 @@ static POA_Nautilus_ContentView__epv impl_Nautilus_ContentView_epv = {
   NULL /* _private */
 };
 
-static PortableServer_ServantBase__epv base_epv = { NULL};
+static PortableServer_ServantBase__epv base_epv = { NULL, NULL, NULL };
 
 static POA_Nautilus_ContentView__vepv impl_Nautilus_ContentView_vepv =
 {
diff --git a/libnautilus/ntl-meta-view-client.c b/libnautilus/ntl-meta-view-client.c
index 585106504..27eaf3a19 100644
--- a/libnautilus/ntl-meta-view-client.c
+++ b/libnautilus/ntl-meta-view-client.c
@@ -38,7 +38,7 @@ static POA_Nautilus_MetaView__epv impl_Nautilus_MetaView_epv = {
   NULL /* _private */
 };
 
-static PortableServer_ServantBase__epv base_epv = { NULL};
+static PortableServer_ServantBase__epv base_epv = { NULL, NULL, NULL };
 
 static POA_Nautilus_MetaView__vepv impl_Nautilus_MetaView_vepv =
 {
@@ -110,9 +110,8 @@ nautilus_meta_view_set_label(NautilusMetaViewClient *mvc, const char *label)
   GnomePropertyBag *bag;
 
   ctl = nautilus_view_client_get_gnome_object(NAUTILUS_VIEW_CLIENT(mvc));
-  /* set description */
   bag = gnome_control_get_property_bag(GNOME_CONTROL(ctl));
-  gnome_property_bag_add(bag, "label", "string", label, label, _("Label"),
-			 GNOME_PROPERTY_READ_ONLY);
+  gnome_property_bag_add(bag, "label", "string",
+			 g_strdup(label), g_strdup(label),
+			 _("Label"), GNOME_PROPERTY_READ_ONLY);
 }
-
diff --git a/libnautilus/ntl-meta-view-frame.c b/libnautilus/ntl-meta-view-frame.c
index 585106504..27eaf3a19 100644
--- a/libnautilus/ntl-meta-view-frame.c
+++ b/libnautilus/ntl-meta-view-frame.c
@@ -38,7 +38,7 @@ static POA_Nautilus_MetaView__epv impl_Nautilus_MetaView_epv = {
   NULL /* _private */
 };
 
-static PortableServer_ServantBase__epv base_epv = { NULL};
+static PortableServer_ServantBase__epv base_epv = { NULL, NULL, NULL };
 
 static POA_Nautilus_MetaView__vepv impl_Nautilus_MetaView_vepv =
 {
@@ -110,9 +110,8 @@ nautilus_meta_view_set_label(NautilusMetaViewClient *mvc, const char *label)
   GnomePropertyBag *bag;
 
   ctl = nautilus_view_client_get_gnome_object(NAUTILUS_VIEW_CLIENT(mvc));
-  /* set description */
   bag = gnome_control_get_property_bag(GNOME_CONTROL(ctl));
-  gnome_property_bag_add(bag, "label", "string", label, label, _("Label"),
-			 GNOME_PROPERTY_READ_ONLY);
+  gnome_property_bag_add(bag, "label", "string",
+			 g_strdup(label), g_strdup(label),
+			 _("Label"), GNOME_PROPERTY_READ_ONLY);
 }
-
diff --git a/libnautilus/ntl-view-client.c b/libnautilus/ntl-view-client.c
index 5b426193d..f9827c27f 100644
--- a/libnautilus/ntl-view-client.c
+++ b/libnautilus/ntl-view-client.c
@@ -68,7 +68,7 @@ POA_Nautilus_View__epv libnautilus_Nautilus_View_epv =
   (gpointer) & impl_Nautilus_View_notify_selection_change
 };
 
-static PortableServer_ServantBase__epv base_epv = { NULL};
+static PortableServer_ServantBase__epv base_epv = { NULL, NULL, NULL };
 
 static POA_Nautilus_View__vepv impl_Nautilus_View_vepv =
 {
diff --git a/libnautilus/ntl-view-frame.c b/libnautilus/ntl-view-frame.c
index 5b426193d..f9827c27f 100644
--- a/libnautilus/ntl-view-frame.c
+++ b/libnautilus/ntl-view-frame.c
@@ -68,7 +68,7 @@ POA_Nautilus_View__epv libnautilus_Nautilus_View_epv =
   (gpointer) & impl_Nautilus_View_notify_selection_change
 };
 
-static PortableServer_ServantBase__epv base_epv = { NULL};
+static PortableServer_ServantBase__epv base_epv = { NULL, NULL, NULL };
 
 static POA_Nautilus_View__vepv impl_Nautilus_View_vepv =
 {
diff --git a/src/file-manager/dfos-xfer-progress-dialog.c b/src/file-manager/dfos-xfer-progress-dialog.c
index 81b3b8b8b..2c9467d93 100644
--- a/src/file-manager/dfos-xfer-progress-dialog.c
+++ b/src/file-manager/dfos-xfer-progress-dialog.c
@@ -234,6 +234,7 @@ dfos_xfer_progress_dialog_get_type (void)
 			(GtkClassInitFunc) class_init,
 			(GtkObjectInitFunc) init,
 			NULL,
+			NULL,
 			NULL
 		};
 
diff --git a/src/file-manager/dfos-xfer.c b/src/file-manager/dfos-xfer.c
index 881850515..db6b34d26 100644
--- a/src/file-manager/dfos-xfer.c
+++ b/src/file-manager/dfos-xfer.c
@@ -31,8 +31,6 @@
 
 #include "dfos-xfer.h"
 
-#define error(x...)
-
 
 struct _XferInfo {
 	GnomeVFSAsyncHandle *handle;
@@ -164,7 +162,7 @@ handle_xfer_vfs_error (const GnomeVFSXferProgressInfo *progress_info,
 	default:
 		dfos_xfer_progress_dialog_freeze (DFOS_XFER_PROGRESS_DIALOG
 						  (xfer_info->progress_dialog));
-		error (xfer_info->progress_dialog,
+		error (0, 0,
 		       _("Copy operation failed:\n%s"),
 		       gnome_vfs_result_to_string (progress_info->vfs_status));
 		dfos_xfer_progress_dialog_thaw (DFOS_XFER_PROGRESS_DIALOG
diff --git a/src/nautilus-main.c b/src/nautilus-main.c
index 67b4c115a..f4b3469e7 100644
--- a/src/nautilus-main.c
+++ b/src/nautilus-main.c
@@ -70,7 +70,7 @@ int main(int argc, char *argv[])
   CORBA_Environment ev;
   CORBA_ORB orb;
   struct poptOption options[] = {
-    {NULL}
+    { NULL, '\0', 0, NULL, 0, NULL, NULL }
   };
   GtkWidget *mainwin;
   GnomeGenericFactory *gfact;
diff --git a/src/nautilus-navigation-window.c b/src/nautilus-navigation-window.c
index 0701c565e..3d0bceaa7 100644
--- a/src/nautilus-navigation-window.c
+++ b/src/nautilus-navigation-window.c
@@ -43,7 +43,7 @@ static POA_Nautilus_ViewWindow__epv impl_Nautilus_ViewWindow_epv =
   NULL
 };
 
-static PortableServer_ServantBase__epv base_epv = { NULL};
+static PortableServer_ServantBase__epv base_epv = { NULL, NULL, NULL };
 
 static POA_Nautilus_ViewWindow__vepv impl_Nautilus_ViewWindow_vepv =
 {
@@ -124,7 +124,10 @@ nautilus_window_get_type(void)
 	sizeof(NautilusWindow),
 	sizeof(NautilusWindowClass),
 	(GtkClassInitFunc) nautilus_window_class_init,
-	(GtkObjectInitFunc) nautilus_window_init
+	(GtkObjectInitFunc) nautilus_window_init,
+        NULL,
+        NULL,
+        NULL
       };
 
       window_type = gtk_type_unique (gnome_app_get_type(), &window_info);
@@ -242,8 +245,7 @@ nautilus_window_goto_url(NautilusWindow *window, const char *url)
   navinfo.new_window_default = navinfo.new_window_suggested = Nautilus_V_FALSE;
   navinfo.new_window_enforced = Nautilus_V_UNKNOWN;
 
-  nautilus_window_request_location_change(NAUTILUS_WINDOW(window), &navinfo,
-                                          NULL);
+  nautilus_window_request_location_change(window, &navinfo, NULL);
 }
 
 static void
@@ -251,7 +253,7 @@ nautilus_window_goto_url_cb (GtkWidget *widget,
                           const char *url,
                           GtkWidget *window)
 {
-  nautilus_window_goto_url(window, url);
+  nautilus_window_goto_url(NAUTILUS_WINDOW(window), url);
 }
 
 static void
diff --git a/src/nautilus-object-window.c b/src/nautilus-object-window.c
index 0701c565e..3d0bceaa7 100644
--- a/src/nautilus-object-window.c
+++ b/src/nautilus-object-window.c
@@ -43,7 +43,7 @@ static POA_Nautilus_ViewWindow__epv impl_Nautilus_ViewWindow_epv =
   NULL
 };
 
-static PortableServer_ServantBase__epv base_epv = { NULL};
+static PortableServer_ServantBase__epv base_epv = { NULL, NULL, NULL };
 
 static POA_Nautilus_ViewWindow__vepv impl_Nautilus_ViewWindow_vepv =
 {
@@ -124,7 +124,10 @@ nautilus_window_get_type(void)
 	sizeof(NautilusWindow),
 	sizeof(NautilusWindowClass),
 	(GtkClassInitFunc) nautilus_window_class_init,
-	(GtkObjectInitFunc) nautilus_window_init
+	(GtkObjectInitFunc) nautilus_window_init,
+        NULL,
+        NULL,
+        NULL
       };
 
       window_type = gtk_type_unique (gnome_app_get_type(), &window_info);
@@ -242,8 +245,7 @@ nautilus_window_goto_url(NautilusWindow *window, const char *url)
   navinfo.new_window_default = navinfo.new_window_suggested = Nautilus_V_FALSE;
   navinfo.new_window_enforced = Nautilus_V_UNKNOWN;
 
-  nautilus_window_request_location_change(NAUTILUS_WINDOW(window), &navinfo,
-                                          NULL);
+  nautilus_window_request_location_change(window, &navinfo, NULL);
 }
 
 static void
@@ -251,7 +253,7 @@ nautilus_window_goto_url_cb (GtkWidget *widget,
                           const char *url,
                           GtkWidget *window)
 {
-  nautilus_window_goto_url(window, url);
+  nautilus_window_goto_url(NAUTILUS_WINDOW(window), url);
 }
 
 static void
diff --git a/src/nautilus-spatial-window.c b/src/nautilus-spatial-window.c
index 0701c565e..3d0bceaa7 100644
--- a/src/nautilus-spatial-window.c
+++ b/src/nautilus-spatial-window.c
@@ -43,7 +43,7 @@ static POA_Nautilus_ViewWindow__epv impl_Nautilus_ViewWindow_epv =
   NULL
 };
 
-static PortableServer_ServantBase__epv base_epv = { NULL};
+static PortableServer_ServantBase__epv base_epv = { NULL, NULL, NULL };
 
 static POA_Nautilus_ViewWindow__vepv impl_Nautilus_ViewWindow_vepv =
 {
@@ -124,7 +124,10 @@ nautilus_window_get_type(void)
 	sizeof(NautilusWindow),
 	sizeof(NautilusWindowClass),
 	(GtkClassInitFunc) nautilus_window_class_init,
-	(GtkObjectInitFunc) nautilus_window_init
+	(GtkObjectInitFunc) nautilus_window_init,
+        NULL,
+        NULL,
+        NULL
       };
 
       window_type = gtk_type_unique (gnome_app_get_type(), &window_info);
@@ -242,8 +245,7 @@ nautilus_window_goto_url(NautilusWindow *window, const char *url)
   navinfo.new_window_default = navinfo.new_window_suggested = Nautilus_V_FALSE;
   navinfo.new_window_enforced = Nautilus_V_UNKNOWN;
 
-  nautilus_window_request_location_change(NAUTILUS_WINDOW(window), &navinfo,
-                                          NULL);
+  nautilus_window_request_location_change(window, &navinfo, NULL);
 }
 
 static void
@@ -251,7 +253,7 @@ nautilus_window_goto_url_cb (GtkWidget *widget,
                           const char *url,
                           GtkWidget *window)
 {
-  nautilus_window_goto_url(window, url);
+  nautilus_window_goto_url(NAUTILUS_WINDOW(window), url);
 }
 
 static void
diff --git a/src/nautilus-view-frame.c b/src/nautilus-view-frame.c
index 847c2898e..6e76643f1 100644
--- a/src/nautilus-view-frame.c
+++ b/src/nautilus-view-frame.c
@@ -73,7 +73,7 @@ POA_Nautilus_ViewFrame__epv impl_Nautilus_ViewFrame_epv =
    (void(*))&impl_Nautilus_ViewFrame_request_selection_change
 };
 
-static PortableServer_ServantBase__epv base_epv = { NULL};
+static PortableServer_ServantBase__epv base_epv = { NULL, NULL, NULL };
 
 static POA_Nautilus_ViewFrame__vepv impl_Nautilus_ViewFrame_vepv =
 {
diff --git a/src/nautilus-window.c b/src/nautilus-window.c
index 0701c565e..3d0bceaa7 100644
--- a/src/nautilus-window.c
+++ b/src/nautilus-window.c
@@ -43,7 +43,7 @@ static POA_Nautilus_ViewWindow__epv impl_Nautilus_ViewWindow_epv =
   NULL
 };
 
-static PortableServer_ServantBase__epv base_epv = { NULL};
+static PortableServer_ServantBase__epv base_epv = { NULL, NULL, NULL };
 
 static POA_Nautilus_ViewWindow__vepv impl_Nautilus_ViewWindow_vepv =
 {
@@ -124,7 +124,10 @@ nautilus_window_get_type(void)
 	sizeof(NautilusWindow),
 	sizeof(NautilusWindowClass),
 	(GtkClassInitFunc) nautilus_window_class_init,
-	(GtkObjectInitFunc) nautilus_window_init
+	(GtkObjectInitFunc) nautilus_window_init,
+        NULL,
+        NULL,
+        NULL
       };
 
       window_type = gtk_type_unique (gnome_app_get_type(), &window_info);
@@ -242,8 +245,7 @@ nautilus_window_goto_url(NautilusWindow *window, const char *url)
   navinfo.new_window_default = navinfo.new_window_suggested = Nautilus_V_FALSE;
   navinfo.new_window_enforced = Nautilus_V_UNKNOWN;
 
-  nautilus_window_request_location_change(NAUTILUS_WINDOW(window), &navinfo,
-                                          NULL);
+  nautilus_window_request_location_change(window, &navinfo, NULL);
 }
 
 static void
@@ -251,7 +253,7 @@ nautilus_window_goto_url_cb (GtkWidget *widget,
                           const char *url,
                           GtkWidget *window)
 {
-  nautilus_window_goto_url(window, url);
+  nautilus_window_goto_url(NAUTILUS_WINDOW(window), url);
 }
 
 static void
diff --git a/src/ntl-content-view.c b/src/ntl-content-view.c
index ab84ca5da..f78985253 100644
--- a/src/ntl-content-view.c
+++ b/src/ntl-content-view.c
@@ -27,7 +27,7 @@
 #include "ntl-content-view.h"
 #include <gtk/gtksignal.h>
 
-static PortableServer_ServantBase__epv base_epv = { NULL};
+static PortableServer_ServantBase__epv base_epv = { NULL, NULL, NULL };
 
 static POA_Nautilus_ContentViewFrame__epv impl_Nautilus_ContentViewFrame_epv = {
   NULL
@@ -58,7 +58,10 @@ nautilus_content_view_get_type(void)
 	sizeof(NautilusContentView),
 	sizeof(NautilusContentViewClass),
 	(GtkClassInitFunc) nautilus_content_view_class_init,
-	(GtkObjectInitFunc) nautilus_content_view_init
+	(GtkObjectInitFunc) nautilus_content_view_init,
+        NULL,
+        NULL,
+        NULL
       };
 
       view_type = gtk_type_unique (nautilus_view_get_type(), &view_info);
diff --git a/src/ntl-main.c b/src/ntl-main.c
index 67b4c115a..f4b3469e7 100644
--- a/src/ntl-main.c
+++ b/src/ntl-main.c
@@ -70,7 +70,7 @@ int main(int argc, char *argv[])
   CORBA_Environment ev;
   CORBA_ORB orb;
   struct poptOption options[] = {
-    {NULL}
+    { NULL, '\0', 0, NULL, 0, NULL, NULL }
   };
   GtkWidget *mainwin;
   GnomeGenericFactory *gfact;
diff --git a/src/ntl-types.h b/src/ntl-types.h
index aacb51ab0..7ae621bc7 100644
--- a/src/ntl-types.h
+++ b/src/ntl-types.h
@@ -40,7 +40,7 @@ typedef struct {
 
   GnomeVFSFileInfo *vfs_fileinfo;
 
-  char *content_iid;
+  const char *content_iid;
   GSList *meta_iids;
 } NautilusNavigationInfo;
 
diff --git a/src/ntl-view.c b/src/ntl-view.c
index 847c2898e..6e76643f1 100644
--- a/src/ntl-view.c
+++ b/src/ntl-view.c
@@ -73,7 +73,7 @@ POA_Nautilus_ViewFrame__epv impl_Nautilus_ViewFrame_epv =
    (void(*))&impl_Nautilus_ViewFrame_request_selection_change
 };
 
-static PortableServer_ServantBase__epv base_epv = { NULL};
+static PortableServer_ServantBase__epv base_epv = { NULL, NULL, NULL };
 
 static POA_Nautilus_ViewFrame__vepv impl_Nautilus_ViewFrame_vepv =
 {
diff --git a/src/ntl-window.c b/src/ntl-window.c
index 0701c565e..3d0bceaa7 100644
--- a/src/ntl-window.c
+++ b/src/ntl-window.c
@@ -43,7 +43,7 @@ static POA_Nautilus_ViewWindow__epv impl_Nautilus_ViewWindow_epv =
   NULL
 };
 
-static PortableServer_ServantBase__epv base_epv = { NULL};
+static PortableServer_ServantBase__epv base_epv = { NULL, NULL, NULL };
 
 static POA_Nautilus_ViewWindow__vepv impl_Nautilus_ViewWindow_vepv =
 {
@@ -124,7 +124,10 @@ nautilus_window_get_type(void)
 	sizeof(NautilusWindow),
 	sizeof(NautilusWindowClass),
 	(GtkClassInitFunc) nautilus_window_class_init,
-	(GtkObjectInitFunc) nautilus_window_init
+	(GtkObjectInitFunc) nautilus_window_init,
+        NULL,
+        NULL,
+        NULL
       };
 
       window_type = gtk_type_unique (gnome_app_get_type(), &window_info);
@@ -242,8 +245,7 @@ nautilus_window_goto_url(NautilusWindow *window, const char *url)
   navinfo.new_window_default = navinfo.new_window_suggested = Nautilus_V_FALSE;
   navinfo.new_window_enforced = Nautilus_V_UNKNOWN;
 
-  nautilus_window_request_location_change(NAUTILUS_WINDOW(window), &navinfo,
-                                          NULL);
+  nautilus_window_request_location_change(window, &navinfo, NULL);
 }
 
 static void
@@ -251,7 +253,7 @@ nautilus_window_goto_url_cb (GtkWidget *widget,
                           const char *url,
                           GtkWidget *window)
 {
-  nautilus_window_goto_url(window, url);
+  nautilus_window_goto_url(NAUTILUS_WINDOW(window), url);
 }
 
 static void