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

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

diff --git a/ChangeLog b/ChangeLog
index f5d941ba2a1c9232c142a810c1c89e65f87a8876..e8fe493439c4834d51c271f53ad193d1ce12997f 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -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>
 
        * gtk/gtkcombobox.c (gtk_combo_box_class_init): use

diff --git a/gtk/gtkfontsel.c b/gtk/gtkfontsel.c
index 5c795c53aeb4bd7eb2eb76ec57a2a3e05099c072..fc526aa371864ca7d77f7bc10fe434b1aefb5227 100644 (file)
--- a/gtk/gtkfontsel.c
+++ b/gtk/gtkfontsel.c
@@ -1087,7 +1087,7 @@ gtk_font_selection_update_preview (GtkFontSelection *fontsel)
   rc_style->font_desc = gtk_font_selection_get_font_description (fontsel);
   
   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);
   

diff --git a/gtk/gtkrc.c b/gtk/gtkrc.c
index 707535e429a218049b7d2a04f96ed1538ea112dc..211e099c52fb2c997e61fa022a8c5121214706a3 100644 (file)
--- a/gtk/gtkrc.c
+++ b/gtk/gtkrc.c
@@ -1559,7 +1559,7 @@ gtk_rc_clear_hash_node (gpointer key,
                        gpointer data, 
                        gpointer user_data)
 {
-  gtk_rc_style_unref (data);
+  g_object_unref (data);
 }
 
 static void
@@ -2453,7 +2453,7 @@ gtk_rc_init_style (GtkRcContext *context,
          }
 
       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);
     }
@@ -3235,7 +3235,7 @@ gtk_rc_parse_style (GtkRcContext *context,
 
  err:
   if (rc_style != orig_style)
-    gtk_rc_style_unref (rc_style);
+    g_object_unref (rc_style);
 
   if (orig_style)
     g_object_unref (orig_style);

diff --git a/gtk/gtkstyle.c b/gtk/gtkstyle.c
index d2c1576d4e9e630d4b54c966ddb10fd4ab153985..ac5860ddadb2cae5e30074dac3c878def265ca5f 100644 (file)
--- a/gtk/gtkstyle.c
+++ b/gtk/gtkstyle.c
@@ -617,10 +617,10 @@ gtk_style_finalize (GObject *object)
 
   if (style->private_font_desc)
     pango_font_description_free (style->private_font_desc);
-  
+
   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);
 }
 

diff --git a/gtk/gtkwidget.c b/gtk/gtkwidget.c
index aa5402d7c2d7ada82675f6ab97b04294e670091c..291b56b9626842cc2404ccbf1e469da9c067371d 100644 (file)
--- a/gtk/gtkwidget.c
+++ b/gtk/gtkwidget.c
@@ -5713,7 +5713,7 @@ gtk_widget_modify_style (GtkWidget      *widget,
   g_object_set_qdata_full (G_OBJECT (widget),
                           quark_rc_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
    * 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),
                               quark_rc_style,
                               rc_style,
-                              (GDestroyNotify) gtk_rc_style_unref);
+                              (GDestroyNotify) g_object_unref);
     }
 
   return rc_style;