Commit 49c1e6dc authored by Havoc Pennington's avatar Havoc Pennington Committed by Havoc Pennington

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/)
parent 1bbcf039
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):
......
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):
......
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):
......
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):
......
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):
......
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):
......
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):
......
......@@ -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));
}
......
......@@ -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;
}
......
......@@ -40,6 +40,7 @@ GtkTreeSelection
</para>
@model:
@path:
@iter:
@data:
......
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
......
......@@ -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
......
......@@ -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;
}
......
......@@ -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,
......
......@@ -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;
......
......@@ -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,
......
......@@ -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,
......
......@@ -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",
......
This diff is collapsed.
......@@ -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
......
......@@ -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
......
......@@ -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
......
......@@ -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);
......
......@@ -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
......
......@@ -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;
}
}
......
......@@ -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),