up version to 1.3.7, interface age 0, binary age 0. depend on glib 1.3.7.

Thu Jun 28 17:18:41 2001  Tim Janik  <timj@gtk.org>

	* configure.in (GTK_MICRO_VERSION): up version to 1.3.7, interface
	age 0, binary age 0. depend on glib 1.3.7.

	* gtk/gtkcontainer.c: remove g_signal_handlers_disconnect_by_func() hack.

	* gtk/gtkmenubar.c: same here.

	* gtk/gtkcontainer.c (gtk_container_focus_tab): fix param-spec retrival.

	* gtk/gtkcolorsel.c (gtk_color_selection_init): fix connect_data() usage.

	* gtk/gtkentry.c (gtk_entry_focus_in): same here.

	* gtk/gtkmenubar.c (add_to_window): likewise.

	* gtk/gtktextbtree.c: and here...

	* gtk/gtktextview.c (gtk_text_view_ensure_layout): same thing.

	* gtk/gtktoolbar.c (gtk_toolbar_init): once more.

	* gtk/gtktreemodel.c (connect_ref_callbacks): and another time.

	* gtk/gtktreeviewcolumn.c:
	(_gtk_tree_view_column_set_tree_view): yet again.

	* demos/gtk-demo/images.c (progressive_timeout): demonstrate
	signal connections without g_signal_connect_data().

	* demos/gtk-demo/stock_browser.c (do_stock_browser): second
	demo of the matter.

	* demos/testpixbuf.c (main): running out of equality phrases for the
	ChangeLog, but had to adapt connections here as well.

	* demos/testanimation.c (progressive_timeout): and for the fun of it,
	tackled this the same way.

	* tests/testtext.c (create_view): ok, it's becoming a pain at this
	point, but had enough enery for one more fix.

	* tests/testtreecolumns.c (main): stand up man, do your work!

	* tests/testtreeview.c (set_columns_type): ok, this is the last file i
	fix, either that's been all of it or CVS gtk is broken yet again.
This commit is contained in:
Tim Janik 2001-06-28 17:12:40 +00:00 committed by Tim Janik
parent cd3ddf900f
commit 10f047cf4c
28 changed files with 451 additions and 156 deletions

View File

@ -1,3 +1,51 @@
Thu Jun 28 17:18:41 2001 Tim Janik <timj@gtk.org>
* configure.in (GTK_MICRO_VERSION): up version to 1.3.7, interface
age 0, binary age 0. depend on glib 1.3.7.
* gtk/gtkcontainer.c: remove g_signal_handlers_disconnect_by_func() hack.
* gtk/gtkmenubar.c: same here.
* gtk/gtkcontainer.c (gtk_container_focus_tab): fix param-spec retrival.
* gtk/gtkcolorsel.c (gtk_color_selection_init): fix connect_data() usage.
* gtk/gtkentry.c (gtk_entry_focus_in): same here.
* gtk/gtkmenubar.c (add_to_window): likewise.
* gtk/gtktextbtree.c: and here...
* gtk/gtktextview.c (gtk_text_view_ensure_layout): same thing.
* gtk/gtktoolbar.c (gtk_toolbar_init): once more.
* gtk/gtktreemodel.c (connect_ref_callbacks): and another time.
* gtk/gtktreeviewcolumn.c:
(_gtk_tree_view_column_set_tree_view): yet again.
* demos/gtk-demo/images.c (progressive_timeout): demonstrate
signal connections without g_signal_connect_data().
* demos/gtk-demo/stock_browser.c (do_stock_browser): second
demo of the matter.
* demos/testpixbuf.c (main): running out of equality phrases for the
ChangeLog, but had to adapt connections here as well.
* demos/testanimation.c (progressive_timeout): and for the fun of it,
tackled this the same way.
* tests/testtext.c (create_view): ok, it's becoming a pain at this
point, but had enough enery for one more fix.
* tests/testtreecolumns.c (main): stand up man, do your work!
* tests/testtreeview.c (set_columns_type): ok, this is the last file i
fix, either that's been all of it or CVS gtk is broken yet again.
2001-06-29 James Henstridge <james@daa.com.au>
The following changes correspond to bug #56812

View File

@ -1,3 +1,51 @@
Thu Jun 28 17:18:41 2001 Tim Janik <timj@gtk.org>
* configure.in (GTK_MICRO_VERSION): up version to 1.3.7, interface
age 0, binary age 0. depend on glib 1.3.7.
* gtk/gtkcontainer.c: remove g_signal_handlers_disconnect_by_func() hack.
* gtk/gtkmenubar.c: same here.
* gtk/gtkcontainer.c (gtk_container_focus_tab): fix param-spec retrival.
* gtk/gtkcolorsel.c (gtk_color_selection_init): fix connect_data() usage.
* gtk/gtkentry.c (gtk_entry_focus_in): same here.
* gtk/gtkmenubar.c (add_to_window): likewise.
* gtk/gtktextbtree.c: and here...
* gtk/gtktextview.c (gtk_text_view_ensure_layout): same thing.
* gtk/gtktoolbar.c (gtk_toolbar_init): once more.
* gtk/gtktreemodel.c (connect_ref_callbacks): and another time.
* gtk/gtktreeviewcolumn.c:
(_gtk_tree_view_column_set_tree_view): yet again.
* demos/gtk-demo/images.c (progressive_timeout): demonstrate
signal connections without g_signal_connect_data().
* demos/gtk-demo/stock_browser.c (do_stock_browser): second
demo of the matter.
* demos/testpixbuf.c (main): running out of equality phrases for the
ChangeLog, but had to adapt connections here as well.
* demos/testanimation.c (progressive_timeout): and for the fun of it,
tackled this the same way.
* tests/testtext.c (create_view): ok, it's becoming a pain at this
point, but had enough enery for one more fix.
* tests/testtreecolumns.c (main): stand up man, do your work!
* tests/testtreeview.c (set_columns_type): ok, this is the last file i
fix, either that's been all of it or CVS gtk is broken yet again.
2001-06-29 James Henstridge <james@daa.com.au>
The following changes correspond to bug #56812

View File

@ -1,3 +1,51 @@
Thu Jun 28 17:18:41 2001 Tim Janik <timj@gtk.org>
* configure.in (GTK_MICRO_VERSION): up version to 1.3.7, interface
age 0, binary age 0. depend on glib 1.3.7.
* gtk/gtkcontainer.c: remove g_signal_handlers_disconnect_by_func() hack.
* gtk/gtkmenubar.c: same here.
* gtk/gtkcontainer.c (gtk_container_focus_tab): fix param-spec retrival.
* gtk/gtkcolorsel.c (gtk_color_selection_init): fix connect_data() usage.
* gtk/gtkentry.c (gtk_entry_focus_in): same here.
* gtk/gtkmenubar.c (add_to_window): likewise.
* gtk/gtktextbtree.c: and here...
* gtk/gtktextview.c (gtk_text_view_ensure_layout): same thing.
* gtk/gtktoolbar.c (gtk_toolbar_init): once more.
* gtk/gtktreemodel.c (connect_ref_callbacks): and another time.
* gtk/gtktreeviewcolumn.c:
(_gtk_tree_view_column_set_tree_view): yet again.
* demos/gtk-demo/images.c (progressive_timeout): demonstrate
signal connections without g_signal_connect_data().
* demos/gtk-demo/stock_browser.c (do_stock_browser): second
demo of the matter.
* demos/testpixbuf.c (main): running out of equality phrases for the
ChangeLog, but had to adapt connections here as well.
* demos/testanimation.c (progressive_timeout): and for the fun of it,
tackled this the same way.
* tests/testtext.c (create_view): ok, it's becoming a pain at this
point, but had enough enery for one more fix.
* tests/testtreecolumns.c (main): stand up man, do your work!
* tests/testtreeview.c (set_columns_type): ok, this is the last file i
fix, either that's been all of it or CVS gtk is broken yet again.
2001-06-29 James Henstridge <james@daa.com.au>
The following changes correspond to bug #56812

View File

@ -1,3 +1,51 @@
Thu Jun 28 17:18:41 2001 Tim Janik <timj@gtk.org>
* configure.in (GTK_MICRO_VERSION): up version to 1.3.7, interface
age 0, binary age 0. depend on glib 1.3.7.
* gtk/gtkcontainer.c: remove g_signal_handlers_disconnect_by_func() hack.
* gtk/gtkmenubar.c: same here.
* gtk/gtkcontainer.c (gtk_container_focus_tab): fix param-spec retrival.
* gtk/gtkcolorsel.c (gtk_color_selection_init): fix connect_data() usage.
* gtk/gtkentry.c (gtk_entry_focus_in): same here.
* gtk/gtkmenubar.c (add_to_window): likewise.
* gtk/gtktextbtree.c: and here...
* gtk/gtktextview.c (gtk_text_view_ensure_layout): same thing.
* gtk/gtktoolbar.c (gtk_toolbar_init): once more.
* gtk/gtktreemodel.c (connect_ref_callbacks): and another time.
* gtk/gtktreeviewcolumn.c:
(_gtk_tree_view_column_set_tree_view): yet again.
* demos/gtk-demo/images.c (progressive_timeout): demonstrate
signal connections without g_signal_connect_data().
* demos/gtk-demo/stock_browser.c (do_stock_browser): second
demo of the matter.
* demos/testpixbuf.c (main): running out of equality phrases for the
ChangeLog, but had to adapt connections here as well.
* demos/testanimation.c (progressive_timeout): and for the fun of it,
tackled this the same way.
* tests/testtext.c (create_view): ok, it's becoming a pain at this
point, but had enough enery for one more fix.
* tests/testtreecolumns.c (main): stand up man, do your work!
* tests/testtreeview.c (set_columns_type): ok, this is the last file i
fix, either that's been all of it or CVS gtk is broken yet again.
2001-06-29 James Henstridge <james@daa.com.au>
The following changes correspond to bug #56812

View File

@ -1,3 +1,51 @@
Thu Jun 28 17:18:41 2001 Tim Janik <timj@gtk.org>
* configure.in (GTK_MICRO_VERSION): up version to 1.3.7, interface
age 0, binary age 0. depend on glib 1.3.7.
* gtk/gtkcontainer.c: remove g_signal_handlers_disconnect_by_func() hack.
* gtk/gtkmenubar.c: same here.
* gtk/gtkcontainer.c (gtk_container_focus_tab): fix param-spec retrival.
* gtk/gtkcolorsel.c (gtk_color_selection_init): fix connect_data() usage.
* gtk/gtkentry.c (gtk_entry_focus_in): same here.
* gtk/gtkmenubar.c (add_to_window): likewise.
* gtk/gtktextbtree.c: and here...
* gtk/gtktextview.c (gtk_text_view_ensure_layout): same thing.
* gtk/gtktoolbar.c (gtk_toolbar_init): once more.
* gtk/gtktreemodel.c (connect_ref_callbacks): and another time.
* gtk/gtktreeviewcolumn.c:
(_gtk_tree_view_column_set_tree_view): yet again.
* demos/gtk-demo/images.c (progressive_timeout): demonstrate
signal connections without g_signal_connect_data().
* demos/gtk-demo/stock_browser.c (do_stock_browser): second
demo of the matter.
* demos/testpixbuf.c (main): running out of equality phrases for the
ChangeLog, but had to adapt connections here as well.
* demos/testanimation.c (progressive_timeout): and for the fun of it,
tackled this the same way.
* tests/testtext.c (create_view): ok, it's becoming a pain at this
point, but had enough enery for one more fix.
* tests/testtreecolumns.c (main): stand up man, do your work!
* tests/testtreeview.c (set_columns_type): ok, this is the last file i
fix, either that's been all of it or CVS gtk is broken yet again.
2001-06-29 James Henstridge <james@daa.com.au>
The following changes correspond to bug #56812

View File

@ -1,3 +1,51 @@
Thu Jun 28 17:18:41 2001 Tim Janik <timj@gtk.org>
* configure.in (GTK_MICRO_VERSION): up version to 1.3.7, interface
age 0, binary age 0. depend on glib 1.3.7.
* gtk/gtkcontainer.c: remove g_signal_handlers_disconnect_by_func() hack.
* gtk/gtkmenubar.c: same here.
* gtk/gtkcontainer.c (gtk_container_focus_tab): fix param-spec retrival.
* gtk/gtkcolorsel.c (gtk_color_selection_init): fix connect_data() usage.
* gtk/gtkentry.c (gtk_entry_focus_in): same here.
* gtk/gtkmenubar.c (add_to_window): likewise.
* gtk/gtktextbtree.c: and here...
* gtk/gtktextview.c (gtk_text_view_ensure_layout): same thing.
* gtk/gtktoolbar.c (gtk_toolbar_init): once more.
* gtk/gtktreemodel.c (connect_ref_callbacks): and another time.
* gtk/gtktreeviewcolumn.c:
(_gtk_tree_view_column_set_tree_view): yet again.
* demos/gtk-demo/images.c (progressive_timeout): demonstrate
signal connections without g_signal_connect_data().
* demos/gtk-demo/stock_browser.c (do_stock_browser): second
demo of the matter.
* demos/testpixbuf.c (main): running out of equality phrases for the
ChangeLog, but had to adapt connections here as well.
* demos/testanimation.c (progressive_timeout): and for the fun of it,
tackled this the same way.
* tests/testtext.c (create_view): ok, it's becoming a pain at this
point, but had enough enery for one more fix.
* tests/testtreecolumns.c (main): stand up man, do your work!
* tests/testtreeview.c (set_columns_type): ok, this is the last file i
fix, either that's been all of it or CVS gtk is broken yet again.
2001-06-29 James Henstridge <james@daa.com.au>
The following changes correspond to bug #56812

View File

@ -1,3 +1,51 @@
Thu Jun 28 17:18:41 2001 Tim Janik <timj@gtk.org>
* configure.in (GTK_MICRO_VERSION): up version to 1.3.7, interface
age 0, binary age 0. depend on glib 1.3.7.
* gtk/gtkcontainer.c: remove g_signal_handlers_disconnect_by_func() hack.
* gtk/gtkmenubar.c: same here.
* gtk/gtkcontainer.c (gtk_container_focus_tab): fix param-spec retrival.
* gtk/gtkcolorsel.c (gtk_color_selection_init): fix connect_data() usage.
* gtk/gtkentry.c (gtk_entry_focus_in): same here.
* gtk/gtkmenubar.c (add_to_window): likewise.
* gtk/gtktextbtree.c: and here...
* gtk/gtktextview.c (gtk_text_view_ensure_layout): same thing.
* gtk/gtktoolbar.c (gtk_toolbar_init): once more.
* gtk/gtktreemodel.c (connect_ref_callbacks): and another time.
* gtk/gtktreeviewcolumn.c:
(_gtk_tree_view_column_set_tree_view): yet again.
* demos/gtk-demo/images.c (progressive_timeout): demonstrate
signal connections without g_signal_connect_data().
* demos/gtk-demo/stock_browser.c (do_stock_browser): second
demo of the matter.
* demos/testpixbuf.c (main): running out of equality phrases for the
ChangeLog, but had to adapt connections here as well.
* demos/testanimation.c (progressive_timeout): and for the fun of it,
tackled this the same way.
* tests/testtext.c (create_view): ok, it's becoming a pain at this
point, but had enough enery for one more fix.
* tests/testtreecolumns.c (main): stand up man, do your work!
* tests/testtreeview.c (set_columns_type): ok, this is the last file i
fix, either that's been all of it or CVS gtk is broken yet again.
2001-06-29 James Henstridge <james@daa.com.au>
The following changes correspond to bug #56812

View File

@ -34,7 +34,7 @@ AC_DIVERT_PUSH(AC_DIVERSION_NOTICE)dnl
#
GTK_MAJOR_VERSION=1
GTK_MINOR_VERSION=3
GTK_MICRO_VERSION=6
GTK_MICRO_VERSION=7
GTK_INTERFACE_AGE=0
GTK_BINARY_AGE=0
GTK_VERSION=$GTK_MAJOR_VERSION.$GTK_MINOR_VERSION.$GTK_MICRO_VERSION
@ -289,7 +289,7 @@ AC_TRY_COMPILE([#include <dirent.h>], [DIR *dir;],
#
GLIB_PACKAGES="gobject-2.0 gmodule-2.0"
GLIB_REQUIRED_VERSION=1.3.4
GLIB_REQUIRED_VERSION=1.3.7
AM_PATH_GLIB_2_0($GLIB_REQUIRED_VERSION, :,
AC_MSG_ERROR([

View File

@ -224,17 +224,15 @@ progressive_timeout (gpointer data)
pixbuf_loader = gdk_pixbuf_loader_new ();
g_signal_connect_data (G_OBJECT (pixbuf_loader),
g_signal_connect (G_OBJECT (pixbuf_loader),
"area_prepared",
G_CALLBACK (progressive_prepared_callback),
image,
NULL, FALSE, FALSE);
image);
g_signal_connect_data (G_OBJECT (pixbuf_loader),
g_signal_connect (G_OBJECT (pixbuf_loader),
"area_updated",
G_CALLBACK (progressive_updated_callback),
image,
NULL, FALSE, FALSE);
image);
}
/* leave timeout installed */

View File

@ -500,10 +500,10 @@ do_stock_browser (void)
selection = gtk_tree_view_get_selection (GTK_TREE_VIEW (treeview));
gtk_tree_selection_set_mode (selection, GTK_TREE_SELECTION_SINGLE);
g_signal_connect_data (G_OBJECT (selection),
g_signal_connect (G_OBJECT (selection),
"changed",
G_CALLBACK (selection_changed),
NULL, NULL, FALSE, FALSE);
NULL);
}
if (!GTK_WIDGET_VISIBLE (window))

View File

@ -285,17 +285,14 @@ progressive_timeout (gpointer data)
lc->pixbuf_loader = gdk_pixbuf_loader_new ();
g_signal_connect_data (G_OBJECT (lc->pixbuf_loader),
g_signal_connect (G_OBJECT (lc->pixbuf_loader),
"area_prepared",
G_CALLBACK (progressive_prepared_callback),
image,
NULL, FALSE, FALSE);
g_signal_connect_data (G_OBJECT (lc->pixbuf_loader),
image);
g_signal_connect (G_OBJECT (lc->pixbuf_loader),
"area_updated",
G_CALLBACK (progressive_updated_callback),
image,
NULL, FALSE, FALSE);
image);
}
/* leave timeout installed */

View File

@ -605,18 +605,14 @@ main (int argc, char **argv)
status.rgbwin = &rgb_window;
status.buf = g_malloc (readlen);
g_signal_connect_data (G_OBJECT(pixbuf_loader),
g_signal_connect (G_OBJECT(pixbuf_loader),
"area_prepared",
GTK_SIGNAL_FUNC(progressive_prepared_callback),
&rgb_window,
NULL, FALSE, FALSE);
g_signal_connect_data (G_OBJECT(pixbuf_loader),
&rgb_window);
g_signal_connect (G_OBJECT(pixbuf_loader),
"area_updated",
GTK_SIGNAL_FUNC(progressive_updated_callback),
&rgb_window,
NULL, FALSE, FALSE);
&rgb_window);
status.imagefile = fopen (argv[1], "r");
g_assert (status.imagefile != NULL);

View File

@ -495,6 +495,7 @@ This can later be composited together with other
#GtkRcStyle structures to form a #GtkStyle.
</para>
@parent_instance:
@name:
@bg_pixmap_name:
@font_desc:

View File

@ -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 */

View File

@ -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)

View File

@ -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 (),
g_signal_connect (gdk_keymap_get_default (),
"direction_changed",
G_CALLBACK (gtk_entry_keymap_direction_changed), entry, NULL,
FALSE, FALSE);
G_CALLBACK (gtk_entry_keymap_direction_changed), entry);
gtk_entry_check_cursor_blink (entry);

View File

@ -437,18 +437,14 @@ add_to_window (GtkWindow *window,
"gtk-menu-bar",
menubar);
g_signal_connect_data (G_OBJECT (window),
g_signal_connect (G_OBJECT (window),
"key_press_event",
G_CALLBACK (window_key_press_handler),
menubar,
NULL, FALSE, FALSE);
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)

View File

@ -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),
tree->tag_changed_handler = g_signal_connect (G_OBJECT (tree->table),
"tag_changed",
G_CALLBACK (tag_changed_cb),
tree,
NULL, FALSE, FALSE);
tree);
tree->tag_removed_handler = g_signal_connect_data (G_OBJECT (tree->table),
tree->tag_removed_handler = g_signal_connect (G_OBJECT (tree->table),
"tag_removed",
G_CALLBACK (tag_removed_cb),
tree,
NULL, FALSE, FALSE);
tree);
tree->mark_table = g_hash_table_new (g_str_hash, g_str_equal);
tree->child_anchor_table = NULL;

View File

@ -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 (),
g_signal_connect (gdk_keymap_get_default (),
"direction_changed",
G_CALLBACK (keymap_direction_changed), text_view, NULL,
FALSE, FALSE);
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),
g_signal_connect (G_OBJECT (text_view->layout),
"invalidated",
G_CALLBACK (invalidated_handler),
text_view,
NULL, FALSE, FALSE);
text_view);
g_signal_connect_data (G_OBJECT (text_view->layout),
g_signal_connect (G_OBJECT (text_view->layout),
"changed",
G_CALLBACK (changed_handler),
text_view,
NULL, FALSE, FALSE);
text_view);
g_signal_connect_data (G_OBJECT (text_view->layout),
g_signal_connect (G_OBJECT (text_view->layout),
"allocate_child",
G_CALLBACK (gtk_text_view_child_allocated),
text_view,
NULL, FALSE, FALSE);
text_view);
if (get_buffer (text_view))
gtk_text_layout_set_buffer (text_view->layout, get_buffer (text_view));

View File

@ -358,16 +358,16 @@ gtk_toolbar_init (GtkToolbar *toolbar)
NULL);
toolbar->style_set_connection =
g_signal_connect_data (G_OBJECT (gtk_settings_get_global ()),
g_signal_connect (G_OBJECT (gtk_settings_get_global ()),
"notify::gtk-toolbar-style",
G_CALLBACK (style_change_notify),
toolbar, NULL, FALSE, FALSE);
toolbar);
toolbar->icon_size_connection =
g_signal_connect_data (G_OBJECT (gtk_settings_get_global ()),
g_signal_connect (G_OBJECT (gtk_settings_get_global ()),
"notify::gtk-toolbar-icon-size",
G_CALLBACK (icon_size_change_notify),
toolbar, NULL, FALSE, FALSE);
toolbar);
}
static void

View File

@ -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),
g_signal_connect (G_OBJECT (model),
"inserted",
(GCallback) gtk_tree_row_ref_inserted_callback,
model,
NULL,
FALSE,
FALSE);
g_signal_connect_data (G_OBJECT (model),
model);
g_signal_connect (G_OBJECT (model),
"deleted",
(GCallback) gtk_tree_row_ref_deleted_callback,
model,
NULL,
FALSE,
FALSE);
g_signal_connect_data (G_OBJECT (model),
model);
g_signal_connect (G_OBJECT (model),
"reordered",
(GCallback) gtk_tree_row_ref_reordered_callback,
model,
NULL,
FALSE,
FALSE);
model);
}
static void

View File

@ -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),
g_signal_connect (GTK_OBJECT (tree_view),
"notify::model",
GTK_SIGNAL_FUNC (gtk_tree_view_column_setup_sort_column_id_callback),
column, NULL, TRUE, FALSE);
column);
gtk_tree_view_column_setup_sort_column_id_callback (column);
}

View File

@ -77,7 +77,6 @@ testtext_LDADD = $(LDADDS)
treestoretest_LDADD = $(LDADDS)
testgtk_SOURCES = \
prop-editor.c \
testgtk.c
testtreeview_SOURCES = \

View File

@ -124,7 +124,7 @@ connect_controller (GObject *controller,
p->modified_id = g_signal_connect_data (controller, signal, func, p,
(GClosureNotify)free_object_property,
FALSE, FALSE);
0);
g_object_set_data (controller, "object-property", p);
}

View File

@ -390,10 +390,10 @@ tag_event_handler (GtkTextTag *tag, GtkWidget *widget, GdkEvent *event,
static void
setup_tag (GtkTextTag *tag)
{
g_signal_connect_data (G_OBJECT (tag),
g_signal_connect (G_OBJECT (tag),
"event",
G_CALLBACK (tag_event_handler),
NULL, NULL, FALSE, FALSE);
NULL);
}
static const char *book_closed_xpm[] = {
@ -2187,10 +2187,10 @@ create_view (Buffer *buffer)
GTK_SIGNAL_FUNC (tab_stops_expose),
NULL);
g_signal_connect_data (G_OBJECT (view->buffer->buffer),
g_signal_connect (G_OBJECT (view->buffer->buffer),
"mark_set",
GTK_SIGNAL_FUNC (cursor_set_callback),
view->text_view, NULL, FALSE, FALSE);
view->text_view);
/* Draw line numbers in the side windows; we should really be
* more scientific about what width we set them to.

View File

@ -604,7 +604,7 @@ main (int argc, char *argv[])
gtk_tree_view_insert_column_with_attributes (GTK_TREE_VIEW (left_tree_view), -1,
"Unattached Columns", cell, "text", 0, NULL);
cell = gtk_cell_renderer_toggle_new ();
g_signal_connect_data (G_OBJECT (cell), "toggled", (GCallback) set_visible, left_tree_view, NULL, FALSE, FALSE);
g_signal_connect (G_OBJECT (cell), "toggled", (GCallback) set_visible, left_tree_view);
column = gtk_tree_view_column_new_with_attributes ("Visible", cell, NULL);
gtk_tree_view_append_column (GTK_TREE_VIEW (left_tree_view), column);
g_object_unref (G_OBJECT (column));
@ -665,7 +665,7 @@ main (int argc, char *argv[])
gtk_tree_view_insert_column_with_attributes (GTK_TREE_VIEW (top_right_tree_view), -1,
NULL, cell, "text", 0, NULL);
cell = gtk_cell_renderer_toggle_new ();
g_signal_connect_data (G_OBJECT (cell), "toggled", (GCallback) set_visible, top_right_tree_view, NULL, FALSE, FALSE);
g_signal_connect (G_OBJECT (cell), "toggled", (GCallback) set_visible, top_right_tree_view);
column = gtk_tree_view_column_new_with_attributes (NULL, cell, NULL);
gtk_tree_view_column_set_cell_data_func (column, cell, get_visible, NULL, NULL);
gtk_tree_view_append_column (GTK_TREE_VIEW (top_right_tree_view), column);
@ -680,7 +680,7 @@ main (int argc, char *argv[])
gtk_tree_view_insert_column_with_attributes (GTK_TREE_VIEW (bottom_right_tree_view), -1,
NULL, cell, "text", 0, NULL);
cell = gtk_cell_renderer_toggle_new ();
g_signal_connect_data (G_OBJECT (cell), "toggled", (GCallback) set_visible, bottom_right_tree_view, NULL, FALSE, FALSE);
g_signal_connect (G_OBJECT (cell), "toggled", (GCallback) set_visible, bottom_right_tree_view);
column = gtk_tree_view_column_new_with_attributes (NULL, cell, NULL);
gtk_tree_view_column_set_cell_data_func (column, cell, get_visible, NULL, NULL);
gtk_tree_view_append_column (GTK_TREE_VIEW (bottom_right_tree_view), column);

View File

@ -342,7 +342,7 @@ main (int argc, char *argv[])
/* Alex Column */
renderer = gtk_cell_renderer_toggle_new ();
g_signal_connect_data (G_OBJECT (renderer), "toggled", G_CALLBACK (alex_toggled), model, NULL, FALSE, FALSE);
g_signal_connect (G_OBJECT (renderer), "toggled", G_CALLBACK (alex_toggled), model);
g_object_set (G_OBJECT (renderer), "xalign", 0.0, NULL);
col_offset = gtk_tree_view_insert_column_with_attributes (GTK_TREE_VIEW (tree_view),
@ -360,7 +360,7 @@ main (int argc, char *argv[])
/* Havoc Column */
renderer = gtk_cell_renderer_toggle_new ();
g_signal_connect_data (G_OBJECT (renderer), "toggled", G_CALLBACK (havoc_toggled), model, NULL, FALSE, FALSE);
g_signal_connect (G_OBJECT (renderer), "toggled", G_CALLBACK (havoc_toggled), model);
g_object_set (G_OBJECT (renderer), "xalign", 0.0, NULL);
col_offset = gtk_tree_view_insert_column_with_attributes (GTK_TREE_VIEW (tree_view),
@ -377,7 +377,7 @@ main (int argc, char *argv[])
/* Tim Column */
renderer = gtk_cell_renderer_toggle_new ();
g_signal_connect_data (G_OBJECT (renderer), "toggled", G_CALLBACK (tim_toggled), model, NULL, FALSE, FALSE);
g_signal_connect (G_OBJECT (renderer), "toggled", G_CALLBACK (tim_toggled), model);
g_object_set (G_OBJECT (renderer), "xalign", 0.0, NULL);
col_offset = gtk_tree_view_insert_column_with_attributes (GTK_TREE_VIEW (tree_view),
@ -395,7 +395,7 @@ main (int argc, char *argv[])
/* Owen Column */
renderer = gtk_cell_renderer_toggle_new ();
g_signal_connect_data (G_OBJECT (renderer), "toggled", G_CALLBACK (owen_toggled), model, NULL, FALSE, FALSE);
g_signal_connect (G_OBJECT (renderer), "toggled", G_CALLBACK (owen_toggled), model);
g_object_set (G_OBJECT (renderer), "xalign", 0.0, NULL);
col_offset = gtk_tree_view_insert_column_with_attributes (GTK_TREE_VIEW (tree_view),
-1, "Owen",
@ -411,7 +411,7 @@ main (int argc, char *argv[])
/* Owen Column */
renderer = gtk_cell_renderer_toggle_new ();
g_signal_connect_data (G_OBJECT (renderer), "toggled", G_CALLBACK (dave_toggled), model, NULL, FALSE, FALSE);
g_signal_connect (G_OBJECT (renderer), "toggled", G_CALLBACK (dave_toggled), model);
g_object_set (G_OBJECT (renderer), "xalign", 0.0, NULL);
col_offset = gtk_tree_view_insert_column_with_attributes (GTK_TREE_VIEW (tree_view),
-1, "Dave",

View File

@ -159,13 +159,10 @@ static void
setup_column (GtkTreeViewColumn *col)
{
gtk_tree_view_column_set_clickable (col, TRUE);
g_signal_connect_data (G_OBJECT (col),
g_signal_connect (G_OBJECT (col),
"clicked",
(GCallback) col_clicked_cb,
NULL,
NULL,
FALSE,
FALSE);
NULL);
}
static void
@ -302,9 +299,8 @@ set_columns_type (GtkTreeView *tree_view, ColumnsType type)
rend = gtk_cell_renderer_toggle_new ();
g_signal_connect_data (G_OBJECT (rend), "toggled",
GTK_SIGNAL_FUNC (toggled_callback), tree_view,
NULL, FALSE, FALSE);
g_signal_connect (G_OBJECT (rend), "toggled",
GTK_SIGNAL_FUNC (toggled_callback), tree_view);
col = gtk_tree_view_column_new_with_attributes ("Column 3",
rend,
@ -335,9 +331,8 @@ set_columns_type (GtkTreeView *tree_view, ColumnsType type)
*/
g_object_set (G_OBJECT (rend), "radio", TRUE, NULL);
g_signal_connect_data (G_OBJECT (rend), "toggled",
G_CALLBACK (toggled_callback), tree_view,
NULL, FALSE, FALSE);
g_signal_connect (G_OBJECT (rend), "toggled",
G_CALLBACK (toggled_callback), tree_view);
col = gtk_tree_view_column_new_with_attributes ("Column 4",
rend,