AuroraMiddleware/gtk
1
0
Fork 1
mirror of https://gitlab.gnome.org/GNOME/gtk.git synced 2024-12-26 21:51:08 +00:00
Code Issues Projects Releases Wiki Activity

Replace gtk_rc_style_ref/unref by g_object_ref/unref.

Browse Source 
2006-07-21  Matthias Clasen  <mclasen@redhat.com>

	* gtk/gtkstyle.c:
	* gtk/gtkrc.c:
	* gtk/gtkwidget.c: Replace gtk_rc_style_ref/unref by
	g_object_ref/unref.
This commit is contained in:
Matthias Clasen 2006-07-21 14:52:05 +00:00 committed by Matthias Clasen
parent c70489d6eb
commit 465daa910f
5 changed files with 14 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
ChangeLog
View File

@ -1,5 +1,10 @@
2006-07-21 Matthias Clasen <mclasen@redhat.com> 2006-07-21 Matthias Clasen <mclasen@redhat.com>
* gtk/gtkstyle.c:
* gtk/gtkrc.c:
* gtk/gtkwidget.c: Replace gtk_rc_style_ref/unref by
g_object_ref/unref.
* gtk/gtkimcontextsimple.c (gtk_im_context_simple_get_preedit_string): * gtk/gtkimcontextsimple.c (gtk_im_context_simple_get_preedit_string):
0-terminate outbuf in all cases. (#348227, Nguyen Thái Ngoc Duy) 0-terminate outbuf in all cases. (#348227, Nguyen Thái Ngoc Duy)

5
ChangeLog.pre-2-10
View File

@ -1,5 +1,10 @@
2006-07-21 Matthias Clasen <mclasen@redhat.com> 2006-07-21 Matthias Clasen <mclasen@redhat.com>
* gtk/gtkstyle.c:
* gtk/gtkrc.c:
* gtk/gtkwidget.c: Replace gtk_rc_style_ref/unref by
g_object_ref/unref.
* gtk/gtkimcontextsimple.c (gtk_im_context_simple_get_preedit_string): * gtk/gtkimcontextsimple.c (gtk_im_context_simple_get_preedit_string):
0-terminate outbuf in all cases. (#348227, Nguyen Thái Ngoc Duy) 0-terminate outbuf in all cases. (#348227, Nguyen Thái Ngoc Duy)

4
gtk/gtkrc.c
View File

@ -2284,9 +2284,7 @@ gtk_rc_style_to_style (GtkRcContext *context,
style = GTK_RC_STYLE_GET_CLASS (rc_style)->create_style (rc_style); style = GTK_RC_STYLE_GET_CLASS (rc_style)->create_style (rc_style);
_gtk_style_init_for_settings (style, context->settings); _gtk_style_init_for_settings (style, context->settings);
style->rc_style = rc_style; style->rc_style = g_object_ref (rc_style);
gtk_rc_style_ref (rc_style);
GTK_STYLE_GET_CLASS (style)->init_from_rc (style, rc_style); GTK_STYLE_GET_CLASS (style)->init_from_rc (style, rc_style);

4
gtk/gtkstyle.c
View File

@ -1614,10 +1614,10 @@ gtk_style_real_copy (GtkStyle *style,
style->ythickness = src->ythickness; style->ythickness = src->ythickness;
if (style->rc_style) if (style->rc_style)
gtk_rc_style_unref (style->rc_style); g_object_unref (style->rc_style);
style->rc_style = src->rc_style; style->rc_style = src->rc_style;
if (src->rc_style) if (src->rc_style)
gtk_rc_style_ref (src->rc_style); g_object_ref (src->rc_style);
/* don't copy, just clear cache */ /* don't copy, just clear cache */
clear_property_cache (style); clear_property_cache (style);

2
gtk/gtkwidget.c
View File

@ -4887,7 +4887,7 @@ gtk_widget_modify_style (GtkWidget *widget,
* *
* Return value: the modifier style for the widget. This rc style is * Return value: the modifier style for the widget. This rc style is
* owned by the widget. If you want to keep a pointer to value this * owned by the widget. If you want to keep a pointer to value this
* around, you must add a refcount using gtk_rc_style_ref(). * around, you must add a refcount using g_object_ref().
**/ **/
GtkRcStyle * GtkRcStyle *
gtk_widget_get_modifier_style (GtkWidget *widget) gtk_widget_get_modifier_style (GtkWidget *widget)