dbus/glib dbus-gobject.c,1.15,1.16 dbus-gparser.c,1.8,1.9

[Havoc Pennington]

Update of /cvs/dbus/dbus/glib
In directory gabe:/tmp/cvs-serv18909/glib

Modified Files:
	dbus-gobject.c dbus-gparser.c 
Log Message:
2005-01-30  Havoc Pennington  <hp at redhat.com>

	* glib/dbus-gobject.c (introspect_properties): fix the XML
	generated

	* dbus/dbus-message.c (dbus_message_unref): add an in_cache flag
	which effectively detects the use of freed messages

	* glib/dbus-gobject.c (handle_introspect): modify and return the
	reply message instead of the incoming message

	* dbus/dbus-object-tree.c (handle_default_introspect_unlocked):
	gee, maybe it should SEND THE XML instead of just making a string
	and freeing it again ;-)

	* tools/dbus-print-message.c (print_message): improve printing of
	messages

	* configure.in: add debug-glib.service to the output



Index: dbus-gobject.c
===================================================================
RCS file: /cvs/dbus/dbus/glib/dbus-gobject.c,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -d -r1.15 -r1.16
--- dbus-gobject.c	30 Jan 2005 05:18:44 -0000	1.15
+++ dbus-gobject.c	30 Jan 2005 07:44:08 -0000	1.16
@@ -204,7 +204,7 @@
           g_string_append (xml, s);
           g_string_append (xml, "\" type=\"");
           g_string_append (xml, _dbus_gutils_type_to_string (dbus_type));
-          g_string_append (xml, "\" access=\"\n");
+          g_string_append (xml, "\" access=\"");
 
           if (can_set && can_get)
             g_string_append (xml, "readwrite");
@@ -216,7 +216,7 @@
               g_string_append (xml, "write");
             }
           
-          g_string_append (xml, "\">\n");
+          g_string_append (xml, "\"/>\n");
         }
       
       g_free (s);
@@ -329,12 +329,12 @@
   if (ret == NULL)
     g_error ("Out of memory");
 
-  dbus_message_append_args (message,
+  dbus_message_append_args (ret,
                             DBUS_TYPE_STRING, &xml->str,
                             DBUS_TYPE_INVALID);
 
-  dbus_connection_send (connection, message, NULL);
-  dbus_message_unref (message);
+  dbus_connection_send (connection, ret, NULL);
+  dbus_message_unref (ret);
 
   g_string_free (xml, TRUE);
 

Index: dbus-gparser.c
===================================================================
RCS file: /cvs/dbus/dbus/glib/dbus-gparser.c,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -d -r1.8 -r1.9
--- dbus-gparser.c	29 Jan 2005 19:52:19 -0000	1.8
+++ dbus-gparser.c	30 Jan 2005 07:44:08 -0000	1.9
@@ -483,6 +483,8 @@
     return DBUS_TYPE_BYTE;
   else if (strcmp (str, "object") == 0)
     return DBUS_TYPE_OBJECT_PATH;
+  else if (strcmp (str, "variant") == 0)
+    return DBUS_TYPE_VARIANT;
   else
     return DBUS_TYPE_INVALID;
 }