[network-manager-applet/rm-userset: 1/4] core: remove dbus service files

[Dan Williams <dcbw src gnome org>]

commit c0b1241cb3d4e5a773511ed21caa76e7651d5f97
Author: Dan Williams <dcbw redhat com>
Date:   Thu Dec 23 08:17:03 2010 -0600

    core: remove dbus service files
    
    The applet no longer needs to be a dbus service, since connections
    are all stored in NetworkManager.

 Makefile.am                 |   20 ++------------------
 nm-applet-dbus-126.conf     |   42 ------------------------------------------
 nm-applet-pre-dbus-126.conf |   32 --------------------------------
 3 files changed, 2 insertions(+), 92 deletions(-)
---
diff --git a/Makefile.am b/Makefile.am
index 6f164b9..4474d3f 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -8,19 +8,6 @@ EXTRA_DIST =				\
 	intltool-merge.in		\
 	intltool-update.in
 
-dbusservicedir = $(DBUS_SYS_DIR)
-dbusservice_DATA = nm-applet.conf
-
-DBUS_126_CONF = nm-applet-dbus-126.conf
-DBUS_PRE_126_CONF = nm-applet-pre-dbus-126.conf
-
-nm-applet.conf:
-if HAVE_DBUS_126
-	cp -f $(top_srcdir)/$(DBUS_126_CONF) nm-applet.conf
-else
-	cp -f $(top_srcdir)/$(DBUS_PRE_126_CONF) nm-applet.conf
-endif
-
 autostartdir = $(sysconfdir)/xdg/autostart
 autostart_in_files = nm-applet.desktop.in
 autostart_DATA = $(autostart_in_files:.desktop.in=.desktop)
@@ -39,15 +26,12 @@ schemas_DATA = $(schemas_in_files:.schemas.in=.schemas)
 EXTRA_DIST += \
 	$(schemas_in_files) \
 	$(autostart_in_files) \
-	$(desktop_in_files) \
-	$(DBUS_126_CONF) \
-	$(DBUS_PRE_126_CONF)
+	$(desktop_in_files)
 
 CLEANFILES = \
 	$(autostart_DATA) \
 	$(desktop_DATA) \
-	$(schemas_DATA) \
-	$(dbusservice_DATA)
+	$(schemas_DATA)
 
 DISTCLEANFILES = intltool-extract intltool-merge intltool-update