Mercurial > pidgin.yaz
diff pidgin/gtkconv.c @ 30207:8b452039c329
propagate from branch 'im.pidgin.pidgin' (head 53abc38e3dfd2e9f8ae8c3e6532379d4b0dc333b)
to branch 'im.pidgin.cpw.malu.ft_thumbnails' (head 4d135ac4918d2e985a66786a6c07473911498c4f)
| author | Marcus Lundblad <ml@update.uu.se> |
|---|---|
| date | Sun, 12 Jul 2009 20:47:45 +0000 |
| parents | 2a19181b41fa |
| children | a12574d982a1 15cde23b43bc |
line wrap: on
line diff
--- a/pidgin/gtkconv.c Mon Jul 06 17:38:22 2009 +0000 +++ b/pidgin/gtkconv.c Sun Jul 12 20:47:45 2009 +0000 @@ -3293,7 +3293,7 @@ purple_blist_node_set_flags((PurpleBlistNode *)buddy, PURPLE_BLIST_NODE_FLAG_NO_SAVE); g_object_set_data_full(G_OBJECT(gtkconv->imhtml), "transient_buddy", - buddy, (GDestroyNotify)purple_blist_remove_buddy); + buddy, (GDestroyNotify)purple_buddy_destroy); } } } @@ -4939,6 +4939,7 @@ gtk_widget_set_name(gtkconv->imhtml, "pidgin_conv_imhtml"); gtk_imhtml_show_comments(GTK_IMHTML(gtkconv->imhtml),TRUE); + g_object_set_data(G_OBJECT(gtkconv->imhtml), "gtkconv", gtkconv); gtk_scrolled_window_get_policy(GTK_SCROLLED_WINDOW(imhtml_sw), &imhtml_sw_hscroll, NULL);