← Back to branch summary

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

« back to all changes in this revision

Viewing changes to protocols/wlm/wlmcontact.h

  • 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/wlmcontact.h
52
52
    Q_OBJECT
53
53
public:
54
54
    WlmContact (Kopete::Account * _account, const QString & uniqueName,
55
 
                const QString & contactSerial,
56
 
                const QString & displayName, Kopete::MetaContact * parent);
 
55
                const QString & contactSerial, Kopete::MetaContact * parent);
57
56
 
58
57
    ~WlmContact ();
59
58
 
68
67
         * Return the actions for this contact
69
68
         */
70
69
    virtual QList <KAction *>*customContextMenuActions ();
 
70
    using Kopete::Contact::customContextMenuActions;
71
71
        /**
72
72
         * Returns a Kopete::ChatSession associated with this contact
73
73
         */