From: Anders Carlsson <andersca@codefactory.se>
Date: Thu, 19 Jun 2003 22:22:37 +0000 (+0000)
Subject: 2003-06-19  Philip Blundell  <philb@gnu.org>
X-Git-Tag: dbus-object-names-branchpoint~19
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=e94493fc116955bbf72a8896c48f2c119efacf7f;p=platform%2Fupstream%2Fdbus.git

2003-06-19  Philip Blundell  <philb@gnu.org>

	* tools/dbus-print-message.c (print_message): Handle BOOLEAN.

	* tools/dbus-send.c: Accept both --system and --session.

	* tools/dbus-monitor.c: Same here.
---

diff --git a/ChangeLog b/ChangeLog
index 74ea1e1..eb7cd6d 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+2003-06-19  Philip Blundell  <philb@gnu.org>
+
+	* tools/dbus-print-message.c (print_message): Handle BOOLEAN.
+
+	* tools/dbus-send.c: Accept both --system and --session.
+        
+	* tools/dbus-monitor.c: Same here.
+	
 2003-06-19  Anders Carlsson  <andersca@codefactory.se>
 
 	* glib/dbus-glib.h: Fix so that dbus-glib.h can be used
diff --git a/tools/dbus-monitor.c b/tools/dbus-monitor.c
index 0829506..dac1529 100644
--- a/tools/dbus-monitor.c
+++ b/tools/dbus-monitor.c
@@ -46,7 +46,7 @@ handler_func (DBusMessageHandler *handler,
 static void
 usage (char *name, int ecode)
 {
-  fprintf (stderr, "Usage: %s [--system]\n", name);
+  fprintf (stderr, "Usage: %s [--system | --session]\n", name);
   exit (ecode);
 }
 
@@ -66,6 +66,8 @@ main (int argc, char *argv[])
 
       if (!strcmp (arg, "--system"))
 	type = DBUS_BUS_SYSTEM;
+      else if (!strcmp (arg, "--session"))
+	type = DBUS_BUS_SESSION;
       else if (!strcmp (arg, "--help"))
 	usage (argv[0], 0);
       else if (!strcmp (arg, "--"))
diff --git a/tools/dbus-print-message.c b/tools/dbus-print-message.c
index fcf22b7..bb380ce 100644
--- a/tools/dbus-print-message.c
+++ b/tools/dbus-print-message.c
@@ -43,6 +43,7 @@ print_message (DBusMessage *message)
       dbus_int32_t int32;
       double d;
       unsigned char byte;
+      dbus_bool_t boolean;
 
       if (type == DBUS_TYPE_INVALID)
 	break;
@@ -74,6 +75,11 @@ print_message (DBusMessage *message)
 	  printf ("byte:%d\n", byte);
 	  break;
 
+	case DBUS_TYPE_BOOLEAN:
+	  boolean = dbus_message_iter_get_boolean (&iter);
+	  printf ("boolean:%s\n", boolean ? "true" : "false");
+	  break;
+
 	default:
 	  printf ("(unknown arg type %d)\n", type);
 	  break;
diff --git a/tools/dbus-send.c b/tools/dbus-send.c
index cada26a..12ad5c8 100644
--- a/tools/dbus-send.c
+++ b/tools/dbus-send.c
@@ -30,7 +30,7 @@
 static void
 usage (char *name, int ecode)
 {
-  fprintf (stderr, "Usage: %s [--help] [--session] [--dest=SERVICE] [--print-reply] <message type> [contents ...]\n", name);
+  fprintf (stderr, "Usage: %s [--help] [--system | --session] [--dest=SERVICE] [--print-reply] <message type> [contents ...]\n", name);
   exit (ecode);
 }
 
@@ -58,6 +58,8 @@ main (int argc, char *argv[])
 
       if (strcmp (arg, "--system") == 0)
 	type = DBUS_BUS_SYSTEM;
+      else if (strcmp (arg, "--session") == 0)
+	type = DBUS_BUS_SESSION;
       else if (strcmp (arg, "--print-reply") == 0)
         print_reply = TRUE;
       else if (strstr (arg, "--dest=") == arg)