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-trash-monitor.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-trash-monitor.c')
| -rw-r--r-- | libnautilus-private/nautilus-trash-monitor.c | 32 |
1 files changed, 16 insertions, 16 deletions
diff --git a/libnautilus-private/nautilus-trash-monitor.c b/libnautilus-private/nautilus-trash-monitor.c index 64da6584d..a53c3dc33 100644 --- a/libnautilus-private/nautilus-trash-monitor.c +++ b/libnautilus-private/nautilus-trash-monitor.c @@ -51,15 +51,15 @@ enum { static guint signals[LAST_SIGNAL]; static NautilusTrashMonitor *nautilus_trash_monitor; -static void nautilus_trash_monitor_initialize_class (NautilusTrashMonitorClass *klass); -static void nautilus_trash_monitor_initialize (gpointer object, +static void nautilus_trash_monitor_class_init (NautilusTrashMonitorClass *klass); +static void nautilus_trash_monitor_init (gpointer object, gpointer klass); static void destroy (GtkObject *object); EEL_DEFINE_CLASS_BOILERPLATE (NautilusTrashMonitor, nautilus_trash_monitor, GTK_TYPE_OBJECT) static void -nautilus_trash_monitor_initialize_class (NautilusTrashMonitorClass *klass) +nautilus_trash_monitor_class_init (NautilusTrashMonitorClass *klass) { GtkObjectClass *object_class; @@ -67,25 +67,25 @@ nautilus_trash_monitor_initialize_class (NautilusTrashMonitorClass *klass) object_class->destroy = destroy; - signals[TRASH_STATE_CHANGED] = gtk_signal_new + signals[TRASH_STATE_CHANGED] = g_signal_new ("trash_state_changed", - GTK_RUN_LAST, - object_class->type, - GTK_SIGNAL_OFFSET (NautilusTrashMonitorClass, trash_state_changed), + G_TYPE_FROM_CLASS (object_class), + G_SIGNAL_RUN_LAST, + G_STRUCT_OFFSET (NautilusTrashMonitorClass, trash_state_changed), + NULL, NULL, gtk_marshal_NONE__BOOL, - GTK_TYPE_NONE, 1, + G_TYPE_NONE, 1, GTK_TYPE_BOOL); - signals[CHECK_TRASH_DIRECTORY_ADDED] = gtk_signal_new + signals[CHECK_TRASH_DIRECTORY_ADDED] = g_signal_new ("check_trash_directory_added", - GTK_RUN_LAST, - object_class->type, - GTK_SIGNAL_OFFSET (NautilusTrashMonitorClass, check_trash_directory_added), + G_TYPE_FROM_CLASS (object_class), + G_SIGNAL_RUN_LAST, + G_STRUCT_OFFSET (NautilusTrashMonitorClass, check_trash_directory_added), + NULL, NULL, gtk_marshal_NONE__POINTER, - GTK_TYPE_NONE, 1, + G_TYPE_NONE, 1, GTK_TYPE_POINTER); - - gtk_object_class_add_signals (object_class, signals, LAST_SIGNAL); } static void @@ -119,7 +119,7 @@ nautilus_trash_files_changed_callback (NautilusDirectory *directory, GList *file } static void -nautilus_trash_monitor_initialize (gpointer object, gpointer klass) +nautilus_trash_monitor_init (gpointer object, gpointer klass) { NautilusDirectory *trash_directory; NautilusTrashMonitor *trash_monitor; |