callisto-debian/gtk3
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

add deprecation compile flags

Browse Source 
Sun Sep 29 14:22:47 2002 Manish Singh  <yosh@gimp.org>

        * contrib/gdk-pixbuf-xlib/Makefile.am demos/Makefile.am
        demos/gtk-demo/Makefile.am: add deprecation compile flags

        * demos/testanimation.c demos/testpixbuf-save.c demos/testpixbuf.c
        demos/gtk-demo/*.c gdk-pixbuf/gdk-pixbuf-animation.c
        gdk-pixbuf/gdk-pixbuf.c: minor cleanups, getting rid of
        unnecessary casts
This commit is contained in:
Manish Singh
2002-09-29 21:24:24 +00:00
committed by Manish Singh
parent 9ab61d6938
commit d8efdf0024
23 changed files with 130 additions and 68 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
ChangeLog
View File

@ -1,3 +1,13 @@
Sun Sep 29 14:22:47 2002 Manish Singh <yosh@gimp.org>
* contrib/gdk-pixbuf-xlib/Makefile.am demos/Makefile.am
demos/gtk-demo/Makefile.am: add deprecation compile flags
* demos/testanimation.c demos/testpixbuf-save.c demos/testpixbuf.c
demos/gtk-demo/*.c gdk-pixbuf/gdk-pixbuf-animation.c
gdk-pixbuf/gdk-pixbuf.c: minor cleanups, getting rid of
unnecessary casts
Sun Sep 29 13:11:13 2002 Manish Singh <yosh@gimp.org> Sun Sep 29 13:11:13 2002 Manish Singh <yosh@gimp.org>
* gtk/gtktypeutils.h: use #defines instead of enum for * gtk/gtktypeutils.h: use #defines instead of enum for

10
ChangeLog.pre-2-10
View File

@ -1,3 +1,13 @@
Sun Sep 29 14:22:47 2002 Manish Singh <yosh@gimp.org>
* contrib/gdk-pixbuf-xlib/Makefile.am demos/Makefile.am
demos/gtk-demo/Makefile.am: add deprecation compile flags
* demos/testanimation.c demos/testpixbuf-save.c demos/testpixbuf.c
demos/gtk-demo/*.c gdk-pixbuf/gdk-pixbuf-animation.c
gdk-pixbuf/gdk-pixbuf.c: minor cleanups, getting rid of
unnecessary casts
Sun Sep 29 13:11:13 2002 Manish Singh <yosh@gimp.org> Sun Sep 29 13:11:13 2002 Manish Singh <yosh@gimp.org>
* gtk/gtktypeutils.h: use #defines instead of enum for * gtk/gtktypeutils.h: use #defines instead of enum for

10
ChangeLog.pre-2-2
View File

@ -1,3 +1,13 @@
Sun Sep 29 14:22:47 2002 Manish Singh <yosh@gimp.org>
* contrib/gdk-pixbuf-xlib/Makefile.am demos/Makefile.am
demos/gtk-demo/Makefile.am: add deprecation compile flags
* demos/testanimation.c demos/testpixbuf-save.c demos/testpixbuf.c
demos/gtk-demo/*.c gdk-pixbuf/gdk-pixbuf-animation.c
gdk-pixbuf/gdk-pixbuf.c: minor cleanups, getting rid of
unnecessary casts
Sun Sep 29 13:11:13 2002 Manish Singh <yosh@gimp.org> Sun Sep 29 13:11:13 2002 Manish Singh <yosh@gimp.org>
* gtk/gtktypeutils.h: use #defines instead of enum for * gtk/gtktypeutils.h: use #defines instead of enum for

10
ChangeLog.pre-2-4
View File

@ -1,3 +1,13 @@
Sun Sep 29 14:22:47 2002 Manish Singh <yosh@gimp.org>
* contrib/gdk-pixbuf-xlib/Makefile.am demos/Makefile.am
demos/gtk-demo/Makefile.am: add deprecation compile flags
* demos/testanimation.c demos/testpixbuf-save.c demos/testpixbuf.c
demos/gtk-demo/*.c gdk-pixbuf/gdk-pixbuf-animation.c
gdk-pixbuf/gdk-pixbuf.c: minor cleanups, getting rid of
unnecessary casts
Sun Sep 29 13:11:13 2002 Manish Singh <yosh@gimp.org> Sun Sep 29 13:11:13 2002 Manish Singh <yosh@gimp.org>
* gtk/gtktypeutils.h: use #defines instead of enum for * gtk/gtktypeutils.h: use #defines instead of enum for

10
ChangeLog.pre-2-6
View File

@ -1,3 +1,13 @@
Sun Sep 29 14:22:47 2002 Manish Singh <yosh@gimp.org>
* contrib/gdk-pixbuf-xlib/Makefile.am demos/Makefile.am
demos/gtk-demo/Makefile.am: add deprecation compile flags
* demos/testanimation.c demos/testpixbuf-save.c demos/testpixbuf.c
demos/gtk-demo/*.c gdk-pixbuf/gdk-pixbuf-animation.c
gdk-pixbuf/gdk-pixbuf.c: minor cleanups, getting rid of
unnecessary casts
Sun Sep 29 13:11:13 2002 Manish Singh <yosh@gimp.org> Sun Sep 29 13:11:13 2002 Manish Singh <yosh@gimp.org>
* gtk/gtktypeutils.h: use #defines instead of enum for * gtk/gtktypeutils.h: use #defines instead of enum for

10
ChangeLog.pre-2-8
View File

@ -1,3 +1,13 @@
Sun Sep 29 14:22:47 2002 Manish Singh <yosh@gimp.org>
* contrib/gdk-pixbuf-xlib/Makefile.am demos/Makefile.am
demos/gtk-demo/Makefile.am: add deprecation compile flags
* demos/testanimation.c demos/testpixbuf-save.c demos/testpixbuf.c
demos/gtk-demo/*.c gdk-pixbuf/gdk-pixbuf-animation.c
gdk-pixbuf/gdk-pixbuf.c: minor cleanups, getting rid of
unnecessary casts
Sun Sep 29 13:11:13 2002 Manish Singh <yosh@gimp.org> Sun Sep 29 13:11:13 2002 Manish Singh <yosh@gimp.org>
* gtk/gtktypeutils.h: use #defines instead of enum for * gtk/gtktypeutils.h: use #defines instead of enum for

2
contrib/gdk-pixbuf-xlib/Makefile.am
View File

@ -4,6 +4,8 @@ INCLUDES = @STRIP_BEGIN@ \
-I$(top_srcdir) -I$(top_builddir) \ -I$(top_srcdir) -I$(top_builddir) \
-I$(top_srcdir)/gdk-pixbuf \ -I$(top_srcdir)/gdk-pixbuf \
-I$(top_srcdir)/contrib \ -I$(top_srcdir)/contrib \
-DG_DISABLE_DEPRECATED \
-DGDK_PIXBUF_DISABLE_DEPRECATED \
@GDK_PIXBUF_XLIB_DEP_CFLAGS@ \ @GDK_PIXBUF_XLIB_DEP_CFLAGS@ \
@STRIP_END@ @STRIP_END@

2
demos/Makefile.am
View File

@ -6,8 +6,8 @@ INCLUDES = @STRIP_BEGIN@ \
-I$(top_srcdir) \ -I$(top_srcdir) \
-I$(top_builddir)/gdk \ -I$(top_builddir)/gdk \
-DG_DISABLE_DEPRECATED \ -DG_DISABLE_DEPRECATED \
-DGDK_DISABLE_DEPRECATED \
-DGDK_PIXBUF_DISABLE_DEPRECATED \ -DGDK_PIXBUF_DISABLE_DEPRECATED \
-DGDK_DISABLE_DEPRECATED \
-DGTK_DISABLE_DEPRECATED \ -DGTK_DISABLE_DEPRECATED \
@GTK_DEBUG_FLAGS@ \ @GTK_DEBUG_FLAGS@ \
@GTK_DEP_CFLAGS@ \ @GTK_DEP_CFLAGS@ \

2
demos/gtk-demo/Makefile.am
View File

@ -29,8 +29,8 @@ INCLUDES = @STRIP_BEGIN@ \
-I$(top_srcdir) \ -I$(top_srcdir) \
-I$(top_builddir)/gdk \ -I$(top_builddir)/gdk \
-DG_DISABLE_DEPRECATED \ -DG_DISABLE_DEPRECATED \
-DGDK_DISABLE_DEPRECATED \
-DGDK_PIXBUF_DISABLE_DEPRECATED \ -DGDK_PIXBUF_DISABLE_DEPRECATED \
-DGDK_DISABLE_DEPRECATED \
-DGTK_DISABLE_DEPRECATED \ -DGTK_DISABLE_DEPRECATED \
@GTK_DEBUG_FLAGS@ \ @GTK_DEBUG_FLAGS@ \
@GTK_DEP_CFLAGS@ \ @GTK_DEP_CFLAGS@ \

12
demos/gtk-demo/appwindow.c
View File

@ -24,7 +24,7 @@ menuitem_cb (gpointer callback_data,
gtk_item_factory_path_from_widget (widget)); gtk_item_factory_path_from_widget (widget));
/* Close dialog on user response */ /* Close dialog on user response */
g_signal_connect (G_OBJECT (dialog), g_signal_connect (dialog,
"response", "response",
G_CALLBACK (gtk_widget_destroy), G_CALLBACK (gtk_widget_destroy),
NULL); NULL);
@ -73,7 +73,7 @@ toolbar_cb (GtkWidget *button,
"You selected a toolbar button"); "You selected a toolbar button");
/* Close dialog on user response */ /* Close dialog on user response */
g_signal_connect (G_OBJECT (dialog), g_signal_connect (dialog,
"response", "response",
G_CALLBACK (gtk_widget_destroy), G_CALLBACK (gtk_widget_destroy),
NULL); NULL);
@ -137,14 +137,14 @@ register_stock_icons (void)
icon_set = gtk_icon_set_new_from_pixbuf (transparent); icon_set = gtk_icon_set_new_from_pixbuf (transparent);
gtk_icon_factory_add (factory, "demo-gtk-logo", icon_set); gtk_icon_factory_add (factory, "demo-gtk-logo", icon_set);
gtk_icon_set_unref (icon_set); gtk_icon_set_unref (icon_set);
g_object_unref (G_OBJECT (pixbuf)); g_object_unref (pixbuf);
g_object_unref (G_OBJECT (transparent)); g_object_unref (transparent);
} }
else else
g_warning ("failed to load GTK logo for toolbar"); g_warning ("failed to load GTK logo for toolbar");
/* Drop our reference to the factory, GTK will hold a reference. */ /* Drop our reference to the factory, GTK will hold a reference. */
g_object_unref (G_OBJECT (factory)); g_object_unref (factory);
} }
} }
@ -208,7 +208,7 @@ do_appwindow (void)
gtk_window_set_title (GTK_WINDOW (window), "Application Window"); gtk_window_set_title (GTK_WINDOW (window), "Application Window");
/* NULL window variable when window is closed */ /* NULL window variable when window is closed */
g_signal_connect (G_OBJECT (window), "destroy", g_signal_connect (window, "destroy",
G_CALLBACK (gtk_widget_destroyed), G_CALLBACK (gtk_widget_destroyed),
&window); &window);

6
demos/gtk-demo/drawingarea.c
View File

@ -26,7 +26,7 @@ scribble_configure_event (GtkWidget *widget,
gpointer data) gpointer data)
{ {
if (pixmap) if (pixmap)
g_object_unref (G_OBJECT (pixmap)); g_object_unref (pixmap);
pixmap = gdk_pixmap_new (widget->window, pixmap = gdk_pixmap_new (widget->window,
widget->allocation.width, widget->allocation.width,
@ -209,8 +209,8 @@ checkerboard_expose (GtkWidget *da,
++xcount; ++xcount;
} }
g_object_unref (G_OBJECT (gc1)); g_object_unref (gc1);
g_object_unref (G_OBJECT (gc2)); g_object_unref (gc2);
/* return TRUE because we've handled this event, so no /* return TRUE because we've handled this event, so no
* further processing is required. * further processing is required.

12
demos/gtk-demo/editable_cells.c
View File

@ -201,7 +201,7 @@ add_columns (GtkTreeView *treeview)
/* number column */ /* number column */
renderer = gtk_cell_renderer_text_new (); renderer = gtk_cell_renderer_text_new ();
g_signal_connect (G_OBJECT (renderer), "edited", g_signal_connect (renderer, "edited",
G_CALLBACK (cell_edited), model); G_CALLBACK (cell_edited), model);
g_object_set_data (G_OBJECT (renderer), "column", (gint *)COLUMN_NUMBER); g_object_set_data (G_OBJECT (renderer), "column", (gint *)COLUMN_NUMBER);
@ -213,7 +213,7 @@ add_columns (GtkTreeView *treeview)
/* product column */ /* product column */
renderer = gtk_cell_renderer_text_new (); renderer = gtk_cell_renderer_text_new ();
g_signal_connect (G_OBJECT (renderer), "edited", g_signal_connect (renderer, "edited",
G_CALLBACK (cell_edited), model); G_CALLBACK (cell_edited), model);
g_object_set_data (G_OBJECT (renderer), "column", (gint *)COLUMN_PRODUCT); g_object_set_data (G_OBJECT (renderer), "column", (gint *)COLUMN_PRODUCT);
@ -240,7 +240,7 @@ do_editable_cells (void)
window = gtk_window_new (GTK_WINDOW_TOPLEVEL); window = gtk_window_new (GTK_WINDOW_TOPLEVEL);
gtk_window_set_title (GTK_WINDOW (window), "Shopping list"); gtk_window_set_title (GTK_WINDOW (window), "Shopping list");
gtk_container_set_border_width (GTK_CONTAINER (window), 5); gtk_container_set_border_width (GTK_CONTAINER (window), 5);
g_signal_connect (G_OBJECT (window), "destroy", g_signal_connect (window, "destroy",
G_CALLBACK (gtk_widget_destroyed), &window); G_CALLBACK (gtk_widget_destroyed), &window);
vbox = gtk_vbox_new (FALSE, 5); vbox = gtk_vbox_new (FALSE, 5);
@ -263,7 +263,7 @@ do_editable_cells (void)
/* create tree view */ /* create tree view */
treeview = gtk_tree_view_new_with_model (model); treeview = gtk_tree_view_new_with_model (model);
g_object_unref (G_OBJECT (model)); g_object_unref (model);
gtk_tree_view_set_rules_hint (GTK_TREE_VIEW (treeview), TRUE); gtk_tree_view_set_rules_hint (GTK_TREE_VIEW (treeview), TRUE);
gtk_tree_selection_set_mode (gtk_tree_view_get_selection (GTK_TREE_VIEW (treeview)), gtk_tree_selection_set_mode (gtk_tree_view_get_selection (GTK_TREE_VIEW (treeview)),
GTK_SELECTION_SINGLE); GTK_SELECTION_SINGLE);
@ -277,12 +277,12 @@ do_editable_cells (void)
gtk_box_pack_start (GTK_BOX (vbox), hbox, FALSE, FALSE, 0); gtk_box_pack_start (GTK_BOX (vbox), hbox, FALSE, FALSE, 0);
button = gtk_button_new_with_label ("Add item"); button = gtk_button_new_with_label ("Add item");
g_signal_connect (G_OBJECT (button), "clicked", g_signal_connect (button, "clicked",
G_CALLBACK (add_item), model); G_CALLBACK (add_item), model);
gtk_box_pack_start (GTK_BOX (hbox), button, TRUE, TRUE, 0); gtk_box_pack_start (GTK_BOX (hbox), button, TRUE, TRUE, 0);
button = gtk_button_new_with_label ("Remove item"); button = gtk_button_new_with_label ("Remove item");
g_signal_connect (G_OBJECT (button), "clicked", g_signal_connect (button, "clicked",
G_CALLBACK (remove_item), treeview); G_CALLBACK (remove_item), treeview);
gtk_box_pack_start (GTK_BOX (hbox), button, TRUE, TRUE, 0); gtk_box_pack_start (GTK_BOX (hbox), button, TRUE, TRUE, 0);

14
demos/gtk-demo/images.c
View File

@ -165,7 +165,7 @@ progressive_timeout (gpointer data)
gtk_widget_show (dialog); gtk_widget_show (dialog);
g_object_unref (G_OBJECT (pixbuf_loader)); g_object_unref (pixbuf_loader);
pixbuf_loader = NULL; pixbuf_loader = NULL;
load_timeout = 0; load_timeout = 0;
@ -173,7 +173,7 @@ progressive_timeout (gpointer data)
return FALSE; /* uninstall the timeout */ return FALSE; /* uninstall the timeout */
} }
g_object_unref (G_OBJECT (pixbuf_loader)); g_object_unref (pixbuf_loader);
pixbuf_loader = NULL; pixbuf_loader = NULL;
} }
} }
@ -227,16 +227,16 @@ progressive_timeout (gpointer data)
if (pixbuf_loader) if (pixbuf_loader)
{ {
gdk_pixbuf_loader_close (pixbuf_loader, NULL); gdk_pixbuf_loader_close (pixbuf_loader, NULL);
g_object_unref (G_OBJECT (pixbuf_loader)); g_object_unref (pixbuf_loader);
pixbuf_loader = NULL; pixbuf_loader = NULL;
} }
pixbuf_loader = gdk_pixbuf_loader_new (); pixbuf_loader = gdk_pixbuf_loader_new ();
g_signal_connect (G_OBJECT (pixbuf_loader), "area_prepared", g_signal_connect (pixbuf_loader, "area_prepared",
G_CALLBACK (progressive_prepared_callback), image); G_CALLBACK (progressive_prepared_callback), image);
g_signal_connect (G_OBJECT (pixbuf_loader), "area_updated", g_signal_connect (pixbuf_loader, "area_updated",
G_CALLBACK (progressive_updated_callback), image); G_CALLBACK (progressive_updated_callback), image);
} }
@ -272,7 +272,7 @@ cleanup_callback (GtkObject *object,
if (pixbuf_loader) if (pixbuf_loader)
{ {
gdk_pixbuf_loader_close (pixbuf_loader, NULL); gdk_pixbuf_loader_close (pixbuf_loader, NULL);
g_object_unref (G_OBJECT (pixbuf_loader)); g_object_unref (pixbuf_loader);
pixbuf_loader = NULL; pixbuf_loader = NULL;
} }
@ -442,7 +442,7 @@ do_images (void)
button = gtk_toggle_button_new_with_mnemonic ("_Insensitive"); button = gtk_toggle_button_new_with_mnemonic ("_Insensitive");
gtk_box_pack_start (GTK_BOX (vbox), button, FALSE, FALSE, 0); gtk_box_pack_start (GTK_BOX (vbox), button, FALSE, FALSE, 0);
g_signal_connect (G_OBJECT (button), "toggled", g_signal_connect (button, "toggled",
G_CALLBACK (toggle_sensitivity_callback), G_CALLBACK (toggle_sensitivity_callback),
vbox); vbox);
} }

6
demos/gtk-demo/list_store.c
View File

@ -109,7 +109,7 @@ add_columns (GtkTreeView *treeview)
/* column for fixed toggles */ /* column for fixed toggles */
renderer = gtk_cell_renderer_toggle_new (); renderer = gtk_cell_renderer_toggle_new ();
g_signal_connect (G_OBJECT (renderer), "toggled", g_signal_connect (renderer, "toggled",
G_CALLBACK (fixed_toggled), model); G_CALLBACK (fixed_toggled), model);
column = gtk_tree_view_column_new_with_attributes ("Fixed?", column = gtk_tree_view_column_new_with_attributes ("Fixed?",
@ -169,7 +169,7 @@ do_list_store (void)
window = gtk_window_new (GTK_WINDOW_TOPLEVEL); window = gtk_window_new (GTK_WINDOW_TOPLEVEL);
gtk_window_set_title (GTK_WINDOW (window), "GtkListStore demo"); gtk_window_set_title (GTK_WINDOW (window), "GtkListStore demo");
g_signal_connect (G_OBJECT (window), "destroy", g_signal_connect (window, "destroy",
G_CALLBACK (gtk_widget_destroyed), &window); G_CALLBACK (gtk_widget_destroyed), &window);
gtk_container_set_border_width (GTK_CONTAINER (window), 8); gtk_container_set_border_width (GTK_CONTAINER (window), 8);
@ -196,7 +196,7 @@ do_list_store (void)
gtk_tree_view_set_search_column (GTK_TREE_VIEW (treeview), gtk_tree_view_set_search_column (GTK_TREE_VIEW (treeview),
COLUMN_DESCRIPTION); COLUMN_DESCRIPTION);
g_object_unref (G_OBJECT (model)); g_object_unref (model);
gtk_container_add (GTK_CONTAINER (sw), treeview); gtk_container_add (GTK_CONTAINER (sw), treeview);

4
demos/gtk-demo/main.c
View File

@ -790,8 +790,8 @@ setup_default_icon (void)
list = g_list_append (list, transparent); list = g_list_append (list, transparent);
gtk_window_set_default_icon_list (list); gtk_window_set_default_icon_list (list);
g_list_free (list); g_list_free (list);
g_object_unref (G_OBJECT (pixbuf)); g_object_unref (pixbuf);
g_object_unref (G_OBJECT (transparent)); g_object_unref (transparent);
} }
} }

12
demos/gtk-demo/stock_browser.c
View File

@ -34,7 +34,7 @@ stock_item_info_free (StockItemInfo *info)
g_free (info->macro); g_free (info->macro);
g_free (info->accel_str); g_free (info->accel_str);
if (info->small_icon) if (info->small_icon)
g_object_unref (G_OBJECT (info->small_icon)); g_object_unref (info->small_icon);
g_free (info); g_free (info);
} }
@ -53,7 +53,7 @@ stock_item_info_copy (StockItemInfo *src)
info->small_icon = src->small_icon; info->small_icon = src->small_icon;
if (info->small_icon) if (info->small_icon)
g_object_ref (G_OBJECT (info->small_icon)); g_object_ref (info->small_icon);
return info; return info;
} }
@ -190,7 +190,7 @@ create_model (void)
w, h, w, h,
GDK_INTERP_BILINEAR); GDK_INTERP_BILINEAR);
g_object_unref (G_OBJECT (info.small_icon)); g_object_unref (info.small_icon);
info.small_icon = scaled; info.small_icon = scaled;
} }
} }
@ -215,7 +215,7 @@ create_model (void)
g_free (info.macro); g_free (info.macro);
g_free (info.accel_str); g_free (info.accel_str);
if (info.small_icon) if (info.small_icon)
g_object_unref (G_OBJECT (info.small_icon)); g_object_unref (info.small_icon);
tmp_list = g_slist_next (tmp_list); tmp_list = g_slist_next (tmp_list);
} }
@ -436,7 +436,7 @@ do_stock_browser (void)
treeview = gtk_tree_view_new_with_model (model); treeview = gtk_tree_view_new_with_model (model);
g_object_unref (G_OBJECT (model)); g_object_unref (model);
gtk_container_add (GTK_CONTAINER (sw), treeview); gtk_container_add (GTK_CONTAINER (sw), treeview);
@ -524,7 +524,7 @@ do_stock_browser (void)
selection = gtk_tree_view_get_selection (GTK_TREE_VIEW (treeview)); selection = gtk_tree_view_get_selection (GTK_TREE_VIEW (treeview));
gtk_tree_selection_set_mode (selection, GTK_SELECTION_SINGLE); gtk_tree_selection_set_mode (selection, GTK_SELECTION_SINGLE);
g_signal_connect (G_OBJECT (selection), g_signal_connect (selection,
"changed", "changed",
G_CALLBACK (selection_changed), G_CALLBACK (selection_changed),
NULL); NULL);

10
demos/gtk-demo/textview.c
View File

@ -84,7 +84,7 @@ create_tags (GtkTextBuffer *buffer)
gtk_text_buffer_create_tag (buffer, "foreground_stipple", gtk_text_buffer_create_tag (buffer, "foreground_stipple",
"foreground_stipple", stipple, NULL); "foreground_stipple", stipple, NULL);
g_object_unref (G_OBJECT (stipple)); g_object_unref (stipple);
gtk_text_buffer_create_tag (buffer, "big_gap_before_line", gtk_text_buffer_create_tag (buffer, "big_gap_before_line",
"pixels_above_lines", 30, NULL); "pixels_above_lines", 30, NULL);
@ -174,7 +174,7 @@ insert_text (GtkTextBuffer *buffer)
} }
scaled = gdk_pixbuf_scale_simple (pixbuf, 32, 32, GDK_INTERP_BILINEAR); scaled = gdk_pixbuf_scale_simple (pixbuf, 32, 32, GDK_INTERP_BILINEAR);
g_object_unref (G_OBJECT (pixbuf)); g_object_unref (pixbuf);
pixbuf = scaled; pixbuf = scaled;
/* get start of buffer; each insertion will revalidate the /* get start of buffer; each insertion will revalidate the
@ -356,7 +356,7 @@ insert_text (GtkTextBuffer *buffer)
gtk_text_buffer_get_bounds (buffer, &start, &end); gtk_text_buffer_get_bounds (buffer, &start, &end);
gtk_text_buffer_apply_tag_by_name (buffer, "word_wrap", &start, &end); gtk_text_buffer_apply_tag_by_name (buffer, "word_wrap", &start, &end);
g_object_unref (G_OBJECT (pixbuf)); g_object_unref (pixbuf);
} }
static gboolean static gboolean
@ -393,7 +393,7 @@ attach_widgets (GtkTextView *text_view)
{ {
widget = gtk_button_new_with_label ("Click Me"); widget = gtk_button_new_with_label ("Click Me");
g_signal_connect (G_OBJECT (widget), "clicked", g_signal_connect (widget, "clicked",
G_CALLBACK (easter_egg_callback), G_CALLBACK (easter_egg_callback),
NULL); NULL);
} }
@ -583,7 +583,7 @@ easter_egg_callback (GtkWidget *button,
recursive_attach_view (0, GTK_TEXT_VIEW (view), anchor); recursive_attach_view (0, GTK_TEXT_VIEW (view), anchor);
g_object_unref (G_OBJECT (buffer)); g_object_unref (buffer);
window = gtk_window_new (GTK_WINDOW_TOPLEVEL); window = gtk_window_new (GTK_WINDOW_TOPLEVEL);
sw = gtk_scrolled_window_new (NULL, NULL); sw = gtk_scrolled_window_new (NULL, NULL);

26
demos/gtk-demo/tree_store.c
View File

@ -276,8 +276,8 @@ add_columns (GtkTreeView *treeview)
g_object_set (G_OBJECT (renderer), "xalign", 0.0, NULL); g_object_set (G_OBJECT (renderer), "xalign", 0.0, NULL);
g_object_set_data (G_OBJECT (renderer), "column", (gint *)ALEX_COLUMN); g_object_set_data (G_OBJECT (renderer), "column", (gint *)ALEX_COLUMN);
g_signal_connect (G_OBJECT (renderer), "toggled", G_CALLBACK (item_toggled), g_signal_connect (renderer, "toggled", G_CALLBACK (item_toggled), model);
model);
col_offset = gtk_tree_view_insert_column_with_attributes (GTK_TREE_VIEW (treeview), col_offset = gtk_tree_view_insert_column_with_attributes (GTK_TREE_VIEW (treeview),
-1, "Alex", -1, "Alex",
renderer, renderer,
@ -299,8 +299,8 @@ add_columns (GtkTreeView *treeview)
g_object_set (G_OBJECT (renderer), "xalign", 0.0, NULL); g_object_set (G_OBJECT (renderer), "xalign", 0.0, NULL);
g_object_set_data (G_OBJECT (renderer), "column", (gint *)HAVOC_COLUMN); g_object_set_data (G_OBJECT (renderer), "column", (gint *)HAVOC_COLUMN);
g_signal_connect (G_OBJECT (renderer), "toggled", G_CALLBACK (item_toggled), g_signal_connect (renderer, "toggled", G_CALLBACK (item_toggled), model);
model);
col_offset = gtk_tree_view_insert_column_with_attributes (GTK_TREE_VIEW (treeview), col_offset = gtk_tree_view_insert_column_with_attributes (GTK_TREE_VIEW (treeview),
-1, "Havoc", -1, "Havoc",
renderer, renderer,
@ -321,8 +321,8 @@ add_columns (GtkTreeView *treeview)
g_object_set (G_OBJECT (renderer), "xalign", 0.0, NULL); g_object_set (G_OBJECT (renderer), "xalign", 0.0, NULL);
g_object_set_data (G_OBJECT (renderer), "column", (gint *)TIM_COLUMN); g_object_set_data (G_OBJECT (renderer), "column", (gint *)TIM_COLUMN);
g_signal_connect (G_OBJECT (renderer), "toggled", G_CALLBACK (item_toggled), g_signal_connect (renderer, "toggled", G_CALLBACK (item_toggled), model);
model);
col_offset = gtk_tree_view_insert_column_with_attributes (GTK_TREE_VIEW (treeview), col_offset = gtk_tree_view_insert_column_with_attributes (GTK_TREE_VIEW (treeview),
-1, "Tim", -1, "Tim",
renderer, renderer,
@ -344,8 +344,8 @@ add_columns (GtkTreeView *treeview)
g_object_set (G_OBJECT (renderer), "xalign", 0.0, NULL); g_object_set (G_OBJECT (renderer), "xalign", 0.0, NULL);
g_object_set_data (G_OBJECT (renderer), "column", (gint *)OWEN_COLUMN); g_object_set_data (G_OBJECT (renderer), "column", (gint *)OWEN_COLUMN);
g_signal_connect (G_OBJECT (renderer), "toggled", G_CALLBACK (item_toggled), g_signal_connect (renderer, "toggled", G_CALLBACK (item_toggled), model);
model);
col_offset = gtk_tree_view_insert_column_with_attributes (GTK_TREE_VIEW (treeview), col_offset = gtk_tree_view_insert_column_with_attributes (GTK_TREE_VIEW (treeview),
-1, "Owen", -1, "Owen",
renderer, renderer,
@ -366,8 +366,8 @@ add_columns (GtkTreeView *treeview)
g_object_set (G_OBJECT (renderer), "xalign", 0.0, NULL); g_object_set (G_OBJECT (renderer), "xalign", 0.0, NULL);
g_object_set_data (G_OBJECT (renderer), "column", (gint *)DAVE_COLUMN); g_object_set_data (G_OBJECT (renderer), "column", (gint *)DAVE_COLUMN);
g_signal_connect (G_OBJECT (renderer), "toggled", G_CALLBACK (item_toggled), g_signal_connect (renderer, "toggled", G_CALLBACK (item_toggled), model);
model);
col_offset = gtk_tree_view_insert_column_with_attributes (GTK_TREE_VIEW (treeview), col_offset = gtk_tree_view_insert_column_with_attributes (GTK_TREE_VIEW (treeview),
-1, "Dave", -1, "Dave",
renderer, renderer,
@ -397,7 +397,7 @@ do_tree_store (void)
/* create window, etc */ /* create window, etc */
window = gtk_window_new (GTK_WINDOW_TOPLEVEL); window = gtk_window_new (GTK_WINDOW_TOPLEVEL);
gtk_window_set_title (GTK_WINDOW (window), "Card planning sheet"); gtk_window_set_title (GTK_WINDOW (window), "Card planning sheet");
g_signal_connect (G_OBJECT (window), "destroy", g_signal_connect (window, "destroy",
G_CALLBACK (gtk_widget_destroyed), &window); G_CALLBACK (gtk_widget_destroyed), &window);
vbox = gtk_vbox_new (FALSE, 8); vbox = gtk_vbox_new (FALSE, 8);
@ -421,7 +421,7 @@ do_tree_store (void)
/* create tree view */ /* create tree view */
treeview = gtk_tree_view_new_with_model (model); treeview = gtk_tree_view_new_with_model (model);
g_object_unref (G_OBJECT (model)); g_object_unref (model);
gtk_tree_view_set_rules_hint (GTK_TREE_VIEW (treeview), TRUE); gtk_tree_view_set_rules_hint (GTK_TREE_VIEW (treeview), TRUE);
gtk_tree_selection_set_mode (gtk_tree_view_get_selection (GTK_TREE_VIEW (treeview)), gtk_tree_selection_set_mode (gtk_tree_view_get_selection (GTK_TREE_VIEW (treeview)),
GTK_SELECTION_MULTIPLE); GTK_SELECTION_MULTIPLE);
@ -431,7 +431,7 @@ do_tree_store (void)
gtk_container_add (GTK_CONTAINER (sw), treeview); gtk_container_add (GTK_CONTAINER (sw), treeview);
/* expand all rows after the treeview widget has been realized */ /* expand all rows after the treeview widget has been realized */
g_signal_connect (G_OBJECT (treeview), "realize", g_signal_connect (treeview, "realize",
G_CALLBACK (gtk_tree_view_expand_all), NULL); G_CALLBACK (gtk_tree_view_expand_all), NULL);
gtk_window_set_default_size (GTK_WINDOW (window), 650, 400); gtk_window_set_default_size (GTK_WINDOW (window), 650, 400);
} }

16
demos/testanimation.c
View File

@ -53,7 +53,7 @@ destroy_context (gpointer data)
if (lc->pixbuf_loader) if (lc->pixbuf_loader)
{ {
gdk_pixbuf_loader_close (lc->pixbuf_loader, NULL); gdk_pixbuf_loader_close (lc->pixbuf_loader, NULL);
g_object_unref (G_OBJECT (lc->pixbuf_loader)); g_object_unref (lc->pixbuf_loader);
} }
g_free (lc); g_free (lc);
@ -230,7 +230,7 @@ progressive_timeout (gpointer data)
gtk_widget_show (dialog); gtk_widget_show (dialog);
g_object_unref (G_OBJECT (lc->pixbuf_loader)); g_object_unref (lc->pixbuf_loader);
lc->pixbuf_loader = NULL; lc->pixbuf_loader = NULL;
lc->load_timeout = 0; lc->load_timeout = 0;
@ -238,7 +238,7 @@ progressive_timeout (gpointer data)
return FALSE; /* uninstall the timeout */ return FALSE; /* uninstall the timeout */
} }
g_object_unref (G_OBJECT (lc->pixbuf_loader)); g_object_unref (lc->pixbuf_loader);
lc->pixbuf_loader = NULL; lc->pixbuf_loader = NULL;
} }
} }
@ -271,7 +271,7 @@ progressive_timeout (gpointer data)
if (lc->pixbuf_loader) if (lc->pixbuf_loader)
{ {
gdk_pixbuf_loader_close (lc->pixbuf_loader, NULL); gdk_pixbuf_loader_close (lc->pixbuf_loader, NULL);
g_object_unref (G_OBJECT (lc->pixbuf_loader)); g_object_unref (lc->pixbuf_loader);
lc->pixbuf_loader = NULL; lc->pixbuf_loader = NULL;
} }
@ -357,10 +357,10 @@ do_image (const char *filename)
start_progressive_loading (image); start_progressive_loading (image);
g_signal_connect (G_OBJECT (window), "destroy", g_signal_connect (window, "destroy",
G_CALLBACK (gtk_main_quit), NULL); G_CALLBACK (gtk_main_quit), NULL);
g_signal_connect (G_OBJECT (window), "delete_event", g_signal_connect (window, "delete_event",
G_CALLBACK (gtk_main_quit), NULL); G_CALLBACK (gtk_main_quit), NULL);
gtk_widget_show_all (window); gtk_widget_show_all (window);
@ -411,10 +411,10 @@ do_nonprogressive (const gchar *filename)
image = gtk_image_new_from_file (filename); image = gtk_image_new_from_file (filename);
gtk_container_add (GTK_CONTAINER (frame), image); gtk_container_add (GTK_CONTAINER (frame), image);
g_signal_connect (G_OBJECT (window), "destroy", g_signal_connect (window, "destroy",
G_CALLBACK (gtk_main_quit), NULL); G_CALLBACK (gtk_main_quit), NULL);
g_signal_connect (G_OBJECT (window), "delete_event", g_signal_connect (window, "delete_event",
G_CALLBACK (gtk_main_quit), NULL); G_CALLBACK (gtk_main_quit), NULL);
gtk_widget_show_all (window); gtk_widget_show_all (window);

4
demos/testpixbuf-save.c
View File

@ -100,7 +100,7 @@ keypress_check (GtkWidget *widget, GdkEventKey *evt, gpointer data)
g_error_free (err); g_error_free (err);
} else { } else {
compare_pixbufs (pixbuf, compare, "jpeg"); compare_pixbufs (pixbuf, compare, "jpeg");
g_object_unref (G_OBJECT (compare)); g_object_unref (compare);
} }
} }
@ -126,7 +126,7 @@ keypress_check (GtkWidget *widget, GdkEventKey *evt, gpointer data)
g_error_free (err); g_error_free (err);
} else { } else {
compare_pixbufs (pixbuf, compare, "png"); compare_pixbufs (pixbuf, compare, "png");
g_object_unref (G_OBJECT (compare)); g_object_unref (compare);
} }
} }

2
demos/testpixbuf.c
View File

@ -464,7 +464,7 @@ update_timeout (gpointer data)
/* ignoring errors, we should not do that. */ /* ignoring errors, we should not do that. */
gdk_pixbuf_loader_close (GDK_PIXBUF_LOADER (status->loader), NULL); gdk_pixbuf_loader_close (GDK_PIXBUF_LOADER (status->loader), NULL);
gtk_widget_queue_draw (*status->rgbwin); gtk_widget_queue_draw (*status->rgbwin);
g_object_unref (G_OBJECT (status->loader)); g_object_unref (status->loader);
fclose (status->imagefile); fclose (status->imagefile);
g_free (status->buf); g_free (status->buf);
} }

4
gdk-pixbuf/gdk-pixbuf-animation.c
View File

@ -243,7 +243,7 @@ gdk_pixbuf_animation_new_from_file (const char *filename,
GdkPixbufAnimation * GdkPixbufAnimation *
gdk_pixbuf_animation_ref (GdkPixbufAnimation *animation) gdk_pixbuf_animation_ref (GdkPixbufAnimation *animation)
{ {
return (GdkPixbufAnimation*) g_object_ref (G_OBJECT (animation)); return (GdkPixbufAnimation*) g_object_ref (animation);
} }
/** /**
@ -255,7 +255,7 @@ gdk_pixbuf_animation_ref (GdkPixbufAnimation *animation)
void void
gdk_pixbuf_animation_unref (GdkPixbufAnimation *animation) gdk_pixbuf_animation_unref (GdkPixbufAnimation *animation)
{ {
g_object_unref (G_OBJECT (animation)); g_object_unref (animation);
} }
/** /**

4
gdk-pixbuf/gdk-pixbuf.c
View File

@ -96,7 +96,7 @@ gdk_pixbuf_finalize (GObject *object)
GdkPixbuf * GdkPixbuf *
gdk_pixbuf_ref (GdkPixbuf *pixbuf) gdk_pixbuf_ref (GdkPixbuf *pixbuf)
{ {
return (GdkPixbuf *) g_object_ref (G_OBJECT(pixbuf)); return (GdkPixbuf *) g_object_ref (pixbuf);
} }
/** /**
@ -110,7 +110,7 @@ gdk_pixbuf_ref (GdkPixbuf *pixbuf)
void void
gdk_pixbuf_unref (GdkPixbuf *pixbuf) gdk_pixbuf_unref (GdkPixbuf *pixbuf)
{ {
g_object_unref (G_OBJECT (pixbuf)); g_object_unref (pixbuf);
} }