dbus/tools dbus-launch.1,1.4,1.5 dbus-launch.c,1.8,1.9

[Havoc Pennington]

Update of /cvs/dbus/dbus/tools
In directory gabe:/tmp/cvs-serv31876/tools

Modified Files:
	dbus-launch.1 dbus-launch.c 
Log Message:

2005-01-18  Havoc Pennington  <hp@redhat.com>

	* rename dbus-daemon-1 to dbus-daemon throughout



Index: dbus-launch.1
===================================================================
RCS file: /cvs/dbus/dbus/tools/dbus-launch.1,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- dbus-launch.1	12 Oct 2003 05:59:39 -0000	1.4
+++ dbus-launch.1	18 Jan 2005 22:20:38 -0000	1.5
@@ -11,7 +11,7 @@
 
 .SH DESCRIPTION
 
-The \fIdbus-launch\fP command is used to start \fIdbus-daemon-1\fP
+The \fIdbus-launch\fP command is used to start \fIdbus-daemon\fP
 from a shell script. It would normally be called from a user's login
 scripts. Unlike the daemon itself, \fIdbus-launch\fP exits, so
 backticks or the $() construct can be used to read information from
@@ -40,7 +40,7 @@
 
 .PP
 See http://www.freedesktop.org/software/dbus/ for more information
-about D-BUS. See also the man page for \fIdbus-daemon-1\fP.
+about D-BUS. See also the man page for \fIdbus-daemon\fP.
 
 .PP
 Here is an example of how to use \fIdbus-launch\fP with an 
@@ -76,7 +76,7 @@
 .TP
 .I "--config-file=FILENAME"
 Pass \-\-config-file=FILENAME to the bus daemon, instead of passing it 
-the \-\-session argument. See the man page for dbus-daemon-1
+the \-\-session argument. See the man page for dbus-daemon
 
 .TP
 .I "--csh-syntax"

Index: dbus-launch.c
===================================================================
RCS file: /cvs/dbus/dbus/tools/dbus-launch.c,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -d -r1.8 -r1.9
--- dbus-launch.c	10 Aug 2004 03:07:01 -0000	1.8
+++ dbus-launch.c	18 Jan 2005 22:20:38 -0000	1.9
@@ -756,7 +756,7 @@
       verbose ("=== Bus exec process created\n");
       
       /* Now we are the bus process (well, almost;
-       * dbus-daemon-1 itself forks again)
+       * dbus-daemon itself forks again)
        */
       close (bus_pid_to_launcher_pipe[READ_END]);
       close (bus_address_to_launcher_pipe[READ_END]);
@@ -771,8 +771,8 @@
 
       verbose ("Calling exec()\n");
       
-      execlp ("dbus-daemon-1",
-              "dbus-daemon-1",
+      execlp ("dbus-daemon",
+              "dbus-daemon",
               "--fork",
               "--print-pid", write_pid_fd_as_string,
               "--print-address", write_address_fd_as_string,