Commit 93359a3e authored by Darin Adler's avatar Darin Adler

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.
parent 5abcc199
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> 2001-10-28 Darin Adler <darin@bentspoon.com>
* Lots of files: * Lots of files:
......
...@@ -89,7 +89,7 @@ nautilus_adapter_load_strategy_class_init (NautilusAdapterLoadStrategyClass *kla ...@@ -89,7 +89,7 @@ nautilus_adapter_load_strategy_class_init (NautilusAdapterLoadStrategyClass *kla
G_SIGNAL_RUN_LAST, G_SIGNAL_RUN_LAST,
G_STRUCT_OFFSET (NautilusAdapterLoadStrategyClass, report_load_progress), G_STRUCT_OFFSET (NautilusAdapterLoadStrategyClass, report_load_progress),
NULL, NULL, NULL, NULL,
eel_gtk_marshal_NONE__DOUBLE, eel_marshal_NONE__DOUBLE,
G_TYPE_NONE, 1, GTK_TYPE_DOUBLE); G_TYPE_NONE, 1, GTK_TYPE_DOUBLE);
signals[REPORT_LOAD_COMPLETE] = signals[REPORT_LOAD_COMPLETE] =
g_signal_new ("report_load_complete", g_signal_new ("report_load_complete",
......
...@@ -131,6 +131,8 @@ AC_SUBST(LIBNAUTILUS_PRIVATE_LIBS) ...@@ -131,6 +131,8 @@ AC_SUBST(LIBNAUTILUS_PRIVATE_LIBS)
LIBNAUTILUS_PRIVATE_IDL_INCLUDES="`$PKG_CONFIG --variable=idldir $LIBNAUTILUS_PRIVATE_MODULES | $srcdir/add-include-prefix`" LIBNAUTILUS_PRIVATE_IDL_INCLUDES="`$PKG_CONFIG --variable=idldir $LIBNAUTILUS_PRIVATE_MODULES | $srcdir/add-include-prefix`"
AC_SUBST(LIBNAUTILUS_PRIVATE_IDL_INCLUDES) AC_SUBST(LIBNAUTILUS_PRIVATE_IDL_INCLUDES)
AC_PATH_PROG(GLIB_GENMARSHAL, glib-genmarshal)
dnl ==================================== dnl ====================================
dnl = Begin profiling support dnl = Begin profiling support
dnl ==================================== dnl ====================================
......
...@@ -9,3 +9,5 @@ nautilus-metafile-server-skels.c ...@@ -9,3 +9,5 @@ nautilus-metafile-server-skels.c
nautilus-metafile-server-stubs.c nautilus-metafile-server-stubs.c
nautilus-metafile-server.h nautilus-metafile-server.h
nautilus_metafile_server_idl_stamp nautilus_metafile_server_idl_stamp
nautilus-marshal.c
nautilus-marshal.h
...@@ -35,138 +35,144 @@ nautilus_metafile_server_idl_sources = \ ...@@ -35,138 +35,144 @@ nautilus_metafile_server_idl_sources = \
nautilus-metafile-server-common.c \ nautilus-metafile-server-common.c \
$(NULL) $(NULL)
marshal_sources = \
nautilus-marshal.h \
nautilus-marshal.c \
$(NULL)
libnautilus_private_la_SOURCES = \ libnautilus_private_la_SOURCES = \
$(nautilus_metafile_server_idl_sources) \ $(nautilus_metafile_server_idl_sources) \
nautilus-audio-player.c \ 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-audio-player.h \
nautilus-authn-manager.c \
nautilus-authn-manager.h \
nautilus-bonobo-extensions.c \
nautilus-bonobo-extensions.h \ nautilus-bonobo-extensions.h \
nautilus-bookmark.c \
nautilus-bookmark.h \ nautilus-bookmark.h \
nautilus-cdrom-extensions.h \ nautilus-cdrom-extensions.h \
nautilus-customization-data.c \
nautilus-customization-data.h \ nautilus-customization-data.h \
nautilus-default-file-icon.c \
nautilus-default-file-icon.h \ nautilus-default-file-icon.h \
nautilus-desktop-file-loader.c \
nautilus-desktop-file-loader.h \ nautilus-desktop-file-loader.h \
nautilus-directory-async.c \
nautilus-directory-background.c \
nautilus-directory-background.h \ nautilus-directory-background.h \
nautilus-directory-metafile-monitor.c \
nautilus-directory-metafile-monitor.h \ nautilus-directory-metafile-monitor.h \
nautilus-directory-metafile.c \
nautilus-directory-metafile.h \ nautilus-directory-metafile.h \
nautilus-directory-notify.h \ nautilus-directory-notify.h \
nautilus-directory-private.h \ nautilus-directory-private.h \
nautilus-directory.c \
nautilus-directory.h \ nautilus-directory.h \
nautilus-drag-window.c \
nautilus-drag-window.h \ nautilus-drag-window.h \
nautilus-druid-page-eazel.h \ nautilus-druid-page-eazel.h \
nautilus-druid.h \ nautilus-druid.h \
nautilus-entry.c \
nautilus-entry.h \ nautilus-entry.h \
nautilus-file-attributes.h \ nautilus-file-attributes.h \
nautilus-file-changes-queue.c \
nautilus-file-changes-queue.h \ nautilus-file-changes-queue.h \
nautilus-file-dnd.c \
nautilus-file-dnd.h \ nautilus-file-dnd.h \
nautilus-file-operations-progress.c \
nautilus-file-operations-progress.h \ nautilus-file-operations-progress.h \
nautilus-file-operations.c \
nautilus-file-operations.h \ nautilus-file-operations.h \
nautilus-file-private.h \ nautilus-file-private.h \
nautilus-file-queue.c \
nautilus-file-queue.h \
nautilus-file-utilities.c \
nautilus-file-utilities.h \ nautilus-file-utilities.h \
nautilus-file.c \
nautilus-file.h \ nautilus-file.h \
nautilus-file-queue.h \ nautilus-find-icon-image.c \
nautilus-find-icon-image.h \ nautilus-find-icon-image.h \
nautilus-font-factory.c \
nautilus-font-factory.h \ nautilus-font-factory.h \
nautilus-global-preferences.c \
nautilus-global-preferences.h \ nautilus-global-preferences.h \
nautilus-horizontal-splitter.c \
nautilus-horizontal-splitter.h \ nautilus-horizontal-splitter.h \
nautilus-icon-canvas-item.c \
nautilus-icon-canvas-item.h \ nautilus-icon-canvas-item.h \
nautilus-icon-container.c \
nautilus-icon-container.h \ nautilus-icon-container.h \
nautilus-icon-dnd.c \
nautilus-icon-dnd.h \ nautilus-icon-dnd.h \
nautilus-icon-factory-private.h \ nautilus-icon-factory-private.h \
nautilus-icon-factory.c \
nautilus-icon-factory.h \ nautilus-icon-factory.h \
nautilus-icon-private.h \ nautilus-icon-private.h \
nautilus-icon-text-item.c \
nautilus-icon-text-item.h \ nautilus-icon-text-item.h \
nautilus-iso9660.h \ nautilus-iso9660.h \
nautilus-keep-last-vertical-box.c \
nautilus-keep-last-vertical-box.h \ nautilus-keep-last-vertical-box.h \
nautilus-lib-self-check-functions.c \
nautilus-lib-self-check-functions.h \ nautilus-lib-self-check-functions.h \
nautilus-link-set.h \ nautilus-link-desktop-file.c \
nautilus-link.h \
nautilus-link-desktop-file.h \ nautilus-link-desktop-file.h \
nautilus-link-historical.c \
nautilus-link-historical.h \ 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-medusa-support.h \
nautilus-merged-directory.c \
nautilus-merged-directory.h \ nautilus-merged-directory.h \
nautilus-metadata.h \ nautilus-metadata.h \
nautilus-metafile-factory.c \
nautilus-metafile-factory.h \ nautilus-metafile-factory.h \
nautilus-metafile.c \
nautilus-metafile.h \ nautilus-metafile.h \
nautilus-mime-actions.c \
nautilus-mime-actions.h \ nautilus-mime-actions.h \
nautilus-monitor.c \
nautilus-monitor.h \ nautilus-monitor.h \
nautilus-program-chooser.c \
nautilus-program-chooser.h \ nautilus-program-chooser.h \
nautilus-program-choosing.c \
nautilus-program-choosing.h \ nautilus-program-choosing.h \
nautilus-search-uri.c \
nautilus-search-uri.h \ nautilus-search-uri.h \
nautilus-sidebar-functions.c \
nautilus-sidebar-functions.h \ nautilus-sidebar-functions.h \
nautilus-sound.c \
nautilus-sound.h \ nautilus-sound.h \
nautilus-theme.c \
nautilus-theme.h \ nautilus-theme.h \
nautilus-thumbnails.h \ nautilus-thumbnails-jpeg.c \
nautilus-thumbnails-jpeg.h \ nautilus-thumbnails-jpeg.h \
nautilus-thumbnails.c \
nautilus-thumbnails.h \
nautilus-trash-directory.c \
nautilus-trash-directory.h \ nautilus-trash-directory.h \
nautilus-trash-file.c \
nautilus-trash-file.h \ nautilus-trash-file.h \
nautilus-trash-monitor.c \
nautilus-trash-monitor.h \ nautilus-trash-monitor.h \
nautilus-undo-context.c \
nautilus-undo-context.h \ nautilus-undo-context.h \
nautilus-undo-manager.c \
nautilus-undo-manager.h \ nautilus-undo-manager.h \
nautilus-undo-signal-handlers.c \
nautilus-undo-signal-handlers.h \ nautilus-undo-signal-handlers.h \
nautilus-vfs-directory.c \
nautilus-vfs-directory.h \ nautilus-vfs-directory.h \
nautilus-vfs-file.c \
nautilus-vfs-file.h \ nautilus-vfs-file.h \
nautilus-view-identifier.c \
nautilus-view-identifier.h \ nautilus-view-identifier.h \
nautilus-volume-monitor.c \
nautilus-volume-monitor.h \ nautilus-volume-monitor.h \
nautilus-authn-manager.h \
$(NULL) $(NULL)
fsattributesdir = $(datadir)/nautilus fsattributesdir = $(datadir)/nautilus
...@@ -179,20 +185,23 @@ nautilus_metafile_server_idl_stamp: nautilus-metafile-server.idl $(ORBIT_IDL) ...@@ -179,20 +185,23 @@ nautilus_metafile_server_idl_stamp: nautilus-metafile-server.idl $(ORBIT_IDL)
$(ORBIT_IDL) -I$(top_srcdir) $(LIBNAUTILUS_PRIVATE_IDL_INCLUDES) $< $(ORBIT_IDL) -I$(top_srcdir) $(LIBNAUTILUS_PRIVATE_IDL_INCLUDES) $<
touch $@ 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 = \ EXTRA_DIST = \
$(fsattributes_DATA) \ $(fsattributes_DATA) \
nautilus-metafile-server.idl \ nautilus-metafile-server.idl \
$(NULL) nautilus-marshal.list \
BUILT_SOURCES = \
$(nautilus_metafile_server_idl_sources) \
$(NULL) $(NULL)
CLEANFILES = \ CLEANFILES = \
$(nautilus_metafile_server_idl_sources) \ $(nautilus_metafile_server_idl_sources) \
nautilus_metafile_server_idl_stamp \ nautilus_metafile_server_idl_stamp \
$(marshal_sources) \
$(NULL) $(NULL)
dist-hook: dist-hook:
......
...@@ -57,8 +57,10 @@ static gboolean nautilus_horizontal_splitter_motion (GtkWidget ...@@ -57,8 +57,10 @@ static gboolean nautilus_horizontal_splitter_motion (GtkWidget
static void nautilus_horizontal_splitter_destroy (GtkObject *object); static void nautilus_horizontal_splitter_destroy (GtkObject *object);
/* GtkWidgetClass methods */ /* GtkWidgetClass methods */
#if GNOME2_CONVERSION_COMPLETE
static void nautilus_horizontal_splitter_draw (GtkWidget *widget, static void nautilus_horizontal_splitter_draw (GtkWidget *widget,
GdkRectangle *area); GdkRectangle *area);
#endif
EEL_DEFINE_CLASS_BOILERPLATE (NautilusHorizontalSplitter, EEL_DEFINE_CLASS_BOILERPLATE (NautilusHorizontalSplitter,
nautilus_horizontal_splitter, nautilus_horizontal_splitter,
...@@ -78,7 +80,9 @@ nautilus_horizontal_splitter_class_init (NautilusHorizontalSplitterClass *horizo ...@@ -78,7 +80,9 @@ nautilus_horizontal_splitter_class_init (NautilusHorizontalSplitterClass *horizo
object_class->destroy = nautilus_horizontal_splitter_destroy; object_class->destroy = nautilus_horizontal_splitter_destroy;
/* GtkWidgetClass */ /* GtkWidgetClass */
#if GNOME2_CONVERSION_COMPLETE
widget_class->draw = nautilus_horizontal_splitter_draw; widget_class->draw = nautilus_horizontal_splitter_draw;
#endif
widget_class->button_press_event = nautilus_horizontal_splitter_button_press; widget_class->button_press_event = nautilus_horizontal_splitter_button_press;
widget_class->button_release_event = nautilus_horizontal_splitter_button_release; widget_class->button_release_event = nautilus_horizontal_splitter_button_release;
widget_class->motion_notify_event = nautilus_horizontal_splitter_motion; widget_class->motion_notify_event = nautilus_horizontal_splitter_motion;
...@@ -106,6 +110,8 @@ nautilus_horizontal_splitter_destroy (GtkObject *object) ...@@ -106,6 +110,8 @@ nautilus_horizontal_splitter_destroy (GtkObject *object)
EEL_CALL_PARENT (GTK_OBJECT_CLASS, destroy, (object)); EEL_CALL_PARENT (GTK_OBJECT_CLASS, destroy, (object));
} }
#if GNOME2_CONVERSION_COMPLETE
static void static void
draw_resize_bar (GtkWidget *widget, draw_resize_bar (GtkWidget *widget,
GdkWindow *window, GdkWindow *window,
...@@ -266,6 +272,8 @@ nautilus_horizontal_splitter_draw (GtkWidget *widget, ...@@ -266,6 +272,8 @@ nautilus_horizontal_splitter_draw (GtkWidget *widget,
} }
} }
#endif
void void
nautilus_horizontal_splitter_expand (NautilusHorizontalSplitter *splitter) nautilus_horizontal_splitter_expand (NautilusHorizontalSplitter *splitter)
{ {
......
...@@ -32,7 +32,6 @@ ...@@ -32,7 +32,6 @@
#include <gdk-pixbuf/gdk-pixbuf.h> #include <gdk-pixbuf/gdk-pixbuf.h>
#include <libgnome/gnome-i18n.h> #include <libgnome/gnome-i18n.h>
#include <libgnomecanvas/gnome-canvas-util.h> #include <libgnomecanvas/gnome-canvas-util.h>
#include <libgnomecanvas/gnome-icon-text.h>
#include <libart_lgpl/art_rgb.h> #include <libart_lgpl/art_rgb.h>
#include <libart_lgpl/art_rgb_affine.h> #include <libart_lgpl/art_rgb_affine.h>
#include <libart_lgpl/art_rgb_rgba_affine.h> #include <libart_lgpl/art_rgb_rgba_affine.h>
...@@ -705,6 +704,8 @@ nautilus_icon_canvas_item_update (GnomeCanvasItem *item, ...@@ -705,6 +704,8 @@ nautilus_icon_canvas_item_update (GnomeCanvasItem *item,
/* routine to underline the text in a gnome_icon_text structure */ /* routine to underline the text in a gnome_icon_text structure */
#if GNOME2_CONVERSION_COMPLETE
static void static void
gnome_icon_underline_text (GnomeIconTextInfo *text_info, gnome_icon_underline_text (GnomeIconTextInfo *text_info,
GdkDrawable *drawable, GdkDrawable *drawable,
...@@ -731,6 +732,8 @@ gnome_icon_underline_text (GnomeIconTextInfo *text_info, ...@@ -731,6 +732,8 @@ gnome_icon_underline_text (GnomeIconTextInfo *text_info,
} }
} }
#endif
static gboolean static gboolean
in_single_click_mode (void) in_single_click_mode (void)
{ {
...@@ -758,8 +761,11 @@ draw_or_measure_label_text (NautilusIconCanvasItem *item, ...@@ -758,8 +761,11 @@ draw_or_measure_label_text (NautilusIconCanvasItem *item,
guint32 label_color; guint32 label_color;
GnomeCanvasItem *canvas_item; GnomeCanvasItem *canvas_item;
int max_text_width; 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; GnomeIconTextInfo *icon_text_info;
#endif
char **pieces; char **pieces;
const char *text_piece; const char *text_piece;
int i; int i;
...@@ -854,6 +860,7 @@ draw_or_measure_label_text (NautilusIconCanvasItem *item, ...@@ -854,6 +860,7 @@ draw_or_measure_label_text (NautilusIconCanvasItem *item,
text_piece = " "; text_piece = " ";
} }
#ifdef GNOME2_CONVERSION_COMPLETE
icon_text_info = gnome_icon_layout_text icon_text_info = gnome_icon_layout_text
(details->font, text_piece, (details->font, text_piece,
LINE_BREAK_CHARACTERS, LINE_BREAK_CHARACTERS,
...@@ -897,6 +904,7 @@ draw_or_measure_label_text (NautilusIconCanvasItem *item, ...@@ -897,6 +904,7 @@ draw_or_measure_label_text (NautilusIconCanvasItem *item,
height_so_far += icon_text_info->height; height_so_far += icon_text_info->height;
gnome_icon_text_info_free (icon_text_info); gnome_icon_text_info_free (icon_text_info);
#endif
} }
g_strfreev (pieces); g_strfreev (pieces);
......
...@@ -32,6 +32,7 @@ ...@@ -32,6 +32,7 @@
#include "nautilus-icon-private.h" #include "nautilus-icon-private.h"
#include "nautilus-icon-text-item.h" #include "nautilus-icon-text-item.h"
#include "nautilus-lib-self-check-functions.h" #include "nautilus-lib-self-check-functions.h"
#include "nautilus-marshal.h"
#include "nautilus-theme.h" #include "nautilus-theme.h"
#include <ctype.h> #include <ctype.h>
#include <eel/eel-background.h> #include <eel/eel-background.h>
...@@ -41,6 +42,7 @@ ...@@ -41,6 +42,7 @@
#include <eel/eel-gnome-extensions.h> #include <eel/eel-gnome-extensions.h>
#include <eel/eel-gtk-extensions.h> #include <eel/eel-gtk-extensions.h>
#include <eel/eel-gtk-macros.h> #include <eel/eel-gtk-macros.h>
#include <eel/eel-marshal.h>
#include <eel/eel-string.h> #include <eel/eel-string.h>
#include <libgnomecanvas/gnome-canvas-pixbuf.h> #include <libgnomecanvas/gnome-canvas-pixbuf.h>
#include <gdk/gdkkeysyms.h> #include <gdk/gdkkeysyms.h>
...@@ -442,13 +444,13 @@ set_pending_icon_to_reveal (NautilusIconContainer *container, NautilusIcon *icon ...@@ -442,13 +444,13 @@ set_pending_icon_to_reveal (NautilusIconContainer *container, NautilusIcon *icon
if (cur_pending != NULL) { if (cur_pending != NULL) {
gtk_signal_disconnect_by_func (GTK_OBJECT (cur_pending->item), 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); container);
} }
if (icon != NULL) { if (icon != NULL) {
gtk_signal_connect (GTK_OBJECT (icon->item), "destroy", 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; container->details->pending_icon_to_reveal = icon;
...@@ -3052,28 +3054,28 @@ nautilus_icon_container_class_init (NautilusIconContainerClass *class) ...@@ -3052,28 +3054,28 @@ nautilus_icon_container_class_init (NautilusIconContainerClass *class)
G_TYPE_FROM_CLASS (object_class), G_TYPE_FROM_CLASS (object_class),
G_SIGNAL_RUN_LAST, G_SIGNAL_RUN_LAST,
G_STRUCT_OFFSET (NautilusIconContainerClass, G_STRUCT_OFFSET (NautilusIconContainerClass,
selection_changed), selection_changed),
NULL, NULL, NULL, NULL,
gtk_marshal_NONE__NONE, gtk_marshal_VOID__VOID,
G_TYPE_NONE, 0); G_TYPE_NONE, 0);
signals[BUTTON_PRESS] signals[BUTTON_PRESS]
= g_signal_new ("button_press", = g_signal_new ("button_press",
G_TYPE_FROM_CLASS (object_class), G_TYPE_FROM_CLASS (object_class),
G_SIGNAL_RUN_LAST, G_SIGNAL_RUN_LAST,
G_STRUCT_OFFSET (NautilusIconContainerClass, G_STRUCT_OFFSET (NautilusIconContainerClass,
button_press), button_press),
NULL, NULL, NULL, NULL,
gtk_marshal_BOOL__POINTER, nautilus_marshal_BOOLEAN__POINTER,
GTK_TYPE_BOOL, 1, GTK_TYPE_BOOL, 1,
GDK_TYPE_EVENT); GDK_TYPE_EVENT);
signals[ACTIVATE] signals[ACTIVATE]
= g_signal_new ("activate", = g_signal_new ("activate",
G_TYPE_FROM_CLASS (object_class), G_TYPE_FROM_CLASS (object_class),
G_SIGNAL_RUN_LAST, G_SIGNAL_RUN_LAST,
G_STRUCT_OFFSET (NautilusIconContainerClass, G_STRUCT_OFFSET (NautilusIconContainerClass,
activate), activate),
NULL, NULL, NULL, NULL,
gtk_marshal_NONE__POINTER, gtk_marshal_VOID__POINTER,
G_TYPE_NONE, 1, G_TYPE_NONE, 1,
GTK_TYPE_POINTER); GTK_TYPE_POINTER);
signals[CONTEXT_CLICK_SELECTION] signals[CONTEXT_CLICK_SELECTION]
...@@ -3081,9 +3083,9 @@ nautilus_icon_container_class_init (NautilusIconContainerClass *class) ...@@ -3081,9 +3083,9 @@ nautilus_icon_container_class_init (NautilusIconContainerClass *class)
G_TYPE_FROM_CLASS (object_class), G_TYPE_FROM_CLASS (object_class),
G_SIGNAL_RUN_LAST, G_SIGNAL_RUN_LAST,
G_STRUCT_OFFSET (NautilusIconContainerClass, G_STRUCT_OFFSET (NautilusIconContainerClass,
context_click_selection), context_click_selection),
NULL, NULL, NULL, NULL,
gtk_marshal_NONE__POINTER, gtk_marshal_VOID__POINTER,
G_TYPE_NONE, 1, G_TYPE_NONE, 1,
GTK_TYPE_POINTER); GTK_TYPE_POINTER);
signals[CONTEXT_CLICK_BACKGROUND] signals[CONTEXT_CLICK_BACKGROUND]
...@@ -3091,53 +3093,53 @@ nautilus_icon_container_class_init (NautilusIconContainerClass *class) ...@@ -3091,53 +3093,53 @@ nautilus_icon_container_class_init (NautilusIconContainerClass *class)
G_TYPE_FROM_CLASS (object_class), G_TYPE_FROM_CLASS (object_class),
G_SIGNAL_RUN_LAST, G_SIGNAL_RUN_LAST,
G_STRUCT_OFFSET (NautilusIconContainerClass, G_STRUCT_OFFSET (NautilusIconContainerClass,
context_click_background), context_click_background),
NULL, NULL, NULL, NULL,
gtk_marshal_NONE__POINTER, gtk_marshal_VOID__POINTER,
G_TYPE_NONE, 1, G_TYPE_NONE, 1,
GTK_TYPE_POINTER); GTK_TYPE_POINTER);
signals[MIDDLE_CLICK] signals[MIDDLE_CLICK]
= g_signal_new ("middle_click", = g_signal_new ("middle_click",
G_TYPE_FROM_CLASS (object_class), G_TYPE_FROM_CLASS (object_class),
G_SIGNAL_RUN_LAST, G_SIGNAL_RUN_LAST,
G_STRUCT_OFFSET (NautilusIconContainerClass, G_STRUCT_OFFSET (NautilusIconContainerClass,
middle_click), middle_click),
NULL, NULL, NULL, NULL,
gtk_marshal_NONE__POINTER, gtk_marshal_VOID__POINTER,
G_TYPE_NONE, 1, G_TYPE_NONE, 1,
GTK_TYPE_POINTER); GTK_TYPE_POINTER);
signals[ICON_POSITION_CHANGED] signals[ICON_POSITION_CHANGED]
= g_signal_new ("icon_position_changed", = g_signal_new ("icon_position_changed",
G_TYPE_FROM_CLASS (object_class), G_TYPE_FROM_CLASS (object_class),
G_SIGNAL_RUN_LAST, G_SIGNAL_RUN_LAST,
G_STRUCT_OFFSET (NautilusIconContainerClass, G_STRUCT_OFFSET (NautilusIconContainerClass,
icon_position_changed), icon_position_changed),
NULL, NULL, NULL, NULL,
gtk_marshal_NONE__POINTER_POINTER, nautilus_marshal_VOID__POINTER_POINTER,
G_TYPE_NONE, 2, G_TYPE_NONE, 2,
GTK_TYPE_POINTER, GTK_TYPE_POINTER,
GTK_TYPE_POINTER); GTK_TYPE_POINTER);
signals[ICON_TEXT_CHANGED] signals[ICON_TEXT_CHANGED]
= g_signal_new ("icon_text_changed", = g_signal_new ("icon_text_changed",
G_TYPE_FROM_CLASS (object_class),