pidgin: 5a44f021: Oops, I must have been tired. I only rep...

[qulogic at pidgin.im]

-----------------------------------------------------------------
Revision: 5a44f021fc8b8e73833c2100ddd1b693a62a57e0
Ancestor: f11c46cb59c07c862176434fa78eaa1a8ca2c600
Author: qulogic at pidgin.im
Date: 2009-04-18T22:39:56
Branch: im.pidgin.pidgin
URL: http://d.pidgin.im/viewmtn/revision/info/5a44f021fc8b8e73833c2100ddd1b693a62a57e0

Modified files:
        pidgin/gtkblist.c pidgin/gtkimhtml.c
        pidgin/gtkimhtmltoolbar.c pidgin/gtkprefs.c
        pidgin/gtksmiley.c pidgin/gtkstatusbox.c

ChangeLog: 

Oops, I must have been tired. I only replaced the first occurrence of these
deprecated functions. I think I got them all now.

-------------- next part --------------
============================================================
--- pidgin/gtkblist.c	b4a1fb3fdb9b25e45206268da71f270404c9db6a
+++ pidgin/gtkblist.c	898270ee1348629738da9221fcea4db2fa4f9139
@@ -6630,7 +6630,7 @@ static void pidgin_blist_destroy(PurpleB
 	purple_signals_disconnect_by_handle(gtkblist);
 
 	if (gtkblist->headline_close)
-		gdk_pixbuf_unref(gtkblist->headline_close);
+		g_object_unref(G_OBJECT(gtkblist->headline_close));
 
 	gtk_widget_destroy(gtkblist->window);
 
============================================================
--- pidgin/gtkimhtml.c	c59928417ffdb8329e492cc6b5cac2ea3f27567d
+++ pidgin/gtkimhtml.c	10d218854e8aa6e514703b8ccc9f61ad58662a86
@@ -782,7 +782,7 @@ gtk_imhtml_expose_event (GtkWidget      
 				   gc,
 				   TRUE,
 				   visible_rect.x, visible_rect.y, visible_rect.width, visible_rect.height);
-		gdk_gc_unref(gc);
+		g_object_unref(G_OBJECT(gc));
 
 		if (GTK_WIDGET_CLASS (parent_class)->expose_event)
 			return (* GTK_WIDGET_CLASS (parent_class)->expose_event)
@@ -873,7 +873,7 @@ gtk_imhtml_expose_event (GtkWidget      
 		       !gtk_text_iter_begins_tag(&cur, NULL));
 	}
 
-	gdk_gc_unref(gc);
+	g_object_unref(G_OBJECT(gc));
 
 	if (GTK_WIDGET_CLASS (parent_class)->expose_event)
 		return (* GTK_WIDGET_CLASS (parent_class)->expose_event)
@@ -1451,7 +1451,7 @@ static void gtk_imhtml_class_init (GtkIM
 	GObjectClass   *gobject_class;
 	object_class = (GtkObjectClass*) klass;
 	gobject_class = (GObjectClass*) klass;
-	parent_class = gtk_type_class(GTK_TYPE_TEXT_VIEW);
+	parent_class = g_type_class_ref(GTK_TYPE_TEXT_VIEW);
 	signals[URL_CLICKED] = g_signal_new("url_clicked",
 						G_TYPE_FROM_CLASS(gobject_class),
 						G_SIGNAL_RUN_FIRST,
============================================================
--- pidgin/gtkimhtmltoolbar.c	5cb24f071177b208678b5635b0acad2f821ce10f
+++ pidgin/gtkimhtmltoolbar.c	53e32eb99f52d5e1780f762e3abd41db02a38b80
@@ -1198,7 +1198,7 @@ static void gtk_imhtmltoolbar_class_init
 	GObjectClass   *gobject_class;
 	object_class = (GtkObjectClass*) class;
 	gobject_class = (GObjectClass*) class;
-	parent_class = gtk_type_class(GTK_TYPE_HBOX);
+	parent_class = g_type_class_ref(GTK_TYPE_HBOX);
 	gobject_class->finalize = gtk_imhtmltoolbar_finalize;
 
 	purple_prefs_add_none(PIDGIN_PREFS_ROOT "/conversations/toolbar");
============================================================
--- pidgin/gtkprefs.c	27661179b510c5ecc8ac0940c4dd68d48b14a949
+++ pidgin/gtkprefs.c	5d678a0da4f1c02fe5a6a738811ddd2db0ee0998
@@ -702,7 +702,7 @@ prefs_themes_init()
 	gtk_list_store_set(prefs_status_icon_themes, &iter, 0, pixbuf, 1, "<b>(Default)</b> - None\n<span color='dim grey'>"
 								    "The default Pidgin status icon theme</span>", 2, "", -1);
 
-	gdk_pixbuf_unref(pixbuf);
+	g_object_unref(G_OBJECT(pixbuf));
 }
 
 /* builds a theme combo box from a list store with colums: icon preview, markup, theme name */
============================================================
--- pidgin/gtksmiley.c	1d1f35e1fe51ce174c286653f95e5964c589068a
+++ pidgin/gtksmiley.c	a942afe215c036667a01ec770970ac37e288b0b5
@@ -344,7 +344,7 @@ static void do_add_file_cb(const char *f
 	pixbuf = gdk_pixbuf_new_from_file_at_scale(filename, 64, 64, FALSE, NULL);
 	gtk_image_set_from_pixbuf(GTK_IMAGE(s->smiley_image), pixbuf);
 	if (pixbuf)
-		gdk_pixbuf_unref(pixbuf);
+		g_object_unref(G_OBJECT(pixbuf));
 	gtk_widget_grab_focus(s->smile);
 }
 
@@ -459,7 +459,7 @@ pidgin_smiley_editor_set_image(PidginSmi
 pidgin_smiley_editor_set_image(PidginSmiley *editor, GdkPixbuf *image)
 {
 	if (editor->custom_pixbuf)
-		gdk_pixbuf_unref(editor->custom_pixbuf);
+		g_object_unref(G_OBJECT(editor->custom_pixbuf));
 	editor->custom_pixbuf = image ? g_object_ref(G_OBJECT(image)) : NULL;
 	if (image)
 		gtk_image_set_from_pixbuf(GTK_IMAGE(editor->smiley_image), image);
============================================================
--- pidgin/gtkstatusbox.c	07626a5d2f503fc08778a9f418918950c2e982f2
+++ pidgin/gtkstatusbox.c	5305c1aaf941b5dcb4b30f6ad8e4f667419b2fae
@@ -1202,7 +1202,7 @@ cache_pixbufs(PidginStatusBox *status_bo
 
 	for (i = 0; i < G_N_ELEMENTS(status_box->connecting_pixbufs); i++) {
 		if (status_box->connecting_pixbufs[i] != NULL)
-			gdk_pixbuf_unref(status_box->connecting_pixbufs[i]);
+			g_object_unref(G_OBJECT(status_box->connecting_pixbufs[i]));
 	}
 
 	status_box->connecting_index = 0;
@@ -1225,7 +1225,7 @@ cache_pixbufs(PidginStatusBox *status_bo
 
 	for (i = 0; i < G_N_ELEMENTS(status_box->typing_pixbufs); i++) {
 		if (status_box->typing_pixbufs[i] != NULL)
-			gdk_pixbuf_unref(status_box->typing_pixbufs[i]);
+			g_object_unref(G_OBJECT(status_box->typing_pixbufs[i]));
 	}
 
 	status_box->typing_index = 0;