pidgin/purple-plugin-pack

updated for 3.0.0

2013-04-07, Gary Kramlich
43fb8babd3ef
Parents bba79eeaa919
Children 62ffa4b377df
updated for 3.0.0
2 files changed, 17 insertions(+), 18 deletions(-)
  • +4 -1
    irssi/lastlog.c
  • +13 -17
    irssi/layout.c
    • --- a/irssi/lastlog.c Sun Apr 07 17:07:22 2013 -0500
    +++ b/irssi/lastlog.c Sun Apr 07 17:28:12 2013 -0500
    @@ -47,7 +47,7 @@
    PidginConversation *gtkconv;
    int i;
    GString *result;
    - char **lines;
    + char **lines = { NULL };
    #if PURPLE_VERSION_CHECK(3,0,0)
    gtkconv = purple_conversation_get_ui_data(c);
    @@ -57,7 +57,10 @@
    /* let's avoid some warnings on anal C compilers like mipspro cc */
    result = g_string_new(NULL);
    +
    + /*
    lines = gtk_imhtml_get_markup_lines(GTK_IMHTML(gtkconv->imhtml));
    + */
    /* XXX: This will include all messages, including the output of the
    * history plugin, system messages, timestamps etc. This might be
    --- a/irssi/layout.c Sun Apr 07 17:07:22 2013 -0500
    +++ b/irssi/layout.c Sun Apr 07 17:28:12 2013 -0500
    @@ -51,25 +51,21 @@
    *****************************************************************************/
    static PurpleBlistNode *
    irssi_layout_get_node_from_conv(PurpleConversation *conv) {
    + PurpleAccount *account = NULL;
    PurpleBlistNode *node = NULL;
    + PurpleConversationType type = purple_conversation_get_type(conv);
    + const char *name = NULL;
    +
    + account = purple_conversation_get_account(conv);
    + name = purple_conversation_get_name(conv);
    /* this is overkill for now, but who knows, we _may_ need it later */
    - switch(conv->type) {
    - case PURPLE_CONV_TYPE_CHAT:
    - node = (PurpleBlistNode *)purple_blist_find_chat(conv->account,
    - conv->name);
    + if(type == PURPLE_CONV_TYPE_CHAT)
    + node = (PurpleBlistNode *)purple_blist_find_chat(account, name);
    + else if(type == PURPLE_CONV_TYPE_IM)
    + node = (PurpleBlistNode *)purple_find_buddy(account, name);
    - break;
    - case PURPLE_CONV_TYPE_IM:
    - node = (PurpleBlistNode *)purple_find_buddy(conv->account, conv->name);
    -
    - break;
    -
    - default:
    - node = NULL;
    - }
    -
    return node;
    }
    @@ -93,7 +89,7 @@
    }
    case PURPLE_BLIST_BUDDY_NODE: {
    PurpleBuddy *buddy = (PurpleBuddy *)node;
    -
    +
    ctype = PURPLE_CONV_TYPE_IM;
    name = buddy->name;
    account = buddy->account;
    @@ -114,7 +110,7 @@
    if(ctype == PURPLE_BLIST_CHAT_NODE) {
    PurpleChat *chat = (PurpleChat *)node;
    - PURPLE_CONV_CHAT(conv)->left = TRUE;
    + purple_conv_chat_left(PURPLE_CONV_CHAT(conv));
    serv_join_chat(account->gc, chat->components);
    }
    }
    @@ -222,7 +218,7 @@
    continue;
    conv = l1->data;
    - gtkconv = conv->ui_data;
    + gtkconv = PIDGIN_CONVERSATION(conv);
    /* pop of the nodes we just handled but hold our places and update
    * the head pointers.