← Back to branch summary

~ubuntu-branches/debian/stretch/psi-plus/stretch

« back to all changes in this revision

Viewing changes to src/psicontactlistviewdelegate.cpp

  • Committer: Package Import Robot
  • Author(s): Boris Pek
  • Date: 2013-10-23 02:42:20 UTC
  • mfrom: (1.4.7)
  • Revision ID: package-import@ubuntu.com-20131023024220-bk2hyoenqkwfhpgw
Tags: 0.16.242-1
http://bugs.debian.org/724880
* New upstream release:
  fixed the problem of initialization of private conversation when both
  sides use libotr 4.0.x. (Closes: #724880)
* Update debian/watch: sources were moved.
* Delete psi-plus-content-downloader package and update all related files.
  This plugin is in psi-plus-plugins package now.
* Update debian/control:
  - remove all currently unneeded Replaces and Breaks fields
  - add build dependency on libidn11-dev
* Update debian/rules: simplify get-orig-source section.
* Update debian/copyright:
  - update Source field due to changes in sources location
  - remove copyright holders whose code was deleted from source tree
    (bundled libidn library was removed)

Show diffs side-by-side

added added

removed removed

Lines of Context:
src/psicontactlistviewdelegate.cpp
164
164
QPixmap PsiContactListViewDelegate::avatarIcon(const QModelIndex& index) const
165
165
{
166
166
        int avSize = showAvatars_ ? avatarSize_ : 0;
167
 
        QPixmap av = index.data(ContactListModel::IsMucRole).toBool() ? QPixmap() : qVariantValue<QPixmap>(index.data(ContactListModel::AvatarRole));
 
167
        QPixmap av = index.data(ContactListModel::IsMucRole).toBool() ? QPixmap() : index.data(ContactListModel::AvatarRole).value<QPixmap>();
168
168
        if(av.isNull() && useDefaultAvatar_)
169
169
                av = IconsetFactory::iconPixmap("psi/default_avatar");
170
170
 
236
236
                        statusRect.setSize(statusPixmap.size());
237
237
                        r.setLeft(statusRect.right() + 3);
238
238
                }
239
 
                painter->drawPixmap(statusRect.topLeft(), statusPixmap);                
 
239
                painter->drawPixmap(statusRect.topLeft(), statusPixmap);
240
240
        } else
241
241
                r.setLeft(r.left() + 3);
242
242