2004-07-27 Dan Williams <dcbw@redhat.com>

* initscript/Makefile.in - Remove * initscript/Makefile.am - Add correct rules to install the init.d initscript * info-daemon/NetworkManagerInfoDbus.c - Remove debug fprintf * src/NetworkManagerDbus.[ch] - Remove debug fprintfs - Add macros for NetworkManagerInfo object path/namespace - Use said macros instead of constant strings git-svn-id: http://svn-archive.gnome.org/svn/NetworkManager/trunk@25 4912f4e0-d625-0410-9fb7-b9a5a253dbdc
2024-07-23 11:14:29 +00:00 · 2004-07-27 18:48:14 +00:00 · 2004-07-27 18:48:14 +00:00 · 8945fdfd7c
parent 7a4149d5c2
commit 8945fdfd7c
6 changed files with 38 additions and 311 deletions
--- a/16
+++ b/16
@ -1,3 +1,19 @@
+2004-07-27  Dan Williams <dcbw@redhat.com>
+
+	* initscript/Makefile.in
+		- Remove
+
+	* initscript/Makefile.am
+		- Add correct rules to install the init.d initscript
+
+	* info-daemon/NetworkManagerInfoDbus.c
+		- Remove debug fprintf
+
+	* src/NetworkManagerDbus.[ch]
+		- Remove debug fprintfs
+		- Add macros for NetworkManagerInfo object path/namespace
+		- Use said macros instead of constant strings
+
 2004-07-27  Dan Williams <dcbw@redhat.com>

 	* initscript/.cvsignore
--- a/info-daemon/NetworkManagerInfoDbus.c
+++ b/info-daemon/NetworkManagerInfoDbus.c
@ -138,8 +138,6 @@ void nmi_dbus_signal_update_allowed_network (DBusConnection *connection, const c
 	g_return_if_fail (connection != NULL);
 	g_return_if_fail (network != NULL);

-fprintf( stderr, "nmi_dbus_signal_update_allowed_network() signaling update for '%s'\n", network);
-
 	message = dbus_message_new_signal ("/org/freedesktop/NetworkManagerInfo", "org.freedesktop.NetworkManagerInfo",
 									"AllowedNetworkUpdate");
 	if (!message)
--- a/initscript/Makefile.am
+++ b/initscript/Makefile.am
@ -1,4 +1,5 @@
 EXTRA_DIST = NetworkManager

-rcddir = $(sysconfdir)/rc.d/init.d
-rcd_DATA = NetworkManager
+initddir = $(sysconfdir)/rc.d/init.d
+
+initd_SCRIPTS = NetworkManager
--- a/initscript/Makefile.in
+++ b/initscript/Makefile.in
@ -1,276 +0,0 @@
-# Makefile.in generated by automake 1.7.9 from Makefile.am.
-# @configure_input@
-
-# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003
-# Free Software Foundation, Inc.
-# This Makefile.in is free software; the Free Software Foundation
-# gives unlimited permission to copy and/or distribute it,
-# with or without modifications, as long as this notice is preserved.
-
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY, to the extent permitted by law; without
-# even the implied warranty of MERCHANTABILITY or FITNESS FOR A
-# PARTICULAR PURPOSE.
-
-@SET_MAKE@
-
-srcdir = @srcdir@
-top_srcdir = @top_srcdir@
-VPATH = @srcdir@
-pkgdatadir = $(datadir)/@PACKAGE@
-pkglibdir = $(libdir)/@PACKAGE@
-pkgincludedir = $(includedir)/@PACKAGE@
-top_builddir = ..
-
-am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
-INSTALL = @INSTALL@
-install_sh_DATA = $(install_sh) -c -m 644
-install_sh_PROGRAM = $(install_sh) -c
-install_sh_SCRIPT = $(install_sh) -c
-INSTALL_HEADER = $(INSTALL_DATA)
-transform = $(program_transform_name)
-NORMAL_INSTALL = :
-PRE_INSTALL = :
-POST_INSTALL = :
-NORMAL_UNINSTALL = :
-PRE_UNINSTALL = :
-POST_UNINSTALL = :
-ACLOCAL = @ACLOCAL@
-AMDEP_FALSE = @AMDEP_FALSE@
-AMDEP_TRUE = @AMDEP_TRUE@
-AMTAR = @AMTAR@
-AUTOCONF = @AUTOCONF@
-AUTOHEADER = @AUTOHEADER@
-AUTOMAKE = @AUTOMAKE@
-AWK = @AWK@
-CC = @CC@
-CCDEPMODE = @CCDEPMODE@
-CFLAGS = @CFLAGS@
-CPP = @CPP@
-CPPFLAGS = @CPPFLAGS@
-CYGPATH_W = @CYGPATH_W@
-DEFS = @DEFS@
-DEPDIR = @DEPDIR@
-ECHO_C = @ECHO_C@
-ECHO_N = @ECHO_N@
-ECHO_T = @ECHO_T@
-EGREP = @EGREP@
-EXEEXT = @EXEEXT@
-GCONF_CFLAGS = @GCONF_CFLAGS@
-GCONF_LIBS = @GCONF_LIBS@
-GLADE_CFLAGS = @GLADE_CFLAGS@
-GLADE_LIBS = @GLADE_LIBS@
-INSTALL_DATA = @INSTALL_DATA@
-INSTALL_PROGRAM = @INSTALL_PROGRAM@
-INSTALL_SCRIPT = @INSTALL_SCRIPT@
-INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
-IWLIB = @IWLIB@
-LDFLAGS = @LDFLAGS@
-LIBOBJS = @LIBOBJS@
-LIBS = @LIBS@
-LTLIBOBJS = @LTLIBOBJS@
-MAKEINFO = @MAKEINFO@
-NM_CFLAGS = @NM_CFLAGS@
-NM_LIBS = @NM_LIBS@
-OBJEXT = @OBJEXT@
-PACKAGE = @PACKAGE@
-PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
-PACKAGE_NAME = @PACKAGE_NAME@
-PACKAGE_STRING = @PACKAGE_STRING@
-PACKAGE_TARNAME = @PACKAGE_TARNAME@
-PACKAGE_VERSION = @PACKAGE_VERSION@
-PATH_SEPARATOR = @PATH_SEPARATOR@
-PKG_CONFIG = @PKG_CONFIG@
-SET_MAKE = @SET_MAKE@
-SHELL = @SHELL@
-STRIP = @STRIP@
-VERSION = @VERSION@
-ac_ct_CC = @ac_ct_CC@
-ac_ct_STRIP = @ac_ct_STRIP@
-am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
-am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
-am__include = @am__include@
-am__leading_dot = @am__leading_dot@
-am__quote = @am__quote@
-bindir = @bindir@
-build_alias = @build_alias@
-datadir = @datadir@
-exec_prefix = @exec_prefix@
-host_alias = @host_alias@
-includedir = @includedir@
-infodir = @infodir@
-install_sh = @install_sh@
-libdir = @libdir@
-libexecdir = @libexecdir@
-localstatedir = @localstatedir@
-mandir = @mandir@
-oldincludedir = @oldincludedir@
-prefix = @prefix@
-program_transform_name = @program_transform_name@
-sbindir = @sbindir@
-sharedstatedir = @sharedstatedir@
-sysconfdir = @sysconfdir@
-target_alias = @target_alias@
-EXTRA_DIST = NetworkManager
-
-rcddir = $(sysconfdir)/rc.d/init.d
-rcd_DATA = NetworkManager
-subdir = initscript
-ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
-CONFIG_CLEAN_FILES =
-DIST_SOURCES =
-DATA = $(rcd_DATA)
-
-DIST_COMMON = $(srcdir)/Makefile.in Makefile.am
-all: all-am
-
-.SUFFIXES:
-$(srcdir)/Makefile.in:  Makefile.am  $(top_srcdir)/configure.in $(ACLOCAL_M4)
-	cd $(top_srcdir) && \
-	  $(AUTOMAKE) --gnu  initscript/Makefile
-Makefile:  $(srcdir)/Makefile.in  $(top_builddir)/config.status
-	cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)
-uninstall-info-am:
-rcdDATA_INSTALL = $(INSTALL_DATA)
-install-rcdDATA: $(rcd_DATA)
-	@$(NORMAL_INSTALL)
-	$(mkinstalldirs) $(DESTDIR)$(rcddir)
-	@list='$(rcd_DATA)'; for p in $$list; do \
-	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
-	  f="`echo $$p | sed -e 's|^.*/||'`"; \
-	  echo " $(rcdDATA_INSTALL) $$d$$p $(DESTDIR)$(rcddir)/$$f"; \
-	  $(rcdDATA_INSTALL) $$d$$p $(DESTDIR)$(rcddir)/$$f; \
-	done
-
-uninstall-rcdDATA:
-	@$(NORMAL_UNINSTALL)
-	@list='$(rcd_DATA)'; for p in $$list; do \
-	  f="`echo $$p | sed -e 's|^.*/||'`"; \
-	  echo " rm -f $(DESTDIR)$(rcddir)/$$f"; \
-	  rm -f $(DESTDIR)$(rcddir)/$$f; \
-	done
-tags: TAGS
-TAGS:
-
-ctags: CTAGS
-CTAGS:
-
-DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
-
-top_distdir = ..
-distdir = $(top_distdir)/$(PACKAGE)-$(VERSION)
-
-distdir: $(DISTFILES)
-	@srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
-	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \
-	list='$(DISTFILES)'; for file in $$list; do \
-	  case $$file in \
-	    $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \
-	    $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \
-	  esac; \
-	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
-	  dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
-	  if test "$$dir" != "$$file" && test "$$dir" != "."; then \
-	    dir="/$$dir"; \
-	    $(mkinstalldirs) "$(distdir)$$dir"; \
-	  else \
-	    dir=''; \
-	  fi; \
-	  if test -d $$d/$$file; then \
-	    if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
-	      cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
-	    fi; \
-	    cp -pR $$d/$$file $(distdir)$$dir || exit 1; \
-	  else \
-	    test -f $(distdir)/$$file \
-	    || cp -p $$d/$$file $(distdir)/$$file \
-	    || exit 1; \
-	  fi; \
-	done
-check-am: all-am
-check: check-am
-all-am: Makefile $(DATA)
-
-installdirs:
-	$(mkinstalldirs) $(DESTDIR)$(rcddir)
-install: install-am
-install-exec: install-exec-am
-install-data: install-data-am
-uninstall: uninstall-am
-
-install-am: all-am
-	@$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am
-
-installcheck: installcheck-am
-install-strip:
-	$(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
-	  install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
-	  `test -z '$(STRIP)' || \
-	    echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
-mostlyclean-generic:
-
-clean-generic:
-
-distclean-generic:
-	-rm -f $(CONFIG_CLEAN_FILES)
-
-maintainer-clean-generic:
-	@echo "This command is intended for maintainers to use"
-	@echo "it deletes files that may require special tools to rebuild."
-clean: clean-am
-
-clean-am: clean-generic mostlyclean-am
-
-distclean: distclean-am
-	-rm -f Makefile
-distclean-am: clean-am distclean-generic
-
-dvi: dvi-am
-
-dvi-am:
-
-info: info-am
-
-info-am:
-
-install-data-am: install-rcdDATA
-
-install-exec-am:
-
-install-info: install-info-am
-
-install-man:
-
-installcheck-am:
-
-maintainer-clean: maintainer-clean-am
-	-rm -f Makefile
-maintainer-clean-am: distclean-am maintainer-clean-generic
-
-mostlyclean: mostlyclean-am
-
-mostlyclean-am: mostlyclean-generic
-
-pdf: pdf-am
-
-pdf-am:
-
-ps: ps-am
-
-ps-am:
-
-uninstall-am: uninstall-info-am uninstall-rcdDATA
-
-.PHONY: all all-am check check-am clean clean-generic distclean \
-	distclean-generic distdir dvi dvi-am info info-am install \
-	install-am install-data install-data-am install-exec \
-	install-exec-am install-info install-info-am install-man \
-	install-rcdDATA install-strip installcheck installcheck-am \
-	installdirs maintainer-clean maintainer-clean-generic \
-	mostlyclean mostlyclean-generic pdf pdf-am ps ps-am uninstall \
-	uninstall-am uninstall-info-am uninstall-rcdDATA
-
-# Tell versions [3.59,3.63) of GNU make to not export all variables.
-# Otherwise a system limit (for SysV at least) may be exceeded.
-.NOEXPORT:
--- a/src/NetworkManagerDbus.c
+++ b/src/NetworkManagerDbus.c
@ -418,10 +418,8 @@ void nm_dbus_get_user_key_for_network (DBusConnection *connection, NMDevice *dev
 	g_return_if_fail (ap != NULL);
 	g_return_if_fail (nm_ap_get_essid (ap) != NULL);

-	message = dbus_message_new_method_call ("org.freedesktop.NetworkManagerInfo",
-						"/org/freedesktop/NetworkManagerInfo",
-						"org.freedesktop.NetworkManagerInfo",
-						"getKeyForNetwork");
+	message = dbus_message_new_method_call (NM_DBUS_NMI_NAMESPACE, NM_DBUS_NMI_OBJECT_PATH,
+						NM_DBUS_NMI_NAMESPACE, "getKeyForNetwork");
 	if (message == NULL)
 	{
 		NM_DEBUG_PRINT ("nm_dbus_get_user_key_for_network(): Couldn't allocate the dbus message\n");
@ -501,10 +499,8 @@ void nm_dbus_cancel_get_user_key_for_network (DBusConnection *connection)

 	g_return_if_fail (connection != NULL);

-	message = dbus_message_new_method_call ("org.freedesktop.NetworkManagerInfo",
-						"/org/freedesktop/NetworkManagerInfo",
-						"org.freedesktop.NetworkManagerInfo",
-						"cancelGetKeyForNetwork");
+	message = dbus_message_new_method_call (NM_DBUS_NMI_NAMESPACE, NM_DBUS_NMI_OBJECT_PATH,
+						NM_DBUS_NMI_NAMESPACE, "cancelGetKeyForNetwork");
 	if (message == NULL)
 	{
 		NM_DEBUG_PRINT ("nm_dbus_cancel_get_user_key_for_network(): Couldn't allocate the dbus message\n");
@ -536,10 +532,8 @@ char * nm_dbus_get_allowed_network_essid (DBusConnection *connection, const char
 	g_return_val_if_fail (connection != NULL, NULL);
 	g_return_val_if_fail (network != NULL, NULL);

-	message = dbus_message_new_method_call ("org.freedesktop.NetworkManagerInfo",
-									"/org/freedesktop/NetworkManagerInfo",
-									"org.freedesktop.NetworkManagerInfo",
-									"getAllowedNetworkEssid");
+	message = dbus_message_new_method_call (NM_DBUS_NMI_NAMESPACE, NM_DBUS_NMI_OBJECT_PATH,
+						NM_DBUS_NMI_NAMESPACE, "getAllowedNetworkEssid");
 	if (!message)
 	{
 		NM_DEBUG_PRINT ("nm_dbus_get_allowed_network_essid(): Couldn't allocate the dbus message\n");
@ -593,10 +587,8 @@ char * nm_dbus_get_allowed_network_key (DBusConnection *connection, const char *
 	g_return_val_if_fail (connection != NULL, NULL);
 	g_return_val_if_fail (network != NULL, NULL);

-	message = dbus_message_new_method_call ("org.freedesktop.NetworkManagerInfo",
-									"/org/freedesktop/NetworkManagerInfo",
-									"org.freedesktop.NetworkManagerInfo",
-									"getAllowedNetworkKey");
+	message = dbus_message_new_method_call (NM_DBUS_NMI_NAMESPACE, NM_DBUS_NMI_OBJECT_PATH,
+						NM_DBUS_NMI_NAMESPACE, "getAllowedNetworkKey");
 	if (!message)
 	{
 		NM_DEBUG_PRINT ("nm_dbus_get_allowed_network_key(): Couldn't allocate the dbus message\n");
@ -648,10 +640,8 @@ guint nm_dbus_get_allowed_network_priority (DBusConnection *connection, const ch
 	g_return_val_if_fail (connection != NULL, NM_AP_PRIORITY_WORST);
 	g_return_val_if_fail (network != NULL, NM_AP_PRIORITY_WORST);

-	message = dbus_message_new_method_call ("org.freedesktop.NetworkManagerInfo",
-									"/org/freedesktop/NetworkManagerInfo",
-									"org.freedesktop.NetworkManagerInfo",
-									"getAllowedNetworkPriority");
+	message = dbus_message_new_method_call (NM_DBUS_NMI_NAMESPACE, NM_DBUS_NMI_OBJECT_PATH,
+						NM_DBUS_NMI_NAMESPACE, "getAllowedNetworkPriority");
 	if (!message)
 	{
 		NM_DEBUG_PRINT ("nm_dbus_get_allowed_network_priority(): Couldn't allocate the dbus message\n");
@ -700,10 +690,8 @@ char ** nm_dbus_get_allowed_networks (DBusConnection *connection, int *num_netwo
 	*num_networks = 0;
 	g_return_val_if_fail (connection != NULL, NULL);

-	message = dbus_message_new_method_call ("org.freedesktop.NetworkManagerInfo",
-									"/org/freedesktop/NetworkManagerInfo",
-									"org.freedesktop.NetworkManagerInfo",
-									"getAllowedNetworks");
+	message = dbus_message_new_method_call (NM_DBUS_NMI_NAMESPACE, NM_DBUS_NMI_OBJECT_PATH,
+						NM_DBUS_NMI_NAMESPACE, "getAllowedNetworks");
 	if (!message)
 	{
 		NM_DEBUG_PRINT ("nm_dbus_get_allowed_networks(): Couldn't allocate the dbus message\n");
@ -749,20 +737,18 @@ static DBusHandlerResult nm_dbus_nmi_filter (DBusConnection *connection, DBusMes
 	g_return_val_if_fail (message != NULL, DBUS_HANDLER_RESULT_NOT_YET_HANDLED);

 	object_path = dbus_message_get_path (message);
-	if (!object_path || (strcmp (object_path, "/org/freedesktop/NetworkManager") != 0))
+	if (!object_path || (strcmp (object_path, NM_DBUS_NMI_OBJECT_PATH) != 0))
 		return (DBUS_HANDLER_RESULT_NOT_YET_HANDLED);

-	if (dbus_message_is_signal (message, "org.freedesktop.NetworkManager", "AllowedNetworkUpdate"))
+	if (dbus_message_is_signal (message, NM_DBUS_NMI_NAMESPACE, "AllowedNetworkUpdate"))
 	{
 		char			*network = NULL;
 		DBusError		 error;
-fprintf( stderr, "nmi_filter(): got signal AllowedNetworkUpdate\n");

 		dbus_error_init (&error);
 		if (!dbus_message_get_args (message, &error, DBUS_TYPE_STRING, &network, DBUS_TYPE_INVALID))
 			return (DBUS_HANDLER_RESULT_NOT_YET_HANDLED);

-fprintf( stderr, "nmi_filter(): updating network '%s'\n", network);
 		nm_ap_list_update_network (data, network);
 		dbus_free (network);
 	}
@ -1071,9 +1057,9 @@ DBusConnection *nm_dbus_init (NMData *data)

 	dbus_bus_add_match (connection,
 				"type='signal',"
-				"interface='org.freedesktop.NetworkManagerInfo',"
-				"sender='org.freedesktop.NetworkManagerInfo',"
-				"path='/org/freedesktop/NetworkManagerInfo'", &dbus_error);
+				"interface='"NM_DBUS_NMI_NAMESPACE"',"
+				"sender='"NM_DBUS_NMI_NAMESPACE"',"
+				"path='"NM_DBUS_NMI_OBJECT_PATH"'", &dbus_error);

 	return (connection);
 }
--- a/src/NetworkManagerDbus.h
+++ b/src/NetworkManagerDbus.h
@ -31,6 +31,8 @@
 #define	NM_DBUS_NM_NAMESPACE				"org.freedesktop.NetworkManager"
 #define	NM_DBUS_DEVICES_OBJECT_PATH_PREFIX		"/org/freedesktop/NetworkManager/Devices"
 #define	NM_DBUS_DEVICES_NAMESPACE			"org.freedesktop.NetworkManager.Devices"
+#define	NM_DBUS_NMI_OBJECT_PATH				"/org/freedesktop/NetworkManagerInfo"
+#define	NM_DBUS_NMI_NAMESPACE				"org.freedesktop.NetworkManagerInfo"


 DBusConnection *	nm_dbus_init						(NMData *data);