diff options
| author | Havoc Pennington <hp@redhat.com> | 2001-06-29 16:30:25 +0000 |
|---|---|---|
| committer | Havoc Pennington <hp@src.gnome.org> | 2001-06-29 16:30:25 +0000 |
| commit | 49c1e6dc8969a06d5b016700f3a64e31d082b7e3 (patch) | |
| tree | 332dd8c4e49797a25d359f979ce5c796389dca5e | |
| parent | 1bbcf0394f0d871d875a330394c6cc07281a177d (diff) | |
| download | gtk+-49c1e6dc8969a06d5b016700f3a64e31d082b7e3.tar.gz | |
fixes to compile with G_DISABLE_COMPAT
2001-06-29 Havoc Pennington <hp@redhat.com>
* Throughout: fixes to compile with G_DISABLE_COMPAT
(s/g_signal_connectc/g_signal_connect/,
s/g_signal_newc/g_signal_new/,
s/g_signal_disconnect_by_func/g_signal_handlers_disconnect_by_func/)
35 files changed, 834 insertions, 789 deletions
@@ -1,3 +1,10 @@ +2001-06-29 Havoc Pennington <hp@redhat.com> + + * Throughout: fixes to compile with G_DISABLE_COMPAT + (s/g_signal_connectc/g_signal_connect/, + s/g_signal_newc/g_signal_new/, + s/g_signal_disconnect_by_func/g_signal_handlers_disconnect_by_func/) + Fri Jun 29 03:14:16 2001 Jonathan Blandford <jrb@webwynk.net> * gtk/gtktreeselection.c (gtk_tree_selection_selected_foreach): diff --git a/ChangeLog.pre-2-0 b/ChangeLog.pre-2-0 index e3d4b5482f..2c486626ea 100644 --- a/ChangeLog.pre-2-0 +++ b/ChangeLog.pre-2-0 @@ -1,3 +1,10 @@ +2001-06-29 Havoc Pennington <hp@redhat.com> + + * Throughout: fixes to compile with G_DISABLE_COMPAT + (s/g_signal_connectc/g_signal_connect/, + s/g_signal_newc/g_signal_new/, + s/g_signal_disconnect_by_func/g_signal_handlers_disconnect_by_func/) + Fri Jun 29 03:14:16 2001 Jonathan Blandford <jrb@webwynk.net> * gtk/gtktreeselection.c (gtk_tree_selection_selected_foreach): diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10 index e3d4b5482f..2c486626ea 100644 --- a/ChangeLog.pre-2-10 +++ b/ChangeLog.pre-2-10 @@ -1,3 +1,10 @@ +2001-06-29 Havoc Pennington <hp@redhat.com> + + * Throughout: fixes to compile with G_DISABLE_COMPAT + (s/g_signal_connectc/g_signal_connect/, + s/g_signal_newc/g_signal_new/, + s/g_signal_disconnect_by_func/g_signal_handlers_disconnect_by_func/) + Fri Jun 29 03:14:16 2001 Jonathan Blandford <jrb@webwynk.net> * gtk/gtktreeselection.c (gtk_tree_selection_selected_foreach): diff --git a/ChangeLog.pre-2-2 b/ChangeLog.pre-2-2 index e3d4b5482f..2c486626ea 100644 --- a/ChangeLog.pre-2-2 +++ b/ChangeLog.pre-2-2 @@ -1,3 +1,10 @@ +2001-06-29 Havoc Pennington <hp@redhat.com> + + * Throughout: fixes to compile with G_DISABLE_COMPAT + (s/g_signal_connectc/g_signal_connect/, + s/g_signal_newc/g_signal_new/, + s/g_signal_disconnect_by_func/g_signal_handlers_disconnect_by_func/) + Fri Jun 29 03:14:16 2001 Jonathan Blandford <jrb@webwynk.net> * gtk/gtktreeselection.c (gtk_tree_selection_selected_foreach): diff --git a/ChangeLog.pre-2-4 b/ChangeLog.pre-2-4 index e3d4b5482f..2c486626ea 100644 --- a/ChangeLog.pre-2-4 +++ b/ChangeLog.pre-2-4 @@ -1,3 +1,10 @@ +2001-06-29 Havoc Pennington <hp@redhat.com> + + * Throughout: fixes to compile with G_DISABLE_COMPAT + (s/g_signal_connectc/g_signal_connect/, + s/g_signal_newc/g_signal_new/, + s/g_signal_disconnect_by_func/g_signal_handlers_disconnect_by_func/) + Fri Jun 29 03:14:16 2001 Jonathan Blandford <jrb@webwynk.net> * gtk/gtktreeselection.c (gtk_tree_selection_selected_foreach): diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6 index e3d4b5482f..2c486626ea 100644 --- a/ChangeLog.pre-2-6 +++ b/ChangeLog.pre-2-6 @@ -1,3 +1,10 @@ +2001-06-29 Havoc Pennington <hp@redhat.com> + + * Throughout: fixes to compile with G_DISABLE_COMPAT + (s/g_signal_connectc/g_signal_connect/, + s/g_signal_newc/g_signal_new/, + s/g_signal_disconnect_by_func/g_signal_handlers_disconnect_by_func/) + Fri Jun 29 03:14:16 2001 Jonathan Blandford <jrb@webwynk.net> * gtk/gtktreeselection.c (gtk_tree_selection_selected_foreach): diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8 index e3d4b5482f..2c486626ea 100644 --- a/ChangeLog.pre-2-8 +++ b/ChangeLog.pre-2-8 @@ -1,3 +1,10 @@ +2001-06-29 Havoc Pennington <hp@redhat.com> + + * Throughout: fixes to compile with G_DISABLE_COMPAT + (s/g_signal_connectc/g_signal_connect/, + s/g_signal_newc/g_signal_new/, + s/g_signal_disconnect_by_func/g_signal_handlers_disconnect_by_func/) + Fri Jun 29 03:14:16 2001 Jonathan Blandford <jrb@webwynk.net> * gtk/gtktreeselection.c (gtk_tree_selection_selected_foreach): diff --git a/demos/gtk-demo/appwindow.c b/demos/gtk-demo/appwindow.c index 06993a926e..1d9c826f49 100644 --- a/demos/gtk-demo/appwindow.c +++ b/demos/gtk-demo/appwindow.c @@ -23,11 +23,10 @@ menuitem_cb (gpointer callback_data, gtk_item_factory_path_from_widget (widget)); /* Close dialog on user response */ - g_signal_connectc (G_OBJECT (dialog), - "response", - G_CALLBACK (gtk_widget_destroy), - NULL, - FALSE); + g_signal_connect (G_OBJECT (dialog), + "response", + G_CALLBACK (gtk_widget_destroy), + NULL); gtk_widget_show (dialog); } @@ -71,11 +70,10 @@ toolbar_cb (GtkWidget *button, "You selected a toolbar button"); /* Close dialog on user response */ - g_signal_connectc (G_OBJECT (dialog), - "response", - G_CALLBACK (gtk_widget_destroy), - NULL, - FALSE); + g_signal_connect (G_OBJECT (dialog), + "response", + G_CALLBACK (gtk_widget_destroy), + NULL); gtk_widget_show (dialog); } @@ -201,9 +199,9 @@ do_appwindow (void) gtk_window_set_title (GTK_WINDOW (window), "Application Window"); /* NULL window variable when window is closed */ - g_signal_connectc (G_OBJECT (window), "destroy", - G_CALLBACK (gtk_widget_destroyed), - &window, FALSE); + g_signal_connect (G_OBJECT (window), "destroy", + G_CALLBACK (gtk_widget_destroyed), + &window); table = gtk_table_new (1, 4, FALSE); @@ -314,15 +312,15 @@ do_appwindow (void) /* Show text widget info in the statusbar */ buffer = gtk_text_view_get_buffer (GTK_TEXT_VIEW (contents)); - g_signal_connectc (G_OBJECT (buffer), - "changed", - G_CALLBACK (update_statusbar), - statusbar, FALSE); - - g_signal_connectc (G_OBJECT (buffer), - "mark_set", /* cursor moved */ - G_CALLBACK (mark_set_callback), - statusbar, FALSE); + g_signal_connect (G_OBJECT (buffer), + "changed", + G_CALLBACK (update_statusbar), + statusbar); + + g_signal_connect (G_OBJECT (buffer), + "mark_set", /* cursor moved */ + G_CALLBACK (mark_set_callback), + statusbar); update_statusbar (buffer, GTK_STATUSBAR (statusbar)); } diff --git a/demos/gtk-demo/main.c b/demos/gtk-demo/main.c index 8cee786a80..9ea9c87ae5 100644 --- a/demos/gtk-demo/main.c +++ b/demos/gtk-demo/main.c @@ -716,8 +716,8 @@ create_tree (void) gtk_tree_view_append_column (GTK_TREE_VIEW (tree_view), GTK_TREE_VIEW_COLUMN (column)); - g_signal_connectc (G_OBJECT (selection), "changed", GTK_SIGNAL_FUNC (selection_cb), model, FALSE); - gtk_signal_connect (GTK_OBJECT (tree_view), "row_activated", GTK_SIGNAL_FUNC (row_activated_cb), model); + g_signal_connect (G_OBJECT (selection), "changed", GTK_SIGNAL_FUNC (selection_cb), model); + g_signal_connect (G_OBJECT (tree_view), "row_activated", GTK_SIGNAL_FUNC (row_activated_cb), model); return tree_view; } diff --git a/docs/reference/gtk/tmpl/gtktreeselection.sgml b/docs/reference/gtk/tmpl/gtktreeselection.sgml index 9998d0055e..7769ab1a56 100644 --- a/docs/reference/gtk/tmpl/gtktreeselection.sgml +++ b/docs/reference/gtk/tmpl/gtktreeselection.sgml @@ -40,6 +40,7 @@ GtkTreeSelection </para> @model: +@path: @iter: @data: diff --git a/gdk-pixbuf/ChangeLog b/gdk-pixbuf/ChangeLog index 12f3908eaa..104883850f 100644 --- a/gdk-pixbuf/ChangeLog +++ b/gdk-pixbuf/ChangeLog @@ -1,3 +1,8 @@ +2001-06-29 Havoc Pennington <hp@redhat.com> + + * gdk-pixbuf-loader.c (gdk_pixbuf_loader_class_init): fix for + G_DISABLE_COMPAT + Thu Jun 28 21:54:19 2001 Owen Taylor <otaylor@redhat.com> * make-inline-pixbuf.c test-gdk-pixbuf.c test-loaders.c diff --git a/gdk-pixbuf/gdk-pixbuf-loader.c b/gdk-pixbuf/gdk-pixbuf-loader.c index a147e8b857..77c8ea8890 100644 --- a/gdk-pixbuf/gdk-pixbuf-loader.c +++ b/gdk-pixbuf/gdk-pixbuf-loader.c @@ -112,35 +112,35 @@ gdk_pixbuf_loader_class_init (GdkPixbufLoaderClass *class) object_class->finalize = gdk_pixbuf_loader_finalize; pixbuf_loader_signals[AREA_PREPARED] = - g_signal_newc ("area_prepared", - G_TYPE_FROM_CLASS (object_class), - G_SIGNAL_RUN_LAST, - G_STRUCT_OFFSET (GdkPixbufLoaderClass, area_prepared), - NULL, NULL, - gdk_pixbuf_marshal_VOID__VOID, - G_TYPE_NONE, 0); + g_signal_new ("area_prepared", + G_TYPE_FROM_CLASS (object_class), + G_SIGNAL_RUN_LAST, + G_STRUCT_OFFSET (GdkPixbufLoaderClass, area_prepared), + NULL, NULL, + gdk_pixbuf_marshal_VOID__VOID, + G_TYPE_NONE, 0); pixbuf_loader_signals[AREA_UPDATED] = - g_signal_newc ("area_updated", - G_TYPE_FROM_CLASS (object_class), - G_SIGNAL_RUN_LAST, - G_STRUCT_OFFSET (GdkPixbufLoaderClass, area_updated), - NULL, NULL, - gdk_pixbuf_marshal_VOID__INT_INT_INT_INT, - G_TYPE_NONE, 4, - G_TYPE_INT, - G_TYPE_INT, - G_TYPE_INT, - G_TYPE_INT); + g_signal_new ("area_updated", + G_TYPE_FROM_CLASS (object_class), + G_SIGNAL_RUN_LAST, + G_STRUCT_OFFSET (GdkPixbufLoaderClass, area_updated), + NULL, NULL, + gdk_pixbuf_marshal_VOID__INT_INT_INT_INT, + G_TYPE_NONE, 4, + G_TYPE_INT, + G_TYPE_INT, + G_TYPE_INT, + G_TYPE_INT); pixbuf_loader_signals[CLOSED] = - g_signal_newc ("closed", - G_TYPE_FROM_CLASS (object_class), - G_SIGNAL_RUN_LAST, - G_STRUCT_OFFSET (GdkPixbufLoaderClass, closed), - NULL, NULL, - gdk_pixbuf_marshal_VOID__VOID, - G_TYPE_NONE, 0); + g_signal_new ("closed", + G_TYPE_FROM_CLASS (object_class), + G_SIGNAL_RUN_LAST, + G_STRUCT_OFFSET (GdkPixbufLoaderClass, closed), + NULL, NULL, + gdk_pixbuf_marshal_VOID__VOID, + G_TYPE_NONE, 0); } static void diff --git a/gtk/gtkentry.c b/gtk/gtkentry.c index 61cf5a8a91..7a9dfab24d 100644 --- a/gtk/gtkentry.c +++ b/gtk/gtkentry.c @@ -1556,9 +1556,9 @@ gtk_entry_focus_out (GtkWidget *widget, gtk_entry_check_cursor_blink (entry); - g_signal_disconnect_by_func (gdk_keymap_get_default (), - gtk_entry_keymap_direction_changed, - entry); + g_signal_handlers_disconnect_by_func (gdk_keymap_get_default (), + gtk_entry_keymap_direction_changed, + entry); return FALSE; } diff --git a/gtk/gtknotebook.c b/gtk/gtknotebook.c index 0ac2a0f572..05d261e75b 100644 --- a/gtk/gtknotebook.c +++ b/gtk/gtknotebook.c @@ -443,24 +443,24 @@ gtk_notebook_class_init (GtkNotebookClass *class) GTK_TYPE_POINTER, GTK_TYPE_UINT); notebook_signals[FOCUS_TAB] = - g_signal_newc ("focus_tab", - G_TYPE_FROM_CLASS (object_class), - G_SIGNAL_RUN_LAST | G_SIGNAL_ACTION, - G_STRUCT_OFFSET (GtkNotebookClass, focus_tab), - NULL, NULL, - gtk_marshal_VOID__ENUM, - G_TYPE_NONE, 1, - GTK_TYPE_NOTEBOOK_TAB); + g_signal_new ("focus_tab", + G_TYPE_FROM_CLASS (object_class), + G_SIGNAL_RUN_LAST | G_SIGNAL_ACTION, + G_STRUCT_OFFSET (GtkNotebookClass, focus_tab), + NULL, NULL, + gtk_marshal_VOID__ENUM, + G_TYPE_NONE, 1, + GTK_TYPE_NOTEBOOK_TAB); notebook_signals[SELECT_PAGE] = - g_signal_newc ("select_page", - G_TYPE_FROM_CLASS (object_class), - G_SIGNAL_RUN_LAST | G_SIGNAL_ACTION, - G_STRUCT_OFFSET (GtkNotebookClass, select_page), - NULL, NULL, - gtk_marshal_VOID__BOOLEAN, - G_TYPE_NONE, 1, - G_TYPE_BOOLEAN); - + g_signal_new ("select_page", + G_TYPE_FROM_CLASS (object_class), + G_SIGNAL_RUN_LAST | G_SIGNAL_ACTION, + G_STRUCT_OFFSET (GtkNotebookClass, select_page), + NULL, NULL, + gtk_marshal_VOID__BOOLEAN, + G_TYPE_NONE, 1, + G_TYPE_BOOLEAN); + binding_set = gtk_binding_set_by_class (object_class); gtk_binding_entry_add_signal (binding_set, GDK_Return, 0, diff --git a/gtk/gtkoptionmenu.c b/gtk/gtkoptionmenu.c index f9a5a764c5..df215d14d1 100644 --- a/gtk/gtkoptionmenu.c +++ b/gtk/gtkoptionmenu.c @@ -132,13 +132,13 @@ gtk_option_menu_class_init (GtkOptionMenuClass *class) parent_class = gtk_type_class (gtk_button_get_type ()); signals[CHANGED] = - g_signal_newc ("changed", - G_OBJECT_CLASS_TYPE (class), - G_SIGNAL_RUN_LAST, - G_STRUCT_OFFSET (GtkOptionMenuClass, changed), - NULL, NULL, - gtk_marshal_VOID__VOID, - G_TYPE_NONE, 0); + g_signal_new ("changed", + G_OBJECT_CLASS_TYPE (class), + G_SIGNAL_RUN_LAST, + G_STRUCT_OFFSET (GtkOptionMenuClass, changed), + NULL, NULL, + gtk_marshal_VOID__VOID, + G_TYPE_NONE, 0); object_class->destroy = gtk_option_menu_destroy; diff --git a/gtk/gtkrange.c b/gtk/gtkrange.c index 1dde609d7e..2883cbc3a2 100644 --- a/gtk/gtkrange.c +++ b/gtk/gtkrange.c @@ -226,24 +226,24 @@ gtk_range_class_init (GtkRangeClass *class) class->stepper_detail = "stepper"; signals[VALUE_CHANGED] = - g_signal_newc ("value_changed", - G_TYPE_FROM_CLASS (object_class), - G_SIGNAL_RUN_LAST, - G_STRUCT_OFFSET (GtkRangeClass, value_changed), - NULL, NULL, - gtk_marshal_NONE__NONE, - G_TYPE_NONE, 0); + g_signal_new ("value_changed", + G_TYPE_FROM_CLASS (object_class), + G_SIGNAL_RUN_LAST, + G_STRUCT_OFFSET (GtkRangeClass, value_changed), + NULL, NULL, + gtk_marshal_NONE__NONE, + G_TYPE_NONE, 0); signals[MOVE_SLIDER] = - g_signal_newc ("move_slider", - G_TYPE_FROM_CLASS (object_class), - G_SIGNAL_RUN_LAST | G_SIGNAL_ACTION, - G_STRUCT_OFFSET (GtkRangeClass, move_slider), - NULL, NULL, - gtk_marshal_VOID__ENUM, - G_TYPE_NONE, 1, - GTK_TYPE_SCROLL_TYPE); - + g_signal_new ("move_slider", + G_TYPE_FROM_CLASS (object_class), + G_SIGNAL_RUN_LAST | G_SIGNAL_ACTION, + G_STRUCT_OFFSET (GtkRangeClass, move_slider), + NULL, NULL, + gtk_marshal_VOID__ENUM, + G_TYPE_NONE, 1, + GTK_TYPE_SCROLL_TYPE); + g_object_class_install_property (gobject_class, PROP_UPDATE_POLICY, diff --git a/gtk/gtkscale.c b/gtk/gtkscale.c index e406535e65..d3fc24d989 100644 --- a/gtk/gtkscale.c +++ b/gtk/gtkscale.c @@ -133,14 +133,14 @@ gtk_scale_class_init (GtkScaleClass *class) range_class->get_range_border = gtk_scale_get_range_border; signals[FORMAT_VALUE] = - g_signal_newc ("format_value", - G_TYPE_FROM_CLASS (object_class), - G_SIGNAL_RUN_LAST, - G_STRUCT_OFFSET (GtkScaleClass, format_value), - single_string_accumulator, NULL, - gtk_marshal_STRING__DOUBLE, - G_TYPE_STRING, 1, - G_TYPE_DOUBLE); + g_signal_new ("format_value", + G_TYPE_FROM_CLASS (object_class), + G_SIGNAL_RUN_LAST, + G_STRUCT_OFFSET (GtkScaleClass, format_value), + single_string_accumulator, NULL, + gtk_marshal_STRING__DOUBLE, + G_TYPE_STRING, 1, + G_TYPE_DOUBLE); g_object_class_install_property (gobject_class, PROP_DIGITS, diff --git a/gtk/gtkspinbutton.c b/gtk/gtkspinbutton.c index df69180b38..3eca302a8d 100644 --- a/gtk/gtkspinbutton.c +++ b/gtk/gtkspinbutton.c @@ -283,13 +283,13 @@ gtk_spin_button_class_init (GtkSpinButtonClass *class) GTK_TYPE_INT, 1, GTK_TYPE_POINTER); spinbutton_signals[OUTPUT] = - g_signal_newc ("output", - G_TYPE_FROM_CLASS(object_class), - G_SIGNAL_RUN_LAST, - G_STRUCT_OFFSET(GtkSpinButtonClass, output), - _gtk_boolean_handled_accumulator, NULL, - gtk_marshal_BOOLEAN__VOID, - G_TYPE_BOOLEAN, 0); + g_signal_new ("output", + G_TYPE_FROM_CLASS(object_class), + G_SIGNAL_RUN_LAST, + G_STRUCT_OFFSET(GtkSpinButtonClass, output), + _gtk_boolean_handled_accumulator, NULL, + gtk_marshal_BOOLEAN__VOID, + G_TYPE_BOOLEAN, 0); spinbutton_signals[VALUE_CHANGED] = gtk_signal_new ("value_changed", diff --git a/gtk/gtktextbuffer.c b/gtk/gtktextbuffer.c index 8606a08f44..975aecc6b8 100644 --- a/gtk/gtktextbuffer.c +++ b/gtk/gtktextbuffer.c @@ -158,142 +158,142 @@ gtk_text_buffer_class_init (GtkTextBufferClass *klass) klass->changed = gtk_text_buffer_real_changed; signals[INSERT_TEXT] = - g_signal_newc ("insert_text", - G_OBJECT_CLASS_TYPE (object_class), - G_SIGNAL_RUN_LAST, - G_STRUCT_OFFSET (GtkTextBufferClass, insert_text), - NULL, NULL, - gtk_marshal_VOID__BOXED_STRING_INT, - GTK_TYPE_NONE, - 3, - GTK_TYPE_TEXT_ITER | G_SIGNAL_TYPE_STATIC_SCOPE, - GTK_TYPE_STRING | G_SIGNAL_TYPE_STATIC_SCOPE, - GTK_TYPE_INT); + g_signal_new ("insert_text", + G_OBJECT_CLASS_TYPE (object_class), + G_SIGNAL_RUN_LAST, + G_STRUCT_OFFSET (GtkTextBufferClass, insert_text), + NULL, NULL, + gtk_marshal_VOID__BOXED_STRING_INT, + GTK_TYPE_NONE, + 3, + GTK_TYPE_TEXT_ITER | G_SIGNAL_TYPE_STATIC_SCOPE, + GTK_TYPE_STRING | G_SIGNAL_TYPE_STATIC_SCOPE, + GTK_TYPE_INT); signals[INSERT_PIXBUF] = - g_signal_newc ("insert_pixbuf", - G_OBJECT_CLASS_TYPE (object_class), - G_SIGNAL_RUN_LAST, - G_STRUCT_OFFSET (GtkTextBufferClass, insert_pixbuf), - NULL, NULL, - gtk_marshal_VOID__BOXED_OBJECT, - GTK_TYPE_NONE, - 2, - GTK_TYPE_TEXT_ITER | G_SIGNAL_TYPE_STATIC_SCOPE, - GDK_TYPE_PIXBUF); + g_signal_new ("insert_pixbuf", + G_OBJECT_CLASS_TYPE (object_class), + G_SIGNAL_RUN_LAST, + G_STRUCT_OFFSET (GtkTextBufferClass, insert_pixbuf), + NULL, NULL, + gtk_marshal_VOID__BOXED_OBJECT, + GTK_TYPE_NONE, + 2, + GTK_TYPE_TEXT_ITER | G_SIGNAL_TYPE_STATIC_SCOPE, + GDK_TYPE_PIXBUF); signals[INSERT_CHILD_ANCHOR] = - g_signal_newc ("insert_child_anchor", - G_OBJECT_CLASS_TYPE (object_class), - G_SIGNAL_RUN_LAST, - G_STRUCT_OFFSET (GtkTextBufferClass, insert_child_anchor), - NULL, NULL, - gtk_marshal_VOID__BOXED_OBJECT, - GTK_TYPE_NONE, - 2, - GTK_TYPE_TEXT_ITER | G_SIGNAL_TYPE_STATIC_SCOPE, - GTK_TYPE_TEXT_CHILD_ANCHOR); + g_signal_new ("insert_child_anchor", + G_OBJECT_CLASS_TYPE (object_class), + G_SIGNAL_RUN_LAST, + G_STRUCT_OFFSET (GtkTextBufferClass, insert_child_anchor), + NULL, NULL, + gtk_marshal_VOID__BOXED_OBJECT, + GTK_TYPE_NONE, + 2, + GTK_TYPE_TEXT_ITER | G_SIGNAL_TYPE_STATIC_SCOPE, + GTK_TYPE_TEXT_CHILD_ANCHOR); signals[DELETE_RANGE] = - g_signal_newc ("delete_range", - G_OBJECT_CLASS_TYPE (object_class), - G_SIGNAL_RUN_LAST, - G_STRUCT_OFFSET (GtkTextBufferClass, delete_range), - NULL, NULL, - gtk_marshal_VOID__BOXED_BOXED, - GTK_TYPE_NONE, - 2, - GTK_TYPE_TEXT_ITER | G_SIGNAL_TYPE_STATIC_SCOPE, - GTK_TYPE_TEXT_ITER | G_SIGNAL_TYPE_STATIC_SCOPE); + g_signal_new ("delete_range", + G_OBJECT_CLASS_TYPE (object_class), + G_SIGNAL_RUN_LAST, + G_STRUCT_OFFSET (GtkTextBufferClass, delete_range), + NULL, NULL, + gtk_marshal_VOID__BOXED_BOXED, + GTK_TYPE_NONE, + 2, + GTK_TYPE_TEXT_ITER | G_SIGNAL_TYPE_STATIC_SCOPE, + GTK_TYPE_TEXT_ITER | G_SIGNAL_TYPE_STATIC_SCOPE); signals[CHANGED] = - g_signal_newc ("changed", - G_OBJECT_CLASS_TYPE (object_class), - G_SIGNAL_RUN_LAST, - G_STRUCT_OFFSET (GtkTextBufferClass, changed), - NULL, NULL, - gtk_marshal_VOID__VOID, - GTK_TYPE_NONE, - 0); + g_signal_new ("changed", + G_OBJECT_CLASS_TYPE (object_class), + G_SIGNAL_RUN_LAST, + G_STRUCT_OFFSET (GtkTextBufferClass, changed), + NULL, NULL, + gtk_marshal_VOID__VOID, + GTK_TYPE_NONE, + 0); signals[MODIFIED_CHANGED] = - g_signal_newc ("modified_changed", - G_OBJECT_CLASS_TYPE (object_class), - G_SIGNAL_RUN_LAST, - G_STRUCT_OFFSET (GtkTextBufferClass, modified_changed), - NULL, NULL, - gtk_marshal_VOID__VOID, - GTK_TYPE_NONE, - 0); + g_signal_new ("modified_changed", + G_OBJECT_CLASS_TYPE (object_class), + G_SIGNAL_RUN_LAST, + G_STRUCT_OFFSET (GtkTextBufferClass, modified_changed), + NULL, NULL, + gtk_marshal_VOID__VOID, + GTK_TYPE_NONE, + 0); signals[MARK_SET] = - g_signal_newc ("mark_set", - G_OBJECT_CLASS_TYPE (object_class), - G_SIGNAL_RUN_LAST, - G_STRUCT_OFFSET (GtkTextBufferClass, mark_set), - NULL, NULL, - gtk_marshal_VOID__BOXED_OBJECT, - GTK_TYPE_NONE, - 2, - GTK_TYPE_TEXT_ITER, - GTK_TYPE_TEXT_MARK); + g_signal_new ("mark_set", + G_OBJECT_CLASS_TYPE (object_class), + G_SIGNAL_RUN_LAST, + G_STRUCT_OFFSET (GtkTextBufferClass, mark_set), + NULL, NULL, + gtk_marshal_VOID__BOXED_OBJECT, + GTK_TYPE_NONE, + 2, + GTK_TYPE_TEXT_ITER, + GTK_TYPE_TEXT_MARK); signals[MARK_DELETED] = - g_signal_newc ("mark_deleted", - G_OBJECT_CLASS_TYPE (object_class), - G_SIGNAL_RUN_LAST, - G_STRUCT_OFFSET (GtkTextBufferClass, mark_deleted), - NULL, NULL, - gtk_marshal_VOID__OBJECT, - GTK_TYPE_NONE, - 1, - GTK_TYPE_TEXT_MARK); + g_signal_new ("mark_deleted", + G_OBJECT_CLASS_TYPE (object_class), + G_SIGNAL_RUN_LAST, + G_STRUCT_OFFSET (GtkTextBufferClass, mark_deleted), + NULL, NULL, + gtk_marshal_VOID__OBJECT, + GTK_TYPE_NONE, + 1, + GTK_TYPE_TEXT_MARK); signals[APPLY_TAG] = - g_signal_newc ("apply_tag", - G_OBJECT_CLASS_TYPE (object_class), - G_SIGNAL_RUN_LAST, - G_STRUCT_OFFSET (GtkTextBufferClass, apply_tag), - NULL, NULL, - gtk_marshal_VOID__OBJECT_BOXED_BOXED, - GTK_TYPE_NONE, - 3, - GTK_TYPE_TEXT_TAG, - GTK_TYPE_TEXT_ITER, - GTK_TYPE_TEXT_ITER); + g_signal_new ("apply_tag", + G_OBJECT_CLASS_TYPE (object_class), + G_SIGNAL_RUN_LAST, + G_STRUCT_OFFSET (GtkTextBufferClass, apply_tag), + NULL, NULL, + gtk_marshal_VOID__OBJECT_BOXED_BOXED, + GTK_TYPE_NONE, + 3, + GTK_TYPE_TEXT_TAG, + GTK_TYPE_TEXT_ITER, + GTK_TYPE_TEXT_ITER); signals[REMOVE_TAG] = - g_signal_newc ("remove_tag", - G_OBJECT_CLASS_TYPE (object_class), - G_SIGNAL_RUN_LAST, - G_STRUCT_OFFSET (GtkTextBufferClass, remove_tag), - NULL, NULL, - gtk_marshal_VOID__OBJECT_BOXED_BOXED, - GTK_TYPE_NONE, - 3, - GTK_TYPE_TEXT_TAG, - GTK_TYPE_TEXT_ITER, - GTK_TYPE_TEXT_ITER); + g_signal_new ("remove_tag", + G_OBJECT_CLASS_TYPE (object_class), + G_SIGNAL_RUN_LAST, + G_STRUCT_OFFSET (GtkTextBufferClass, remove_tag), + NULL, NULL, + gtk_marshal_VOID__OBJECT_BOXED_BOXED, + GTK_TYPE_NONE, + 3, + GTK_TYPE_TEXT_TAG, + GTK_TYPE_TEXT_ITER, + GTK_TYPE_TEXT_ITER); signals[BEGIN_USER_ACTION] = - g_signal_newc ("begin_user_action", - G_OBJECT_CLASS_TYPE (object_class), - G_SIGNAL_RUN_LAST, - G_STRUCT_OFFSET (GtkTextBufferClass, begin_user_action), - NULL, NULL, - gtk_marshal_VOID__VOID, - GTK_TYPE_NONE, - 0); + g_signal_new ("begin_user_action", + G_OBJECT_CLASS_TYPE (object_class), + G_SIGNAL_RUN_LAST, + G_STRUCT_OFFSET (GtkTextBufferClass, begin_user_action), + NULL, NULL, + gtk_marshal_VOID__VOID, + GTK_TYPE_NONE, + 0); signals[END_USER_ACTION] = - g_signal_newc ("end_user_action", - G_OBJECT_CLASS_TYPE (object_class), - G_SIGNAL_RUN_LAST, - G_STRUCT_OFFSET (GtkTextBufferClass, end_user_action), - NULL, NULL, - gtk_marshal_VOID__VOID, - GTK_TYPE_NONE, - 0); + g_signal_new ("end_user_action", + G_OBJECT_CLASS_TYPE (object_class), + G_SIGNAL_RUN_LAST, + G_STRUCT_OFFSET (GtkTextBufferClass, end_user_action), + NULL, NULL, + gtk_marshal_VOID__VOID, + GTK_TYPE_NONE, + 0); } void diff --git a/gtk/gtktextlayout.c b/gtk/gtktextlayout.c index e3feea10f1..6c79d124ed 100644 --- a/gtk/gtktextlayout.c +++ b/gtk/gtktextlayout.c @@ -173,40 +173,40 @@ gtk_text_layout_class_init (GtkTextLayoutClass *klass) klass->free_line_data = gtk_text_layout_real_free_line_data; signals[INVALIDATED] = - g_signal_newc ("invalidated", - G_OBJECT_CLASS_TYPE (object_class), - G_SIGNAL_RUN_LAST, - G_STRUCT_OFFSET (GtkTextLayoutClass, invalidated), - NULL, NULL, - gtk_marshal_VOID__VOID, - GTK_TYPE_NONE, - 0); + g_signal_new ("invalidated", + G_OBJECT_CLASS_TYPE (object_class), + G_SIGNAL_RUN_LAST, + G_STRUCT_OFFSET (GtkTextLayoutClass, invalidated), + NULL, NULL, + gtk_marshal_VOID__VOID, + GTK_TYPE_NONE, + 0); signals[CHANGED] = - g_signal_newc ("changed", - G_OBJECT_CLASS_TYPE (object_class), - G_SIGNAL_RUN_LAST, - G_STRUCT_OFFSET (GtkTextLayoutClass, changed), - NULL, NULL, - gtk_marshal_VOID__INT_INT_INT, - GTK_TYPE_NONE, - 3, - GTK_TYPE_INT, - GTK_TYPE_INT, - GTK_TYPE_INT); + g_signal_new ("changed", + G_OBJECT_CLASS_TYPE (object_class), + G_SIGNAL_RUN_LAST, + G_STRUCT_OFFSET (GtkTextLayoutClass, changed), + NULL, NULL, + gtk_marshal_VOID__INT_INT_INT, + GTK_TYPE_NONE, + 3, + GTK_TYPE_INT, + GTK_TYPE_INT, + GTK_TYPE_INT); signals[ALLOCATE_CHILD] = - g_signal_newc ("allocate_child", - G_OBJECT_CLASS_TYPE (object_class), - G_SIGNAL_RUN_LAST, - G_STRUCT_OFFSET (GtkTextLayoutClass, allocate_child), - NULL, NULL, - gtk_marshal_VOID__OBJECT_INT_INT, - GTK_TYPE_NONE, - 3, - GTK_TYPE_OBJECT, - GTK_TYPE_INT, - GTK_TYPE_INT); + g_signal_new ("allocate_child", + G_OBJECT_CLASS_TYPE (object_class), + G_SIGNAL_RUN_LAST, + G_STRUCT_OFFSET (GtkTextLayoutClass, allocate_child), + NULL, NULL, + gtk_marshal_VOID__OBJECT_INT_INT, + GTK_TYPE_NONE, + 3, + GTK_TYPE_OBJECT, + GTK_TYPE_INT, + GTK_TYPE_INT); } void diff --git a/gtk/gtktexttag.c b/gtk/gtktexttag.c index 104339f29a..902e9becc3 100644 --- a/gtk/gtktexttag.c +++ b/gtk/gtktexttag.c @@ -616,17 +616,17 @@ gtk_text_tag_class_init (GtkTextTagClass *klass) _("Whether this tag affects text visibility")); signals[EVENT] = - g_signal_newc ("event", - G_OBJECT_CLASS_TYPE (object_class), - G_SIGNAL_RUN_LAST, - GTK_SIGNAL_OFFSET (GtkTextTagClass, event), - _gtk_boolean_handled_accumulator, NULL, - gtk_marshal_BOOLEAN__OBJECT_BOXED_BOXED, - G_TYPE_BOOLEAN, - 3, - G_TYPE_OBJECT, - GDK_TYPE_EVENT, - GTK_TYPE_TEXT_ITER); + g_signal_new ("event", + G_OBJECT_CLASS_TYPE (object_class), + G_SIGNAL_RUN_LAST, + GTK_SIGNAL_OFFSET (GtkTextTagClass, event), + _gtk_boolean_handled_accumulator, NULL, + gtk_marshal_BOOLEAN__OBJECT_BOXED_BOXED, + G_TYPE_BOOLEAN, + 3, + G_TYPE_OBJECT, + GDK_TYPE_EVENT, + GTK_TYPE_TEXT_ITER); } void diff --git a/gtk/gtktexttagtable.c b/gtk/gtktexttagtable.c index c85fbcd8a8..e2668b110f 100644 --- a/gtk/gtktexttagtable.c +++ b/gtk/gtktexttagtable.c @@ -72,38 +72,38 @@ gtk_text_tag_table_class_init (GtkTextTagTableClass *klass) object_class->finalize = gtk_text_tag_table_finalize; signals[TAG_CHANGED] = - g_signal_newc ("tag_changed", - G_OBJECT_CLASS_TYPE (object_class), - G_SIGNAL_RUN_LAST, - G_STRUCT_OFFSET (GtkTextTagTableClass, tag_changed), - NULL, NULL, - gtk_marshal_VOID__OBJECT_BOOLEAN, - G_TYPE_NONE, - 2, - G_TYPE_OBJECT, - G_TYPE_BOOLEAN); + g_signal_new ("tag_changed", + G_OBJECT_CLASS_TYPE (object_class), + G_SIGNAL_RUN_LAST, + G_STRUCT_OFFSET (GtkTextTagTableClass, tag_changed), + NULL, NULL, + gtk_marshal_VOID__OBJECT_BOOLEAN, + G_TYPE_NONE, + 2, + G_TYPE_OBJECT, + G_TYPE_BOOLEAN); signals[TAG_ADDED] = - g_signal_newc ("tag_added", - GTK_CLASS_TYPE (object_class), - G_SIGNAL_RUN_LAST, - G_STRUCT_OFFSET (GtkTextTagTableClass, tag_added), - NULL, NULL, - gtk_marshal_VOID__OBJECT, - GTK_TYPE_NONE, - 1, - G_TYPE_OBJECT); + g_signal_new ("tag_added", + GTK_CLASS_TYPE (object_class), + G_SIGNAL_RUN_LAST, + G_STRUCT_OFFSET (GtkTextTagTableClass, tag_added), + NULL, NULL, + gtk_marshal_VOID__OBJECT, + GTK_TYPE_NONE, + 1, + G_TYPE_OBJECT); signals[TAG_REMOVED] = - g_signal_newc ("tag_removed", - GTK_CLASS_TYPE (object_class), - G_SIGNAL_RUN_LAST, - G_STRUCT_OFFSET (GtkTextTagTableClass, tag_removed), - NULL, NULL, - gtk_marshal_VOID__OBJECT, - GTK_TYPE_NONE, - 1, - G_TYPE_OBJECT); + g_signal_new ("tag_removed", + GTK_CLASS_TYPE (object_class), + G_SIGNAL_RUN_LAST, + G_STRUCT_OFFSET (GtkTextTagTableClass, tag_removed), + NULL, NULL, + gtk_marshal_VOID__OBJECT, + GTK_TYPE_NONE, + 1, + G_TYPE_OBJECT); } void diff --git a/gtk/gtktextview.c b/gtk/gtktextview.c index 5de42f936c..05adad5a3f 100644 --- a/gtk/gtktextview.c +++ b/gtk/gtktextview.c @@ -3439,9 +3439,9 @@ gtk_text_view_focus_out_event (GtkWidget *widget, GdkEventFocus *event) gtk_text_view_check_cursor_blink (text_view); } - g_signal_disconnect_by_func (gdk_keymap_get_default (), - keymap_direction_changed, - text_view); + g_signal_handlers_disconnect_by_func (gdk_keymap_get_default (), + keymap_direction_changed, + text_view); text_view->need_im_reset = TRUE; gtk_im_context_focus_out (GTK_TEXT_VIEW (widget)->im_context); diff --git a/gtk/gtktipsquery.c b/gtk/gtktipsquery.c index d05a1fdceb..ea1b2a7e56 100644 --- a/gtk/gtktipsquery.c +++ b/gtk/gtktipsquery.c @@ -159,17 +159,17 @@ gtk_tips_query_class_init (GtkTipsQueryClass *class) GTK_TYPE_STRING, GTK_TYPE_STRING); tips_query_signals[SIGNAL_WIDGET_SELECTED] = - g_signal_newc ("widget_selected", - G_TYPE_FROM_CLASS(object_class), - G_SIGNAL_RUN_LAST, - G_STRUCT_OFFSET(GtkTipsQueryClass, widget_selected), - _gtk_boolean_handled_accumulator, NULL, - gtk_marshal_BOOLEAN__OBJECT_STRING_STRING_BOXED, - G_TYPE_BOOLEAN, 4, - GTK_TYPE_WIDGET, - G_TYPE_STRING, - G_TYPE_STRING, - GDK_TYPE_EVENT); + g_signal_new ("widget_selected", + G_TYPE_FROM_CLASS(object_class), + G_SIGNAL_RUN_LAST, + G_STRUCT_OFFSET(GtkTipsQueryClass, widget_selected), + _gtk_boolean_handled_accumulator, NULL, + gtk_marshal_BOOLEAN__OBJECT_STRING_STRING_BOXED, + G_TYPE_BOOLEAN, 4, + GTK_TYPE_WIDGET, + G_TYPE_STRING, + G_TYPE_STRING, + GDK_TYPE_EVENT); } static void diff --git a/gtk/gtktreemodel.c b/gtk/gtktreemodel.c index a2936830a6..fe68852de6 100644 --- a/gtk/gtktreemodel.c +++ b/gtk/gtktreemodel.c @@ -71,53 +71,53 @@ gtk_tree_model_base_init (gpointer g_class) if (! initialized) { - g_signal_newc ("range_changed", - GTK_TYPE_TREE_MODEL, - G_SIGNAL_RUN_LAST, - G_STRUCT_OFFSET (GtkTreeModelIface, range_changed), - NULL, NULL, - gtk_marshal_VOID__BOXED_BOXED_BOXED_BOXED, - G_TYPE_NONE, 4, - GTK_TYPE_TREE_PATH, - GTK_TYPE_TREE_ITER, - GTK_TYPE_TREE_PATH, - GTK_TYPE_TREE_ITER); - g_signal_newc ("inserted", - GTK_TYPE_TREE_MODEL, - G_SIGNAL_RUN_LAST, - G_STRUCT_OFFSET (GtkTreeModelIface, inserted), - NULL, NULL, - gtk_marshal_VOID__BOXED_BOXED, - G_TYPE_NONE, 2, - GTK_TYPE_TREE_PATH, - GTK_TYPE_TREE_ITER); - g_signal_newc ("has_child_toggled", - GTK_TYPE_TREE_MODEL, - G_SIGNAL_RUN_LAST, - G_STRUCT_OFFSET (GtkTreeModelIface, has_child_toggled), - NULL, NULL, - gtk_marshal_VOID__BOXED_BOXED, - G_TYPE_NONE, 2, - GTK_TYPE_TREE_PATH, - GTK_TYPE_TREE_ITER); - g_signal_newc ("deleted", - GTK_TYPE_TREE_MODEL, - G_SIGNAL_RUN_LAST, - G_STRUCT_OFFSET (GtkTreeModelIface, deleted), - NULL, NULL, - gtk_marshal_VOID__BOXED, - G_TYPE_NONE, 1, - GTK_TYPE_TREE_PATH); - g_signal_newc ("reordered", - GTK_TYPE_TREE_MODEL, - G_SIGNAL_RUN_LAST, - G_STRUCT_OFFSET (GtkTreeModelIface, reordered), - NULL, NULL, - gtk_marshal_VOID__BOXED_BOXED_POINTER, - G_TYPE_NONE, 3, - GTK_TYPE_TREE_PATH, - GTK_TYPE_TREE_ITER, - G_TYPE_POINTER); + g_signal_new ("range_changed", + GTK_TYPE_TREE_MODEL, + G_SIGNAL_RUN_LAST, + G_STRUCT_OFFSET (GtkTreeModelIface, range_changed), + NULL, NULL, + gtk_marshal_VOID__BOXED_BOXED_BOXED_BOXED, + G_TYPE_NONE, 4, + GTK_TYPE_TREE_PATH, + GTK_TYPE_TREE_ITER, + GTK_TYPE_TREE_PATH, + GTK_TYPE_TREE_ITER); + g_signal_new ("inserted", + GTK_TYPE_TREE_MODEL, + G_SIGNAL_RUN_LAST, + G_STRUCT_OFFSET (GtkTreeModelIface, inserted), + NULL, NULL, + gtk_marshal_VOID__BOXED_BOXED, + G_TYPE_NONE, 2, + GTK_TYPE_TREE_PATH, + GTK_TYPE_TREE_ITER); + g_signal_new ("has_child_toggled", + GTK_TYPE_TREE_MODEL, + G_SIGNAL_RUN_LAST, + G_STRUCT_OFFSET (GtkTreeModelIface, has_child_toggled), + NULL, NULL, + gtk_marshal_VOID__BOXED_BOXED, + G_TYPE_NONE, 2, + GTK_TYPE_TREE_PATH, + GTK_TYPE_TREE_ITER); + g_signal_new ("deleted", + GTK_TYPE_TREE_MODEL, + G_SIGNAL_RUN_LAST, + G_STRUCT_OFFSET (GtkTreeModelIface, deleted), + NULL, NULL, + gtk_marshal_VOID__BOXED, + G_TYPE_NONE, 1, + GTK_TYPE_TREE_PATH); + g_signal_new ("reordered", + GTK_TYPE_TREE_MODEL, + G_SIGNAL_RUN_LAST, + G_STRUCT_OFFSET (GtkTreeModelIface, reordered), + NULL, NULL, + gtk_marshal_VOID__BOXED_BOXED_POINTER, + G_TYPE_NONE, 3, + GTK_TYPE_TREE_PATH, + GTK_TYPE_TREE_ITER, + G_TYPE_POINTER); initialized = TRUE; } } diff --git a/gtk/gtktreemodelsort.c b/gtk/gtktreemodelsort.c index b9fa1eb663..b80f9ba565 100644 --- a/gtk/gtktreemodelsort.c +++ b/gtk/gtktreemodelsort.c @@ -294,29 +294,25 @@ gtk_tree_model_sort_set_model (GtkTreeModelSort *tree_model_sort, gint i, n_columns; tree_model_sort->changed_id = - g_signal_connectc (child_model, - "range_changed", - G_CALLBACK (gtk_tree_model_sort_range_changed), - tree_model_sort, - FALSE); + g_signal_connect (child_model, + "range_changed", + G_CALLBACK (gtk_tree_model_sort_range_changed), + tree_model_sort); tree_model_sort->inserted_id = - g_signal_connectc (child_model, - "inserted", - G_CALLBACK (gtk_tree_model_sort_inserted), - tree_model_sort, - FALSE); + g_signal_connect (child_model, + "inserted", + G_CALLBACK (gtk_tree_model_sort_inserted), + tree_model_sort); tree_model_sort->has_child_toggled_id = - g_signal_connectc (child_model, - "has_child_toggled", - G_CALLBACK (gtk_tree_model_sort_has_child_toggled), - tree_model_sort, - FALSE); + g_signal_connect (child_model, + "has_child_toggled", + G_CALLBACK (gtk_tree_model_sort_has_child_toggled), + tree_model_sort); tree_model_sort->deleted_id = - g_signal_connectc (child_model, - "deleted", - G_CALLBACK (gtk_tree_model_sort_deleted), - tree_model_sort, - FALSE); + g_signal_connect (child_model, + "deleted", + G_CALLBACK (gtk_tree_model_sort_deleted), + tree_model_sort); tree_model_sort->flags = gtk_tree_model_get_flags (child_model); n_columns = gtk_tree_model_get_n_columns (child_model); diff --git a/gtk/gtktreesortable.c b/gtk/gtktreesortable.c index ab50ce73c7..14d0e3c660 100644 --- a/gtk/gtktreesortable.c +++ b/gtk/gtktreesortable.c @@ -56,13 +56,13 @@ gtk_tree_sortable_base_init (gpointer g_class) if (! initialized) { - g_signal_newc ("sort_column_changed", - GTK_TYPE_TREE_SORTABLE, - G_SIGNAL_RUN_LAST, - G_STRUCT_OFFSET (GtkTreeSortableIface, sort_column_changed), - NULL, NULL, - gtk_marshal_VOID__VOID, - G_TYPE_NONE, 0); + g_signal_new ("sort_column_changed", + GTK_TYPE_TREE_SORTABLE, + G_SIGNAL_RUN_LAST, + G_STRUCT_OFFSET (GtkTreeSortableIface, sort_column_changed), + NULL, NULL, + gtk_marshal_VOID__VOID, + G_TYPE_NONE, 0); initialized = TRUE; } } diff --git a/gtk/gtktreeview.c b/gtk/gtktreeview.c index 59817163b0..df79a7ae21 100644 --- a/gtk/gtktreeview.c +++ b/gtk/gtktreeview.c @@ -575,138 +575,138 @@ gtk_tree_view_class_init (GtkTreeViewClass *class) GTK_TYPE_TREE_VIEW_COLUMN); tree_view_signals[TEST_EXPAND_ROW] = - g_signal_newc ("test_expand_row", - G_TYPE_FROM_CLASS (object_class), - G_SIGNAL_RUN_LAST, - G_STRUCT_OFFSET (GtkTreeViewClass, test_expand_row), - _gtk_boolean_handled_accumulator, NULL, - gtk_marshal_BOOLEAN__BOXED_BOXED, - G_TYPE_BOOLEAN, 2, - GTK_TYPE_TREE_ITER, - GTK_TYPE_TREE_PATH); + g_signal_new ("test_expand_row", + G_TYPE_FROM_CLASS (object_class), + G_SIGNAL_RUN_LAST, + G_STRUCT_OFFSET (GtkTreeViewClass, test_expand_row), + _gtk_boolean_handled_accumulator, NULL, + gtk_marshal_BOOLEAN__BOXED_BOXED, + G_TYPE_BOOLEAN, 2, + GTK_TYPE_TREE_ITER, + GTK_TYPE_TREE_PATH); tree_view_signals[TEST_COLLAPSE_ROW] = - g_signal_newc ("test_collapse_row", - G_TYPE_FROM_CLASS (object_class), - G_SIGNAL_RUN_LAST, - G_STRUCT_OFFSET (GtkTreeViewClass, test_collapse_row), - _gtk_boolean_handled_accumulator, NULL, - gtk_marshal_BOOLEAN__BOXED_BOXED, - G_TYPE_BOOLEAN, 2, - GTK_TYPE_TREE_ITER, - GTK_TYPE_TREE_PATH); + g_signal_new ("test_collapse_row", + G_TYPE_FROM_CLASS (object_class), + G_SIGNAL_RUN_LAST, + G_STRUCT_OFFSET (GtkTreeViewClass, test_collapse_row), + _gtk_boolean_handled_accumulator, NULL, + gtk_marshal_BOOLEAN__BOXED_BOXED, + G_TYPE_BOOLEAN, 2, + GTK_TYPE_TREE_ITER, + GTK_TYPE_TREE_PATH); tree_view_signals[ROW_EXPANDED] = - g_signal_newc ("row_expanded", - G_TYPE_FROM_CLASS (object_class), - G_SIGNAL_RUN_LAST, - G_STRUCT_OFFSET (GtkTreeViewClass, row_expanded), - NULL, NULL, - gtk_marshal_VOID__BOXED_BOXED, - GTK_TYPE_NONE, 2, - GTK_TYPE_TREE_ITER, - GTK_TYPE_TREE_PATH); + g_signal_new ("row_expanded", + G_TYPE_FROM_CLASS (object_class), + G_SIGNAL_RUN_LAST, + G_STRUCT_OFFSET (GtkTreeViewClass, row_expanded), + NULL, NULL, + gtk_marshal_VOID__BOXED_BOXED, + GTK_TYPE_NONE, 2, + GTK_TYPE_TREE_ITER, + GTK_TYPE_TREE_PATH); tree_view_signals[ROW_COLLAPSED] = - g_signal_newc ("row_collapsed", - G_TYPE_FROM_CLASS (object_class), - G_SIGNAL_RUN_LAST, - G_STRUCT_OFFSET (GtkTreeViewClass, row_collapsed), - NULL, NULL, - gtk_marshal_VOID__BOXED_BOXED, - GTK_TYPE_NONE, 2, - GTK_TYPE_TREE_ITER, - GTK_TYPE_TREE_PATH); + g_signal_new ("row_collapsed", + G_TYPE_FROM_CLASS (object_class), + G_SIGNAL_RUN_LAST, + G_STRUCT_OFFSET (GtkTreeViewClass, row_collapsed), + NULL, NULL, + gtk_marshal_VOID__BOXED_BOXED, + GTK_TYPE_NONE, 2, + GTK_TYPE_TREE_ITER, + GTK_TYPE_TREE_PATH); tree_view_signals[COLUMNS_CHANGED] = - g_signal_newc ("columns_changed", - G_TYPE_FROM_CLASS (object_class), - G_SIGNAL_RUN_LAST, - G_STRUCT_OFFSET (GtkTreeViewClass, columns_changed), - NULL, NULL, - gtk_marshal_NONE__NONE, - G_TYPE_NONE, 0); + g_signal_new ("columns_changed", + G_TYPE_FROM_CLASS (object_class), + G_SIGNAL_RUN_LAST, + G_STRUCT_OFFSET (GtkTreeViewClass, columns_changed), + NULL, NULL, + gtk_marshal_NONE__NONE, + G_TYPE_NONE, 0); tree_view_signals[BEGIN_EXTENDED_SELECTION] = - g_signal_newc ("begin_extended_selection", - G_TYPE_FROM_CLASS (object_class), - G_SIGNAL_RUN_LAST | GTK_RUN_ACTION, - G_STRUCT_OFFSET (GtkTreeViewClass, begin_extended_selection), - NULL, NULL, - gtk_marshal_NONE__NONE, - G_TYPE_NONE, 0); + g_signal_new ("begin_extended_selection", + G_TYPE_FROM_CLASS (object_class), + G_SIGNAL_RUN_LAST | GTK_RUN_ACTION, + G_STRUCT_OFFSET (GtkTreeViewClass, begin_extended_selection), + NULL, NULL, + gtk_marshal_NONE__NONE, + G_TYPE_NONE, 0); tree_view_signals[END_EXTENDED_SELECTION] = - g_signal_newc ("end_extended_selection", - G_TYPE_FROM_CLASS (object_class), - G_SIGNAL_RUN_LAST | GTK_RUN_ACTION, - G_STRUCT_OFFSET (GtkTreeViewClass, end_extended_selection), - NULL, NULL, - gtk_marshal_NONE__NONE, - G_TYPE_NONE, 0); + g_signal_new ("end_extended_selection", + G_TYPE_FROM_CLASS (object_class), + G_SIGNAL_RUN_LAST | GTK_RUN_ACTION, + G_STRUCT_OFFSET (GtkTreeViewClass, end_extended_selection), + NULL, NULL, + gtk_marshal_NONE__NONE, + G_TYPE_NONE, 0); tree_view_signals[BEGIN_FREE_MOTION] = - g_signal_newc ("begin_free_motion", - G_TYPE_FROM_CLASS (object_class), - G_SIGNAL_RUN_LAST | GTK_RUN_ACTION, - G_STRUCT_OFFSET (GtkTreeViewClass, begin_free_motion), - NULL, NULL, - gtk_marshal_NONE__NONE, - G_TYPE_NONE, 0); + g_signal_new ("begin_free_motion", + G_TYPE_FROM_CLASS (object_class), + G_SIGNAL_RUN_LAST | GTK_RUN_ACTION, + G_STRUCT_OFFSET (GtkTreeViewClass, begin_free_motion), + NULL, NULL, + gtk_marshal_NONE__NONE, + G_TYPE_NONE, 0); tree_view_signals[END_FREE_MOTION] = - g_signal_newc ("end_free_motion", - G_TYPE_FROM_CLASS (object_class), - G_SIGNAL_RUN_LAST | GTK_RUN_ACTION, - G_STRUCT_OFFSET (GtkTreeViewClass, end_free_motion), - NULL, NULL, - gtk_marshal_NONE__NONE, - G_TYPE_NONE, 0); + g_signal_new ("end_free_motion", + G_TYPE_FROM_CLASS (object_class), + G_SIGNAL_RUN_LAST | GTK_RUN_ACTION, + G_STRUCT_OFFSET (GtkTreeViewClass, end_free_motion), + NULL, NULL, + gtk_marshal_NONE__NONE, + G_TYPE_NONE, 0); tree_view_signals[MOVE_CURSOR] = - g_signal_newc ("move_cursor", - G_TYPE_FROM_CLASS (object_class), - G_SIGNAL_RUN_LAST | GTK_RUN_ACTION, - G_STRUCT_OFFSET (GtkTreeViewClass, move_cursor), - NULL, NULL, - gtk_marshal_VOID__ENUM_INT, - GTK_TYPE_NONE, 2, GTK_TYPE_MOVEMENT_STEP, GTK_TYPE_INT); + g_signal_new ("move_cursor", + G_TYPE_FROM_CLASS (object_class), + G_SIGNAL_RUN_LAST | GTK_RUN_ACTION, + G_STRUCT_OFFSET (GtkTreeViewClass, move_cursor), + NULL, NULL, + gtk_marshal_VOID__ENUM_INT, + GTK_TYPE_NONE, 2, GTK_TYPE_MOVEMENT_STEP, GTK_TYPE_INT); tree_view_signals[SELECT_CURSOR_ROW] = - g_signal_newc ("select_cursor_row", - G_TYPE_FROM_CLASS (object_class), - G_SIGNAL_RUN_LAST | GTK_RUN_ACTION, - G_STRUCT_OFFSET (GtkTreeViewClass, select_cursor_row), - NULL, NULL, - gtk_marshal_NONE__NONE, - GTK_TYPE_NONE, 0); + g_signal_new ("select_cursor_row", + G_TYPE_FROM_CLASS (object_class), + G_SIGNAL_RUN_LAST | GTK_RUN_ACTION, + G_STRUCT_OFFSET (GtkTreeViewClass, select_cursor_row), + NULL, NULL, + gtk_marshal_NONE__NONE, + GTK_TYPE_NONE, 0); tree_view_signals[TOGGLE_CURSOR_ROW] = - g_signal_newc ("toggle_cursor_row", - G_TYPE_FROM_CLASS (object_class), - G_SIGNAL_RUN_LAST | GTK_RUN_ACTION, - G_STRUCT_OFFSET (GtkTreeViewClass, toggle_cursor_row), - NULL, NULL, - gtk_marshal_NONE__NONE, - GTK_TYPE_NONE, 0); + g_signal_new ("toggle_cursor_row", + G_TYPE_FROM_CLASS (object_class), + G_SIGNAL_RUN_LAST | GTK_RUN_ACTION, + G_STRUCT_OFFSET (GtkTreeViewClass, toggle_cursor_row), + NULL, NULL, + gtk_marshal_NONE__NONE, + GTK_TYPE_NONE, 0); tree_view_signals[EXPAND_COLLAPSE_CURSOR_ROW] = - g_signal_newc ("expand_collapse_cursor_row", - G_TYPE_FROM_CLASS (object_class), - G_SIGNAL_RUN_LAST | GTK_RUN_ACTION, - G_STRUCT_OFFSET (GtkTreeViewClass, expand_collapse_cursor_row), - NULL, NULL, - gtk_marshal_VOID__BOOLEAN_BOOLEAN_BOOLEAN, - GTK_TYPE_NONE, 3, GTK_TYPE_BOOL, GTK_TYPE_BOOL, GTK_TYPE_BOOL); + g_signal_new ("expand_collapse_cursor_row", + G_TYPE_FROM_CLASS (object_class), + G_SIGNAL_RUN_LAST | GTK_RUN_ACTION, + G_STRUCT_OFFSET (GtkTreeViewClass, expand_collapse_cursor_row), + NULL, NULL, + gtk_marshal_VOID__BOOLEAN_BOOLEAN_BOOLEAN, + GTK_TYPE_NONE, 3, GTK_TYPE_BOOL, GTK_TYPE_BOOL, GTK_TYPE_BOOL); tree_view_signals[SELECT_CURSOR_PARENT] = - g_signal_newc ("select_cursor_parent", - G_TYPE_FROM_CLASS (object_class), - G_SIGNAL_RUN_LAST | GTK_RUN_ACTION, - G_STRUCT_OFFSET (GtkTreeViewClass, select_cursor_parent), - NULL, NULL, - gtk_marshal_NONE__NONE, - GTK_TYPE_NONE, 0); + g_signal_new ("select_cursor_parent", + G_TYPE_FROM_CLASS (object_class), + G_SIGNAL_RUN_LAST | GTK_RUN_ACTION, + G_STRUCT_OFFSET (GtkTreeViewClass, select_cursor_parent), + NULL, NULL, + gtk_marshal_NONE__NONE, + GTK_TYPE_NONE, 0); /* Key bindings */ gtk_binding_entry_add_signal (binding_set, GDK_Shift_L, 0, "begin_extended_selection", 0); @@ -4680,31 +4680,26 @@ gtk_tree_view_setup_model (GtkTreeView *tree_view) tree_view->priv->tree = NULL; - g_signal_connectc (tree_view->priv->model, - "range_changed", - (GCallback) gtk_tree_view_range_changed, - tree_view, - FALSE); - g_signal_connectc (tree_view->priv->model, - "inserted", - (GCallback) gtk_tree_view_inserted, - tree_view, - FALSE); - g_signal_connectc (tree_view->priv->model, - "has_child_toggled", - (GCallback) gtk_tree_view_has_child_toggled, - tree_view, - FALSE); - g_signal_connectc (tree_view->priv->model, - "deleted", - (GCallback) gtk_tree_view_deleted, - tree_view, - FALSE); - g_signal_connectc (tree_view->priv->model, - "reordered", - (GCallback) gtk_tree_view_reordered, - tree_view, - FALSE); + g_signal_connect (tree_view->priv->model, + "range_changed", + (GCallback) gtk_tree_view_range_changed, + tree_view); + g_signal_connect (tree_view->priv->model, + "inserted", + (GCallback) gtk_tree_view_inserted, + tree_view); + g_signal_connect (tree_view->priv->model, + "has_child_toggled", + (GCallback) gtk_tree_view_has_child_toggled, + tree_view); + g_signal_connect (tree_view->priv->model, + "deleted", + (GCallback) gtk_tree_view_deleted, + tree_view); + g_signal_connect (tree_view->priv->model, + "reordered", + (GCallback) gtk_tree_view_reordered, + tree_view); if (tree_view->priv->columns == NULL) return; diff --git a/gtk/gtktreeviewcolumn.c b/gtk/gtktreeviewcolumn.c index 677a213ece..f79f6c2cdd 100644 --- a/gtk/gtktreeviewcolumn.c +++ b/gtk/gtktreeviewcolumn.c @@ -156,13 +156,13 @@ gtk_tree_view_column_class_init (GtkTreeViewColumnClass *class) object_class->get_property = gtk_tree_view_column_get_property; tree_column_signals[CLICKED] = - g_signal_newc ("clicked", - GTK_CLASS_TYPE (object_class), - G_SIGNAL_RUN_LAST, - G_STRUCT_OFFSET (GtkTreeViewColumnClass, clicked), - NULL, NULL, - gtk_marshal_VOID__VOID, - GTK_TYPE_NONE, 0); + g_signal_new ("clicked", + GTK_CLASS_TYPE (object_class), + G_SIGNAL_RUN_LAST, + G_STRUCT_OFFSET (GtkTreeViewColumnClass, clicked), + NULL, NULL, + gtk_marshal_VOID__VOID, + GTK_TYPE_NONE, 0); g_object_class_install_property (object_class, PROP_VISIBLE, @@ -849,10 +849,10 @@ gtk_tree_view_column_setup_sort_column_id_callback (GtkTreeViewColumn *tree_colu if (tree_column->sort_column_changed_signal == 0) tree_column->sort_column_changed_signal = - g_signal_connectc (G_OBJECT (model), "sort_column_changed", - GTK_SIGNAL_FUNC (gtk_tree_view_model_sort_column_changed), - tree_column, FALSE); - + g_signal_connect (G_OBJECT (model), "sort_column_changed", + GTK_SIGNAL_FUNC (gtk_tree_view_model_sort_column_changed), + tree_column); + if (gtk_tree_sortable_get_sort_column_id (GTK_TREE_SORTABLE (model), &real_sort_column_id, &real_order) && @@ -1870,10 +1870,10 @@ gtk_tree_view_column_set_sort_column_id (GtkTreeViewColumn *tree_column, gtk_tree_view_column_set_clickable (tree_column, TRUE); if (! tree_column->sort_clicked_signal) - tree_column->sort_clicked_signal = g_signal_connectc (G_OBJECT (tree_column), - "clicked", - G_CALLBACK (gtk_tree_view_column_sort), - NULL, FALSE); + tree_column->sort_clicked_signal = g_signal_connect (G_OBJECT (tree_column), + "clicked", + G_CALLBACK (gtk_tree_view_column_sort), + NULL); gtk_tree_view_column_setup_sort_column_id_callback (tree_column); } diff --git a/gtk/gtkwidget.c b/gtk/gtkwidget.c index 3ff70a81c0..b26a1e2c56 100644 --- a/gtk/gtkwidget.c +++ b/gtk/gtkwidget.c @@ -570,7 +570,7 @@ gtk_widget_class_init (GtkWidgetClass *klass) gtk_marshal_VOID__VOID, GTK_TYPE_NONE, 0); widget_signals[SIZE_REQUEST] = - g_signal_newc ("size_request", + g_signal_new ("size_request", G_OBJECT_CLASS_TYPE (object_class), G_SIGNAL_RUN_FIRST, G_STRUCT_OFFSET (GtkWidgetClass, size_request), @@ -634,7 +634,7 @@ gtk_widget_class_init (GtkWidgetClass *klass) GTK_TYPE_NONE, 1, GTK_TYPE_BOOL); widget_signals[CHILD_NOTIFY] = - g_signal_newc ("child_notify", + g_signal_new ("child_notify", G_TYPE_FROM_CLASS (klass), G_SIGNAL_RUN_FIRST | G_SIGNAL_NO_RECURSE | G_SIGNAL_DETAILED | G_SIGNAL_NO_HOOKS, G_STRUCT_OFFSET (GtkWidgetClass, child_notify), @@ -649,14 +649,14 @@ gtk_widget_class_init (GtkWidgetClass *klass) gtk_accel_group_create_remove (GTK_CLASS_TYPE (object_class), GTK_RUN_LAST, GTK_SIGNAL_OFFSET (GtkWidgetClass, remove_accelerator)); widget_signals[ACTIVATE_MNEMONIC] = - g_signal_newc ("mnemonic_activate", - GTK_CLASS_TYPE (object_class), - GTK_RUN_LAST, - GTK_SIGNAL_OFFSET (GtkWidgetClass, mnemonic_activate), - _gtk_boolean_handled_accumulator, NULL, - gtk_marshal_BOOLEAN__BOOLEAN, - GTK_TYPE_BOOL, 1, - GTK_TYPE_BOOL); + g_signal_new ("mnemonic_activate", + GTK_CLASS_TYPE (object_class), + GTK_RUN_LAST, + GTK_SIGNAL_OFFSET (GtkWidgetClass, mnemonic_activate), + _gtk_boolean_handled_accumulator, NULL, + gtk_marshal_BOOLEAN__BOOLEAN, + GTK_TYPE_BOOL, 1, + GTK_TYPE_BOOL); widget_signals[GRAB_FOCUS] = gtk_signal_new ("grab_focus", GTK_RUN_LAST | GTK_RUN_ACTION, @@ -665,141 +665,141 @@ gtk_widget_class_init (GtkWidgetClass *klass) gtk_marshal_VOID__VOID, GTK_TYPE_NONE, 0); widget_signals[FOCUS] = - g_signal_newc ("focus", - G_TYPE_FROM_CLASS (object_class), - G_SIGNAL_RUN_LAST, - G_STRUCT_OFFSET (GtkWidgetClass, focus), - _gtk_boolean_handled_accumulator, NULL, - gtk_marshal_BOOLEAN__ENUM, - G_TYPE_BOOLEAN, 1, - GTK_TYPE_DIRECTION_TYPE); + g_signal_new ("focus", + G_TYPE_FROM_CLASS (object_class), + G_SIGNAL_RUN_LAST, + G_STRUCT_OFFSET (GtkWidgetClass, focus), + _gtk_boolean_handled_accumulator, NULL, + gtk_marshal_BOOLEAN__ENUM, + G_TYPE_BOOLEAN, 1, + GTK_TYPE_DIRECTION_TYPE); widget_signals[EVENT] = - g_signal_newc ("event", - G_TYPE_FROM_CLASS (object_class), - G_SIGNAL_RUN_LAST, - G_STRUCT_OFFSET(GtkWidgetClass, event), - _gtk_boolean_handled_accumulator, NULL, - gtk_marshal_BOOLEAN__BOXED, - G_TYPE_BOOLEAN, 1, - GDK_TYPE_EVENT); + g_signal_new ("event", + G_TYPE_FROM_CLASS (object_class), + G_SIGNAL_RUN_LAST, + G_STRUCT_OFFSET(GtkWidgetClass, event), + _gtk_boolean_handled_accumulator, NULL, + gtk_marshal_BOOLEAN__BOXED, + G_TYPE_BOOLEAN, 1, + GDK_TYPE_EVENT); widget_signals[EVENT_AFTER] = - g_signal_newc ("event-after", - G_TYPE_FROM_CLASS (object_class), - 0, - 0, - NULL, NULL, - gtk_marshal_VOID__BOXED, - G_TYPE_NONE, 1, GDK_TYPE_EVENT); + g_signal_new ("event-after", + G_TYPE_FROM_CLASS (object_class), + 0, + 0, + NULL, NULL, + gtk_marshal_VOID__BOXED, + G_TYPE_NONE, 1, GDK_TYPE_EVENT); widget_signals[BUTTON_PRESS_EVENT] = - g_signal_newc ("button_press_event", - G_TYPE_FROM_CLASS (object_class), - G_SIGNAL_RUN_LAST, - G_STRUCT_OFFSET(GtkWidgetClass, button_press_event), - _gtk_boolean_handled_accumulator, NULL, - gtk_marshal_BOOLEAN__BOXED, - G_TYPE_BOOLEAN, 1, - GDK_TYPE_EVENT); + g_signal_new ("button_press_event", + G_TYPE_FROM_CLASS (object_class), + G_SIGNAL_RUN_LAST, + G_STRUCT_OFFSET(GtkWidgetClass, button_press_event), + _gtk_boolean_handled_accumulator, NULL, + gtk_marshal_BOOLEAN__BOXED, + G_TYPE_BOOLEAN, 1, + GDK_TYPE_EVENT); widget_signals[BUTTON_RELEASE_EVENT] = - g_signal_newc ("button_release_event", - G_TYPE_FROM_CLASS(object_class), - G_SIGNAL_RUN_LAST, - G_STRUCT_OFFSET(GtkWidgetClass, button_release_event), - _gtk_boolean_handled_accumulator, NULL, - gtk_marshal_BOOLEAN__BOXED, - G_TYPE_BOOLEAN, 1, - GDK_TYPE_EVENT); + g_signal_new ("button_release_event", + G_TYPE_FROM_CLASS(object_class), + G_SIGNAL_RUN_LAST, + G_STRUCT_OFFSET(GtkWidgetClass, button_release_event), + _gtk_boolean_handled_accumulator, NULL, + gtk_marshal_BOOLEAN__BOXED, + G_TYPE_BOOLEAN, 1, + GDK_TYPE_EVENT); widget_signals[SCROLL_EVENT] = - g_signal_newc ("scroll_event", - G_TYPE_FROM_CLASS(object_class), - G_SIGNAL_RUN_LAST, - G_STRUCT_OFFSET(GtkWidgetClass, scroll_event), - _gtk_boolean_handled_accumulator, NULL, - gtk_marshal_BOOLEAN__BOXED, - G_TYPE_BOOLEAN, 1, - GDK_TYPE_EVENT); + g_signal_new ("scroll_event", + G_TYPE_FROM_CLASS(object_class), + G_SIGNAL_RUN_LAST, + G_STRUCT_OFFSET(GtkWidgetClass, scroll_event), + _gtk_boolean_handled_accumulator, NULL, + gtk_marshal_BOOLEAN__BOXED, + G_TYPE_BOOLEAN, 1, + GDK_TYPE_EVENT); widget_signals[MOTION_NOTIFY_EVENT] = - g_signal_newc ("motion_notify_event", - G_TYPE_FROM_CLASS(object_class), - G_SIGNAL_RUN_LAST, - G_STRUCT_OFFSET(GtkWidgetClass, motion_notify_event), - _gtk_boolean_handled_accumulator, NULL, - gtk_marshal_BOOLEAN__BOXED, - G_TYPE_BOOLEAN, 1, - GDK_TYPE_EVENT); + g_signal_new ("motion_notify_event", + G_TYPE_FROM_CLASS(object_class), + G_SIGNAL_RUN_LAST, + G_STRUCT_OFFSET(GtkWidgetClass, motion_notify_event), + _gtk_boolean_handled_accumulator, NULL, + gtk_marshal_BOOLEAN__BOXED, + G_TYPE_BOOLEAN, 1, + GDK_TYPE_EVENT); widget_signals[DELETE_EVENT] = - g_signal_newc ("delete_event", - G_TYPE_FROM_CLASS(object_class), - G_SIGNAL_RUN_LAST, - G_STRUCT_OFFSET(GtkWidgetClass, delete_event), - _gtk_boolean_handled_accumulator, NULL, - gtk_marshal_BOOLEAN__BOXED, - G_TYPE_BOOLEAN, 1, - GDK_TYPE_EVENT); + g_signal_new ("delete_event", + G_TYPE_FROM_CLASS(object_class), + G_SIGNAL_RUN_LAST, + G_STRUCT_OFFSET(GtkWidgetClass, delete_event), + _gtk_boolean_handled_accumulator, NULL, + gtk_marshal_BOOLEAN__BOXED, + G_TYPE_BOOLEAN, 1, + GDK_TYPE_EVENT); widget_signals[DESTROY_EVENT] = - g_signal_newc ("destroy_event", - G_TYPE_FROM_CLASS(object_class), - G_SIGNAL_RUN_LAST, - G_STRUCT_OFFSET(GtkWidgetClass, destroy_event), - _gtk_boolean_handled_accumulator, NULL, - gtk_marshal_BOOLEAN__BOXED, - G_TYPE_BOOLEAN, 1, - GDK_TYPE_EVENT); + g_signal_new ("destroy_event", + G_TYPE_FROM_CLASS(object_class), + G_SIGNAL_RUN_LAST, + G_STRUCT_OFFSET(GtkWidgetClass, destroy_event), + _gtk_boolean_handled_accumulator, NULL, + gtk_marshal_BOOLEAN__BOXED, + G_TYPE_BOOLEAN, 1, + GDK_TYPE_EVENT); widget_signals[EXPOSE_EVENT] = - g_signal_newc ("expose_event", - G_TYPE_FROM_CLASS(object_class), - G_SIGNAL_RUN_LAST, - G_STRUCT_OFFSET(GtkWidgetClass, expose_event), - _gtk_boolean_handled_accumulator, NULL, - gtk_marshal_BOOLEAN__BOXED, - G_TYPE_BOOLEAN, 1, - GDK_TYPE_EVENT); + g_signal_new ("expose_event", + G_TYPE_FROM_CLASS(object_class), + G_SIGNAL_RUN_LAST, + G_STRUCT_OFFSET(GtkWidgetClass, expose_event), + _gtk_boolean_handled_accumulator, NULL, + gtk_marshal_BOOLEAN__BOXED, + G_TYPE_BOOLEAN, 1, + GDK_TYPE_EVENT); widget_signals[KEY_PRESS_EVENT] = - g_signal_newc ("key_press_event", - G_TYPE_FROM_CLASS(object_class), - G_SIGNAL_RUN_LAST, - G_STRUCT_OFFSET(GtkWidgetClass, key_press_event), - _gtk_boolean_handled_accumulator, NULL, - gtk_marshal_BOOLEAN__BOXED, - G_TYPE_BOOLEAN, 1, - GDK_TYPE_EVENT); + g_signal_new ("key_press_event", + G_TYPE_FROM_CLASS(object_class), + G_SIGNAL_RUN_LAST, + G_STRUCT_OFFSET(GtkWidgetClass, key_press_event), + _gtk_boolean_handled_accumulator, NULL, + gtk_marshal_BOOLEAN__BOXED, + G_TYPE_BOOLEAN, 1, + GDK_TYPE_EVENT); widget_signals[KEY_RELEASE_EVENT] = - g_signal_newc ("key_release_event", - G_TYPE_FROM_CLASS(object_class), - G_SIGNAL_RUN_LAST, - G_STRUCT_OFFSET(GtkWidgetClass, key_release_event), - _gtk_boolean_handled_accumulator, NULL, - gtk_marshal_BOOLEAN__BOXED, - G_TYPE_BOOLEAN, 1, - GDK_TYPE_EVENT); + g_signal_new ("key_release_event", + G_TYPE_FROM_CLASS(object_class), + G_SIGNAL_RUN_LAST, + G_STRUCT_OFFSET(GtkWidgetClass, key_release_event), + _gtk_boolean_handled_accumulator, NULL, + gtk_marshal_BOOLEAN__BOXED, + G_TYPE_BOOLEAN, 1, + GDK_TYPE_EVENT); widget_signals[ENTER_NOTIFY_EVENT] = - g_signal_newc ("enter_notify_event", - G_TYPE_FROM_CLASS(object_class), - G_SIGNAL_RUN_LAST, - G_STRUCT_OFFSET(GtkWidgetClass, enter_notify_event), - _gtk_boolean_handled_accumulator, NULL, - gtk_marshal_BOOLEAN__BOXED, - G_TYPE_BOOLEAN, 1, - GDK_TYPE_EVENT); + g_signal_new ("enter_notify_event", + G_TYPE_FROM_CLASS(object_class), + G_SIGNAL_RUN_LAST, + G_STRUCT_OFFSET(GtkWidgetClass, enter_notify_event), + _gtk_boolean_handled_accumulator, NULL, + gtk_marshal_BOOLEAN__BOXED, + G_TYPE_BOOLEAN, 1, + GDK_TYPE_EVENT); widget_signals[LEAVE_NOTIFY_EVENT] = - g_signal_newc ("leave_notify_event", - G_TYPE_FROM_CLASS(object_class), - G_SIGNAL_RUN_LAST, - G_STRUCT_OFFSET(GtkWidgetClass, leave_notify_event), - _gtk_boolean_handled_accumulator, NULL, - gtk_marshal_BOOLEAN__BOXED, - G_TYPE_BOOLEAN, 1, - GDK_TYPE_EVENT); + g_signal_new ("leave_notify_event", + G_TYPE_FROM_CLASS(object_class), + G_SIGNAL_RUN_LAST, + G_STRUCT_OFFSET(GtkWidgetClass, leave_notify_event), + _gtk_boolean_handled_accumulator, NULL, + gtk_marshal_BOOLEAN__BOXED, + G_TYPE_BOOLEAN, 1, + GDK_TYPE_EVENT); widget_signals[CONFIGURE_EVENT] = - g_signal_newc ("configure_event", - G_TYPE_FROM_CLASS(object_class), - G_SIGNAL_RUN_LAST, - G_STRUCT_OFFSET(GtkWidgetClass, configure_event), - _gtk_boolean_handled_accumulator, NULL, - gtk_marshal_BOOLEAN__BOXED, - G_TYPE_BOOLEAN, 1, - GDK_TYPE_EVENT); + g_signal_new ("configure_event", + G_TYPE_FROM_CLASS(object_class), + G_SIGNAL_RUN_LAST, + G_STRUCT_OFFSET(GtkWidgetClass, configure_event), + _gtk_boolean_handled_accumulator, NULL, + gtk_marshal_BOOLEAN__BOXED, + G_TYPE_BOOLEAN, 1, + GDK_TYPE_EVENT); widget_signals[FOCUS_IN_EVENT] = - g_signal_newc ("focus_in_event", + g_signal_new ("focus_in_event", G_TYPE_FROM_CLASS(object_class), G_SIGNAL_RUN_LAST, G_STRUCT_OFFSET(GtkWidgetClass, focus_in_event), @@ -808,7 +808,7 @@ gtk_widget_class_init (GtkWidgetClass *klass) G_TYPE_BOOLEAN, 1, GDK_TYPE_EVENT); widget_signals[FOCUS_OUT_EVENT] = - g_signal_newc ("focus_out_event", + g_signal_new ("focus_out_event", G_TYPE_FROM_CLASS(object_class), G_SIGNAL_RUN_LAST, G_STRUCT_OFFSET(GtkWidgetClass, focus_out_event), @@ -817,7 +817,7 @@ gtk_widget_class_init (GtkWidgetClass *klass) G_TYPE_BOOLEAN, 1, GDK_TYPE_EVENT); widget_signals[MAP_EVENT] = - g_signal_newc ("map_event", + g_signal_new ("map_event", G_TYPE_FROM_CLASS(object_class), G_SIGNAL_RUN_LAST, G_STRUCT_OFFSET(GtkWidgetClass, map_event), @@ -826,7 +826,7 @@ gtk_widget_class_init (GtkWidgetClass *klass) G_TYPE_BOOLEAN, 1, GDK_TYPE_EVENT); widget_signals[UNMAP_EVENT] = - g_signal_newc ("unmap_event", + g_signal_new ("unmap_event", G_TYPE_FROM_CLASS(object_class), G_SIGNAL_RUN_LAST, G_STRUCT_OFFSET(GtkWidgetClass, unmap_event), @@ -835,7 +835,7 @@ gtk_widget_class_init (GtkWidgetClass *klass) G_TYPE_BOOLEAN, 1, GDK_TYPE_EVENT); widget_signals[PROPERTY_NOTIFY_EVENT] = - g_signal_newc ("property_notify_event", + g_signal_new ("property_notify_event", G_TYPE_FROM_CLASS(object_class), G_SIGNAL_RUN_LAST, G_STRUCT_OFFSET(GtkWidgetClass, property_notify_event), @@ -844,7 +844,7 @@ gtk_widget_class_init (GtkWidgetClass *klass) G_TYPE_BOOLEAN, 1, GDK_TYPE_EVENT); widget_signals[SELECTION_CLEAR_EVENT] = - g_signal_newc ("selection_clear_event", + g_signal_new ("selection_clear_event", G_TYPE_FROM_CLASS(object_class), G_SIGNAL_RUN_LAST, G_STRUCT_OFFSET(GtkWidgetClass, selection_clear_event), @@ -853,7 +853,7 @@ gtk_widget_class_init (GtkWidgetClass *klass) G_TYPE_BOOLEAN, 1, GDK_TYPE_EVENT); widget_signals[SELECTION_REQUEST_EVENT] = - g_signal_newc ("selection_request_event", + g_signal_new ("selection_request_event", G_TYPE_FROM_CLASS(object_class), G_SIGNAL_RUN_LAST, G_STRUCT_OFFSET(GtkWidgetClass, selection_request_event), @@ -862,7 +862,7 @@ gtk_widget_class_init (GtkWidgetClass *klass) G_TYPE_BOOLEAN, 1, GDK_TYPE_EVENT); widget_signals[SELECTION_NOTIFY_EVENT] = - g_signal_newc ("selection_notify_event", + g_signal_new ("selection_notify_event", G_TYPE_FROM_CLASS(object_class), G_SIGNAL_RUN_LAST, G_STRUCT_OFFSET(GtkWidgetClass, selection_notify_event), @@ -890,7 +890,7 @@ gtk_widget_class_init (GtkWidgetClass *klass) GTK_TYPE_UINT, GTK_TYPE_UINT); widget_signals[PROXIMITY_IN_EVENT] = - g_signal_newc ("proximity_in_event", + g_signal_new ("proximity_in_event", G_TYPE_FROM_CLASS(object_class), G_SIGNAL_RUN_LAST, G_STRUCT_OFFSET(GtkWidgetClass, proximity_in_event), @@ -899,7 +899,7 @@ gtk_widget_class_init (GtkWidgetClass *klass) G_TYPE_BOOLEAN, 1, GDK_TYPE_EVENT); widget_signals[PROXIMITY_OUT_EVENT] = - g_signal_newc ("proximity_out_event", + g_signal_new ("proximity_out_event", G_TYPE_FROM_CLASS(object_class), G_SIGNAL_RUN_LAST, G_STRUCT_OFFSET(GtkWidgetClass, proximity_out_event), @@ -941,7 +941,7 @@ gtk_widget_class_init (GtkWidgetClass *klass) GTK_TYPE_NONE, 1, GDK_TYPE_DRAG_CONTEXT); widget_signals[DRAG_MOTION] = - g_signal_newc ("drag_motion", + g_signal_new ("drag_motion", G_TYPE_FROM_CLASS(object_class), G_SIGNAL_RUN_LAST, G_STRUCT_OFFSET(GtkWidgetClass, drag_motion), @@ -953,7 +953,7 @@ gtk_widget_class_init (GtkWidgetClass *klass) G_TYPE_INT, G_TYPE_UINT); widget_signals[DRAG_DROP] = - g_signal_newc ("drag_drop", + g_signal_new ("drag_drop", G_TYPE_FROM_CLASS(object_class), G_SIGNAL_RUN_LAST, G_STRUCT_OFFSET(GtkWidgetClass, drag_drop), @@ -989,7 +989,7 @@ gtk_widget_class_init (GtkWidgetClass *klass) GTK_TYPE_UINT, GTK_TYPE_UINT); widget_signals[VISIBILITY_NOTIFY_EVENT] = - g_signal_newc ("visibility_notify_event", + g_signal_new ("visibility_notify_event", G_TYPE_FROM_CLASS(object_class), G_SIGNAL_RUN_LAST, G_STRUCT_OFFSET(GtkWidgetClass, visibility_notify_event), @@ -998,7 +998,7 @@ gtk_widget_class_init (GtkWidgetClass *klass) G_TYPE_BOOLEAN, 1, GDK_TYPE_EVENT); widget_signals[CLIENT_EVENT] = - g_signal_newc ("client_event", + g_signal_new ("client_event", G_TYPE_FROM_CLASS(object_class), G_SIGNAL_RUN_LAST, G_STRUCT_OFFSET(GtkWidgetClass, client_event), @@ -1007,7 +1007,7 @@ gtk_widget_class_init (GtkWidgetClass *klass) G_TYPE_BOOLEAN, 1, GDK_TYPE_EVENT); widget_signals[NO_EXPOSE_EVENT] = - g_signal_newc ("no_expose_event", + g_signal_new ("no_expose_event", G_TYPE_FROM_CLASS(object_class), G_SIGNAL_RUN_LAST, G_STRUCT_OFFSET(GtkWidgetClass, no_expose_event), @@ -1016,7 +1016,7 @@ gtk_widget_class_init (GtkWidgetClass *klass) G_TYPE_BOOLEAN, 1, GDK_TYPE_EVENT); widget_signals[WINDOW_STATE_EVENT] = - g_signal_newc ("window_state_event", + g_signal_new ("window_state_event", G_TYPE_FROM_CLASS(object_class), G_SIGNAL_RUN_LAST, G_STRUCT_OFFSET(GtkWidgetClass, window_state_event), diff --git a/gtk/gtkwindow.c b/gtk/gtkwindow.c index f787153a46..8b3fccab89 100644 --- a/gtk/gtkwindow.c +++ b/gtk/gtkwindow.c @@ -397,7 +397,7 @@ gtk_window_class_init (GtkWindowClass *klass) PROP_DEFAULT_HEIGHT, g_param_spec_int ("default_height", _("Default Height"), - _("The default height of the windo, or 0 to use the size request."), + _("The default height of the window, or 0 to use the size request."), 0, G_MAXINT, 0, @@ -407,62 +407,62 @@ gtk_window_class_init (GtkWindowClass *klass) PROP_DESTROY_WITH_PARENT, g_param_spec_boolean ("destroy_with_parent", _("Destroy with Parent"), - _("If this window should be destroyed when the parent is destroyed,"), + _("If this window should be destroyed when the parent is destroyed"), FALSE, G_PARAM_READWRITE)); /* Style props are set or not */ window_signals[SET_FOCUS] = - g_signal_newc ("set_focus", - G_TYPE_FROM_CLASS (object_class), - G_SIGNAL_RUN_LAST, - G_STRUCT_OFFSET (GtkWindowClass, set_focus), - NULL, NULL, - gtk_marshal_VOID__OBJECT, - G_TYPE_NONE, 1, - GTK_TYPE_WIDGET); + g_signal_new ("set_focus", + G_TYPE_FROM_CLASS (object_class), + G_SIGNAL_RUN_LAST, + G_STRUCT_OFFSET (GtkWindowClass, set_focus), + NULL, NULL, + gtk_marshal_VOID__OBJECT, + G_TYPE_NONE, 1, + GTK_TYPE_WIDGET); window_signals[FRAME_EVENT] = - g_signal_newc ("frame_event", - G_TYPE_FROM_CLASS(object_class), - G_SIGNAL_RUN_LAST, - G_STRUCT_OFFSET(GtkWindowClass, frame_event), - _gtk_boolean_handled_accumulator, NULL, - gtk_marshal_BOOLEAN__BOXED, - G_TYPE_BOOLEAN, 1, - GDK_TYPE_EVENT); + g_signal_new ("frame_event", + G_TYPE_FROM_CLASS(object_class), + G_SIGNAL_RUN_LAST, + G_STRUCT_OFFSET(GtkWindowClass, frame_event), + _gtk_boolean_handled_accumulator, NULL, + gtk_marshal_BOOLEAN__BOXED, + G_TYPE_BOOLEAN, 1, + GDK_TYPE_EVENT); window_signals[ACTIVATE_FOCUS] = - g_signal_newc ("activate_focus", - G_OBJECT_CLASS_TYPE (object_class), - G_SIGNAL_RUN_LAST | G_SIGNAL_ACTION, - GTK_SIGNAL_OFFSET (GtkWindowClass, activate_focus), - NULL, NULL, - gtk_marshal_VOID__VOID, - G_TYPE_NONE, - 0); + g_signal_new ("activate_focus", + G_OBJECT_CLASS_TYPE (object_class), + G_SIGNAL_RUN_LAST | G_SIGNAL_ACTION, + GTK_SIGNAL_OFFSET (GtkWindowClass, activate_focus), + NULL, NULL, + gtk_marshal_VOID__VOID, + G_TYPE_NONE, + 0); window_signals[ACTIVATE_DEFAULT] = - g_signal_newc ("activate_default", - G_OBJECT_CLASS_TYPE (object_class), - G_SIGNAL_RUN_LAST | G_SIGNAL_ACTION, - GTK_SIGNAL_OFFSET (GtkWindowClass, activate_default), - NULL, NULL, - gtk_marshal_VOID__VOID, - G_TYPE_NONE, - 0); + g_signal_new ("activate_default", + G_OBJECT_CLASS_TYPE (object_class), + G_SIGNAL_RUN_LAST | G_SIGNAL_ACTION, + GTK_SIGNAL_OFFSET (GtkWindowClass, activate_default), + NULL, NULL, + gtk_marshal_VOID__VOID, + G_TYPE_NONE, + 0); window_signals[MOVE_FOCUS] = - g_signal_newc ("move_focus", - G_OBJECT_CLASS_TYPE (object_class), - G_SIGNAL_RUN_LAST | G_SIGNAL_ACTION, - GTK_SIGNAL_OFFSET (GtkWindowClass, move_focus), - NULL, NULL, - gtk_marshal_VOID__ENUM, - G_TYPE_NONE, - 1, - GTK_TYPE_DIRECTION_TYPE); + g_signal_new ("move_focus", + G_OBJECT_CLASS_TYPE (object_class), + G_SIGNAL_RUN_LAST | G_SIGNAL_ACTION, + GTK_SIGNAL_OFFSET (GtkWindowClass, move_focus), + NULL, NULL, + gtk_marshal_VOID__ENUM, + G_TYPE_NONE, + 1, + GTK_TYPE_DIRECTION_TYPE); if (!mnemonic_hash_table) mnemonic_hash_table = g_hash_table_new (mnemonic_hash, @@ -3428,12 +3428,12 @@ gtk_window_present (GtkWindow *window) * gtk_window_iconify: * @window: a #GtkWindow * - * Asks to iconify @window. Note that you shouldn't assume the window - * is definitely iconified afterward, because other entities (e.g. the - * user or window manager) could deiconify it again, or there may not - * be a window manager in which case iconification isn't possible, - * etc. But normally the window will end up iconified. Just don't write - * code that crashes if not. + * Asks to iconify (i.e. minimize) the specified @window. Note that you + * shouldn't assume the window is definitely iconified afterward, + * because other entities (e.g. the user or window manager) could + * deiconify it again, or there may not be a window manager in which + * case iconification isn't possible, etc. But normally the window + * will end up iconified. Just don't write code that crashes if not. * * It's permitted to call this function before showing a window, * in which case the window will be iconified before it ever appears @@ -3468,10 +3468,11 @@ gtk_window_iconify (GtkWindow *window) * gtk_window_deiconify: * @window: a #GtkWindow * - * Asks to deiconify @window. Note that you shouldn't assume the - * window is definitely deiconified afterward, because other entities - * (e.g. the user or window manager) could iconify it again before - * your code which assumes deiconification gets to run. + * Asks to deiconify (i.e. unminimize) the specified @window. Note + * that you shouldn't assume the window is definitely deiconified + * afterward, because other entities (e.g. the user or window manager) + * could iconify it again before your code which assumes + * deiconification gets to run. * * You can track iconification via the "window_state_event" signal * on #GtkWidget. diff --git a/gtk/treestoretest.c b/gtk/treestoretest.c index f7b9827bc4..2e4f0a84a0 100644 --- a/gtk/treestoretest.c +++ b/gtk/treestoretest.c @@ -273,10 +273,10 @@ make_window (gint view_type) /* buttons */ button = gtk_button_new_with_label ("gtk_tree_store_remove"); gtk_box_pack_start (GTK_BOX (vbox), button, FALSE, FALSE, 0); - g_signal_connectc (G_OBJECT (selection), - "changed", - selection_changed, - button, FALSE); + g_signal_connect (G_OBJECT (selection), + "changed", + selection_changed, + button, FALSE); gtk_signal_connect (GTK_OBJECT (button), "clicked", iter_remove, tree_view); gtk_widget_set_sensitive (button, FALSE); @@ -293,19 +293,19 @@ make_window (gint view_type) button = gtk_button_new_with_label ("gtk_tree_store_insert_before"); gtk_box_pack_start (GTK_BOX (vbox), button, FALSE, FALSE, 0); gtk_signal_connect (GTK_OBJECT (button), "clicked", iter_insert_before, tree_view); - g_signal_connectc (G_OBJECT (selection), - "changed", - selection_changed, - button, FALSE); + g_signal_connect (G_OBJECT (selection), + "changed", + selection_changed, + button, FALSE); gtk_widget_set_sensitive (button, FALSE); button = gtk_button_new_with_label ("gtk_tree_store_insert_after"); gtk_box_pack_start (GTK_BOX (vbox), button, FALSE, FALSE, 0); gtk_signal_connect (GTK_OBJECT (button), "clicked", iter_insert_after, tree_view); - g_signal_connectc (GTK_OBJECT (selection), - "changed", - selection_changed, - button, FALSE); + g_signal_connect (GTK_OBJECT (selection), + "changed", + selection_changed, + button, FALSE); gtk_widget_set_sensitive (button, FALSE); button = gtk_button_new_with_label ("gtk_tree_store_prepend"); diff --git a/tests/testtreecolumns.c b/tests/testtreecolumns.c index 10cdbb0ced..b8e80653fe 100644 --- a/tests/testtreecolumns.c +++ b/tests/testtreecolumns.c @@ -623,15 +623,15 @@ main (int argc, char *argv[]) button = gtk_button_new_with_label ("<<"); gtk_widget_set_sensitive (button, FALSE); gtk_signal_connect (GTK_OBJECT (button), "clicked", GTK_SIGNAL_FUNC (add_left_clicked), top_right_tree_view); - g_signal_connectc (G_OBJECT (gtk_tree_view_get_selection (GTK_TREE_VIEW (top_right_tree_view))), - "changed", GTK_SIGNAL_FUNC (selection_changed), button, FALSE); + g_signal_connect (G_OBJECT (gtk_tree_view_get_selection (GTK_TREE_VIEW (top_right_tree_view))), + "changed", GTK_SIGNAL_FUNC (selection_changed), button); gtk_box_pack_start (GTK_BOX (bbox), button, FALSE, FALSE, 0); button = gtk_button_new_with_label (">>"); gtk_widget_set_sensitive (button, FALSE); gtk_signal_connect (GTK_OBJECT (button), "clicked", GTK_SIGNAL_FUNC (add_right_clicked), top_right_tree_view); - g_signal_connectc (G_OBJECT (gtk_tree_view_get_selection (GTK_TREE_VIEW (left_tree_view))), - "changed", GTK_SIGNAL_FUNC (selection_changed), button, FALSE); + g_signal_connect (G_OBJECT (gtk_tree_view_get_selection (GTK_TREE_VIEW (left_tree_view))), + "changed", GTK_SIGNAL_FUNC (selection_changed), button); gtk_box_pack_start (GTK_BOX (bbox), button, FALSE, FALSE, 0); bbox = gtk_vbutton_box_new (); @@ -642,15 +642,15 @@ main (int argc, char *argv[]) button = gtk_button_new_with_label ("<<"); gtk_widget_set_sensitive (button, FALSE); gtk_signal_connect (GTK_OBJECT (button), "clicked", GTK_SIGNAL_FUNC (add_left_clicked), bottom_right_tree_view); - g_signal_connectc (G_OBJECT (gtk_tree_view_get_selection (GTK_TREE_VIEW (bottom_right_tree_view))), - "changed", GTK_SIGNAL_FUNC (selection_changed), button, FALSE); + g_signal_connect (G_OBJECT (gtk_tree_view_get_selection (GTK_TREE_VIEW (bottom_right_tree_view))), + "changed", GTK_SIGNAL_FUNC (selection_changed), button); gtk_box_pack_start (GTK_BOX (bbox), button, FALSE, FALSE, 0); button = gtk_button_new_with_label (">>"); gtk_widget_set_sensitive (button, FALSE); gtk_signal_connect (GTK_OBJECT (button), "clicked", GTK_SIGNAL_FUNC (add_right_clicked), bottom_right_tree_view); - g_signal_connectc (G_OBJECT (gtk_tree_view_get_selection (GTK_TREE_VIEW (left_tree_view))), - "changed", GTK_SIGNAL_FUNC (selection_changed), button, FALSE); + g_signal_connect (G_OBJECT (gtk_tree_view_get_selection (GTK_TREE_VIEW (left_tree_view))), + "changed", GTK_SIGNAL_FUNC (selection_changed), button); gtk_box_pack_start (GTK_BOX (bbox), button, FALSE, FALSE, 0); diff --git a/tests/testtreeview.c b/tests/testtreeview.c index f26c462dbf..6a717836f7 100644 --- a/tests/testtreeview.c +++ b/tests/testtreeview.c @@ -901,44 +901,44 @@ gtk_tree_model_types_class_init (GtkTreeModelTypesClass *class) object_class = (GObjectClass*) class; model_types_signals[CHANGED] = - g_signal_newc ("changed", - GTK_CLASS_TYPE (object_class), - G_SIGNAL_RUN_FIRST, - GTK_SIGNAL_OFFSET (GtkTreeModelTypesClass, changed), - NULL, NULL, - gtk_marshal_VOID__BOXED_BOXED, - G_TYPE_NONE, 2, - G_TYPE_POINTER, - G_TYPE_POINTER); + g_signal_new ("changed", + GTK_CLASS_TYPE (object_class), + G_SIGNAL_RUN_FIRST, + GTK_SIGNAL_OFFSET (GtkTreeModelTypesClass, changed), + NULL, NULL, + gtk_marshal_VOID__BOXED_BOXED, + G_TYPE_NONE, 2, + G_TYPE_POINTER, + G_TYPE_POINTER); model_types_signals[INSERTED] = - g_signal_newc ("inserted", - GTK_CLASS_TYPE (object_class), - G_SIGNAL_RUN_FIRST, - GTK_SIGNAL_OFFSET (GtkTreeModelTypesClass, inserted), - NULL, NULL, - gtk_marshal_VOID__BOXED_BOXED, - G_TYPE_NONE, 2, - G_TYPE_POINTER, - G_TYPE_POINTER); + g_signal_new ("inserted", + GTK_CLASS_TYPE (object_class), + G_SIGNAL_RUN_FIRST, + GTK_SIGNAL_OFFSET (GtkTreeModelTypesClass, inserted), + NULL, NULL, + gtk_marshal_VOID__BOXED_BOXED, + G_TYPE_NONE, 2, + G_TYPE_POINTER, + G_TYPE_POINTER); model_types_signals[CHILD_TOGGLED] = - g_signal_newc ("child_toggled", - GTK_CLASS_TYPE (object_class), - G_SIGNAL_RUN_FIRST, - GTK_SIGNAL_OFFSET (GtkTreeModelTypesClass, child_toggled), - NULL, NULL, - gtk_marshal_VOID__BOXED_BOXED, - G_TYPE_NONE, 2, - G_TYPE_POINTER, - G_TYPE_POINTER); + g_signal_new ("child_toggled", + GTK_CLASS_TYPE (object_class), + G_SIGNAL_RUN_FIRST, + GTK_SIGNAL_OFFSET (GtkTreeModelTypesClass, child_toggled), + NULL, NULL, + gtk_marshal_VOID__BOXED_BOXED, + G_TYPE_NONE, 2, + G_TYPE_POINTER, + G_TYPE_POINTER); model_types_signals[DELETED] = - g_signal_newc ("deleted", - GTK_CLASS_TYPE (object_class), - G_SIGNAL_RUN_FIRST, - GTK_SIGNAL_OFFSET (GtkTreeModelTypesClass, deleted), - NULL, NULL, - gtk_marshal_VOID__BOXED, - G_TYPE_NONE, 1, - G_TYPE_POINTER); + g_signal_new ("deleted", + GTK_CLASS_TYPE (object_class), + G_SIGNAL_RUN_FIRST, + GTK_SIGNAL_OFFSET (GtkTreeModelTypesClass, deleted), + NULL, NULL, + gtk_marshal_VOID__BOXED, + G_TYPE_NONE, 1, + G_TYPE_POINTER); } static void diff --git a/tests/treestoretest.c b/tests/treestoretest.c index cf4c7e85e1..84b127d31e 100644 --- a/tests/treestoretest.c +++ b/tests/treestoretest.c @@ -276,10 +276,10 @@ make_window (gint view_type) /* buttons */ button = gtk_button_new_with_label ("gtk_tree_store_remove"); gtk_box_pack_start (GTK_BOX (vbox), button, FALSE, FALSE, 0); - g_signal_connectc (G_OBJECT (selection), - "changed", - selection_changed, - button, FALSE); + g_signal_connect (G_OBJECT (selection), + "changed", + selection_changed, + button); gtk_signal_connect (GTK_OBJECT (button), "clicked", iter_remove, tree_view); gtk_widget_set_sensitive (button, FALSE); @@ -296,19 +296,19 @@ make_window (gint view_type) button = gtk_button_new_with_label ("gtk_tree_store_insert_before"); gtk_box_pack_start (GTK_BOX (vbox), button, FALSE, FALSE, 0); gtk_signal_connect (GTK_OBJECT (button), "clicked", iter_insert_before, tree_view); - g_signal_connectc (G_OBJECT (selection), - "changed", - selection_changed, - button, FALSE); + g_signal_connect (G_OBJECT (selection), + "changed", + selection_changed, + button); gtk_widget_set_sensitive (button, FALSE); button = gtk_button_new_with_label ("gtk_tree_store_insert_after"); gtk_box_pack_start (GTK_BOX (vbox), button, FALSE, FALSE, 0); gtk_signal_connect (GTK_OBJECT (button), "clicked", iter_insert_after, tree_view); - g_signal_connectc (G_OBJECT (selection), - "changed", - selection_changed, - button, FALSE); + g_signal_connect (G_OBJECT (selection), + "changed", + selection_changed, + button); gtk_widget_set_sensitive (button, FALSE); button = gtk_button_new_with_label ("gtk_tree_store_prepend"); |