← Back to branch summary

~ubuntu-branches/ubuntu/trusty/ktp-kded-integration-module/trusty-proposed

« back to all changes in this revision

Viewing changes to contact-request-handler.cpp

  • Committer: Package Import Robot
  • Author(s): George Kiagiadakis
  • Date: 2012-06-19 12:23:53 UTC
  • mfrom: (1.1.2)
  • Revision ID: package-import@ubuntu.com-20120619122353-yx283wesj3dmuh10
Tags: 0.4.0-0ubuntu1
Upload to Kubuntu

Show diffs side-by-side

added added

removed removed

Lines of Context:
contact-request-handler.cpp
152
152
            if (m_pendingContacts.contains(contact->id())) {
153
153
                // It's likely we have a simultaneous request
154
154
                bool newReq = true;
155
 
                QHash<QString, Tp::ContactPtr>::const_iterator i = m_pendingContacts.find(contact->id());
 
155
                QHash<QString, Tp::ContactPtr>::const_iterator i = m_pendingContacts.constFind(contact->id());
156
156
                while (i != m_pendingContacts.constEnd() && i.key() == contact->id()) {
157
157
                    if (i.value().data() == contact.data()) {
158
158
                        newReq = false;
172
172
 
173
173
            updateMenus();
174
174
 
175
 
            m_notifierItem.data()->showMessage(i18n("New contact request"),
 
175
            m_notifierItem.data()->showMessage(i18n("New contact request"),    //krazy:exclude=qmethods
176
176
                                               i18n("The contact %1 added you to its contact list. You can answer this "
177
177
                                                    "request using the tray icon.",
178
178
                                                    contact->id()),
237
237
 
238
238
    if (!contactId.isEmpty()) {
239
239
        QList<Tp::PendingOperation*> operations;
240
 
        QHash<QString, Tp::ContactPtr>::const_iterator i = m_pendingContacts.find(contactId);
 
240
        QHash<QString, Tp::ContactPtr>::const_iterator i = m_pendingContacts.constFind(contactId);
241
241
        while (i != m_pendingContacts.constEnd() && i.key() == contactId) {
242
242
            if (!i.value()->manager().isNull()) {
243
243
                Tp::PendingOperation *op = i.value()->manager()->authorizePresencePublication(QList< Tp::ContactPtr >() << i.value());
303
303
 
304
304
    if (!contactId.isEmpty()) {
305
305
        QList<Tp::PendingOperation*> operations;
306
 
        QHash<QString, Tp::ContactPtr>::const_iterator i = m_pendingContacts.find(contactId);
 
306
        QHash<QString, Tp::ContactPtr>::const_iterator i = m_pendingContacts.constFind(contactId);
307
307
        while (i != m_pendingContacts.constEnd() && i.key() == contactId) {
308
308
            if (!i.value()->manager().isNull()) {
309
309
                Tp::PendingOperation *op = i.value()->manager()->removePresencePublication(QList< Tp::ContactPtr >() << i.value());