pidgin/quail/quail-redux

Fetch the buddy icon from libpurple

2013-08-30, Phil Hannent
298217b3f296
Parents ac6fe25ce84c
Children b57337fa2d7b
Fetch the buddy icon from libpurple
2 files changed, 12 insertions(+), 9 deletions(-)
  • +12 -8
    src/QuailBlistItem.cpp
  • +0 -1
    src/QuailBuddyList.cpp
    • --- a/src/QuailBlistItem.cpp Thu Aug 29 15:12:20 2013 +0100
    +++ b/src/QuailBlistItem.cpp Fri Aug 30 09:04:26 2013 +0100
    @@ -35,7 +35,8 @@
    QQuailBListItem::updateInfo()
    {
    qDebug() << "QQuailBListItem::updateInfo";
    -
    + gsize len;
    + const guchar *data = NULL;
    dirty = true;
    if (PURPLE_BLIST_NODE_IS_CONTACT(node))
    @@ -101,16 +102,19 @@
    }
    qDebug() << "QQuailBListItem::updateInfo.Contact.3";
    - QPixmap statusIcon = QQuailBListItem::getBuddyStatusIcon(
    - (PurpleBlistNode *)buddy);
    - if (statusIcon.size().width() > 0) {
    - setIcon(1, statusIcon);
    - qDebug() << "QQuailBListItem::updateInfo.Contact.3a" << statusIcon.size().width();
    + setIcon(1, QQuailBListItem::getBuddyStatusIcon((PurpleBlistNode *)buddy));
    + setToolTip(1, text);
    + PurpleBuddyIcon *purpleIcon = purple_buddy_get_icon(buddy);
    + //TODO: Verify this is working
    + data = (guchar *)purple_buddy_icon_get_data(purpleIcon, &len);
    + QImage buddyIcon = QImage::fromData(data, len);
    + purple_buddy_icon_unref(purpleIcon);
    + if (buddyIcon.size().width() > 0) {
    + qDebug() << "QQuailBListItem::updateInfo.Contact.3a" << buddyIcon.size().width();
    } else {
    qDebug() << "QQuailBListItem::updateInfo.Contact.3b";
    }
    - setToolTip(1, text);
    - //setIcon(2, QImage::fromData(((PurpleBuddyIcon*)purple_buddy_get_icon(buddy))));
    + setIcon(2, QPixmap::fromImage(buddyIcon));
    }
    //qDebug() << "QQuailBListItem::updateInfo.Contact.1:" << buddy->server_alias;
    setText(1, getAlias(buddy));
    --- a/src/QuailBuddyList.cpp Thu Aug 29 15:12:20 2013 +0100
    +++ b/src/QuailBuddyList.cpp Fri Aug 30 09:04:26 2013 +0100
    @@ -1083,7 +1083,6 @@
    {
    node->ui_data = item = new QQuailBListItem(
    (QQuailBListItem *)(node->parent->ui_data), node);
    - //item->setIcon(0, QIcon(QQuailBuddyList::getBuddyStatusIcon(node)));
    }
    else
    item->updateInfo();