← Back to branch summary

~ubuntu-branches/ubuntu/quantal/sflphone/quantal

« back to all changes in this revision

Viewing changes to daemon/src/dbus/dbusmanager.cpp

  • Committer: Package Import Robot
  • Author(s): Mark Purcell
  • Date: 2012-05-27 08:22:22 UTC
  • mfrom: (4.1.15 sid)
  • Revision ID: package-import@ubuntu.com-20120527082222-fs3ojksqvt0ol6rl
Tags: 1.1.0-2
http://bugs.debian.org/674644
* Drop unsupported CELT codec (Build-Depends)
  - Fixes "Spurious build dependency on libcelt-dev" (Closes: #674644)

Show diffs side-by-side

added added

removed removed

Lines of Context:
daemon/src/dbus/dbusmanager.cpp
32
32
#include "dbusmanager.h"
33
33
#include "global.h"
34
34
#include "manager.h"
 
35
#include "logger.h"
35
36
#include "instance.h"
36
37
 
37
38
#include "callmanager.h"
50
51
        DBus::_init_threading();
51
52
        DBus::default_dispatcher = &dispatcher_;
52
53
 
53
 
        DBus::Connection sessionConnection = DBus::Connection::SessionBus();
 
54
        DBus::Connection sessionConnection(DBus::Connection::SessionBus());
54
55
        sessionConnection.request_name("org.sflphone.SFLphone");
55
56
 
56
57
        callManager_ = new CallManager(sessionConnection);
58
59
        instanceManager_ = new Instance(sessionConnection);
59
60
 
60
61
#ifdef USE_NETWORKMANAGER
61
 
        DBus::Connection systemConnection = DBus::Connection::SystemBus();
 
62
        DBus::Connection systemConnection(DBus::Connection::SystemBus());
62
63
        networkManager_ = new NetworkManager(systemConnection, "/org/freedesktop/NetworkManager", "");
63
64
#endif
64
65
 
86
87
        ERROR("%s: %s, exiting\n", err.name(), err.what());
87
88
        ::exit(EXIT_FAILURE);
88
89
    } catch (const std::exception &err) {
89
 
        ERROR("%s: %s, exiting\n", err.what());
 
90
        ERROR("%s: exiting\n", err.what());
90
91
        ::exit(EXIT_FAILURE);
91
92
    }
92
93
}
100
101
        ERROR("%s: %s, exiting\n", err.name(), err.what());
101
102
        ::exit(EXIT_FAILURE);
102
103
    } catch (const std::exception &err) {
103
 
        ERROR("%s: %s, exiting\n", err.what());
 
104
        ERROR("%s: exiting\n", err.what());
104
105
        ::exit(EXIT_FAILURE);
105
106
    }
106
107
}