Locate glib-genmarshal.

	* configure.in: Locate glib-genmarshal.
	* libnautilus-private/.cvsignore:
	* libnautilus-private/Makefile.am:
	* libnautilus-private/nautilus-marshal.list:
	* src/nautilus-view-frame.c: (nautilus_view_frame_class_init):
	* src/nautilus-zoom-control.c: (nautilus_zoom_control_class_init):
	Add marshalers used inside Nautilus only.

	* components/adapter/nautilus-adapter-load-strategy.c:
	(nautilus_adapter_load_strategy_class_init):

	* libnautilus-private/nautilus-horizontal-splitter.c:
	* libnautilus-private/nautilus-icon-canvas-item.c:
	* libnautilus-private/nautilus-icon-text-item.h:
	Put code in #if GNOME2_CONVERSION_COMPLETE.

	* libnautilus-private/nautilus-icon-container.c:
	(set_pending_icon_to_reveal), (nautilus_icon_container_class_init),
	(nautilus_icon_container_init), (set_pending_icon_to_rename):
	Convert signal-handling code.

	* libnautilus-private/nautilus-icon-dnd.c:
	(get_data_on_first_target_we_support): Update for GdkAtom changes.
	(confirm_switch_to_manual_layout): Switch to GtkDialog.

13 files changed, 245 insertions, 177 deletions

diff --git a/ChangeLog b/ChangeLog
index 692495478..ac73b5191 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,30 @@
+2001-10-29  Darin Adler  <darin@bentspoon.com>
+
+	* configure.in: Locate glib-genmarshal.
+	* libnautilus-private/.cvsignore:
+	* libnautilus-private/Makefile.am:
+	* libnautilus-private/nautilus-marshal.list:
+	* src/nautilus-view-frame.c: (nautilus_view_frame_class_init):
+	* src/nautilus-zoom-control.c: (nautilus_zoom_control_class_init):
+	Add marshalers used inside Nautilus only.
+
+	* components/adapter/nautilus-adapter-load-strategy.c:
+	(nautilus_adapter_load_strategy_class_init):
+
+	* libnautilus-private/nautilus-horizontal-splitter.c:
+	* libnautilus-private/nautilus-icon-canvas-item.c:
+	* libnautilus-private/nautilus-icon-text-item.h:
+	Put code in #if GNOME2_CONVERSION_COMPLETE.
+
+	* libnautilus-private/nautilus-icon-container.c:
+	(set_pending_icon_to_reveal), (nautilus_icon_container_class_init),
+	(nautilus_icon_container_init), (set_pending_icon_to_rename):
+	Convert signal-handling code.
+
+	* libnautilus-private/nautilus-icon-dnd.c:
+	(get_data_on_first_target_we_support): Update for GdkAtom changes.
+	(confirm_switch_to_manual_layout): Switch to GtkDialog.
+
 2001-10-28  Darin Adler  <darin@bentspoon.com>
 
 	* Lots of files:
diff --git a/components/adapter/nautilus-adapter-load-strategy.c b/components/adapter/nautilus-adapter-load-strategy.c
index d14adf6f9..4a10a6bd5 100644
--- a/components/adapter/nautilus-adapter-load-strategy.c
+++ b/components/adapter/nautilus-adapter-load-strategy.c
@@ -89,7 +89,7 @@ nautilus_adapter_load_strategy_class_init (NautilusAdapterLoadStrategyClass *kla
 		              G_SIGNAL_RUN_LAST,
 		              G_STRUCT_OFFSET (NautilusAdapterLoadStrategyClass, report_load_progress),
 		              NULL, NULL,
-		              eel_gtk_marshal_NONE__DOUBLE,
+		              eel_marshal_NONE__DOUBLE,
 		              G_TYPE_NONE, 1, GTK_TYPE_DOUBLE);
 	signals[REPORT_LOAD_COMPLETE] =
 		g_signal_new ("report_load_complete",
diff --git a/configure.in b/configure.in
index 06c44b71a..30ce79f75 100644
--- a/configure.in
+++ b/configure.in
@@ -131,6 +131,8 @@ AC_SUBST(LIBNAUTILUS_PRIVATE_LIBS)
 LIBNAUTILUS_PRIVATE_IDL_INCLUDES="`$PKG_CONFIG --variable=idldir $LIBNAUTILUS_PRIVATE_MODULES | $srcdir/add-include-prefix`"
 AC_SUBST(LIBNAUTILUS_PRIVATE_IDL_INCLUDES)
 
+AC_PATH_PROG(GLIB_GENMARSHAL, glib-genmarshal)
+
 dnl ====================================
 dnl = Begin profiling support
 dnl ====================================
diff --git a/libnautilus-private/.cvsignore b/libnautilus-private/.cvsignore
index 71d4ac9f1..9a14a6e14 100644
--- a/libnautilus-private/.cvsignore
+++ b/libnautilus-private/.cvsignore
@@ -9,3 +9,5 @@ nautilus-metafile-server-skels.c
 nautilus-metafile-server-stubs.c
 nautilus-metafile-server.h
 nautilus_metafile_server_idl_stamp
+nautilus-marshal.c
+nautilus-marshal.h
diff --git a/libnautilus-private/Makefile.am b/libnautilus-private/Makefile.am
index 5a0461b8c..01202dd59 100644
--- a/libnautilus-private/Makefile.am
+++ b/libnautilus-private/Makefile.am
@@ -35,138 +35,144 @@ nautilus_metafile_server_idl_sources = \
 	nautilus-metafile-server-common.c \
 	$(NULL)
 
+marshal_sources = \
+	nautilus-marshal.h \
+	nautilus-marshal.c \
+	$(NULL)
+
 libnautilus_private_la_SOURCES = \
 	$(nautilus_metafile_server_idl_sources)	\
 	nautilus-audio-player.c \
-	nautilus-bonobo-extensions.c \
-	nautilus-bookmark.c \
-	nautilus-customization-data.c \
-	nautilus-default-file-icon.c \
-	nautilus-desktop-file-loader.c \
-	nautilus-directory-async.c \
-	nautilus-directory-background.c \
-	nautilus-directory-metafile-monitor.c \
-	nautilus-directory-metafile.c \
-	nautilus-directory.c \
-	nautilus-drag-window.c \
-	nautilus-entry.c \
-	nautilus-file-changes-queue.c \
-	nautilus-file-dnd.c \
-	nautilus-file-operations-progress.c \
-	nautilus-file-queue.c \
-	nautilus-file-operations.c \
-	nautilus-file-utilities.c \
-	nautilus-file.c \
-	nautilus-find-icon-image.c \
-	nautilus-font-factory.c \
-	nautilus-global-preferences.c \
-	nautilus-horizontal-splitter.c \
-	nautilus-icon-canvas-item.c \
-	nautilus-icon-container.c \
-	nautilus-icon-dnd.c \
-	nautilus-icon-factory.c \
-	nautilus-icon-text-item.c \
-	nautilus-keep-last-vertical-box.c \
-	nautilus-lib-self-check-functions.c \
-	nautilus-link-set.c \
-	nautilus-link.c \
-	nautilus-link-desktop-file.c \
-	nautilus-link-historical.c \
-	nautilus-medusa-support.c \
-	nautilus-merged-directory.c \
-	nautilus-metafile-factory.c \
-	nautilus-metafile.c \
-	nautilus-mime-actions.c \
-	nautilus-monitor.c \
-	nautilus-program-chooser.c \
-	nautilus-program-choosing.c \
-	nautilus-search-uri.c \
-	nautilus-sidebar-functions.c \
-	nautilus-sound.c \
-	nautilus-theme.c \
-	nautilus-thumbnails.c \
-	nautilus-thumbnails-jpeg.c \
-	nautilus-trash-directory.c \
-	nautilus-trash-file.c \
-	nautilus-trash-monitor.c \
-	nautilus-undo-context.c \
-	nautilus-undo-manager.c \
-	nautilus-undo-signal-handlers.c \
-	nautilus-vfs-directory.c \
-	nautilus-vfs-file.c \
-	nautilus-view-identifier.c \
-	nautilus-volume-monitor.c \
-	nautilus-authn-manager.c \
 	nautilus-audio-player.h \
+	nautilus-authn-manager.c \
+	nautilus-authn-manager.h \
+	nautilus-bonobo-extensions.c \
 	nautilus-bonobo-extensions.h \
+	nautilus-bookmark.c \
 	nautilus-bookmark.h \
 	nautilus-cdrom-extensions.h \
+	nautilus-customization-data.c \
 	nautilus-customization-data.h \
+	nautilus-default-file-icon.c \
 	nautilus-default-file-icon.h \
+	nautilus-desktop-file-loader.c \
 	nautilus-desktop-file-loader.h \
+	nautilus-directory-async.c \
+	nautilus-directory-background.c \
 	nautilus-directory-background.h \
+	nautilus-directory-metafile-monitor.c \
 	nautilus-directory-metafile-monitor.h \
+	nautilus-directory-metafile.c \
 	nautilus-directory-metafile.h \
 	nautilus-directory-notify.h \
 	nautilus-directory-private.h \
+	nautilus-directory.c \
 	nautilus-directory.h \
+	nautilus-drag-window.c \
 	nautilus-drag-window.h \
 	nautilus-druid-page-eazel.h \
 	nautilus-druid.h \
+	nautilus-entry.c \
 	nautilus-entry.h \
 	nautilus-file-attributes.h \
+	nautilus-file-changes-queue.c \
 	nautilus-file-changes-queue.h \
+	nautilus-file-dnd.c \
 	nautilus-file-dnd.h \
+	nautilus-file-operations-progress.c \
 	nautilus-file-operations-progress.h \
+	nautilus-file-operations.c \
 	nautilus-file-operations.h \
 	nautilus-file-private.h \
+	nautilus-file-queue.c \
+	nautilus-file-queue.h \
+	nautilus-file-utilities.c \
 	nautilus-file-utilities.h \
+	nautilus-file.c \
 	nautilus-file.h \
-	nautilus-file-queue.h \
+	nautilus-find-icon-image.c \
 	nautilus-find-icon-image.h \
+	nautilus-font-factory.c \
 	nautilus-font-factory.h \
+	nautilus-global-preferences.c \
 	nautilus-global-preferences.h \
+	nautilus-horizontal-splitter.c \
 	nautilus-horizontal-splitter.h \
+	nautilus-icon-canvas-item.c \
 	nautilus-icon-canvas-item.h \
+	nautilus-icon-container.c \
 	nautilus-icon-container.h \
+	nautilus-icon-dnd.c \
 	nautilus-icon-dnd.h \
 	nautilus-icon-factory-private.h \
+	nautilus-icon-factory.c \
 	nautilus-icon-factory.h \
 	nautilus-icon-private.h \
+	nautilus-icon-text-item.c \
 	nautilus-icon-text-item.h \
 	nautilus-iso9660.h \
+	nautilus-keep-last-vertical-box.c \
 	nautilus-keep-last-vertical-box.h \
+	nautilus-lib-self-check-functions.c \
 	nautilus-lib-self-check-functions.h \
-	nautilus-link-set.h \
-	nautilus-link.h \
+	nautilus-link-desktop-file.c \
 	nautilus-link-desktop-file.h \
+	nautilus-link-historical.c \
 	nautilus-link-historical.h \
+	nautilus-link-set.c \
+	nautilus-link-set.h \
+	nautilus-link.c \
+	nautilus-link.h \
+	nautilus-marshal.h \
+	nautilus-medusa-support.c \
 	nautilus-medusa-support.h \
+	nautilus-merged-directory.c \
 	nautilus-merged-directory.h \
 	nautilus-metadata.h \
+	nautilus-metafile-factory.c \
 	nautilus-metafile-factory.h \
+	nautilus-metafile.c \
 	nautilus-metafile.h \
+	nautilus-mime-actions.c \
 	nautilus-mime-actions.h \
+	nautilus-monitor.c \
 	nautilus-monitor.h \
+	nautilus-program-chooser.c \
 	nautilus-program-chooser.h \
+	nautilus-program-choosing.c \
 	nautilus-program-choosing.h \
+	nautilus-search-uri.c \
 	nautilus-search-uri.h \
+	nautilus-sidebar-functions.c \
 	nautilus-sidebar-functions.h \
+	nautilus-sound.c \
 	nautilus-sound.h \
+	nautilus-theme.c \
 	nautilus-theme.h \
-	nautilus-thumbnails.h \
+	nautilus-thumbnails-jpeg.c \
 	nautilus-thumbnails-jpeg.h \
+	nautilus-thumbnails.c \
+	nautilus-thumbnails.h \
+	nautilus-trash-directory.c \
 	nautilus-trash-directory.h \
+	nautilus-trash-file.c \
 	nautilus-trash-file.h \
+	nautilus-trash-monitor.c \
 	nautilus-trash-monitor.h \
+	nautilus-undo-context.c \
 	nautilus-undo-context.h \
+	nautilus-undo-manager.c \
 	nautilus-undo-manager.h \
+	nautilus-undo-signal-handlers.c \
 	nautilus-undo-signal-handlers.h \
+	nautilus-vfs-directory.c \
 	nautilus-vfs-directory.h \
+	nautilus-vfs-file.c \
 	nautilus-vfs-file.h \
+	nautilus-view-identifier.c \
 	nautilus-view-identifier.h \
+	nautilus-volume-monitor.c \
 	nautilus-volume-monitor.h \
-	nautilus-authn-manager.h \
 	$(NULL)
 
 fsattributesdir = $(datadir)/nautilus
@@ -179,20 +185,23 @@ nautilus_metafile_server_idl_stamp: nautilus-metafile-server.idl $(ORBIT_IDL)
 	$(ORBIT_IDL) -I$(top_srcdir) $(LIBNAUTILUS_PRIVATE_IDL_INCLUDES) $<
 	touch $@
 
-$(libnautilus_private_la_OBJECTS): nautilus_metafile_server_idl_stamp
+nautilus-marshal.h: nautilus-marshal.list $(GLIB_GENMARSHAL)
+	$(GLIB_GENMARSHAL) $< --header --prefix=nautilus_marshal > $@
+nautilus-marshal.c: nautilus-marshal.list $(GLIB_GENMARSHAL)
+	$(GLIB_GENMARSHAL) $< --body --prefix=nautilus_marshal > $@
+
+$(libnautilus_private_la_OBJECTS): nautilus_metafile_server_idl_stamp $(marshal_sources)
 
 EXTRA_DIST = 				\
 	$(fsattributes_DATA)		\
 	nautilus-metafile-server.idl	\
-	$(NULL)
-
-BUILT_SOURCES = \
-	$(nautilus_metafile_server_idl_sources)		\
+	nautilus-marshal.list		\
 	$(NULL)
 
 CLEANFILES = \
 	$(nautilus_metafile_server_idl_sources)		\
 	nautilus_metafile_server_idl_stamp		\
+	$(marshal_sources)				\
 	$(NULL)
 
 dist-hook:
diff --git a/libnautilus-private/nautilus-horizontal-splitter.c b/libnautilus-private/nautilus-horizontal-splitter.c
index f904a7ae4..a965a061a 100644
--- a/libnautilus-private/nautilus-horizontal-splitter.c
+++ b/libnautilus-private/nautilus-horizontal-splitter.c
@@ -57,8 +57,10 @@ static gboolean nautilus_horizontal_splitter_motion           (GtkWidget
 static void     nautilus_horizontal_splitter_destroy          (GtkObject                       *object);
 
 /* GtkWidgetClass methods */
+#if GNOME2_CONVERSION_COMPLETE
 static void     nautilus_horizontal_splitter_draw             (GtkWidget                       *widget,
 							       GdkRectangle                    *area);
+#endif
 
 EEL_DEFINE_CLASS_BOILERPLATE (NautilusHorizontalSplitter,
 				   nautilus_horizontal_splitter,
@@ -78,7 +80,9 @@ nautilus_horizontal_splitter_class_init (NautilusHorizontalSplitterClass *horizo
 	object_class->destroy = nautilus_horizontal_splitter_destroy;
 
 	/* GtkWidgetClass */
+#if GNOME2_CONVERSION_COMPLETE
 	widget_class->draw = nautilus_horizontal_splitter_draw;
+#endif
 	widget_class->button_press_event = nautilus_horizontal_splitter_button_press;
 	widget_class->button_release_event = nautilus_horizontal_splitter_button_release;
 	widget_class->motion_notify_event = nautilus_horizontal_splitter_motion;
@@ -106,6 +110,8 @@ nautilus_horizontal_splitter_destroy (GtkObject *object)
 	EEL_CALL_PARENT (GTK_OBJECT_CLASS, destroy, (object));
 }
 
+#if GNOME2_CONVERSION_COMPLETE
+
 static void
 draw_resize_bar (GtkWidget		*widget,
 		 GdkWindow		*window,
@@ -266,6 +272,8 @@ nautilus_horizontal_splitter_draw (GtkWidget    *widget,
 	}
 }
 
+#endif
+
 void
 nautilus_horizontal_splitter_expand (NautilusHorizontalSplitter *splitter)
 {
diff --git a/libnautilus-private/nautilus-icon-canvas-item.c b/libnautilus-private/nautilus-icon-canvas-item.c
index 52e4ad23f..b05c7c074 100644
--- a/libnautilus-private/nautilus-icon-canvas-item.c
+++ b/libnautilus-private/nautilus-icon-canvas-item.c
@@ -32,7 +32,6 @@
 #include <gdk-pixbuf/gdk-pixbuf.h>
 #include <libgnome/gnome-i18n.h>
 #include <libgnomecanvas/gnome-canvas-util.h>
-#include <libgnomecanvas/gnome-icon-text.h>
 #include <libart_lgpl/art_rgb.h>
 #include <libart_lgpl/art_rgb_affine.h>
 #include <libart_lgpl/art_rgb_rgba_affine.h>
@@ -705,6 +704,8 @@ nautilus_icon_canvas_item_update (GnomeCanvasItem *item,
 
 /* routine to underline the text in a gnome_icon_text structure */
 
+#if GNOME2_CONVERSION_COMPLETE
+
 static void
 gnome_icon_underline_text (GnomeIconTextInfo *text_info,
 			   GdkDrawable *drawable,
@@ -731,6 +732,8 @@ gnome_icon_underline_text (GnomeIconTextInfo *text_info,
 	}
 }
 
+#endif
+
 static gboolean
 in_single_click_mode (void)
 {
@@ -758,8 +761,11 @@ draw_or_measure_label_text (NautilusIconCanvasItem *item,
 	guint32 label_color;
 	GnomeCanvasItem *canvas_item;
 	int max_text_width;
-	int icon_width, text_left, box_left;
+	int icon_width, box_left;
+#if GNOME2_CONVERSION_COMPLETE
+	int text_left;
 	GnomeIconTextInfo *icon_text_info;
+#endif
 	char **pieces;
 	const char *text_piece;
 	int i;
@@ -854,6 +860,7 @@ draw_or_measure_label_text (NautilusIconCanvasItem *item,
 			text_piece = " ";
 		}
 		
+#ifdef GNOME2_CONVERSION_COMPLETE
 		icon_text_info = gnome_icon_layout_text
 			(details->font, text_piece,
 			 LINE_BREAK_CHARACTERS,
@@ -897,6 +904,7 @@ draw_or_measure_label_text (NautilusIconCanvasItem *item,
 		height_so_far += icon_text_info->height;
 		
 		gnome_icon_text_info_free (icon_text_info);
+#endif
 	}
 	g_strfreev (pieces);
 	
diff --git a/libnautilus-private/nautilus-icon-container.c b/libnautilus-private/nautilus-icon-container.c
index 06b9d3f94..29f6747d7 100644
--- a/libnautilus-private/nautilus-icon-container.c
+++ b/libnautilus-private/nautilus-icon-container.c
@@ -32,6 +32,7 @@
 #include "nautilus-icon-private.h"
 #include "nautilus-icon-text-item.h"
 #include "nautilus-lib-self-check-functions.h"
+#include "nautilus-marshal.h"
 #include "nautilus-theme.h"
 #include <ctype.h>
 #include <eel/eel-background.h>
@@ -41,6 +42,7 @@
 #include <eel/eel-gnome-extensions.h>
 #include <eel/eel-gtk-extensions.h>
 #include <eel/eel-gtk-macros.h>
+#include <eel/eel-marshal.h>
 #include <eel/eel-string.h>
 #include <libgnomecanvas/gnome-canvas-pixbuf.h>
 #include <gdk/gdkkeysyms.h>
@@ -442,13 +444,13 @@ set_pending_icon_to_reveal (NautilusIconContainer *container, NautilusIcon *icon
 	
 	if (cur_pending != NULL) {
 		gtk_signal_disconnect_by_func (GTK_OBJECT (cur_pending->item),
-					       pending_icon_to_reveal_destroy_callback,
+					       G_CALLBACK (pending_icon_to_reveal_destroy_callback),
 					       container);
 	}
 	
 	if (icon != NULL) {
 		gtk_signal_connect (GTK_OBJECT (icon->item), "destroy",
-				    pending_icon_to_reveal_destroy_callback, container);
+				    G_CALLBACK (pending_icon_to_reveal_destroy_callback), container);
 	}
 	
 	container->details->pending_icon_to_reveal = icon;
@@ -3052,28 +3054,28 @@ nautilus_icon_container_class_init (NautilusIconContainerClass *class)
 		                G_TYPE_FROM_CLASS (object_class),
 		                G_SIGNAL_RUN_LAST,
 		                G_STRUCT_OFFSET (NautilusIconContainerClass,
-						     selection_changed),
+						 selection_changed),
 		                NULL, NULL,
-		                gtk_marshal_NONE__NONE,
+		                gtk_marshal_VOID__VOID,
 		                G_TYPE_NONE, 0);
 	signals[BUTTON_PRESS]
 		= g_signal_new ("button_press",
 		                G_TYPE_FROM_CLASS (object_class),
 		                G_SIGNAL_RUN_LAST,
 		                G_STRUCT_OFFSET (NautilusIconContainerClass,
-						     button_press),
+						 button_press),
 		                NULL, NULL,
-		                gtk_marshal_BOOL__POINTER,
+		                nautilus_marshal_BOOLEAN__POINTER,
 		                GTK_TYPE_BOOL, 1,
-				  GDK_TYPE_EVENT);
+				GDK_TYPE_EVENT);
 	signals[ACTIVATE]
 		= g_signal_new ("activate",
 		                G_TYPE_FROM_CLASS (object_class),
 		                G_SIGNAL_RUN_LAST,
 		                G_STRUCT_OFFSET (NautilusIconContainerClass,
-						     activate),
+						 activate),
 		                NULL, NULL,
-		                gtk_marshal_NONE__POINTER,
+		                gtk_marshal_VOID__POINTER,
 		                G_TYPE_NONE, 1,
 				  GTK_TYPE_POINTER);
 	signals[CONTEXT_CLICK_SELECTION]
@@ -3081,9 +3083,9 @@ nautilus_icon_container_class_init (NautilusIconContainerClass *class)
 		                G_TYPE_FROM_CLASS (object_class),
 		                G_SIGNAL_RUN_LAST,
 		                G_STRUCT_OFFSET (NautilusIconContainerClass,
-						     context_click_selection),
+						 context_click_selection),
 		                NULL, NULL,
-		                gtk_marshal_NONE__POINTER,
+		                gtk_marshal_VOID__POINTER,
 		                G_TYPE_NONE, 1,
 				  GTK_TYPE_POINTER);
 	signals[CONTEXT_CLICK_BACKGROUND]
@@ -3091,53 +3093,53 @@ nautilus_icon_container_class_init (NautilusIconContainerClass *class)
 		                G_TYPE_FROM_CLASS (object_class),
 		                G_SIGNAL_RUN_LAST,
 		                G_STRUCT_OFFSET (NautilusIconContainerClass,
-						     context_click_background),
+						 context_click_background),
 		                NULL, NULL,
-		                gtk_marshal_NONE__POINTER,
+		                gtk_marshal_VOID__POINTER,
 		                G_TYPE_NONE, 1,
-				  GTK_TYPE_POINTER);
+				GTK_TYPE_POINTER);
 	signals[MIDDLE_CLICK]
 		= g_signal_new ("middle_click",
 		                G_TYPE_FROM_CLASS (object_class),
 		                G_SIGNAL_RUN_LAST,
 		                G_STRUCT_OFFSET (NautilusIconContainerClass,
-						     middle_click),
+						 middle_click),
 		                NULL, NULL,
-		                gtk_marshal_NONE__POINTER,
+		                gtk_marshal_VOID__POINTER,
 		                G_TYPE_NONE, 1,
-				  GTK_TYPE_POINTER);
+				GTK_TYPE_POINTER);
 	signals[ICON_POSITION_CHANGED]
 		= g_signal_new ("icon_position_changed",
 		                G_TYPE_FROM_CLASS (object_class),
 		                G_SIGNAL_RUN_LAST,
 		                G_STRUCT_OFFSET (NautilusIconContainerClass,
-						     icon_position_changed),
+						 icon_position_changed),
 		                NULL, NULL,
-		                gtk_marshal_NONE__POINTER_POINTER,
+		                nautilus_marshal_VOID__POINTER_POINTER,
 		                G_TYPE_NONE, 2,
-				  GTK_TYPE_POINTER,
-				  GTK_TYPE_POINTER);
+				GTK_TYPE_POINTER,
+				GTK_TYPE_POINTER);
 	signals[ICON_TEXT_CHANGED]
 		= g_signal_new ("icon_text_changed",
 		                G_TYPE_FROM_CLASS (object_class),
 		                G_SIGNAL_RUN_LAST,
 		                G_STRUCT_OFFSET (NautilusIconContainerClass,
-						     icon_text_changed),
+						 icon_text_changed),
 		                NULL, NULL,
-		                gtk_marshal_NONE__POINTER_POINTER,
+		                nautilus_marshal_VOID__POINTER_POINTER,
 		                G_TYPE_NONE, 2,
-				  GTK_TYPE_POINTER,
-				  G_TYPE_STRING);
+				GTK_TYPE_POINTER,
+				G_TYPE_STRING);
 	signals[ICON_STRETCH_STARTED]
 		= g_signal_new ("icon_stretch_started",
 		                G_TYPE_FROM_CLASS (object_class),
 		                G_SIGNAL_RUN_LAST,
 		                G_STRUCT_OFFSET (NautilusIconContainerClass,
-						     icon_stretch_started),
+						 icon_stretch_started),
 		                NULL, NULL,
-		                gtk_marshal_NONE__POINTER,
+		                gtk_marshal_VOID__POINTER,
 		                G_TYPE_NONE, 1,
-				  GTK_TYPE_POINTER);
+				GTK_TYPE_POINTER);
 	signals[ICON_STRETCH_ENDED]
 		= g_signal_new ("icon_stretch_ended",
 		                G_TYPE_FROM_CLASS (object_class),
@@ -3145,100 +3147,100 @@ nautilus_icon_container_class_init (NautilusIconContainerClass *class)
 		                G_STRUCT_OFFSET (NautilusIconContainerClass,
 						     icon_stretch_ended),
 		                NULL, NULL,
-		                gtk_marshal_NONE__POINTER,
+		                gtk_marshal_VOID__POINTER,
 		                G_TYPE_NONE, 1,
-				  GTK_TYPE_POINTER);
+				GTK_TYPE_POINTER);
 	signals[RENAMING_ICON]
 		= g_signal_new ("renaming_icon",
 		                G_TYPE_FROM_CLASS (object_class),
 		                G_SIGNAL_RUN_LAST,
 		                G_STRUCT_OFFSET (NautilusIconContainerClass,
-						     renaming_icon),
+						 renaming_icon),
 		                NULL, NULL,
-		                gtk_marshal_NONE__POINTER,
+		                gtk_marshal_VOID__POINTER,
 		                G_TYPE_NONE, 1,
-				  GTK_TYPE_POINTER);
+				GTK_TYPE_POINTER);
 	signals[GET_ICON_IMAGES]
 		= g_signal_new ("get_icon_images",
 		                G_TYPE_FROM_CLASS (object_class),
 		                G_SIGNAL_RUN_LAST,
 		                G_STRUCT_OFFSET (NautilusIconContainerClass,
-						     get_icon_images),
+						 get_icon_images),
 		                NULL, NULL,
-		                eel_gtk_marshal_POINTER__POINTER_STRING_POINTER,
+		                eel_marshal_POINTER__POINTER_STRING_POINTER,
 		                GTK_TYPE_POINTER, 3,
-				  GTK_TYPE_POINTER,
-				  G_TYPE_STRING,
-				  GTK_TYPE_POINTER);
+				GTK_TYPE_POINTER,
+				G_TYPE_STRING,
+				GTK_TYPE_POINTER);
 	signals[GET_ICON_TEXT]
 		= g_signal_new ("get_icon_text",
 		                G_TYPE_FROM_CLASS (object_class),
 		                G_SIGNAL_RUN_LAST,
 		                G_STRUCT_OFFSET (NautilusIconContainerClass,
-						     get_icon_text),
+						 get_icon_text),
 		                NULL, NULL,
-		                eel_gtk_marshal_NONE__POINTER_STRING_STRING,
+		                eel_marshal_VOID__POINTER_STRING_STRING,
 		                G_TYPE_NONE, 3,
-				  GTK_TYPE_POINTER,
-				  G_TYPE_STRING,
-				  G_TYPE_STRING);
+				GTK_TYPE_POINTER,
+				G_TYPE_STRING,
+				G_TYPE_STRING);
 	signals[GET_ICON_URI]
 		= g_signal_new ("get_icon_uri",
 		                G_TYPE_FROM_CLASS (object_class),
 		                G_SIGNAL_RUN_LAST,
 		                G_STRUCT_OFFSET (NautilusIconContainerClass,
-						     get_icon_uri),
+						 get_icon_uri),
 		                NULL, NULL,
-		                eel_gtk_marshal_STRING__POINTER,
+		                eel_marshal_STRING__POINTER,
 		                G_TYPE_STRING, 1,
-				  GTK_TYPE_POINTER);
+				GTK_TYPE_POINTER);
 	signals[GET_ICON_DROP_TARGET_URI]
 		= g_signal_new ("get_icon_drop_target_uri",
 		                G_TYPE_FROM_CLASS (object_class),
 		                G_SIGNAL_RUN_LAST,
 		                G_STRUCT_OFFSET (NautilusIconContainerClass,
-						     get_icon_drop_target_uri),
+						 get_icon_drop_target_uri),
 		                NULL, NULL,
-		                eel_gtk_marshal_STRING__POINTER,
+		                eel_marshal_STRING__POINTER,
 		                G_TYPE_STRING, 1,
-				  GTK_TYPE_POINTER);
+				GTK_TYPE_POINTER);
 	signals[COMPARE_ICONS]
 		= g_signal_new ("compare_icons",
 		                G_TYPE_FROM_CLASS (object_class),
 		                G_SIGNAL_RUN_LAST,
 		                G_STRUCT_OFFSET (NautilusIconContainerClass,
-						     compare_icons),
+						 compare_icons),
 		                NULL, NULL,
-		                eel_gtk_marshal_INT__POINTER_POINTER,
+		                nautilus_marshal_INT__POINTER_POINTER,
 		                GTK_TYPE_INT, 2,
-				  GTK_TYPE_POINTER,
-				  GTK_TYPE_POINTER);
+				GTK_TYPE_POINTER,
+				GTK_TYPE_POINTER);
 	signals[COMPARE_ICONS_BY_NAME]
 		= g_signal_new ("compare_icons_by_name",
 		                G_TYPE_FROM_CLASS (object_class),
 		                G_SIGNAL_RUN_LAST,
 		                G_STRUCT_OFFSET (NautilusIconContainerClass,
-						     compare_icons_by_name),
+						 compare_icons_by_name),
 		                NULL, NULL,
-		                eel_gtk_marshal_INT__POINTER_POINTER,
+		                nautilus_marshal_INT__POINTER_POINTER,
 		                GTK_TYPE_INT, 2,
-				  GTK_TYPE_POINTER,
-				  GTK_TYPE_POINTER);
+				GTK_TYPE_POINTER,
+				GTK_TYPE_POINTER);
 	signals[MOVE_COPY_ITEMS] 
 		= g_signal_new ("move_copy_items",
 		                G_TYPE_FROM_CLASS (object_class),
 		                G_SIGNAL_RUN_LAST,
 		                G_STRUCT_OFFSET (NautilusIconContainerClass, 
-						     move_copy_items),
+						 move_copy_items),
 		                NULL, NULL,
-		                eel_gtk_marshal_NONE__POINTER_POINTER_POINTER_INT_INT_INT,
+		                nautilus_marshal_VOID__POINTER_POINTER_POINTER_INT_INT_INT,
 		                G_TYPE_NONE, 6,
-				  GTK_TYPE_POINTER,
-				  GTK_TYPE_POINTER,
-				  GTK_TYPE_POINTER,
-				  GTK_TYPE_INT,
-				  GTK_TYPE_INT,
-				  GTK_TYPE_INT);
+				GTK_TYPE_POINTER,
+				GTK_TYPE_POINTER,
+				GTK_TYPE_POINTER,
+				GTK_TYPE_INT,
+				GTK_TYPE_INT,
+				GTK_TYPE_INT);
 	signals[HANDLE_URI_LIST] 
 		= g_signal_new ("handle_uri_list",
 		                G_TYPE_FROM_CLASS (object_class),
@@ -3246,72 +3248,72 @@ nautilus_icon_container_class_init (NautilusIconContainerClass *class)
 		                G_STRUCT_OFFSET (NautilusIconContainerClass, 
 						     handle_uri_list),
 		                NULL, NULL,
-		                eel_gtk_marshal_NONE__POINTER_INT_INT_INT,
+		                nautilus_marshal_VOID__POINTER_INT_INT_INT,
 		                G_TYPE_NONE, 4,
-				  GTK_TYPE_POINTER,
-				  GTK_TYPE_INT,
-				  GTK_TYPE_INT,
-				  GTK_TYPE_INT);
+				GTK_TYPE_POINTER,
+				GTK_TYPE_INT,
+				GTK_TYPE_INT,
+				GTK_TYPE_INT);
 
 	signals[GET_CONTAINER_URI] 
 		= g_signal_new ("get_container_uri",
 		                G_TYPE_FROM_CLASS (object_class),
 		                G_SIGNAL_RUN_LAST,
 		                G_STRUCT_OFFSET (NautilusIconContainerClass, 
-						     get_container_uri),
+						 get_container_uri),
 		                NULL, NULL,
-		                eel_gtk_marshal_STRING__NONE,
+		                eel_marshal_STRING__VOID,
 		                G_TYPE_STRING, 0);
 	signals[CAN_ACCEPT_ITEM] 
 		= g_signal_new ("can_accept_item",
 		                G_TYPE_FROM_CLASS (object_class),
 		                G_SIGNAL_RUN_LAST,
 		                G_STRUCT_OFFSET (NautilusIconContainerClass, 
-						     can_accept_item),
+						 can_accept_item),
 		                NULL, NULL,
-		                eel_gtk_marshal_INT__POINTER_STRING,
+		                eel_marshal_INT__POINTER_STRING,
 		                GTK_TYPE_INT, 2,
-				  GTK_TYPE_POINTER,
-				  G_TYPE_STRING);
+				GTK_TYPE_POINTER,
+				G_TYPE_STRING);
 	signals[GET_STORED_ICON_POSITION]
 		= g_signal_new ("get_stored_icon_position",
 		                G_TYPE_FROM_CLASS (object_class),
 		                G_SIGNAL_RUN_LAST,
 		                G_STRUCT_OFFSET (NautilusIconContainerClass,
-						     get_stored_icon_position),
+						 get_stored_icon_position),
 		                NULL, NULL,
-		                eel_gtk_marshal_BOOL__POINTER_POINTER,
+		                eel_marshal_BOOLEAN__POINTER_POINTER,
 		                GTK_TYPE_BOOL, 2,
-				  GTK_TYPE_POINTER,
-				  GTK_TYPE_POINTER);
+				GTK_TYPE_POINTER,
+				GTK_TYPE_POINTER);
 	signals[LAYOUT_CHANGED]
 		= g_signal_new ("layout_changed",
 		                G_TYPE_FROM_CLASS (object_class),
 		                G_SIGNAL_RUN_LAST,
 		                G_STRUCT_OFFSET (NautilusIconContainerClass,
-						     layout_changed),
+						 layout_changed),
 		                NULL, NULL,
-		                gtk_marshal_NONE__NONE,
+		                gtk_marshal_VOID__VOID,
 		                G_TYPE_NONE, 0);
 	signals[PREVIEW]
 		= g_signal_new ("preview",
 		                G_TYPE_FROM_CLASS (object_class),
 		                G_SIGNAL_RUN_LAST,
 		                G_STRUCT_OFFSET (NautilusIconContainerClass,
-						     preview),
+						 preview),
 		                NULL, NULL,
-		                eel_gtk_marshal_INT__POINTER_INT,
+		                nautilus_marshal_INT__POINTER_INT,
 		                GTK_TYPE_INT, 2,
-				  GTK_TYPE_POINTER,
-				  GTK_TYPE_BOOL);
+				GTK_TYPE_POINTER,
+				GTK_TYPE_BOOL);
 	signals[BAND_SELECT_STARTED]
 		= g_signal_new ("band_select_started",
 		                G_TYPE_FROM_CLASS (object_class),
 		                G_SIGNAL_RUN_LAST,
 		                G_STRUCT_OFFSET (NautilusIconContainerClass,
-						     band_select_started),
+						 band_select_started),
 		                NULL, NULL,
-		                gtk_marshal_NONE__NONE,
+		                gtk_marshal_VOID__VOID,
 		                G_TYPE_NONE, 0);
 	signals[BAND_SELECT_ENDED]
 		= g_signal_new ("band_select_ended",
@@ -3320,7 +3322,7 @@ nautilus_icon_container_class_init (NautilusIconContainerClass *class)
 		                G_STRUCT_OFFSET (NautilusIconContainerClass,
 						     band_select_ended),
 		                NULL, NULL,
-		                gtk_marshal_NONE__NONE,
+		                gtk_marshal_VOID__VOID,
 		                G_TYPE_NONE, 0);
 
 	/* GtkWidget class.  */
@@ -3396,20 +3398,21 @@ nautilus_icon_container_init (NautilusIconContainer *container)
 	gtk_signal_connect_object_while_alive
 		(nautilus_icon_factory_get (),
 		 "icons_changed",
-		 nautilus_icon_container_request_update_all,
+		 G_CALLBACK (nautilus_icon_container_request_update_all),
 		 GTK_OBJECT (container));	
 
 	/* when the background changes, we must set up the label text color */
 	background = eel_get_widget_background (GTK_WIDGET (container));
 	
 	gtk_signal_connect
-		(GTK_OBJECT(background),
+		(GTK_OBJECT (background),
 		 "appearance_changed",
-		 update_label_color,
+		 G_CALLBACK (update_label_color),
 		 GTK_OBJECT (container));	
 
 
-	gtk_signal_connect (GTK_OBJECT (container), "focus-out-event", handle_focus_out_event, NULL);	
+	gtk_signal_connect (GTK_OBJECT (container), "focus-out-event",
+			    G_CALLBACK (handle_focus_out_event), NULL);	
 
 	/* FIXME: The code to extract colors from the theme should be in FMDirectoryView, not here.
 	 * The NautilusIconContainer class should simply provide calls to set the colors.
@@ -4793,12 +4796,13 @@ set_pending_icon_to_rename (NautilusIconContainer *container, NautilusIcon *icon
 	
 	if (cur_pending != NULL) {
 		gtk_signal_disconnect_by_func (GTK_OBJECT (cur_pending->item),
-					       &pending_icon_to_rename_destroy_callback,
+					       G_CALLBACK (pending_icon_to_rename_destroy_callback),
 					       container);
 	}
 	
 	if (icon != NULL) {
-		gtk_signal_connect (GTK_OBJECT (icon->item), "destroy", &pending_icon_to_rename_destroy_callback, container);
+		gtk_signal_connect (GTK_OBJECT (icon->item), "destroy",
+				    G_CALLBACK (pending_icon_to_rename_destroy_callback), container);
 	}
 	
 	container->details->pending_icon_to_rename = icon;
diff --git a/libnautilus-private/nautilus-icon-dnd.c b/libnautilus-private/nautilus-icon-dnd.c
index 82b79e1ec..97d3dbc2e 100644
--- a/libnautilus-private/nautilus-icon-dnd.c
+++ b/libnautilus-private/nautilus-icon-dnd.c
@@ -500,7 +500,7 @@ get_data_on_first_target_we_support (GtkWidget *widget, GdkDragContext *context,
 
 	for (target = context->targets; target != NULL; target = target->next) {
 		guint dummy_info;
-		GdkAtom target_atom = GPOINTER_TO_UINT (target->data);
+		GdkAtom target_atom = GDK_POINTER_TO_ATOM (target->data);
 
 		if (gtk_target_list_find (drop_types_list, 
 					  target_atom,
@@ -759,7 +759,7 @@ static gboolean
 confirm_switch_to_manual_layout (NautilusIconContainer *container)
 {
 	const char *message;
-	GnomeDialog *dialog;
+	GtkDialog *dialog;
 
 	/* FIXME bugzilla.gnome.org 40915: Use of the word "directory"
 	 * makes this FMIconView specific. Move these messages into
@@ -787,11 +787,11 @@ confirm_switch_to_manual_layout (NautilusIconContainer *container)
 	}
 
 	dialog = eel_show_yes_no_dialog (message, _("Switch to Manual Layout?"),
-					      _("Switch"), GNOME_STOCK_BUTTON_CANCEL,
-					      GTK_WINDOW (gtk_widget_get_ancestor 
-					 	    (GTK_WIDGET (container), GTK_TYPE_WINDOW)));
-
-	return gnome_dialog_run (dialog) == GNOME_OK;
+					 _("Switch"), GTK_RESPONSE_CANCEL,
+					 GTK_WINDOW (gtk_widget_get_ancestor 
+						     (GTK_WIDGET (container), GTK_TYPE_WINDOW)));
+	
+	return gtk_dialog_run (dialog) == GTK_RESPONSE_OK;
 }
 
 static void
diff --git a/libnautilus-private/nautilus-icon-text-item.h b/libnautilus-private/nautilus-icon-text-item.h
index dddd53794..017612b33 100644
--- a/libnautilus-private/nautilus-icon-text-item.h
+++ b/libnautilus-private/nautilus-icon-text-item.h
@@ -12,7 +12,6 @@
 
 #include <gtk/gtkeditable.h>
 #include <libgnomecanvas/gnome-canvas.h>
-#include <libgnomecanvas/gnome-icon-text.h>
 
 #define NAUTILUS_ICON_TEXT_ITEM(obj)     (GTK_CHECK_CAST((obj), \
         nautilus_icon_text_item_get_type (), NautilusIconTextItem))
@@ -40,7 +39,9 @@ typedef struct {
 	char *text;
 
 	/* Text layout information */
+#if GNOME2_CONVERSION_COMPLETE
 	GnomeIconTextInfo *ti;
+#endif
 
 	/* Whether the text is being edited */
 	unsigned int editing : 1;
diff --git a/libnautilus-private/nautilus-marshal.list b/libnautilus-private/nautilus-marshal.list
new file mode 100644
index 000000000..06cf87525
--- /dev/null
+++ b/libnautilus-private/nautilus-marshal.list
@@ -0,0 +1,7 @@
+BOOLEAN:POINTER
+INT:POINTER,INT
+INT:POINTER,POINTER
+VOID:POINTER,INT,INT,INT
+VOID:POINTER,POINTER
+VOID:POINTER,POINTER
+VOID:POINTER,POINTER,POINTER,INT,INT,INT
diff --git a/src/nautilus-view-frame.c b/src/nautilus-view-frame.c
index b2b412ff4..bf8b0b40a 100644
--- a/src/nautilus-view-frame.c
+++ b/src/nautilus-view-frame.c
@@ -187,7 +187,7 @@ nautilus_view_frame_class_init (NautilusViewFrameClass *klass)
 		 G_STRUCT_OFFSET (NautilusViewFrameClass, 
 				    get_history_list),
 		 NULL, NULL,
-		 eel_gtk_marshal_POINTER__NONE,
+		 eel_marshal_POINTER__NONE,
 		 GTK_TYPE_POINTER, 0);
 	signals[GO_BACK] = g_signal_new
 		("go_back",
diff --git a/src/nautilus-zoom-control.c b/src/nautilus-zoom-control.c
index 82ad3185a..7fc213665 100644
--- a/src/nautilus-zoom-control.c
+++ b/src/nautilus-zoom-control.c
@@ -159,7 +159,7 @@ nautilus_zoom_control_class_init (NautilusZoomControlClass *zoom_control_class)
 		              G_STRUCT_OFFSET (NautilusZoomControlClass, 
 						   zoom_to_level),
 		              NULL, NULL,
-		              eel_gtk_marshal_NONE__DOUBLE,
+		              eel_marshal_NONE__DOUBLE,
 		              G_TYPE_NONE,
 				1,
 				GTK_TYPE_DOUBLE);