network-manager-applet r1239 - branches/NETWORKMANAGER_APPLET_0_7

[dcbw svn gnome org]

Author: dcbw
Date: Tue Mar 31 16:09:20 2009
New Revision: 1239
URL: http://svn.gnome.org/viewvc/network-manager-applet?rev=1239&view=rev

Log:
2009-03-31  Dan Williams  <dcbw redhat com>

	* configure.ac
	  Makefile.am
		- Check D-Bus version; use different applet dbus conf files for
			D-Bus >= 1.2.6 which uses deny-by-default processing.  New
			conf file fixes issues with 'root' also being at_console,
			where at_console permissions would deny root access to 
			applet secrets

	* nm-applet.conf
		- Remove; now generated

	* nm-applet-pre-dbus-126.conf
		- D-Bus config for dbus < 1.2.6

	* nm-applet-dbus-126.conf
		- D-Bus config for dbus >= 1.2.6 (from Tambet)



Added:
   branches/NETWORKMANAGER_APPLET_0_7/nm-applet-dbus-126.conf
      - copied unchanged from r1238, /trunk/nm-applet-dbus-126.conf
   branches/NETWORKMANAGER_APPLET_0_7/nm-applet-pre-dbus-126.conf
      - copied unchanged from r1238, /trunk/nm-applet-pre-dbus-126.conf
Removed:
   branches/NETWORKMANAGER_APPLET_0_7/nm-applet.conf
Modified:
   branches/NETWORKMANAGER_APPLET_0_7/ChangeLog
   branches/NETWORKMANAGER_APPLET_0_7/Makefile.am
   branches/NETWORKMANAGER_APPLET_0_7/configure.ac

Modified: branches/NETWORKMANAGER_APPLET_0_7/Makefile.am
==============================================================================
--- branches/NETWORKMANAGER_APPLET_0_7/Makefile.am	(original)
+++ branches/NETWORKMANAGER_APPLET_0_7/Makefile.am	Tue Mar 31 16:09:20 2009
@@ -9,6 +9,16 @@
 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 $(DBUS_126_CONF) nm-applet.conf
+else
+	cp -f $(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)
@@ -19,13 +29,15 @@
 @INTLTOOL_DESKTOP_RULE@
 
 EXTRA_DIST += \
-	$(dbusservice_DATA) \
 	$(autostart_in_files) \
-	$(desktop_in_files)
+	$(desktop_in_files) \
+	$(DBUS_126_CONF) \
+	$(DBUS_PRE_126_CONF)
 
 CLEANFILES = \
 	$(autostart_DATA) \
-	$(desktop_DATA)
+	$(desktop_DATA) \
+	$(dbusservice_DATA)
 
 DISTCLEANFILES = intltool-extract intltool-merge intltool-update
 

Modified: branches/NETWORKMANAGER_APPLET_0_7/configure.ac
==============================================================================
--- branches/NETWORKMANAGER_APPLET_0_7/configure.ac	(original)
+++ branches/NETWORKMANAGER_APPLET_0_7/configure.ac	Tue Mar 31 16:09:20 2009
@@ -112,6 +112,10 @@
 fi
 AC_SUBST(DBUS_CFLAGS)
 
+# Check for dbus-1.2.6 or later for deny-by-default rules
+PKG_CHECK_MODULES(DBUS_126, [dbus-1 >= 1.2.6], [have_dbus_126=yes],[have_dbus_126=no])
+AM_CONDITIONAL(HAVE_DBUS_126, test x"$have_dbus_126" = "xyes")
+
 #### PolicyKit checks; need at least 0.6 or later
 PKG_CHECK_EXISTS(polkit-gnome,[have_polkit_gnome=yes],[have_polkit_gnome=no])
 if test x"$have_polkit_gnome" = "xyes"; then