Replace gtk_rc_style_ref/unref by g_object_ref/unref.

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.

diff --git a/ChangeLog b/ChangeLog
index 72af19b5fd3f1ba1434fd1caa861a717f712c4ac..5ffe7b94f818f6c72224c08a057f1bba8a47a012 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,10 @@
 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): 
        0-terminate outbuf in all cases.  (#348227, Nguyen Thái Ngoc Duy)
 

diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10
index 72af19b5fd3f1ba1434fd1caa861a717f712c4ac..5ffe7b94f818f6c72224c08a057f1bba8a47a012 100644 (file)
--- a/ChangeLog.pre-2-10
+++ b/ChangeLog.pre-2-10
@@ -1,5 +1,10 @@
 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): 
        0-terminate outbuf in all cases.  (#348227, Nguyen Thái Ngoc Duy)
 

diff --git a/gtk/gtkrc.c b/gtk/gtkrc.c
index aa0b0e1a786f9a61617cc94e87680a8f3a62b319..0b5280b001187de9796c84e3c00c0e05a8e22e90 100644 (file)
--- a/gtk/gtkrc.c
+++ b/gtk/gtkrc.c
@@ -2284,9 +2284,7 @@ gtk_rc_style_to_style (GtkRcContext *context,
   style = GTK_RC_STYLE_GET_CLASS (rc_style)->create_style (rc_style);
   _gtk_style_init_for_settings (style, context->settings);
 
-  style->rc_style = rc_style;
-
-  gtk_rc_style_ref (rc_style);
+  style->rc_style = g_object_ref (rc_style);
   
   GTK_STYLE_GET_CLASS (style)->init_from_rc (style, rc_style);  
 

diff --git a/gtk/gtkstyle.c b/gtk/gtkstyle.c
index 7c25358c7e034819fe40a2aa4a77930996509079..7c461cf02305683c9c928b838b4e2cc92c831230 100644 (file)
--- a/gtk/gtkstyle.c
+++ b/gtk/gtkstyle.c
@@ -1614,10 +1614,10 @@ gtk_style_real_copy (GtkStyle *style,
   style->ythickness = src->ythickness;
 
   if (style->rc_style)
-    gtk_rc_style_unref (style->rc_style);
+    g_object_unref (style->rc_style);
   style->rc_style = 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 */
   clear_property_cache (style);

diff --git a/gtk/gtkwidget.c b/gtk/gtkwidget.c
index 45b9376f380bd9243f6fbc03199ff2ae43dcfbf9..e7f6c0dcd65b6b815087fb9cefa66c1ab3944c29 100644 (file)
--- a/gtk/gtkwidget.c
+++ b/gtk/gtkwidget.c
@@ -4887,7 +4887,7 @@ gtk_widget_modify_style (GtkWidget      *widget,
  * 
  * 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
- *   around, you must add a refcount using gtk_rc_style_ref().
+ *   around, you must add a refcount using g_object_ref().
  **/
 GtkRcStyle *
 gtk_widget_get_modifier_style (GtkWidget      *widget)