Mercurial > pidgin
changeset 20142:743cb3444b6b
merge of '4f72579666e002cb42772fe52db9422fdbcfcdbb'
and '7b44471a0827c3a4fcb9b5cb9d6af5c8be1c473e'
| author | Casey Harkins <charkins@pidgin.im> |
|---|---|
| date | Tue, 18 Sep 2007 01:02:40 +0000 |
| parents | 9bfd7a4fd3a7 (current diff) 5dee4e3f09eb (diff) |
| children | ad691fe92bf8 |
| files | |
| diffstat | 4 files changed, 5 insertions(+), 3 deletions(-) [+] |
line wrap: on
line diff
--- 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) {
--- 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);
--- 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;
--- 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