~ubuntu-branches/ubuntu/karmic/centerim/karmic

« back to all changes in this revision

Viewing changes to src/hooks/jabberhook.h

  • Committer: Bazaar Package Importer
  • Author(s): Pedro Fragoso
  • Date: 2008-05-01 03:10:58 UTC
  • mfrom: (1.1.4 upstream) (3.1.1 lenny)
  • Revision ID: james.westby@ubuntu.com-20080501031058-8abtw5d3nemblfqw
Tags: 4.22.5-1ubuntu1
* Merge from Debian unstable (LP #228731), Ubuntu remaining changes:
  - debian/control:
    + Use firefox-3.0 in Recommends
    + Updated maintainer field
* debian/patches/CVE-2008-1467.dpatch: Removed, merged upstream

Show diffs side-by-side

added added

removed removed

Lines of Context:
22
22
        map<string, string> roster;
23
23
        map<string, string> awaymsgs;
24
24
        map<string, vector<string> > chatmembers;
 
25
        map<string, map<string, pair<char, imstatus> > > statuses;  // <JID, <resource, <prio, status> > >
25
26
 
26
27
        struct agent {
27
28
            string jid, name, desc;
54
55
 
55
56
        vector<agent> agents;
56
57
 
 
58
        imstatus process_presence(string id, string s, char prio, imstatus ust);
 
59
 
57
60
        static void statehandler(jconn conn, int state);
58
61
        static void packethandler(jconn conn, jpacket packet);
59
62
        static void jlogger(jconn conn, int inout, const char *p);