[SCM] ktp-approver packaging branch, master, updated. debian/15.12.1-1-299-g62cbbd7

[Maximiliano Curia]

Gitweb-URL: http://git.debian.org/?p=pkg-kde/applications/ktp-approver.git;a=commitdiff;h=5ebe32c

The following commit has been merged in the master branch:
commit 5ebe32c9cce383fb998356adc07adb90baa18d8a
Author: Daniele E. Domenichelli <daniele.domenichelli at gmail.com>
Date:   Fri Dec 16 14:08:59 2011 +0100

    Add D-Bus Service file for approver
    
    This fixes a race condition between kded and mission-control, the approver is
    now started by mission control
    
    BUG: 288881
---
 src/CMakeLists.txt                                        | 1 +
 src/org.freedesktop.Telepathy.Client.KDE.Approver.service | 3 +++
 src/telepathy_kde_approver.desktop                        | 4 ++--
 3 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 05956d4..ee6aeb6 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -17,3 +17,4 @@ target_link_libraries(kded_telepathy_kde_approver ${KDE4_KDEUI_LIBS}
 install(TARGETS kded_telepathy_kde_approver DESTINATION ${PLUGIN_INSTALL_DIR})
 install(FILES telepathy_kde_approver.desktop DESTINATION ${SERVICES_INSTALL_DIR}/kded)
 install(FILES telepathy_kde_approverrc DESTINATION ${CONFIG_INSTALL_DIR})
+install(FILES org.freedesktop.Telepathy.Client.KDE.Approver.service DESTINATION ${DBUS_SERVICES_INSTALL_DIR})
diff --git a/src/org.freedesktop.Telepathy.Client.KDE.Approver.service b/src/org.freedesktop.Telepathy.Client.KDE.Approver.service
new file mode 100644
index 0000000..407a4a0
--- /dev/null
+++ b/src/org.freedesktop.Telepathy.Client.KDE.Approver.service
@@ -0,0 +1,3 @@
+[D-BUS Service]
+Name=org.freedesktop.Telepathy.Client.KDE.Approver
+Exec=dbus-send --session --dest=org.kde.kded /kded org.kde.kded.loadModule string:"telepathy_kde_approver"
diff --git a/src/telepathy_kde_approver.desktop b/src/telepathy_kde_approver.desktop
index ac06bbc..8152404 100644
--- a/src/telepathy_kde_approver.desktop
+++ b/src/telepathy_kde_approver.desktop
@@ -32,5 +32,5 @@ Type=Service
 X-KDE-ServiceTypes=KDEDModule
 X-KDE-Library=telepathy_kde_approver
 X-KDE-DBus-ModuleName=telepathy_kde_approver
-X-KDE-Kded-autoload=true
-X-KDE-Kded-load-on-demand=false
+X-KDE-Kded-autoload=false
+X-KDE-Kded-load-on-demand=true

-- 
ktp-approver packaging