Mercurial > pidgin
changeset 29751:2b294edceaed
merge of '229f226a4d7937c46842e33328e05fc827bf3573'
and '56dbb07bba4460522cb38830486f96c1d361d78b'
| author | Elliott Sales de Andrade <qulogic@pidgin.im> |
|---|---|
| date | Sat, 17 Apr 2010 22:22:21 +0000 |
| parents | 4aa17d7c4e0a (current diff) e7b9a5ba3777 (diff) |
| children | e59f29a9dbf1 |
| files | |
| diffstat | 2 files changed, 2 insertions(+), 2 deletions(-) [+] |
line wrap: on
line diff
--- a/libpurple/protocols/msn/switchboard.c Sat Apr 17 01:33:19 2010 +0000 +++ b/libpurple/protocols/msn/switchboard.c Sat Apr 17 22:22:21 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 01:33:19 2010 +0000 +++ b/pidgin/plugins/ticker/gtkticker.c Sat Apr 17 22:22:21 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;