[Galago-commits] r2379 - in trunk/galago-python: . src
galago-commits at freedesktop.org
galago-commits at freedesktop.org
Wed Dec 14 00:45:13 PST 2005
Author: chipx86
Date: 2005-12-14 00:45:10 -0800 (Wed, 14 Dec 2005)
New Revision: 2379
Modified:
trunk/galago-python/ChangeLog
trunk/galago-python/src/galago.defs
trunk/galago-python/src/galago.override
Log:
Updated for the libgalago object attributes support.
Modified: trunk/galago-python/ChangeLog
===================================================================
--- trunk/galago-python/ChangeLog 2005-12-14 08:36:09 UTC (rev 2378)
+++ trunk/galago-python/ChangeLog 2005-12-14 08:45:10 UTC (rev 2379)
@@ -1,3 +1,9 @@
+Wed Dec 14 00:44:19 PST 2005 Christian Hammond <chipx86 at chipx86.com>
+
+ * src/galago.defs:
+ * src/galago.override:
+ - Updated for the libgalago object attributes support.
+
Sun Dec 04 03:15:17 PST 2005 Christian Hammond <chipx86 at chipx86.com>
* src/galago.defs:
Modified: trunk/galago-python/src/galago.defs
===================================================================
--- trunk/galago-python/src/galago.defs 2005-12-14 08:36:09 UTC (rev 2378)
+++ trunk/galago-python/src/galago.defs 2005-12-14 08:45:10 UTC (rev 2379)
@@ -79,18 +79,6 @@
)
)
-(define-enum PropertyType
- (in-module "Galago")
- (c-name "GalagoPropertyType")
- (gtype-id "GALAGO_TYPE_PROPERTY_TYPE")
- (values
- '("unknown" "GALAGO_PROPERTY_TYPE_UNKNOWN")
- '("string" "GALAGO_PROPERTY_TYPE_STRING")
- '("bool" "GALAGO_PROPERTY_TYPE_BOOL")
- '("uint32" "GALAGO_PROPERTY_TYPE_UINT32")
- )
-)
-
(define-flags ServiceFlags
(in-module "Galago")
(c-name "GalagoServiceFlags")
@@ -689,8 +677,93 @@
(return-type "GalagoContext*")
)
+(define-method set_attr_string
+ (of-object "GalagoObject")
+ (c-name "galago_object_set_attr_string")
+ (return-type "none")
+ (parameters
+ '("const-char*" "name")
+ '("const-char*" "value")
+ )
+)
+(define-method set_attr_bool
+ (of-object "GalagoObject")
+ (c-name "galago_object_set_attr_bool")
+ (return-type "none")
+ (parameters
+ '("const-char*" "name")
+ '("gboolean" "value")
+ )
+)
+(define-method set_attr_uint32
+ (of-object "GalagoObject")
+ (c-name "galago_object_set_attr_uint32")
+ (return-type "none")
+ (parameters
+ '("const-char*" "name")
+ '("guint32" "value")
+ )
+)
+
+(define-method set_attribute
+ (of-object "GalagoObject")
+ (c-name "galago_object_set_attribute")
+ (return-type "none")
+ (parameters
+ '("const-char*" "name")
+ '("GValue*" "value")
+ )
+)
+
+(define-method remove_attribute
+ (of-object "GalagoObject")
+ (c-name "galago_object_remove_attribute")
+ (return-type "gboolean")
+ (parameters
+ '("const-char*" "name")
+ )
+)
+
+(define-method get_attr_string
+ (of-object "GalagoObject")
+ (c-name "galago_object_get_attr_string")
+ (return-type "const-char*")
+ (parameters
+ '("const-char*" "name")
+ )
+)
+
+(define-method get_attr_bool
+ (of-object "GalagoObject")
+ (c-name "galago_object_get_attr_bool")
+ (return-type "gboolean")
+ (parameters
+ '("const-char*" "name")
+ )
+)
+
+(define-method get_attr_uint32
+ (of-object "GalagoObject")
+ (c-name "galago_object_get_attr_uint32")
+ (return-type "guint32")
+ (parameters
+ '("const-char*" "name")
+ )
+)
+
+(define-method get_attribute
+ (of-object "GalagoObject")
+ (c-name "galago_object_get_attribute")
+ (return-type "const-GValue*")
+ (parameters
+ '("const-char*" "name")
+ )
+)
+
+
+
;; From /usr/include/libgalago/galago-person.h
(define-function galago_person_get_type
@@ -793,92 +866,7 @@
)
)
-(define-method set_property_string
- (of-object "GalagoPerson")
- (c-name "galago_person_set_property_string")
- (return-type "none")
- (parameters
- '("const-char*" "name")
- '("const-char*" "value")
- )
-)
-(define-method set_property_bool
- (of-object "GalagoPerson")
- (c-name "galago_person_set_property_bool")
- (return-type "none")
- (parameters
- '("const-char*" "name")
- '("gboolean" "value")
- )
-)
-
-(define-method set_property_uint32
- (of-object "GalagoPerson")
- (c-name "galago_person_set_property_uint32")
- (return-type "none")
- (parameters
- '("const-char*" "name")
- '("guint32" "value")
- )
-)
-
-(define-method set_property
- (of-object "GalagoPerson")
- (c-name "galago_person_set_property")
- (return-type "none")
- (parameters
- '("const-char*" "name")
- '("GalagoValue*" "value")
- )
-)
-
-(define-method remove_property
- (of-object "GalagoPerson")
- (c-name "galago_person_remove_property")
- (return-type "gboolean")
- (parameters
- '("const-char*" "name")
- )
-)
-
-(define-method get_property_string
- (of-object "GalagoPerson")
- (c-name "galago_person_get_property_string")
- (return-type "const-char*")
- (parameters
- '("const-char*" "name")
- )
-)
-
-(define-method get_property_bool
- (of-object "GalagoPerson")
- (c-name "galago_person_get_property_bool")
- (return-type "gboolean")
- (parameters
- '("const-char*" "name")
- )
-)
-
-(define-method get_property_uint32
- (of-object "GalagoPerson")
- (c-name "galago_person_get_property_uint32")
- (return-type "guint32")
- (parameters
- '("const-char*" "name")
- )
-)
-
-(define-method get_property
- (of-object "GalagoPerson")
- (c-name "galago_person_get_property")
- (return-type "const-GalagoValue*")
- (parameters
- '("const-char*" "name")
- )
-)
-
-
;; From /usr/include/libgalago/galago-presence.h
(define-function galago_presence_get_type
Modified: trunk/galago-python/src/galago.override
===================================================================
--- trunk/galago-python/src/galago.override 2005-12-14 08:36:09 UTC (rev 2378)
+++ trunk/galago-python/src/galago.override 2005-12-14 08:45:10 UTC (rev 2379)
@@ -270,73 +270,55 @@
return Py_None;
}
%%
-override galago_person_get_accounts kwargs
+override galago_object_get_attribute kwargs
static PyObject *
-_wrap_galago_person_get_accounts(PyGObject *self, PyObject *args,
- PyObject *kwargs)
+_wrap_galago_object_get_attribute(PyGObject *self, PyObject *args,
+ PyObject *kwargs)
{
- static char *kwlist[] = { "query", NULL };
- PyObject *query = Py_True;
-
- if (!PyArg_ParseTupleAndKeywords(args, kwargs,
- "|O:GalagoPerson.get_accounts",
- kwlist, &query))
- {
- return NULL;
- }
-
- return pygalago_wrap_gobj_list(
- galago_person_get_accounts(GALAGO_PERSON(self->obj),
- PyObject_IsTrue(query)));
-}
-%%
-override galago_person_get_property kwargs
-static PyObject *
-_wrap_galago_person_get_property(PyGObject *self, PyObject *args,
- PyObject *kwargs)
-{
static char *kwlist[] = { "name", NULL };
char *name;
- const GalagoValue *value;
+ const GValue *value;
if (!PyArg_ParseTupleAndKeywords(args, kwargs,
- "s:GalagoPerson.get_property",
+ "s:GalagoObject.get_attribute",
kwlist, &name))
{
return NULL;
}
- value = galago_person_get_property(GALAGO_PERSON(self->obj), name);
+ value = galago_object_get_attribute(GALAGO_OBJECT(self->obj), name);
- switch (galago_value_get_type(value))
+ if (G_VALUE_HOLDS(value, G_TYPE_STRING))
{
- case GALAGO_VALUE_TYPE_STRING:
- return PyString_FromString(galago_value_get_string(value));
-
- case GALAGO_VALUE_TYPE_BOOLEAN:
- return PyBool_FromLong(galago_value_get_boolean(value));
-
- case GALAGO_VALUE_TYPE_UINT:
- return PyLong_FromLong(galago_value_get_uint(value));
-
- default:
- /* TODO: Put out some kind of warning */
- Py_INCREF(Py_None);
- return Py_None;
+ return PyString_FromString(g_value_get_string(value));
}
+ else if (G_VALUE_HOLDS(value, G_TYPE_BOOLEAN))
+ {
+ return PyBool_FromLong(g_value_get_boolean(value));
+ }
+ else if (G_VALUE_HOLDS(value, G_TYPE_INT))
+ {
+ return PyLong_FromLong(g_value_get_int(value));
+ }
+ else
+ {
+ /* TODO: Put out some kind of warning */
+ Py_INCREF(Py_None);
+ return Py_None;
+ }
}
%%
-override galago_person_set_property kwargs
+override galago_object_set_attribute kwargs
static PyObject *
-_wrap_galago_person_set_property(PyGObject *self, PyObject *args,
- PyObject *kwargs)
+_wrap_galago_object_set_attribute(PyGObject *self, PyObject *args,
+ PyObject *kwargs)
{
static char *kwlist[] = { "name", "value", NULL };
char *name;
PyObject *value;
if (!PyArg_ParseTupleAndKeywords(args, kwargs,
- "sO:GalagoPerson.set_property",
+ "sO:GalagoObject.set_attribute",
kwlist, &name, &value))
{
return NULL;
@@ -344,18 +326,18 @@
if (PyString_Check(value))
{
- galago_person_set_property_string(GALAGO_PERSON(self->obj), name,
- PyString_AsString(value));
+ galago_object_set_attr_string(GALAGO_OBJECT(self->obj), name,
+ PyString_AsString(value));
}
else if (PyBool_Check(value))
{
- galago_person_set_property_bool(GALAGO_PERSON(self->obj), name,
- PyObject_IsTrue(value));
+ galago_object_set_attr_bool(GALAGO_OBJECT(self->obj), name,
+ PyObject_IsTrue(value));
}
else if (PyLong_Check(value))
{
- galago_person_set_property_uint32(GALAGO_PERSON(self->obj), name,
- PyLong_AsLong(value));
+ galago_object_set_attr_int(GALAGO_OBJECT(self->obj), name,
+ PyLong_AsLong(value));
}
else
{
@@ -367,6 +349,26 @@
return Py_None;
}
%%
+override galago_person_get_accounts kwargs
+static PyObject *
+_wrap_galago_person_get_accounts(PyGObject *self, PyObject *args,
+ PyObject *kwargs)
+{
+ static char *kwlist[] = { "query", NULL };
+ PyObject *query = Py_True;
+
+ if (!PyArg_ParseTupleAndKeywords(args, kwargs,
+ "|O:GalagoPerson.get_accounts",
+ kwlist, &query))
+ {
+ return NULL;
+ }
+
+ return pygalago_wrap_gobj_list(
+ galago_person_get_accounts(GALAGO_PERSON(self->obj),
+ PyObject_IsTrue(query)));
+}
+%%
override galago_presence_set_statuses kwargs
static PyObject *
_wrap_galago_presence_set_statuses(PyGObject *self, PyObject *args,
More information about the galago-commits
mailing list