SVN commit 1006768 by gkiagia: Move the knotify approver in a separate dbus-activatable process. This is to avoid scenarios where a call comes but kcall is not running, thus there is no approver and the call is auto-accepted. M +1 -2 CMakeLists.txt D kcall.notifyrc A kcall_approver (directory) A kcall_approver/CMakeLists.txt A kcall_approver/kcall_approver.client A kcall_approver/kcall_approver.notifyrc kcall.notifyrc#1006767 A kcall_approver/knotifyapprover.cpp knotifyapprover.cpp#1006767 [License: GPL (v2+)] A kcall_approver/knotifyapprover.h knotifyapprover.h#1006767 [License: GPL (v2+)] A kcall_approver/main.cpp [License: GPL (v2+)] A kcall_approver/org.freedesktop.Telepathy.Client.kcall_approver.service.in M +2 -5 kcallapplication.cpp D knotifyapprover.cpp D knotifyapprover.h --- trunk/playground/network/kcall/CMakeLists.txt #1006767:1006768 @@ -46,6 +46,7 @@ add_subdirectory(libkgstdevices) add_subdirectory(libqtpfarsight) add_subdirectory(kcall_handler) +add_subdirectory(kcall_approver) add_subdirectory(kcm) ########## @@ -56,7 +57,6 @@ mainwindow.cpp contactlistcontroller.cpp systrayicon.cpp - knotifyapprover.cpp ) kde4_add_ui_files(kcall_SRCS mainwindow.ui) @@ -68,4 +68,3 @@ install(TARGETS kcall ${INSTALL_TARGETS_DEFAULT_ARGS}) install(FILES kcallui.rc DESTINATION ${DATA_INSTALL_DIR}/kcall) -install(FILES kcall.notifyrc DESTINATION ${DATA_INSTALL_DIR}/kcall) --- trunk/playground/network/kcall/kcallapplication.cpp #1006767:1006768 @@ -17,7 +17,6 @@ #include "kcallapplication.h" #include "mainwindow.h" #include "systrayicon.h" -#include "knotifyapprover.h" #include "libkcallprivate/accountmanager.h" #include #include @@ -28,7 +27,6 @@ AccountManager *accountManager; Tp::ClientRegistrarPtr registrar; Tp::SharedPtr systrayIcon; - Tp::SharedPtr knotifyApprover; }; KCallApplication::KCallApplication() @@ -39,9 +37,8 @@ d->registrar = Tp::ClientRegistrar::create(); d->systrayIcon = Tp::SharedPtr(new SystrayIcon()); - d->registrar->registerClient(Tp::AbstractClientPtr::dynamicCast(d->systrayIcon), "kcall_approver_systray"); - d->knotifyApprover = Tp::SharedPtr(new KNotifyApprover()); - d->registrar->registerClient(Tp::AbstractClientPtr::dynamicCast(d->knotifyApprover), "kcall_approver_knotify"); + d->registrar->registerClient(Tp::AbstractClientPtr::dynamicCast(d->systrayIcon), + "kcall_approver_systray"); } KCallApplication::~KCallApplication()