From 4354c0ac032ef2837a80f801d1d1cad9036f2b37 Mon Sep 17 00:00:00 2001 From: Not Zed Date: Mon, 2 Dec 2002 03:28:22 +0000 Subject: Add include of gnome-dialog.h 2002-11-27 Not Zed * e-charset-picker.c: Add include of gnome-dialog.h * *.[ch]: ran fix.sh script over everything. svn path=/trunk/; revision=18978 --- widgets/misc/e-title-bar.c | 22 +++++++++++----------- 1 file changed, 11 insertions(+), 11 deletions(-) (limited to 'widgets/misc/e-title-bar.c') diff --git a/widgets/misc/e-title-bar.c b/widgets/misc/e-title-bar.c index ffe249628b..f5ce0f97c4 100644 --- a/widgets/misc/e-title-bar.c +++ b/widgets/misc/e-title-bar.c @@ -200,9 +200,9 @@ button_realize_cb (GtkWidget *widget, gtk_container_add (GTK_CONTAINER (priv->button), hbox); gdk_pixmap_unref (close_pixmap); - gdk_bitmap_unref (close_mask); + g_object_unref (close_mask); gdk_pixmap_unref (pin_pixmap); - gdk_bitmap_unref (pin_mask); + g_object_unref (pin_mask); show_and_hide_pixmaps_according_to_mode (title_bar); } @@ -256,13 +256,13 @@ class_init (ETitleBarClass *klass) object_class = G_OBJECT_CLASS (klass); object_class->finalize = impl_finalize; - parent_class = gtk_type_class (gtk_frame_get_type ()); + parent_class = g_type_class_ref(gtk_frame_get_type ()); signals[LABEL_BUTTON_PRESS_EVENT] = gtk_signal_new ("label_button_press_event", GTK_RUN_FIRST, GTK_CLASS_TYPE (object_class), - GTK_SIGNAL_OFFSET (ETitleBarClass, label_button_press_event), + G_STRUCT_OFFSET (ETitleBarClass, label_button_press_event), gtk_marshal_NONE__POINTER, GTK_TYPE_NONE, 1, GTK_TYPE_POINTER); @@ -271,7 +271,7 @@ class_init (ETitleBarClass *klass) gtk_signal_new ("button_clicked", GTK_RUN_FIRST, GTK_CLASS_TYPE (object_class), - GTK_SIGNAL_OFFSET (ETitleBarClass, button_clicked), + G_STRUCT_OFFSET (ETitleBarClass, button_clicked), gtk_marshal_NONE__NONE, GTK_TYPE_NONE, 0); } @@ -323,12 +323,12 @@ e_title_bar_construct (ETitleBar *title_bar, gtk_container_add (GTK_CONTAINER (title_bar), hbox); - gtk_signal_connect (GTK_OBJECT (priv->button), "realize", - GTK_SIGNAL_FUNC (button_realize_cb), title_bar); - gtk_signal_connect (GTK_OBJECT (priv->button), "clicked", - GTK_SIGNAL_FUNC (button_clicked_cb), title_bar); - gtk_signal_connect (GTK_OBJECT (priv->label), "button_press_event", - GTK_SIGNAL_FUNC (label_button_press_event_cb), title_bar); + g_signal_connect((priv->button), "realize", + G_CALLBACK (button_realize_cb), title_bar); + g_signal_connect((priv->button), "clicked", + G_CALLBACK (button_clicked_cb), title_bar); + g_signal_connect((priv->label), "button_press_event", + G_CALLBACK (label_button_press_event_cb), title_bar); } GtkWidget * -- cgit