diff options
| author | Tomasz Sterna <tomek@xiaoka.com> | 2014-07-14 16:49:27 +0200 |
|---|---|---|
| committer | Tomasz Sterna <tomek@xiaoka.com> | 2014-07-14 16:49:27 +0200 |
| commit | c358544734ae26770e91d56a92dcd8e22da71be5 (patch) | |
| tree | 8227bed64b6cbd7088102c762285e64a30418d56 /daemon/daemon.cpp | |
| parent | 9160f139d399bce61c67a4ebc31dfdf1cc5d3e62 (diff) | |
| parent | c911932934f0a7d8bf1c252be4a3e718859b3b09 (diff) | |
Merge branch 'notifications' of github.com:smurfy/pebble into smurfy-notifications
Conflicts:
daemon/daemon.pro
daemon/manager.cpp
daemon/manager.h
Diffstat (limited to 'daemon/daemon.cpp')
| -rw-r--r-- | daemon/daemon.cpp | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/daemon/daemon.cpp b/daemon/daemon.cpp index eba9afa..cd5e781 100644 --- a/daemon/daemon.cpp +++ b/daemon/daemon.cpp @@ -125,8 +125,9 @@ int main(int argc, char *argv[]) watch::WatchConnector watch; DBusConnector dbus; VoiceCallManager voice; + NotificationManager notifications; - Manager manager(&watch, &dbus, &voice); + Manager manager(&watch, &dbus, &voice, ¬ifications); signal(SIGINT, signalhandler); signal(SIGTERM, signalhandler); |