summaryrefslogtreecommitdiff
path: root/gtk
diff options
context:
space:
mode:
Diffstat (limited to 'gtk')
-rw-r--r--gtk/gtkcolorsel.c4
-rw-r--r--gtk/gtkcontainer.c6
-rw-r--r--gtk/gtkentry.c7
-rw-r--r--gtk/gtkmenubar.c12
-rw-r--r--gtk/gtktextbtree.c20
-rw-r--r--gtk/gtktextview.c43
-rw-r--r--gtk/gtktoolbar.c16
-rw-r--r--gtk/gtktreemodel.c35
-rw-r--r--gtk/gtktreeviewcolumn.c8
9 files changed, 62 insertions, 89 deletions
diff --git a/gtk/gtkcolorsel.c b/gtk/gtkcolorsel.c
index a1cc67fe24..47546b83b6 100644
--- a/gtk/gtkcolorsel.c
+++ b/gtk/gtkcolorsel.c
@@ -1659,7 +1659,7 @@ gtk_color_selection_class_init (GtkColorSelectionClass *klass)
g_signal_connect_data (G_OBJECT (gtk_settings_get_global ()),
"notify::gtk-color-palette",
G_CALLBACK (palette_change_notify_class),
- NULL, NULL, FALSE, FALSE);
+ NULL, NULL, 0);
}
/* widget functions */
@@ -1825,7 +1825,7 @@ gtk_color_selection_init (GtkColorSelection *colorsel)
g_signal_connect_data (G_OBJECT (gtk_settings_get_global ()),
"notify::gtk-color-palette",
G_CALLBACK (palette_change_notify_instance),
- colorsel, NULL, FALSE, FALSE);
+ colorsel, NULL, 0);
/* hide unused stuff */
diff --git a/gtk/gtkcontainer.c b/gtk/gtkcontainer.c
index 75d155b101..455eef7104 100644
--- a/gtk/gtkcontainer.c
+++ b/gtk/gtkcontainer.c
@@ -154,7 +154,7 @@ gtk_container_base_class_finalize (GtkContainerClass *class)
{
GList *list, *node;
- list = g_param_spec_pool_belongings (_gtk_widget_child_property_pool, G_OBJECT_CLASS_TYPE (class));
+ list = g_param_spec_pool_list_owned (_gtk_widget_child_property_pool, G_OBJECT_CLASS_TYPE (class));
for (node = list; node; node = node->next)
{
GParamSpec *pspec = node->data;
@@ -2037,10 +2037,6 @@ gtk_container_children_callback (GtkWidget *widget,
*children = g_list_prepend (*children, widget);
}
-
-/* Hack-around */
-#define g_signal_handlers_disconnect_by_func(obj, func, data) g_signal_handlers_disconnect_matched (obj, G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, 0, 0, NULL, func, data)
-
static void
chain_widget_destroyed (GtkWidget *widget,
gpointer user_data)
diff --git a/gtk/gtkentry.c b/gtk/gtkentry.c
index 7a0753acd3..3a4576f5cc 100644
--- a/gtk/gtkentry.c
+++ b/gtk/gtkentry.c
@@ -1524,10 +1524,9 @@ gtk_entry_focus_in (GtkWidget *widget,
entry->need_im_reset = TRUE;
gtk_im_context_focus_in (entry->im_context);
- g_signal_connect_data (gdk_keymap_get_default (),
- "direction_changed",
- G_CALLBACK (gtk_entry_keymap_direction_changed), entry, NULL,
- FALSE, FALSE);
+ g_signal_connect (gdk_keymap_get_default (),
+ "direction_changed",
+ G_CALLBACK (gtk_entry_keymap_direction_changed), entry);
gtk_entry_check_cursor_blink (entry);
diff --git a/gtk/gtkmenubar.c b/gtk/gtkmenubar.c
index 9965fef932..3b0cb73e10 100644
--- a/gtk/gtkmenubar.c
+++ b/gtk/gtkmenubar.c
@@ -437,18 +437,14 @@ add_to_window (GtkWindow *window,
"gtk-menu-bar",
menubar);
- g_signal_connect_data (G_OBJECT (window),
- "key_press_event",
- G_CALLBACK (window_key_press_handler),
- menubar,
- NULL, FALSE, FALSE);
+ g_signal_connect (G_OBJECT (window),
+ "key_press_event",
+ G_CALLBACK (window_key_press_handler),
+ menubar);
menubar->toplevel = GTK_WIDGET (window);
}
-/* Hack-around */
-#define g_signal_handlers_disconnect_by_func(obj, func, data) g_signal_handlers_disconnect_matched (obj, G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, 0, 0, NULL, func, data)
-
static void
remove_from_window (GtkWindow *window,
GtkMenuBar *menubar)
diff --git a/gtk/gtktextbtree.c b/gtk/gtktextbtree.c
index 40e6ca022c..8fb9dd1285 100644
--- a/gtk/gtktextbtree.c
+++ b/gtk/gtktextbtree.c
@@ -409,17 +409,15 @@ _gtk_text_btree_new (GtkTextTagTable *table,
g_object_ref (G_OBJECT (tree->table));
- tree->tag_changed_handler = g_signal_connect_data (G_OBJECT (tree->table),
- "tag_changed",
- G_CALLBACK (tag_changed_cb),
- tree,
- NULL, FALSE, FALSE);
-
- tree->tag_removed_handler = g_signal_connect_data (G_OBJECT (tree->table),
- "tag_removed",
- G_CALLBACK (tag_removed_cb),
- tree,
- NULL, FALSE, FALSE);
+ tree->tag_changed_handler = g_signal_connect (G_OBJECT (tree->table),
+ "tag_changed",
+ G_CALLBACK (tag_changed_cb),
+ tree);
+
+ tree->tag_removed_handler = g_signal_connect (G_OBJECT (tree->table),
+ "tag_removed",
+ G_CALLBACK (tag_removed_cb),
+ tree);
tree->mark_table = g_hash_table_new (g_str_hash, g_str_equal);
tree->child_anchor_table = NULL;
diff --git a/gtk/gtktextview.c b/gtk/gtktextview.c
index 0521c0e5e5..f268e11aa4 100644
--- a/gtk/gtktextview.c
+++ b/gtk/gtktextview.c
@@ -1028,9 +1028,8 @@ gtk_text_view_set_buffer (GtkTextView *text_view,
text_view->first_para_pixels = 0;
- g_signal_connect_data (G_OBJECT (text_view->buffer), "mark_set",
- G_CALLBACK (gtk_text_view_mark_set_handler), text_view,
- NULL, FALSE, FALSE);
+ g_signal_connect (G_OBJECT (text_view->buffer), "mark_set",
+ G_CALLBACK (gtk_text_view_mark_set_handler), text_view);
}
if (GTK_WIDGET_VISIBLE (text_view))
@@ -3366,10 +3365,9 @@ gtk_text_view_focus_in_event (GtkWidget *widget, GdkEventFocus *event)
gtk_text_view_check_cursor_blink (text_view);
}
- g_signal_connect_data (gdk_keymap_get_default (),
- "direction_changed",
- G_CALLBACK (keymap_direction_changed), text_view, NULL,
- FALSE, FALSE);
+ g_signal_connect (gdk_keymap_get_default (),
+ "direction_changed",
+ G_CALLBACK (keymap_direction_changed), text_view);
gtk_text_view_check_keymap_direction (text_view);
text_view->need_im_reset = TRUE;
@@ -4331,23 +4329,20 @@ gtk_text_view_ensure_layout (GtkTextView *text_view)
text_view->layout = gtk_text_layout_new ();
- g_signal_connect_data (G_OBJECT (text_view->layout),
- "invalidated",
- G_CALLBACK (invalidated_handler),
- text_view,
- NULL, FALSE, FALSE);
-
- g_signal_connect_data (G_OBJECT (text_view->layout),
- "changed",
- G_CALLBACK (changed_handler),
- text_view,
- NULL, FALSE, FALSE);
-
- g_signal_connect_data (G_OBJECT (text_view->layout),
- "allocate_child",
- G_CALLBACK (gtk_text_view_child_allocated),
- text_view,
- NULL, FALSE, FALSE);
+ g_signal_connect (G_OBJECT (text_view->layout),
+ "invalidated",
+ G_CALLBACK (invalidated_handler),
+ text_view);
+
+ g_signal_connect (G_OBJECT (text_view->layout),
+ "changed",
+ G_CALLBACK (changed_handler),
+ text_view);
+
+ g_signal_connect (G_OBJECT (text_view->layout),
+ "allocate_child",
+ G_CALLBACK (gtk_text_view_child_allocated),
+ text_view);
if (get_buffer (text_view))
gtk_text_layout_set_buffer (text_view->layout, get_buffer (text_view));
diff --git a/gtk/gtktoolbar.c b/gtk/gtktoolbar.c
index a04aee87df..bb4add2716 100644
--- a/gtk/gtktoolbar.c
+++ b/gtk/gtktoolbar.c
@@ -358,16 +358,16 @@ gtk_toolbar_init (GtkToolbar *toolbar)
NULL);
toolbar->style_set_connection =
- g_signal_connect_data (G_OBJECT (gtk_settings_get_global ()),
- "notify::gtk-toolbar-style",
- G_CALLBACK (style_change_notify),
- toolbar, NULL, FALSE, FALSE);
+ g_signal_connect (G_OBJECT (gtk_settings_get_global ()),
+ "notify::gtk-toolbar-style",
+ G_CALLBACK (style_change_notify),
+ toolbar);
toolbar->icon_size_connection =
- g_signal_connect_data (G_OBJECT (gtk_settings_get_global ()),
- "notify::gtk-toolbar-icon-size",
- G_CALLBACK (icon_size_change_notify),
- toolbar, NULL, FALSE, FALSE);
+ g_signal_connect (G_OBJECT (gtk_settings_get_global ()),
+ "notify::gtk-toolbar-icon-size",
+ G_CALLBACK (icon_size_change_notify),
+ toolbar);
}
static void
diff --git a/gtk/gtktreemodel.c b/gtk/gtktreemodel.c
index 69e58a8b13..34c872666f 100644
--- a/gtk/gtktreemodel.c
+++ b/gtk/gtktreemodel.c
@@ -1324,29 +1324,18 @@ gtk_tree_row_ref_reordered_callback (GObject *object,
static void
connect_ref_callbacks (GtkTreeModel *model)
{
- g_signal_connect_data (G_OBJECT (model),
- "inserted",
- (GCallback) gtk_tree_row_ref_inserted_callback,
- model,
- NULL,
- FALSE,
- FALSE);
-
- g_signal_connect_data (G_OBJECT (model),
- "deleted",
- (GCallback) gtk_tree_row_ref_deleted_callback,
- model,
- NULL,
- FALSE,
- FALSE);
-
- g_signal_connect_data (G_OBJECT (model),
- "reordered",
- (GCallback) gtk_tree_row_ref_reordered_callback,
- model,
- NULL,
- FALSE,
- FALSE);
+ g_signal_connect (G_OBJECT (model),
+ "inserted",
+ (GCallback) gtk_tree_row_ref_inserted_callback,
+ model);
+ g_signal_connect (G_OBJECT (model),
+ "deleted",
+ (GCallback) gtk_tree_row_ref_deleted_callback,
+ model);
+ g_signal_connect (G_OBJECT (model),
+ "reordered",
+ (GCallback) gtk_tree_row_ref_reordered_callback,
+ model);
}
static void
diff --git a/gtk/gtktreeviewcolumn.c b/gtk/gtktreeviewcolumn.c
index 1310e235c9..851aa44f62 100644
--- a/gtk/gtktreeviewcolumn.c
+++ b/gtk/gtktreeviewcolumn.c
@@ -939,10 +939,10 @@ _gtk_tree_view_column_set_tree_view (GtkTreeViewColumn *column,
gtk_tree_view_column_create_button (column);
column->property_changed_signal =
- g_signal_connect_data (GTK_OBJECT (tree_view),
- "notify::model",
- GTK_SIGNAL_FUNC (gtk_tree_view_column_setup_sort_column_id_callback),
- column, NULL, TRUE, FALSE);
+ g_signal_connect (GTK_OBJECT (tree_view),
+ "notify::model",
+ GTK_SIGNAL_FUNC (gtk_tree_view_column_setup_sort_column_id_callback),
+ column);
gtk_tree_view_column_setup_sort_column_id_callback (column);
}
View Lorry Controller Status