comparison pidgin/gtksmiley.c @ 26817:3912f55a1633

propagate from branch 'im.pidgin.pidgin' (head fbb4fe5da444943eecc76bdcd6c8ba967790b6c8) to branch 'im.pidgin.cpw.darkrain42.xmpp.bosh' (head 601bc627c9430320848361f0ed81c6c4c6ee53e0)
author Paul Aurich <paul@darkrain42.org>
date Tue, 28 Apr 2009 18:43:57 +0000
parents 38a5df43d525
children 804141095de5
comparison
equal deleted inserted replaced
26743:de9816c970fe 26817:3912f55a1633
72 pidgin_smiley_destroy(PidginSmiley *smiley) 72 pidgin_smiley_destroy(PidginSmiley *smiley)
73 { 73 {
74 gtk_widget_destroy(smiley->parent); 74 gtk_widget_destroy(smiley->parent);
75 g_free(smiley->filename); 75 g_free(smiley->filename);
76 if (smiley->custom_pixbuf) 76 if (smiley->custom_pixbuf)
77 gdk_pixbuf_unref(smiley->custom_pixbuf); 77 g_object_unref(G_OBJECT(smiley->custom_pixbuf));
78 g_free(smiley); 78 g_free(smiley);
79 } 79 }
80 80
81 /****************************************************************************** 81 /******************************************************************************
82 * GtkIMHtmlSmileys stuff 82 * GtkIMHtmlSmileys stuff
342 g_free(s->filename); 342 g_free(s->filename);
343 s->filename = g_strdup(filename); 343 s->filename = g_strdup(filename);
344 pixbuf = gdk_pixbuf_new_from_file_at_scale(filename, 64, 64, FALSE, NULL); 344 pixbuf = gdk_pixbuf_new_from_file_at_scale(filename, 64, 64, FALSE, NULL);
345 gtk_image_set_from_pixbuf(GTK_IMAGE(s->smiley_image), pixbuf); 345 gtk_image_set_from_pixbuf(GTK_IMAGE(s->smiley_image), pixbuf);
346 if (pixbuf) 346 if (pixbuf)
347 gdk_pixbuf_unref(pixbuf); 347 g_object_unref(G_OBJECT(pixbuf));
348 gtk_widget_grab_focus(s->smile); 348 gtk_widget_grab_focus(s->smile);
349 } 349 }
350 350
351 static void 351 static void
352 open_image_selector(GtkWidget *widget, PidginSmiley *psmiley) 352 open_image_selector(GtkWidget *widget, PidginSmiley *psmiley)
457 457
458 void 458 void
459 pidgin_smiley_editor_set_image(PidginSmiley *editor, GdkPixbuf *image) 459 pidgin_smiley_editor_set_image(PidginSmiley *editor, GdkPixbuf *image)
460 { 460 {
461 if (editor->custom_pixbuf) 461 if (editor->custom_pixbuf)
462 gdk_pixbuf_unref(editor->custom_pixbuf); 462 g_object_unref(G_OBJECT(editor->custom_pixbuf));
463 editor->custom_pixbuf = image ? gdk_pixbuf_ref(image) : NULL; 463 editor->custom_pixbuf = image ? g_object_ref(G_OBJECT(image)) : NULL;
464 if (image) 464 if (image)
465 gtk_image_set_from_pixbuf(GTK_IMAGE(editor->smiley_image), image); 465 gtk_image_set_from_pixbuf(GTK_IMAGE(editor->smiley_image), image);
466 } 466 }
467 467
468 /****************************************************************************** 468 /******************************************************************************