gtk+ r20405 - in trunk: . gtk

[mitch svn gnome org]

Author: mitch
Date: Mon Jun 16 16:53:39 2008
New Revision: 20405
URL: http://svn.gnome.org/viewvc/gtk+?rev=20405&view=rev

Log:
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().



Modified:
   trunk/ChangeLog
   trunk/gtk/gtkfontsel.c
   trunk/gtk/gtkrc.c
   trunk/gtk/gtkstyle.c
   trunk/gtk/gtkwidget.c

Modified: trunk/gtk/gtkfontsel.c
==============================================================================
--- trunk/gtk/gtkfontsel.c	(original)
+++ trunk/gtk/gtkfontsel.c	Mon Jun 16 16:53:39 2008
@@ -1087,7 +1087,7 @@
   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);
   

Modified: trunk/gtk/gtkrc.c
==============================================================================
--- trunk/gtk/gtkrc.c	(original)
+++ trunk/gtk/gtkrc.c	Mon Jun 16 16:53:39 2008
@@ -1559,7 +1559,7 @@
 			gpointer data, 
 			gpointer user_data)
 {
-  gtk_rc_style_unref (data);
+  g_object_unref (data);
 }
 
 static void
@@ -2453,7 +2453,7 @@
 	  }
 
       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 @@
 
  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);

Modified: trunk/gtk/gtkstyle.c
==============================================================================
--- trunk/gtk/gtkstyle.c	(original)
+++ trunk/gtk/gtkstyle.c	Mon Jun 16 16:53:39 2008
@@ -617,10 +617,10 @@
 
   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);
 }
 

Modified: trunk/gtk/gtkwidget.c
==============================================================================
--- trunk/gtk/gtkwidget.c	(original)
+++ trunk/gtk/gtkwidget.c	Mon Jun 16 16:53:39 2008
@@ -5713,7 +5713,7 @@
   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 @@
       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;