[notification-daemon] Don't use dbus activation

[Matthias Clasen <matthiasc src gnome org>]

commit 1ad20d22098bc7718614a8a87744a2c22d5438d0
Author: Matthias Clasen <mclasen redhat com>
Date:   Tue Feb 15 09:52:11 2011 -0500

    Don't use dbus activation
    
    Dbus activation causes a race with gnome-shell at session startup.
    Instead, install a regular desktop file, so we can make
    notification-daemon a required component of the fallback session.
    Finally, install notification-daemon in bindir to avoid fiddling
    with libexecdir when generating the desktop file.

 data/Makefile.am                              |    8 +++++---
 data/notification-daemon.desktop.in           |    7 +++++++
 data/org.freedesktop.Notifications.service.in |    3 ---
 src/Makefile.am                               |    2 +-
 4 files changed, 13 insertions(+), 7 deletions(-)
---
diff --git a/data/Makefile.am b/data/Makefile.am
index 7145130..c258b33 100644
--- a/data/Makefile.am
+++ b/data/Makefile.am
@@ -1,7 +1,9 @@
-servicedir   = $(DBUS_SERVICES_DIR)
-service_DATA = org.freedesktop.Notifications.service
+ INTLTOOL_DESKTOP_RULE@
+desktopdir= $(datadir)/applications
+desktop_in_files = notification-daemon.desktop.in
+desktop_DATA = $(desktop_in_files:.desktop.in=.desktop)
 
 EXTRA_DIST = \
-	$(service_DATA)
+	$(desktop_in_files)
 
 -include $(top_srcdir)/git.mk
diff --git a/data/notification-daemon.desktop.in b/data/notification-daemon.desktop.in
new file mode 100644
index 0000000..4d0c9aa
--- /dev/null
+++ b/data/notification-daemon.desktop.in
@@ -0,0 +1,7 @@
+[Desktop Entry]
+_Name=Notification Daemon
+_Comment=Display notifications
+Exec=notification-daemon
+Terminal=false
+Type=Application
+NoDisplay=true
diff --git a/src/Makefile.am b/src/Makefile.am
index 384129b..8e8b257 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -1,4 +1,4 @@
-libexec_PROGRAMS = notification-daemon
+bin_PROGRAMS = notification-daemon
 
 notification_daemon_SOURCES = \
 	nd-notification.c \