# HG changeset patch
# User Casey Harkins <charkins@pidgin.im>
# Date 1190077360 0
# Node ID 743cb3444b6bf7ff904eee5f621c8e64f1f70238
# Parent  9bfd7a4fd3a7e85986f11788f979a66df4dcc8f0# Parent  5dee4e3f09eb41bbd38ca1cd4265b971e8668f3c
merge of '4f72579666e002cb42772fe52db9422fdbcfcdbb'
     and '7b44471a0827c3a4fcb9b5cb9d6af5c8be1c473e'

diff -r 9bfd7a4fd3a7 -r 743cb3444b6b libpurple/protocols/msn/slp.c
--- a/libpurple/protocols/msn/slp.c	Tue Sep 18 00:53:28 2007 +0000
+++ b/libpurple/protocols/msn/slp.c	Tue Sep 18 01:02:40 2007 +0000
@@ -343,7 +343,7 @@
 		if (xfer)
 		{
 			bin = (char *)purple_base64_decode(context, &bin_len);
-			file_size = GUINT32_FROM_LE(*(gsize *)(bin + 2));
+			file_size = GUINT32_FROM_LE(*(gsize *)(bin + 8));
 
 			uni_name = (gunichar2 *)(bin + 20);
 			while(*uni_name != 0 && ((char *)uni_name - (bin + 20)) < MAX_FILE_NAME_LEN) {
diff -r 9bfd7a4fd3a7 -r 743cb3444b6b pidgin/gtkaccount.c
--- a/pidgin/gtkaccount.c	Tue Sep 18 00:53:28 2007 +0000
+++ b/pidgin/gtkaccount.c	Tue Sep 18 01:02:40 2007 +0000
@@ -270,6 +270,8 @@
 	add_user_options(dialog,     dialog->top_vbox);
 	add_protocol_options(dialog, dialog->bottom_vbox);
 
+	gtk_widget_grab_focus(dialog->protocol_menu);
+
 	if (!dialog->prpl_info || !dialog->prpl_info->register_user || 
 	    g_object_get_data(G_OBJECT(item), "fake")) {
 		gtk_widget_hide(dialog->register_button);
diff -r 9bfd7a4fd3a7 -r 743cb3444b6b pidgin/gtkblist.c
--- a/pidgin/gtkblist.c	Tue Sep 18 00:53:28 2007 +0000
+++ b/pidgin/gtkblist.c	Tue Sep 18 01:02:40 2007 +0000
@@ -3451,7 +3451,7 @@
 		}
 
 		p = purple_buddy_get_presence(buddy);
-		trans = (purple_presence_is_idle(p) && size == PIDGIN_STATUS_ICON_SMALL);
+		trans = purple_presence_is_idle(p);
 
 		if (PURPLE_BUDDY_IS_ONLINE(buddy) && gtkbuddynode && gtkbuddynode->recent_signonoff)
 			icon = PIDGIN_STOCK_STATUS_LOGIN;
diff -r 9bfd7a4fd3a7 -r 743cb3444b6b pidgin/pixmaps/emotes/default/24/default.theme.in
--- a/pidgin/pixmaps/emotes/default/24/default.theme.in	Tue Sep 18 00:53:28 2007 +0000
+++ b/pidgin/pixmaps/emotes/default/24/default.theme.in	Tue Sep 18 01:02:40 2007 +0000
@@ -23,7 +23,7 @@
 foot-in-mouth.png   :-!
 shout.png           >:o     >:O
 ! skywalker.png     C:-)    c:-)    C:)     c:)
-! monkey.png        :-(|)  :(|)
+! monkey.png        :-(|)  :(|)     8-|)
 ! cyclops.png       O-) o-)
 
 # Following AIM 6.1