← Back to branch summary

~ubuntu-branches/ubuntu/trusty/kopete/trusty

« back to all changes in this revision

Viewing changes to protocols/wlm/wlmprotocol.cpp

  • Committer: Package Import Robot
  • Author(s): Rohan Garg
  • Date: 2013-11-23 17:46:40 UTC
  • mfrom: (1.1.7)
  • Revision ID: package-import@ubuntu.com-20131123174640-gz1zjv1xqh81bi2h
Tags: 4:4.11.80-0ubuntu1
* New upstream beta release
* Bump build dependency to libotr5-dev
* Update symbols
* Update install files
* Drop new_linphone.diff, not required anymore

Show diffs side-by-side

added added

removed removed

Lines of Context:
protocols/wlm/wlmprotocol.cpp
103
103
    QString contactId = serializedData["contactId"];
104
104
    QString contactSerial = serializedData["contactSerial"];
105
105
    QString accountId = serializedData["accountId"];
106
 
    QString displayName = serializedData["displayName"];
107
106
    QString dontShowEmoticons = serializedData["dontShowEmoticons"];
108
107
 
109
108
    QList <Kopete::Account*>accounts =
120
119
        kDebug (14210) << "Account doesn't exist, skipping";
121
120
        return 0;
122
121
    }
123
 
    WlmContact * c = new WlmContact (account, contactId, contactSerial,
124
 
                        displayName, metaContact);
 
122
    WlmContact * c = new WlmContact (account, contactId, contactSerial, metaContact);
125
123
 
126
124
    if(dontShowEmoticons == "true")
127
125
        c->slotDontShowEmoticons(true);