dbus/python dbus_bindings.pyx,1.18,1.19

Robert McQueen robot101 at freedesktop.org
Sun Nov 27 08:55:11 PST 2005


Update of /cvs/dbus/dbus/python
In directory gabe:/tmp/cvs-serv19141/python

Modified Files:
	dbus_bindings.pyx 
Log Message:
2005-11-27  Carlos Garcia Campos  <carlosgc at gnome.org>

	* glib/dbus-gobject.c: Append a GValue instead of a basic type in
	method return message for property getters

Index: dbus_bindings.pyx
===================================================================
RCS file: /cvs/dbus/dbus/python/dbus_bindings.pyx,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -d -r1.18 -r1.19
--- dbus_bindings.pyx	27 Nov 2005 16:40:57 -0000	1.18
+++ dbus_bindings.pyx	27 Nov 2005 16:55:09 -0000	1.19
@@ -1053,10 +1053,7 @@
             tmp_sig = sig[1:-1]
             retval = self.append_struct(value, signature = tmp_sig)
         elif sig_type == TYPE_VARIANT:
-            if isinstance(value, Variant):
-                retval = self.append_variant(value)
-            else:
-                retval = self.append_variant(Variant(value))
+            retval = self.append_variant(Variant(value))
         elif sig_type == DICT_ENTRY_BEGIN:
             raise TypeError, "Signiture is invalid in append_strict. A dict entry must be part of an array." 
         else:
@@ -1751,9 +1748,8 @@
 
     return retval
 
-NAME_FLAG_ALLOW_REPLACEMENT    = 0x1
+NAME_FLAG_PROHIBIT_REPLACEMENT = 0x1
 NAME_FLAG_REPLACE_EXISTING     = 0x2
-NAME_FLAG_DO_NOT_QUEUE         = 0x4
 
 REQUEST_NAME_REPLY_PRIMARY_OWNER = 1
 REQUEST_NAME_REPLY_IN_QUEUE      = 2



More information about the dbus-commit mailing list