AuroraMiddleware/gtk2
1
0
Fork 0
forked from AuroraMiddleware/gtk
Code Issues Pull Requests Projects Releases Wiki Activity

gtk/gtkfontsel.c gtk/gtkrc.c gtk/gtkstyle.c use g_object_unref() instead

Browse Source 
2008-06-16  Michael Natterer  <mitch@imendio.com>

	* gtk/gtkfontsel.c
	* gtk/gtkrc.c
	* gtk/gtkstyle.c
	* gtk/gtkwidget.c: use g_object_unref() instead of the deprecated
	gtk_rc_style_unref().


svn path=/trunk/; revision=20405
This commit is contained in:
Michael Natterer 2008-06-16 16:53:39 +00:00 committed by Michael Natterer
parent 37c28957fe
commit ff5ba96c26
5 changed files with 17 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
ChangeLog
View File

@ -1,3 +1,11 @@
2008-06-16 Michael Natterer <mitch@imendio.com>
* gtk/gtkfontsel.c
* gtk/gtkrc.c
* gtk/gtkstyle.c
* gtk/gtkwidget.c: use g_object_unref() instead of the deprecated
gtk_rc_style_unref().
2008-06-16 Michael Natterer <mitch@imendio.com> 2008-06-16 Michael Natterer <mitch@imendio.com>
* gtk/gtkcombobox.c (gtk_combo_box_class_init): use * gtk/gtkcombobox.c (gtk_combo_box_class_init): use

2
gtk/gtkfontsel.c
View File

@ -1087,7 +1087,7 @@ gtk_font_selection_update_preview (GtkFontSelection *fontsel)
rc_style->font_desc = gtk_font_selection_get_font_description (fontsel); rc_style->font_desc = gtk_font_selection_get_font_description (fontsel);
gtk_widget_modify_style (preview_entry, rc_style); gtk_widget_modify_style (preview_entry, rc_style);
gtk_rc_style_unref (rc_style); g_object_unref (rc_style);
gtk_widget_size_request (preview_entry, NULL); gtk_widget_size_request (preview_entry, NULL);

6
gtk/gtkrc.c
View File

@ -1559,7 +1559,7 @@ gtk_rc_clear_hash_node (gpointer key,
gpointer data, gpointer data,
gpointer user_data) gpointer user_data)
{ {
gtk_rc_style_unref (data); g_object_unref (data);
} }
static void static void
@ -2453,7 +2453,7 @@ gtk_rc_init_style (GtkRcContext *context,
} }
style = gtk_rc_style_to_style (context, proto_style); style = gtk_rc_style_to_style (context, proto_style);
gtk_rc_style_unref (proto_style); g_object_unref (proto_style);
g_hash_table_insert (realized_style_ht, rc_styles, style); g_hash_table_insert (realized_style_ht, rc_styles, style);
} }
@ -3235,7 +3235,7 @@ gtk_rc_parse_style (GtkRcContext *context,
err: err:
if (rc_style != orig_style) if (rc_style != orig_style)
gtk_rc_style_unref (rc_style); g_object_unref (rc_style);
if (orig_style) if (orig_style)
g_object_unref (orig_style); g_object_unref (orig_style);

2
gtk/gtkstyle.c
View File

@ -619,7 +619,7 @@ gtk_style_finalize (GObject *object)
pango_font_description_free (style->private_font_desc); pango_font_description_free (style->private_font_desc);
if (style->rc_style) if (style->rc_style)
gtk_rc_style_unref (style->rc_style); g_object_unref (style->rc_style);
G_OBJECT_CLASS (gtk_style_parent_class)->finalize (object); G_OBJECT_CLASS (gtk_style_parent_class)->finalize (object);
} }

4
gtk/gtkwidget.c
View File

@ -5713,7 +5713,7 @@ gtk_widget_modify_style (GtkWidget *widget,
g_object_set_qdata_full (G_OBJECT (widget), g_object_set_qdata_full (G_OBJECT (widget),
quark_rc_style, quark_rc_style,
gtk_rc_style_copy (style), gtk_rc_style_copy (style),
(GDestroyNotify) gtk_rc_style_unref); (GDestroyNotify) g_object_unref);
/* note that "style" may be invalid here if it was the old /* note that "style" may be invalid here if it was the old
* modifier style and the only reference was our own. * modifier style and the only reference was our own.
@ -5759,7 +5759,7 @@ gtk_widget_get_modifier_style (GtkWidget *widget)
g_object_set_qdata_full (G_OBJECT (widget), g_object_set_qdata_full (G_OBJECT (widget),
quark_rc_style, quark_rc_style,
rc_style, rc_style,
(GDestroyNotify) gtk_rc_style_unref); (GDestroyNotify) g_object_unref);
} }
return rc_style; return rc_style;