← Back to branch summary

~noskcaj/ubuntu/saucy/sflphone/merge-1.2.3-2

« back to all changes in this revision

Viewing changes to daemon/src/iax/iaxaccount.h

  • Committer: Package Import Robot
  • Author(s): Mark Purcell
  • Date: 2012-05-19 21:46:37 UTC
  • mfrom: (1.1.7)
  • Revision ID: package-import@ubuntu.com-20120519214637-la8rbrford5kj6m3
Tags: 1.1.0-1
http://bugs.debian.org/663282
http://bugs.debian.org/665789
* New upstream release 
  - Fixes "FTBFS with libccrtp-dev/2.0.2 from experimental" (Closes: #663282)
* NEW Maintainer: Debian VoIP Team - Thanks Francois for your work.
  - (Closes: #665789: O: sflphone -- SIP and IAX2 compatible VoIP phone)
* Added Build-Depends: libdbus-c++-bin
* Add gcc47-fixes.patch

Show diffs side-by-side

added added

removed removed

Lines of Context:
daemon/src/iax/iaxaccount.h
32
32
#define IAXACCOUNT_H
33
33
 
34
34
#include "account.h"
35
 
#include "noncopyable.h"
36
 
 
37
 
class IAXVoIPLink;
 
35
#include "iaxvoiplink.h"
38
36
 
39
37
/**
40
38
 * @file: iaxaccount.h
43
41
class IAXAccount : public Account {
44
42
    public:
45
43
        IAXAccount(const std::string& accountID);
46
 
        ~IAXAccount();
47
 
 
48
 
        virtual void serialize(Conf::YamlEmitter *emitter);
49
 
 
50
 
        virtual void unserialize(Conf::MappingNode *map);
 
44
 
 
45
        virtual void serialize(Conf::YamlEmitter &emitter);
 
46
        virtual void unserialize(const Conf::MappingNode &map);
51
47
 
52
48
        void setAccountDetails(std::map<std::string, std::string> details);
53
49
 
67
63
        }
68
64
 
69
65
    private:
70
 
        NON_COPYABLE(IAXAccount);
71
66
         // Account login information: password
72
67
        std::string password_;
73
 
        IAXVoIPLink *link_;
 
68
        IAXVoIPLink link_;
74
69
        virtual VoIPLink* getVoIPLink();
75
70
};
76
71