← Back to branch summary

~ubuntu-branches/ubuntu/dapper/kopete/dapper-backports

« back to all changes in this revision

Viewing changes to kopete/protocols/jabber/jabberbasecontact.h

  • Committer: Bazaar Package Importer
  • Author(s): Sarah Hobbs
  • Date: 2006-07-14 23:45:58 UTC
  • mfrom: (1.1.1 upstream)
  • Revision ID: james.westby@ubuntu.com-20060714234558-gq6jzmy117r2pj4r
Tags: 4:3.5.4+kopete0.12.1-0ubuntu1
* New upstream version
* Reverted patch 01_kopete_kdesktop_freeze.diff (fixed upstream)
* Reverted patch 02_icq_version_too_old.diff (fixed upstream)
* Bumped Version so that this gets installed, instead of the kopete in kdenetwork

Show diffs side-by-side

added added

removed removed

Lines of Context:
kopete/protocols/jabber/jabberbasecontact.h
29
29
class JabberResource;
30
30
class JabberTransport;
31
31
namespace Kopete { class MetaContact; }
 
32
namespace XMPP { class VCard; }
32
33
 
33
34
class JabberBaseContact : public Kopete::Contact
34
35
{
135
136
         * to get the jid, use  rosterItem().jid().full()  don't use contactId as it is not the same with transport
136
137
         */
137
138
        XMPP::RosterItem rosterItem() const { return mRosterItem; }
 
139
        
 
140
        /**
 
141
         * Reads a vCard object and updates the contact's
 
142
         * properties accordingly.
 
143
         */
 
144
        void setPropertiesFromVCard ( const XMPP::VCard &vCard );
 
145
 
138
146
 
139
147
public slots:
140
148
 
141
149
        /**
142
150
         * Retrieve a vCard for the contact
143
151
         */
144
 
        virtual void slotUserInfo () = 0;
 
152
        virtual void slotUserInfo ();
145
153
        
146
154
        
147
155
        /**