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 /src/nautilus-information-panel.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 'src/nautilus-information-panel.c')
| -rw-r--r-- | src/nautilus-information-panel.c | 27 |
1 files changed, 13 insertions, 14 deletions
diff --git a/src/nautilus-information-panel.c b/src/nautilus-information-panel.c index 54fd49b44..1ba30d262 100644 --- a/src/nautilus-information-panel.c +++ b/src/nautilus-information-panel.c @@ -94,8 +94,8 @@ struct NautilusSidebarDetails { /* button assignments */ #define CONTEXTUAL_MENU_BUTTON 3 -static void nautilus_sidebar_initialize_class (GtkObjectClass *object_klass); -static void nautilus_sidebar_initialize (GtkObject *object); +static void nautilus_sidebar_class_init (GtkObjectClass *object_klass); +static void nautilus_sidebar_init (GtkObject *object); static void nautilus_sidebar_deactivate_panel (NautilusSidebar *sidebar); static gboolean nautilus_sidebar_press_event (GtkWidget *widget, GdkEventButton *event); @@ -173,7 +173,7 @@ EEL_DEFINE_CLASS_BOILERPLATE (NautilusSidebar, nautilus_sidebar, GTK_TYPE_EVENT_ /* initializing the class object by installing the operations we override */ static void -nautilus_sidebar_initialize_class (GtkObjectClass *object_klass) +nautilus_sidebar_class_init (GtkObjectClass *object_klass) { GtkWidgetClass *widget_class; @@ -193,16 +193,15 @@ nautilus_sidebar_initialize_class (GtkObjectClass *object_klass) widget_class->realize = nautilus_sidebar_realize; /* add the "location changed" signal */ - signals[LOCATION_CHANGED] = gtk_signal_new + signals[LOCATION_CHANGED] = g_signal_new ("location_changed", - GTK_RUN_LAST, - object_klass->type, - GTK_SIGNAL_OFFSET (NautilusSidebarClass, + G_TYPE_FROM_CLASS (object_klass), + G_SIGNAL_RUN_LAST, + G_STRUCT_OFFSET (NautilusSidebarClass, location_changed), - gtk_marshal_NONE__STRING, - GTK_TYPE_NONE, 1, GTK_TYPE_STRING); - - gtk_object_class_add_signals (object_klass, signals, LAST_SIGNAL); + NULL, NULL, + g_cclosure_marshal_VOID__STRING, + G_TYPE_NONE, 1, G_TYPE_STRING); eel_preferences_add_auto_boolean (NAUTILUS_PREFERENCES_CONFIRM_TRASH, &confirm_trash_auto_value); @@ -228,7 +227,7 @@ make_button_box (NautilusSidebar *sidebar) /* initialize the instance's fields, create the necessary subviews, etc. */ static void -nautilus_sidebar_initialize (GtkObject *object) +nautilus_sidebar_init (GtkObject *object) { NautilusSidebar *sidebar; GtkWidget* widget; @@ -295,7 +294,7 @@ nautilus_sidebar_initialize (GtkObject *object) /* prepare ourselves to receive dropped objects */ gtk_drag_dest_set (GTK_WIDGET (sidebar), GTK_DEST_DEFAULT_MOTION | GTK_DEST_DEFAULT_HIGHLIGHT | GTK_DEST_DEFAULT_DROP, - target_table, EEL_N_ELEMENTS (target_table), + target_table, G_N_ELEMENTS (target_table), GDK_ACTION_COPY | GDK_ACTION_MOVE); } @@ -676,7 +675,7 @@ uri_is_local_image (const char *uri) return FALSE; } - pixbuf = gdk_pixbuf_new_from_file (image_path); + pixbuf = gdk_pixbuf_new_from_file (image_path, NULL); g_free (image_path); if (pixbuf == NULL) { |