diff options
| author | Darin Adler <darin@src.gnome.org> | 2001-10-28 20:21:52 +0000 |
|---|---|---|
| committer | Darin Adler <darin@src.gnome.org> | 2001-10-28 20:21:52 +0000 |
| commit | 5abcc1995419a91bebe2e42a5218a374e36533c3 (patch) | |
| tree | 2f6c9699dc992039a973b0bd058aebfa2d820669 /libnautilus-private/nautilus-merged-directory.c | |
| parent | b36a91ca55636af4137615a88c6e70a6dffe7802 (diff) | |
| download | nautilus-5abcc1995419a91bebe2e42a5218a374e36533c3.tar.gz | |
More GNOME 2 work. We now compile up to libnautilus-private and I'm
* Lots of files:
More GNOME 2 work. We now compile up to libnautilus-private and
I'm working my way through the files in there. Also changed all
the initialize_class and initialize to class_init and init.
Diffstat (limited to 'libnautilus-private/nautilus-merged-directory.c')
| -rw-r--r-- | libnautilus-private/nautilus-merged-directory.c | 36 |
1 files changed, 18 insertions, 18 deletions
diff --git a/libnautilus-private/nautilus-merged-directory.c b/libnautilus-private/nautilus-merged-directory.c index 5cff8e9b0..c641c32ee 100644 --- a/libnautilus-private/nautilus-merged-directory.c +++ b/libnautilus-private/nautilus-merged-directory.c @@ -68,9 +68,9 @@ enum { static guint signals[LAST_SIGNAL]; -static void nautilus_merged_directory_initialize (gpointer object, +static void nautilus_merged_directory_init (gpointer object, gpointer klass); -static void nautilus_merged_directory_initialize_class (gpointer klass); +static void nautilus_merged_directory_class_init (gpointer klass); static void remove_all_real_directories (NautilusMergedDirectory *merged); static guint merged_callback_hash (gconstpointer merged_callback); static gboolean merged_callback_equal (gconstpointer merged_callback, @@ -81,7 +81,7 @@ EEL_DEFINE_CLASS_BOILERPLATE (NautilusMergedDirectory, NAUTILUS_TYPE_DIRECTORY) static void -nautilus_merged_directory_initialize (gpointer object, gpointer klass) +nautilus_merged_directory_init (gpointer object, gpointer klass) { NautilusMergedDirectory *merged; @@ -622,7 +622,7 @@ remove_all_real_directories (NautilusMergedDirectory *merged) } static void -nautilus_merged_directory_initialize_class (gpointer klass) +nautilus_merged_directory_class_init (gpointer klass) { GtkObjectClass *object_class; NautilusDirectoryClass *directory_class; @@ -647,21 +647,21 @@ nautilus_merged_directory_initialize_class (gpointer klass) merged_directory_class->remove_real_directory = merged_remove_real_directory; signals[ADD_REAL_DIRECTORY] - = gtk_signal_new ("add_real_directory", - GTK_RUN_LAST, - object_class->type, - GTK_SIGNAL_OFFSET (NautilusMergedDirectoryClass, + = g_signal_new ("add_real_directory", + G_TYPE_FROM_CLASS (object_class), + G_SIGNAL_RUN_LAST, + G_STRUCT_OFFSET (NautilusMergedDirectoryClass, add_real_directory), - gtk_marshal_NONE__POINTER, - GTK_TYPE_NONE, 1, GTK_TYPE_POINTER); + NULL, NULL, + gtk_marshal_NONE__POINTER, + G_TYPE_NONE, 1, GTK_TYPE_POINTER); signals[REMOVE_REAL_DIRECTORY] - = gtk_signal_new ("remove_real_directory", - GTK_RUN_LAST, - object_class->type, - GTK_SIGNAL_OFFSET (NautilusMergedDirectoryClass, + = g_signal_new ("remove_real_directory", + G_TYPE_FROM_CLASS (object_class), + G_SIGNAL_RUN_LAST, + G_STRUCT_OFFSET (NautilusMergedDirectoryClass, remove_real_directory), - gtk_marshal_NONE__POINTER, - GTK_TYPE_NONE, 1, GTK_TYPE_POINTER); - - gtk_object_class_add_signals (object_class, signals, LAST_SIGNAL); + NULL, NULL, + gtk_marshal_NONE__POINTER, + G_TYPE_NONE, 1, GTK_TYPE_POINTER); } |