Mercurial > pidgin.yaz
changeset 28606:b6cc239e2564
merge of '4bf270f4acb1ba37f3a3aa264be813d4b16878ed'
and '97e003ed2bc2bafbb993693c9ae9c6d667731cc1'
| author | Marcus Lundblad <ml@update.uu.se> |
|---|---|
| date | Mon, 07 Sep 2009 19:33:39 +0000 |
| parents | f200f7628962 (diff) 3b820f5d7d6a (current diff) |
| children | c88de9dd2b56 |
| files | |
| diffstat | 2 files changed, 16 insertions(+), 3 deletions(-) [+] |
line wrap: on
line diff
--- a/libpurple/protocols/yahoo/libymsg.c Sun Sep 06 21:53:15 2009 +0000 +++ b/libpurple/protocols/yahoo/libymsg.c Mon Sep 07 19:33:39 2009 +0000 @@ -4500,6 +4500,12 @@ if (purple_presence_is_idle(presence)) yahoo_packet_hash_str(pkt, 47, "2"); + else { + if (!purple_status_is_available(status)) + yahoo_packet_hash_str(pkt, 47, "1"); + else + yahoo_packet_hash_str(pkt, 47, "0"); + } yahoo_packet_send_and_free(pkt, yd);
--- a/pidgin/gtksmiley.c Sun Sep 06 21:53:15 2009 +0000 +++ b/pidgin/gtksmiley.c Mon Sep 07 19:33:39 2009 +0000 @@ -601,10 +601,17 @@ GdkPixbuf *smiley_image = pidgin_pixbuf_from_imgstore(img); purple_imgstore_unref(img); - if (smiley_image != NULL) - sized_smiley = gdk_pixbuf_scale_simple(smiley_image, + if (smiley_image != NULL) { + if (gdk_pixbuf_get_width(smiley_image) > 22 || + gdk_pixbuf_get_height(smiley_image) > 22) { + sized_smiley = gdk_pixbuf_scale_simple(smiley_image, 22, 22, GDK_INTERP_HYPER); - g_object_unref(G_OBJECT(smiley_image)); + g_object_unref(G_OBJECT(smiley_image)); + } else { + /* don't scale up smaller smileys, avoid blurryness */ + sized_smiley = smiley_image; + } + } }