# HG changeset patch
# User Elliott Sales de Andrade <qulogic@pidgin.im>
# Date 1240111066 0
# Node ID 604bec1b4582401a79d43c412eb2272ae3bb5833
# Parent  8cf9251e49ef32ab9cea971ba05f78f1f86e95e0# Parent  618255d76deb36b1f1333c049e29595c7922781b
propagate from branch 'im.pidgin.pidgin' (head 37d6e0111ed0e45196fbb2da9737166f9d743096)
            to branch 'im.pidgin.cpw.qulogic.gtk3' (head 2a648982262f2389aa3a6c742b8b41612aa8cfe8)

diff -r 8cf9251e49ef -r 604bec1b4582 pidgin/gtkblist.c
--- a/pidgin/gtkblist.c	Sat Apr 18 22:14:49 2009 +0000
+++ b/pidgin/gtkblist.c	Sun Apr 19 03:17:46 2009 +0000
@@ -6634,7 +6634,7 @@
 	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);
 
diff -r 8cf9251e49ef -r 604bec1b4582 pidgin/gtkimhtml.c
--- a/pidgin/gtkimhtml.c	Sat Apr 18 22:14:49 2009 +0000
+++ b/pidgin/gtkimhtml.c	Sun Apr 19 03:17:46 2009 +0000
@@ -782,7 +782,7 @@
 				   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_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)
@@ -1384,7 +1384,7 @@
 		gtk_widget_destroy(imhtml->tip_window);
 	}
 	if(imhtml->tip_timer)
-		gtk_timeout_remove(imhtml->tip_timer);
+		g_source_remove(imhtml->tip_timer);
 
 	for(scalables = imhtml->scalables; scalables; scalables = scalables->next) {
 		struct scalable_data *sd = scalables->data;
@@ -1451,7 +1451,7 @@
 	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,
diff -r 8cf9251e49ef -r 604bec1b4582 pidgin/gtkimhtmltoolbar.c
--- a/pidgin/gtkimhtmltoolbar.c	Sat Apr 18 22:14:49 2009 +0000
+++ b/pidgin/gtkimhtmltoolbar.c	Sun Apr 19 03:17:46 2009 +0000
@@ -1208,7 +1208,7 @@
 	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");
diff -r 8cf9251e49ef -r 604bec1b4582 pidgin/gtkprefs.c
--- a/pidgin/gtkprefs.c	Sat Apr 18 22:14:49 2009 +0000
+++ b/pidgin/gtkprefs.c	Sun Apr 19 03:17:46 2009 +0000
@@ -807,7 +807,7 @@
 	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 */
diff -r 8cf9251e49ef -r 604bec1b4582 pidgin/gtksmiley.c
--- a/pidgin/gtksmiley.c	Sat Apr 18 22:14:49 2009 +0000
+++ b/pidgin/gtksmiley.c	Sun Apr 19 03:17:46 2009 +0000
@@ -344,7 +344,7 @@
 	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(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);
diff -r 8cf9251e49ef -r 604bec1b4582 pidgin/gtkstatusbox.c
--- a/pidgin/gtkstatusbox.c	Sat Apr 18 22:14:49 2009 +0000
+++ b/pidgin/gtkstatusbox.c	Sun Apr 19 03:17:46 2009 +0000
@@ -1202,7 +1202,7 @@
 
 	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 @@
 
 	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;