2007-06-15 Havoc Pennington <hp@redhat.com>

	* dbus/dbus-sysdeps-unix.c (_dbus_append_session_config_file)
	(_dbus_append_system_config_file): new functions

	* bus/main.c (main): use _dbus_append_system_config_file() and
	_dbus_append_session_config_file()

	* dbus/Makefile.am (INCLUDES): move DBUS_SYSTEM_CONFIG_FILE and
	DBUS_SESSION_CONFIG_FILE into this makefile

diff --git a/ChangeLog b/ChangeLog
index d80ed401077a3de6970c1040cee054edfb720a19..e89abd6c5a4b52c8bb79c21102678db80f730cff 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,14 @@
+2007-06-15  Havoc Pennington  <hp@redhat.com>
+
+       * dbus/dbus-sysdeps-unix.c (_dbus_append_session_config_file)
+       (_dbus_append_system_config_file): new functions
+
+       * bus/main.c (main): use _dbus_append_system_config_file() and 
+       _dbus_append_session_config_file()
+
+       * dbus/Makefile.am (INCLUDES): move DBUS_SYSTEM_CONFIG_FILE and
+       DBUS_SESSION_CONFIG_FILE into this makefile
+
 2007-06-15  Havoc Pennington  <hp@redhat.com>
 
        * dbus/dbus-sysdeps.c (_dbus_set_errno_to_zero)

diff --git a/bus/Makefile.am b/bus/Makefile.am
index 0ba5f34139da9f9f26e738f899cb9cff61d5994d..f7fec99a3a0e71044180b79336800f8a7906ea7a 100644 (file)
--- a/bus/Makefile.am
+++ b/bus/Makefile.am
@@ -2,9 +2,7 @@
 configdir=$(sysconfdir)/dbus-1
 
 INCLUDES=-I$(top_srcdir) $(DBUS_BUS_CFLAGS)                            \
-       -DDAEMON_NAME=\"dbus-daemon\"  -DDBUS_COMPILATION               \
-       -DDBUS_SYSTEM_CONFIG_FILE=\""$(configdir)/system.conf"\"        \
-       -DDBUS_SESSION_CONFIG_FILE=\""$(configdir)/session.conf"\"
+       -DDAEMON_NAME=\"dbus-daemon\"  -DDBUS_COMPILATION
 
 EFENCE=
 

diff --git a/bus/main.c b/bus/main.c
index f33ac2a367f5487b3b53741c7ca876fffd9b2c80..08f2eb538d9b517b6c490878d3966508ba64777f 100644 (file)
--- a/bus/main.c
+++ b/bus/main.c
@@ -291,21 +291,15 @@ main (int argc, char **argv)
         {
           check_two_config_files (&config_file, "system");
 
-          if (!_dbus_string_append (&config_file, DBUS_SYSTEM_CONFIG_FILE))
+          if (!_dbus_append_system_config_file (&config_file))
             exit (1);
         }
       else if (strcmp (arg, "--session") == 0)
         {
           check_two_config_files (&config_file, "session");
 
-#ifdef DBUS_WIN
-          if (!_dbus_get_config_file_name (&config_file,"session.conf"))
+          if (!_dbus_append_session_config_file (&config_file))
             exit (1);
-          /* don't know how to map DBUS_SESSION_CONFIG_FILE to the function above */
-#else
-          if (!_dbus_string_append (&config_file, DBUS_SESSION_CONFIG_FILE))
-            exit (1);
-#endif
         }
       else if (strstr (arg, "--config-file=") == arg)
         {

diff --git a/dbus/Makefile.am b/dbus/Makefile.am
index d27ca6f4bd85d3188502f9eeb6bb5d08ed479a34..81f90b9b9d5cd7a24f873f5d19ca8a25ffd8da92 100644 (file)
--- a/dbus/Makefile.am
+++ b/dbus/Makefile.am
@@ -1,7 +1,10 @@
 
 configdir=$(sysconfdir)/dbus-1
 
-INCLUDES=-I$(top_builddir) -I$(top_srcdir) $(DBUS_CLIENT_CFLAGS) -DDBUS_COMPILATION -DDBUS_MACHINE_UUID_FILE=\""$(localstatedir)/lib/dbus/machine-id"\"
+INCLUDES=-I$(top_builddir) -I$(top_srcdir) $(DBUS_CLIENT_CFLAGS) -DDBUS_COMPILATION    \
+       -DDBUS_MACHINE_UUID_FILE=\""$(localstatedir)/lib/dbus/machine-id"\"             \
+       -DDBUS_SYSTEM_CONFIG_FILE=\""$(configdir)/system.conf"\"                        \
+       -DDBUS_SESSION_CONFIG_FILE=\""$(configdir)/session.conf"\"
 
 dbusincludedir=$(includedir)/dbus-1.0/dbus
 dbusarchincludedir=$(libdir)/dbus-1.0/include/dbus

diff --git a/dbus/dbus-sysdeps-unix.c b/dbus/dbus-sysdeps-unix.c
index 1e4cf8dd0bc3b2effbdcce8566696076091da2fe..ea8abcff91e55860019aa3c01400bcac7526c118 100644 (file)
--- a/dbus/dbus-sysdeps-unix.c
+++ b/dbus/dbus-sysdeps-unix.c
@@ -2905,6 +2905,32 @@ _dbus_get_standard_session_servicedirs (DBusList **dirs)
   return FALSE;
 }
 
+/**
+ * Append the absolute path of the system.conf file
+ * (there is no system bus on Windows so this can just
+ * return FALSE and print a warning or something)
+ * 
+ * @param str the string to append to
+ * @returns #FALSE if no memory
+ */
+dbus_bool_t
+_dbus_append_system_config_file (DBusString *str)
+{
+  return _dbus_string_append (str, DBUS_SYSTEM_CONFIG_FILE);
+}
+
+/**
+ * Append the absolute path of the session.conf file.
+ * 
+ * @param str the string to append to
+ * @returns #FALSE if no memory
+ */
+dbus_bool_t
+_dbus_append_session_config_file (DBusString *str)
+{
+  return _dbus_string_append (str, DBUS_SESSION_CONFIG_FILE);
+}
+
 /**
  * Called when the bus daemon is signaled to reload its configuration; any
  * caches should be nuked. Of course any caches that need explicit reload

diff --git a/dbus/dbus-sysdeps.h b/dbus/dbus-sysdeps.h
index 49524e3b7716d1a181aea6e5291d457057f2a0d1..069d9ace7dd43f89f2540cf58e6bf2186301b0f1 100644 (file)
--- a/dbus/dbus-sysdeps.h
+++ b/dbus/dbus-sysdeps.h
@@ -261,6 +261,9 @@ dbus_bool_t _dbus_path_is_absolute    (const DBusString *filename);
 
 dbus_bool_t _dbus_get_standard_session_servicedirs (DBusList **dirs);
 
+dbus_bool_t _dbus_append_system_config_file  (DBusString *str);
+dbus_bool_t _dbus_append_session_config_file (DBusString *str);
+
 typedef struct {
   int fd_or_handle;
 } DBusPipe;