summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authortpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da>2011-10-18 00:33:57 +0000
committertpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da>2011-10-18 00:33:57 +0000
commita062a26f39117d05c0d93fe5537ff0cfc40fa86f (patch)
tree197d8faff03c1bd7f2851e7fbc7d75dcfa270d9d
parent49eb1758fe84a5d55f99a62703a1a21f4f4b2566 (diff)
downloadkdbusnotification-a062a26f39117d05c0d93fe5537ff0cfc40fa86f.tar.gz
kdbusnotification-a062a26f39117d05c0d93fe5537ff0cfc40fa86f.zip
Add autostart files to kdbusnotifier
git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/applications/kdbusnotification@1259343 283d02a7-25f6-0310-bc7c-ecb5cbfe19da
-rw-r--r--src/Makefile.am7
-rw-r--r--src/daemon/Makefile.am2
-rw-r--r--src/daemon/daemon.cpp3
-rw-r--r--src/kdbusnotification-autostart.desktop13
-rw-r--r--src/kdbusnotification.desktop13
5 files changed, 36 insertions, 2 deletions
diff --git a/src/Makefile.am b/src/Makefile.am
index 69939d3..9fffe0e 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -2,3 +2,10 @@
SUBDIRS = \
daemon
+
+# this is where the desktop file will go
+xdg_apps_DATA = kdbusnotification.desktop
+
+# and for autostart
+autostartdir = $(prefix)/share/autostart
+autostart_DATA = kdbusnotification-autostart.desktop
diff --git a/src/daemon/Makefile.am b/src/daemon/Makefile.am
index 54aff33..61aa507 100644
--- a/src/daemon/Makefile.am
+++ b/src/daemon/Makefile.am
@@ -14,7 +14,7 @@ INCLUDES = \
$(QT_INCLUDES) \
$(KDE_INCLUDES)
-libexec_PROGRAMS = \
+bin_PROGRAMS = \
notification-daemon-tde
notification_daemon_tde_SOURCES = \
diff --git a/src/daemon/daemon.cpp b/src/daemon/daemon.cpp
index a0b1454..3af9563 100644
--- a/src/daemon/daemon.cpp
+++ b/src/daemon/daemon.cpp
@@ -358,6 +358,7 @@ main(int argc, char **argv)
TQTimer *gtkEventProcessor = new TQTimer( &app );
TQObject::connect( gtkEventProcessor, SIGNAL(timeout()), &nc, SLOT(handleGTKMain()) );
gtkEventProcessor->start( 100, FALSE ); // Every 0.1 seconds poll gtk for DBUS events
+ app.disableSessionManagement();
app.exec();
return 0;
@@ -366,4 +367,4 @@ main(int argc, char **argv)
void real_handleGTKMain() {
while (gtk_events_pending())
gtk_main_iteration();
-} \ No newline at end of file
+}
diff --git a/src/kdbusnotification-autostart.desktop b/src/kdbusnotification-autostart.desktop
new file mode 100644
index 0000000..b23aca5
--- /dev/null
+++ b/src/kdbusnotification-autostart.desktop
@@ -0,0 +1,13 @@
+[Desktop Entry]
+Encoding=UTF-8
+Name=kdbusnotification
+Name[xx]=xxkdbusnotificationxx
+Exec=notification-daemon-tde
+Icon=bell
+Type=Application
+Comment=DBUS notification service daemon
+X-KDE-autostart-phase=1
+X-KDE-StartupNotify=false
+X-KDE-UniqueApplet=true
+Categories=System;
+
diff --git a/src/kdbusnotification.desktop b/src/kdbusnotification.desktop
new file mode 100644
index 0000000..b23aca5
--- /dev/null
+++ b/src/kdbusnotification.desktop
@@ -0,0 +1,13 @@
+[Desktop Entry]
+Encoding=UTF-8
+Name=kdbusnotification
+Name[xx]=xxkdbusnotificationxx
+Exec=notification-daemon-tde
+Icon=bell
+Type=Application
+Comment=DBUS notification service daemon
+X-KDE-autostart-phase=1
+X-KDE-StartupNotify=false
+X-KDE-UniqueApplet=true
+Categories=System;
+