0.11 released

[Colin Walters]

--=-jpHhVyidqYBomr8F34yB
Content-Type: text/plain
Content-Transfer-Encoding: 7bit

On Thu, 2003-05-15 at 16:14, Havoc Pennington wrote:
> Hi,
> 
> ... and today's dumb noticed-just-after-release bug is that it only
> compiles on x86. Fixed in CVS.

The session bus seems to refuse to launch unless
$(libdir)/dbus-1.0/services/ exists.  Patch attached.  I also added a
--session argument to dbus-monitor.

OK to commit?


--=-jpHhVyidqYBomr8F34yB
Content-Disposition: attachment; filename=dbus-stuff.patch
Content-Type: text/x-patch; name=dbus-stuff.patch; charset=UTF-8
Content-Transfer-Encoding: quoted-printable

Index: ChangeLog
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
RCS file: /home/freedesktop/dbus/ChangeLog,v
retrieving revision 1.358
diff -u -d -r1.358 ChangeLog
--- ChangeLog	15 May 2003 20:11:33 -0000	1.358
+++ ChangeLog	16 May 2003 07:21:10 -0000
@@ -1,3 +1,13 @@
+2003-05-16  Colin Walters  <walters@verbum.org>
+
+	* tools/dbus-monitor.c: Add --session argument and usage()
+	function.
+
+	* tools/dbus-monitor.1: Update with new --session arg.
+
+	* bus/Makefile.am (install-data-hook): Create
+	$(libdir)/dbus-1.0/services so that the session bus is happy.
+
 2003-05-15  Havoc Pennington  <hp@redhat.com>
=20
 	* dbus/dbus-sysdeps.c (_dbus_atomic_dec, _dbus_atomic_inc): work
Index: tools/dbus-monitor.c
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
RCS file: /home/freedesktop/dbus/tools/dbus-monitor.c,v
retrieving revision 1.2
diff -u -d -r1.2 dbus-monitor.c
--- tools/dbus-monitor.c	24 Apr 2003 02:22:49 -0000	1.2
+++ tools/dbus-monitor.c	16 May 2003 07:21:06 -0000
@@ -89,6 +89,13 @@
   return DBUS_HANDLER_RESULT_ALLOW_MORE_HANDLERS;
 }
=20
+static void
+usage (char *name, int ecode)
+{
+  fprintf (stderr, "Usage: %s [--session]\n", name);
+  exit (ecode);
+}
+
 int
 main (int argc, char *argv[])
 {
@@ -97,6 +104,24 @@
   DBusBusType type =3D DBUS_BUS_SYSTEM;
   DBusMessageHandler *handler;
   GMainLoop *loop;
+  int i;
+
+  for (i =3D 1; i < argc; i++)
+    {
+      char *arg =3D argv[i];
+
+      if (!strcmp (arg, "--session"))
+	type =3D DBUS_BUS_SESSION;
+      else if (!strcmp (arg, "--help"))
+	usage (argv[0], 0);
+      else if (!strcmp (arg, "--"))
+	break;
+      else if (arg[0] =3D=3D '-')
+	usage (argv[0], 1);
+    }
+
+  if (argc > 2)
+    usage (argv[0], 1);
=20
   loop =3D g_main_loop_new (NULL, FALSE);
=20
Index: tools/dbus-monitor.1
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
RCS file: /home/freedesktop/dbus/tools/dbus-monitor.1,v
retrieving revision 1.1
diff -u -d -r1.1 dbus-monitor.1
--- tools/dbus-monitor.1	3 May 2003 22:03:16 -0000	1.1
+++ tools/dbus-monitor.1	16 May 2003 07:21:06 -0000
@@ -8,6 +8,7 @@
 .SH SYNOPSIS
 .PP
 .B dbus-monitor
+[\-\-session]
=20
 .SH DESCRIPTION
=20
@@ -20,9 +21,8 @@
 There are two well-known message buses: the systemwide message bus
 (installed on many systems as the "messagebus" service) and the
 per-user-login-session message bus (started each time a user logs in).
-Right now, \fIdbus-monitor\fP is hardcoded to only work with the
-systemwide message bus. It should really be extended to have a
-\-\-session command line option as with \fIdbus-send\fP.
+\fIdbus-monitor\fP by default monitors the systemwide bus; to monitor the
+session bus, specify \-\-session.
=20
 .PP=20
 The message bus configuration may keep \fIdbus-monitor\fP from seeing
Index: bus/Makefile.am
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
RCS file: /home/freedesktop/dbus/bus/Makefile.am,v
retrieving revision 1.26
diff -u -d -r1.26 Makefile.am
--- bus/Makefile.am	15 May 2003 19:59:19 -0000	1.26
+++ bus/Makefile.am	16 May 2003 07:21:07 -0000
@@ -86,6 +86,7 @@
 install-data-hook:
 	$(mkinstalldirs) $(DESTDIR)/$(localstatedir)/run/dbus
 	$(mkinstalldirs) $(DESTDIR)/$(configdir)/system.d
+	$(mkinstalldirs) $(DESTDIR)/$(libdir)/dbus-1.0/services
=20
 #### Init scripts fun
 SCRIPT_IN_FILES=3Dmessagebus.in

--=-jpHhVyidqYBomr8F34yB--