← Back to branch summary

~ubuntu-branches/ubuntu/precise/sflphone/precise

« back to all changes in this revision

Viewing changes to daemon/src/account.h

  • Committer: Package Import Robot
  • Author(s): Whoopie
  • Date: 2012-03-22 10:29:10 UTC
  • mfrom: (4.1.12 sid)
  • Revision ID: package-import@ubuntu.com-20120322102910-tb8hugi2su1tguwh
Tags: 1.0.2-1ubuntu1
https://launchpad.net/bugs/913018
* Apply some upstream patches to fix FTBFS (LP: #913018):
  - debian/patches/05_glib_includes.patch: fix glib includes.
  - debian/patches/06_use_XkbKeycodeToKeysym.patch: use 
    XkbKeycodeToKeysym instead of (deprecated) XKeycodeToKeysym.

Show diffs side-by-side

added added

removed removed

Lines of Context:
daemon/src/account.h
71
71
static const char *const CONFIG_ACCOUNT_ALIAS                = "Account.alias";
72
72
static const char *const CONFIG_ACCOUNT_MAILBOX              = "Account.mailbox";
73
73
static const char *const CONFIG_ACCOUNT_ENABLE               = "Account.enable";
74
 
static const char *const CONFIG_ACCOUNT_REGISTRATION_EXPIRE  = "Account.expire";
 
74
static const char *const CONFIG_ACCOUNT_REGISTRATION_EXPIRE  = "Account.registrationExpire";
75
75
static const char *const CONFIG_CREDENTIAL_NUMBER            = "Credential.count";
76
76
static const char *const ACCOUNT_DTMF_TYPE                   = "Account.dtmfType";
77
77
static const char *const CONFIG_RINGTONE_PATH                = "Account.ringtonePath";
188
188
         * Get the voiplink pointer
189
189
         * @return VoIPLink* the pointer or 0
190
190
         */
191
 
        VoIPLink* getVoIPLink() {
192
 
            return link_;
193
 
        }
 
191
        virtual VoIPLink* getVoIPLink() = 0;
194
192
 
195
193
        /**
196
194
         * Register the underlying VoIPLink. Launch the event listener.
325
323
        std::string alias_;
326
324
 
327
325
        /**
328
 
         * Voice over IP Link contains a listener thread and calls
329
 
         */
330
 
        VoIPLink* link_;
331
 
 
332
 
        /**
333
326
         * Tells if the link is enabled, active.
334
327
         * This implies the link will be initialized on startup.
335
328
         * Modified by the configuration (key: ENABLED)