Mercurial > pidgin.yaz
changeset 30164:e59f29a9dbf1
merge of 'de5074f5f3785a3e757b9ab4ed946a01ddc69944'
and 'e8d0f65afa1697a579f40a67aa98f8a8fa4523f0'
| author | Elliott Sales de Andrade <qulogic@pidgin.im> |
|---|---|
| date | Sat, 17 Apr 2010 22:22:52 +0000 |
| parents | 2b294edceaed (diff) 211afed0548b (current diff) |
| children | 378cceb9131d |
| files | |
| diffstat | 2 files changed, 2 insertions(+), 2 deletions(-) [+] |
line wrap: on
line diff
--- a/libpurple/protocols/msn/switchboard.c Sat Apr 17 21:37:52 2010 +0000 +++ b/libpurple/protocols/msn/switchboard.c Sat Apr 17 22:22:52 2010 +0000 @@ -937,7 +937,7 @@ } imgid = purple_imgstore_add_with_id(image_data, image_len, NULL); - image_msg = g_strdup_printf("<IMG ID='%d'/>", imgid); + image_msg = g_strdup_printf("<IMG ID='%d'>", imgid); if (swboard->current_users > 1 || ((swboard->conv != NULL) &&
--- a/pidgin/plugins/ticker/gtkticker.c Sat Apr 17 21:37:52 2010 +0000 +++ b/pidgin/plugins/ticker/gtkticker.c Sat Apr 17 22:22:52 2010 +0000 @@ -343,7 +343,7 @@ window = gdk_window_new (gtk_widget_get_parent_window (widget), &attributes, attributes_mask); -#if GTK_CHECK_VERSION(2,14,0) +#if GTK_CHECK_VERSION(2,18,0) gtk_widget_set_window (widget, window); #else widget->window = window;