Mercurial > pidgin.yaz
changeset 32448:011abe09b264
merge of '808c311196ce8853437bde38c9e3c0864698a4d4'
and 'b5432d58ea3fe5a2182f1eb3ee4fceb12118f088'
| author | Daniel Atallah <daniel.atallah@gmail.com> |
|---|---|
| date | Mon, 29 Aug 2011 22:50:03 +0000 |
| parents | 44d3e067ca46 (diff) a13f4cad3cdd (current diff) |
| children | b6defcebfe4b |
| files | |
| diffstat | 1 files changed, 2 insertions(+), 2 deletions(-) [+] |
line wrap: on
line diff
--- a/pidgin/gtkconv.c Mon Aug 29 22:43:18 2011 +0000 +++ b/pidgin/gtkconv.c Mon Aug 29 22:50:03 2011 +0000 @@ -4848,7 +4848,7 @@ gtkchat->list = list; - gtk_box_pack_start(GTK_BOX(lbox), + gtk_box_pack_start(GTK_BOX(lbox), pidgin_make_scrollable(list, GTK_POLICY_AUTOMATIC, GTK_POLICY_AUTOMATIC, GTK_SHADOW_IN, -1, -1), TRUE, TRUE, 0); } @@ -6451,7 +6451,7 @@ if (!gdk_pixbuf_loader_write(smiley->loader, data, size, &error) || error) { purple_debug_warning("gtkconv", "gdk_pixbuf_loader_write() " - "failed with size=%zu: %s\n", size, + "failed with size=%" G_GSIZE_FORMAT ": %s\n", size, error ? error->message : "(no error message)"); if (error) g_error_free(error);