qulogic/pidgin

merge of '189cc77f1cd38cd5d034b0cc32951b6bad6f200c'

2007-09-18, Casey Harkins
0966e0757637
Parents 189cc77f1cd377acf3ae42aa
Children f78451b4a2f7
merge of '189cc77f1cd38cd5d034b0cc32951b6bad6f200c'
and '77acf3ae42aae1246b646d4d0e39928c84130eba'
4 files changed, 5 insertions(+), 3 deletions(-)
  • +1 -1
    libpurple/protocols/msn/slp.c
  • +2 -0
    pidgin/gtkaccount.c
  • +1 -1
    pidgin/gtkblist.c
  • +1 -1
    pidgin/pixmaps/emotes/default/24/default.theme.in
    • --- 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