[SCM] ktp-common-internals packaging branch, master, updated. debian/15.12.1-2-1839-gf0635e9
Maximiliano Curia
maxy at moszumanska.debian.org
Mon May 9 09:06:43 UTC 2016
Gitweb-URL: http://git.debian.org/?p=pkg-kde/applications/ktp-common-internals.git;a=commitdiff;h=9534a7e
The following commit has been merged in the master branch:
commit 9534a7ed17239471f7382adba225bdd4a17ca646
Author: David Edmundson <kde at davidedmundson.co.uk>
Date: Mon Apr 1 18:32:44 2013 +0100
Show avatars for offline user in contact info dialog
Reviewed-by: Alin Elena
---
KTp/contact-info-dialog.cpp | 14 ++++----------
1 file changed, 4 insertions(+), 10 deletions(-)
diff --git a/KTp/contact-info-dialog.cpp b/KTp/contact-info-dialog.cpp
index 17ad583..c17765d 100644
--- a/KTp/contact-info-dialog.cpp
+++ b/KTp/contact-info-dialog.cpp
@@ -100,7 +100,7 @@ class ContactInfoDialog::Private
void addStateRow(const QString &description, Tp::Contact::PresenceState state);
Tp::AccountPtr account;
- Tp::ContactPtr contact;
+ KTp::ContactPtr contact;
bool editable;
bool infoDataChanged;
@@ -135,7 +135,7 @@ void ContactInfoDialog::Private::onContactUpgraded(Tp::PendingOperation* op)
Tp::PendingContacts *contacts = qobject_cast<Tp::PendingContacts*>(op);
Q_ASSERT(contacts->contacts().count() == 1);
- contact = contacts->contacts().first();
+ contact = KTp::ContactPtr::qObjectCast(contacts->contacts().first());
/* Show avatar immediatelly */
if (contacts->features().contains(Tp::Contact::FeatureAvatarData)) {
@@ -162,13 +162,7 @@ void ContactInfoDialog::Private::onContactUpgraded(Tp::PendingOperation* op)
avatarLayout->addStretch(1);
}
- QPixmap avatar(contact->avatarData().fileName);
- if (avatar.isNull()) {
- avatar = KIconLoader::global()->loadIcon(QLatin1String("im-user"), KIconLoader::Desktop, 128);
- if (clearAvatarButton) {
- clearAvatarButton->setEnabled(false);
- }
- }
+ QPixmap avatar(contact->avatarPixmap());
avatarLabel->setPixmap(avatar.scaled(avatarLabel->maximumSize(), Qt::KeepAspectRatio, Qt::SmoothTransformation));
}
@@ -345,7 +339,7 @@ ContactInfoDialog::ContactInfoDialog(const Tp::AccountPtr& account, const Tp::Co
#endif
d->editable = false;
d->account = account;
- d->contact = contact;
+ d->contact = KTp::ContactPtr::qObjectCast(contact);
if (d->editable) {
--
ktp-common-internals packaging
More information about the pkg-kde-commits
mailing list