Mercurial > pidgin
changeset 20146:ad691fe92bf8
merge of '581cfaaf2f02af0abbaa8910cedb9f7f62b25a5c'
and '8bb511fc7058716755e1117ddde9b2baa349cbab'
| author | Casey Harkins <charkins@pidgin.im> |
|---|---|
| date | Tue, 18 Sep 2007 01:02:45 +0000 |
| parents | 743cb3444b6b (diff) aa2302267aa9 (current diff) |
| children | 51457cf3d27b |
| files | |
| diffstat | 5 files changed, 6 insertions(+), 4 deletions(-) [+] |
line wrap: on
line diff
--- a/libpurple/protocols/msn/slp.c Mon Sep 17 20:55:08 2007 +0000 +++ b/libpurple/protocols/msn/slp.c Tue Sep 18 01:02:45 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 Mon Sep 17 20:55:08 2007 +0000 +++ b/pidgin/gtkaccount.c Tue Sep 18 01:02:45 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 Mon Sep 17 20:55:08 2007 +0000 +++ b/pidgin/gtkblist.c Tue Sep 18 01:02:45 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/gtkdocklet.c Mon Sep 17 20:55:08 2007 +0000 +++ b/pidgin/gtkdocklet.c Tue Sep 18 01:02:45 2007 +0000 @@ -532,7 +532,7 @@ g_signal_connect(G_OBJECT(menuitem), "toggled", G_CALLBACK(docklet_toggle_mute), NULL); gtk_menu_shell_append(GTK_MENU_SHELL(menu), menuitem); - menuitem = gtk_check_menu_item_new_with_label(_("Blink on new message")); + menuitem = gtk_check_menu_item_new_with_label(_("Blink On New Message")); gtk_check_menu_item_set_active(GTK_CHECK_MENU_ITEM(menuitem), purple_prefs_get_bool(PIDGIN_PREFS_ROOT "/docklet/blink")); g_signal_connect(G_OBJECT(menuitem), "toggled", G_CALLBACK(docklet_toggle_blink), NULL); gtk_menu_shell_append(GTK_MENU_SHELL(menu), menuitem);
--- a/pidgin/pixmaps/emotes/default/24/default.theme.in Mon Sep 17 20:55:08 2007 +0000 +++ b/pidgin/pixmaps/emotes/default/24/default.theme.in Tue Sep 18 01:02:45 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