[Galago-commits] r2350 - in trunk/galago-python: . src tests
galago-commits at freedesktop.org
galago-commits at freedesktop.org
Sun Nov 27 21:18:03 PST 2005
Author: chipx86
Date: 2005-11-27 21:18:00 -0800 (Sun, 27 Nov 2005)
New Revision: 2350
Added:
trunk/galago-python/tests/avatar.png
Modified:
trunk/galago-python/ChangeLog
trunk/galago-python/src/galago.defs
trunk/galago-python/src/galago.override
trunk/galago-python/tests/Makefile.am
trunk/galago-python/tests/presence-feed.py
Log:
- Added avatar.png for the presence-feed test.
- Update for the many changes that have gone into libgalago recently.
- Change the constructor definitions to set properties instead of calling the _new() function. I'm doing as the noisy generator errors command me.
Modified: trunk/galago-python/ChangeLog
===================================================================
--- trunk/galago-python/ChangeLog 2005-11-28 05:15:42 UTC (rev 2349)
+++ trunk/galago-python/ChangeLog 2005-11-28 05:18:00 UTC (rev 2350)
@@ -1,3 +1,16 @@
+Sun Nov 27 21:15:59 PST 2005 Christian Hammond <chipx86 at chipx86.com>
+
+ A tests/avatar.png:
+ * src/galago.defs:
+ * src/galago.override:
+ * tests/Makefile.am:
+ * tests/presence-feed.py:
+ - Added avatar.png for the presence-feed test.
+ - Update for the many changes that have gone into libgalago recently.
+ - Change the constructor definitions to set properties instead of
+ calling the _new() function. I'm doing as the noisy generator errors
+ command me.
+
Fri Nov 11 03:00:26 PST 2005 Christian Hammond <chipx86 at chipx86.com>
* tests/get-presence.py:
Modified: trunk/galago-python/src/galago.defs
===================================================================
--- trunk/galago-python/src/galago.defs 2005-11-28 05:15:42 UTC (rev 2349)
+++ trunk/galago-python/src/galago.defs 2005-11-28 05:18:00 UTC (rev 2350)
@@ -14,13 +14,6 @@
(gtype-id "GALAGO_TYPE_IMAGE")
)
-(define-object Avatar
- (in-module "Galago")
- (parent "GalagoImage")
- (c-name "GalagoAvatar")
- (gtype-id "GALAGO_TYPE_AVATAR")
-)
-
(define-object Context
(in-module "Galago")
(parent "GalagoObject")
@@ -42,13 +35,6 @@
(gtype-id "GALAGO_TYPE_PERSON")
)
-(define-object Photo
- (in-module "Galago")
- (parent "GalagoImage")
- (c-name "GalagoPhoto")
- (gtype-id "GALAGO_TYPE_PHOTO")
-)
-
(define-object Presence
(in-module "Galago")
(parent "GalagoObject")
@@ -190,6 +176,12 @@
(return-type "GType")
)
+(define-method create_presence
+ (of-object "GalagoAccount")
+ (c-name "galago_account_create_presence")
+ (return-type "GalagoPresence*")
+)
+
(define-method set_connected
(of-object "GalagoAccount")
(c-name "galago_account_set_connected")
@@ -313,55 +305,20 @@
(c-name "galago_account_set_avatar")
(return-type "none")
(parameters
- '("GalagoAvatar*" "avatar")
+ '("GalagoImage*" "avatar")
)
)
(define-method get_avatar
(of-object "GalagoAccount")
(c-name "galago_account_get_avatar")
- (return-type "GalagoAvatar*")
+ (return-type "GalagoImage*")
(parameters
'("gboolean" "query" (default "TRUE"))
)
)
-
-;; From /usr/include/libgalago/galago-assert.h
-
-
-
-;; From /usr/include/libgalago/galago-avatar.h
-
-(define-function galago_avatar_get_type
- (c-name "galago_avatar_get_type")
- (return-type "GType")
-)
-
-(define-function galago_avatar_new
- (c-name "galago_avatar_new")
- (is-constructor-of "GalagoAvatar")
- (return-type "GalagoAvatar*")
- (parameters
- '("GalagoAccount*" "account")
- '("const-guchar*" "data")
- '("gsize" "len")
- )
-)
-
-(define-method get_account
- (of-object "GalagoAvatar")
- (c-name "galago_avatar_get_account")
- (return-type "GalagoAccount*")
-)
-
-
-
-;; From /usr/include/libgalago/galago-context-base.h
-
-
-
;; From /usr/include/libgalago/galago-context.h
(define-function galago_context_get_type
@@ -796,14 +753,14 @@
(c-name "galago_person_set_photo")
(return-type "none")
(parameters
- '("GalagoPhoto*" "photo")
+ '("GalagoImage*" "photo")
)
)
(define-method get_photo
(of-object "GalagoPerson")
(c-name "galago_person_get_photo")
- (return-type "GalagoPhoto*")
+ (return-type "GalagoImage*")
(parameters
'("gboolean" "query" (default "TRUE"))
)
@@ -948,33 +905,6 @@
)
-
-;; From /usr/include/libgalago/galago-photo.h
-
-(define-function galago_photo_get_type
- (c-name "galago_photo_get_type")
- (return-type "GType")
-)
-
-(define-function galago_photo_new
- (c-name "galago_photo_new")
- (is-constructor-of "GalagoPhoto")
- (return-type "GalagoPhoto*")
- (parameters
- '("GalagoPerson*" "person")
- '("const-guchar*" "data")
- '("gsize" "len")
- )
-)
-
-(define-method get_person
- (of-object "GalagoPhoto")
- (c-name "galago_photo_get_person")
- (return-type "GalagoPerson*")
-)
-
-
-
;; From /usr/include/libgalago/galago-presence.h
(define-function galago_presence_get_type
@@ -982,15 +912,6 @@
(return-type "GType")
)
-(define-function galago_presence_new
- (c-name "galago_presence_new")
- (is-constructor-of "GalagoPresence")
- (return-type "GalagoPresence*")
- (parameters
- '("GalagoAccount*" "account")
- )
-)
-
(define-method set_idle
(of-object "GalagoPresence")
(c-name "galago_presence_set_idle")
@@ -1217,11 +1138,11 @@
(c-name "galago_status_new")
(is-constructor-of "GalagoStatus")
(return-type "GalagoStatus*")
- (parameters
- '("GalagoStatusType" "type")
- '("const-char*" "id")
- '("const-char*" "name")
- '("gboolean" "exclusive")
+ (properties
+ '("primitive")
+ '("id")
+ '("name")
+ '("exclusive")
)
)
@@ -1411,265 +1332,3 @@
(c-name "galago_status_attr_get_double")
(return-type "double")
)
-
-
-
-;; From /usr/include/libgalago/galago-value.h
-
-(define-function galago_value_new
- (c-name "galago_value_new")
- (is-constructor-of "GalagoValue")
- (return-type "GalagoValue*")
- (parameters
- '("GalagoType" "type")
- '("const-void*" "data")
- '("void*" "detail")
- )
-)
-
-(define-function galago_value_new_object
- (c-name "galago_value_new_object")
- (return-type "GalagoValue*")
- (parameters
- '("GType" "type")
- '("const-GObject*" "obj")
- )
-)
-
-(define-function galago_value_new_list
- (c-name "galago_value_new_list")
- (return-type "GalagoValue*")
- (parameters
- '("GalagoType" "type")
- '("GList*" "list")
- '("void*" "detail")
- )
-)
-
-(define-function galago_value_new_array
- (c-name "galago_value_new_array")
- (return-type "GalagoValue*")
- (parameters
- '("GalagoType" "type")
- '("const-void*" "array")
- '("gsize" "size")
- '("void*" "detail")
- )
-)
-
-(define-method destroy
- (of-object "GalagoValue")
- (c-name "galago_value_destroy")
- (return-type "none")
-)
-
-(define-method get_type
- (of-object "GalagoValue")
- (c-name "galago_value_get_type")
- (return-type "GalagoType")
-)
-
-(define-method get_subtype
- (of-object "GalagoValue")
- (c-name "galago_value_get_subtype")
- (return-type "GalagoType")
-)
-
-(define-method get_gtype
- (of-object "GalagoValue")
- (c-name "galago_value_get_gtype")
- (return-type "GType")
-)
-
-(define-method set_char
- (of-object "GalagoValue")
- (c-name "galago_value_set_char")
- (return-type "none")
- (parameters
- '("char" "data")
- )
-)
-
-(define-method set_uchar
- (of-object "GalagoValue")
- (c-name "galago_value_set_uchar")
- (return-type "none")
- (parameters
- '("unsigned-char" "data")
- )
-)
-
-(define-method set_boolean
- (of-object "GalagoValue")
- (c-name "galago_value_set_boolean")
- (return-type "none")
- (parameters
- '("gboolean" "data")
- )
-)
-
-(define-method set_short
- (of-object "GalagoValue")
- (c-name "galago_value_set_short")
- (return-type "none")
- (parameters
- '("short" "data")
- )
-)
-
-(define-method set_ushort
- (of-object "GalagoValue")
- (c-name "galago_value_set_ushort")
- (return-type "none")
- (parameters
- '("unsigned-short" "data")
- )
-)
-
-(define-method set_int
- (of-object "GalagoValue")
- (c-name "galago_value_set_int")
- (return-type "none")
- (parameters
- '("int" "data")
- )
-)
-
-(define-method set_uint
- (of-object "GalagoValue")
- (c-name "galago_value_set_uint")
- (return-type "none")
- (parameters
- '("unsigned-int" "data")
- )
-)
-
-(define-method set_long
- (of-object "GalagoValue")
- (c-name "galago_value_set_long")
- (return-type "none")
- (parameters
- '("long" "data")
- )
-)
-
-(define-method set_ulong
- (of-object "GalagoValue")
- (c-name "galago_value_set_ulong")
- (return-type "none")
- (parameters
- '("unsigned-long" "data")
- )
-)
-
-(define-method set_string
- (of-object "GalagoValue")
- (c-name "galago_value_set_string")
- (return-type "none")
- (parameters
- '("const-char*" "data")
- )
-)
-
-(define-method set_object
- (of-object "GalagoValue")
- (c-name "galago_value_set_object")
- (return-type "none")
- (parameters
- '("void*" "data")
- )
-)
-
-(define-method set_pointer
- (of-object "GalagoValue")
- (c-name "galago_value_set_pointer")
- (return-type "none")
- (parameters
- '("void*" "data")
- )
-)
-
-(define-method set_list
- (of-object "GalagoValue")
- (c-name "galago_value_set_list")
- (return-type "none")
- (parameters
- '("GList*" "data")
- )
-)
-
-(define-method set_array
- (of-object "GalagoValue")
- (c-name "galago_value_set_array")
- (return-type "none")
- (parameters
- '("const-void*" "data")
- '("gsize" "size")
- )
-)
-
-(define-method get_char
- (of-object "GalagoValue")
- (c-name "galago_value_get_char")
- (return-type "char")
-)
-
-(define-method get_boolean
- (of-object "GalagoValue")
- (c-name "galago_value_get_boolean")
- (return-type "gboolean")
-)
-
-(define-method get_short
- (of-object "GalagoValue")
- (c-name "galago_value_get_short")
- (return-type "short")
-)
-
-(define-method get_int
- (of-object "GalagoValue")
- (c-name "galago_value_get_int")
- (return-type "int")
-)
-
-(define-method get_long
- (of-object "GalagoValue")
- (c-name "galago_value_get_long")
- (return-type "long")
-)
-
-(define-method get_string
- (of-object "GalagoValue")
- (c-name "galago_value_get_string")
- (return-type "const-char*")
-)
-
-(define-method get_object
- (of-object "GalagoValue")
- (c-name "galago_value_get_object")
- (return-type "void*")
-)
-
-(define-method get_pointer
- (of-object "GalagoValue")
- (c-name "galago_value_get_pointer")
- (return-type "void*")
-)
-
-(define-method get_list
- (of-object "GalagoValue")
- (c-name "galago_value_get_list")
- (return-type "GList*")
-)
-
-(define-method get_array
- (of-object "GalagoValue")
- (c-name "galago_value_get_array")
- (return-type "none")
- (parameters
- '("const-void**" "ret_array")
- '("gsize*" "ret_size")
- )
-)
-
-
Modified: trunk/galago-python/src/galago.override
===================================================================
--- trunk/galago-python/src/galago.override 2005-11-28 05:15:42 UTC (rev 2349)
+++ trunk/galago-python/src/galago.override 2005-11-28 05:18:00 UTC (rev 2350)
@@ -64,7 +64,6 @@
return items;
}
-
%%
modulename galago
%%
@@ -100,38 +99,6 @@
PyObject_IsTrue(query)));
}
%%
-override galago_avatar_new kwargs
-static int
-_wrap_galago_avatar_new(PyGObject *self, PyObject *args, PyObject *kwargs)
-{
- static char *kwlist[] = { "account", "data", NULL };
- PyGObject *account;
- guchar *data;
- gsize len;
-
- if (!PyArg_ParseTupleAndKeywords(args, kwargs,
- "O!s#:GalagoAvatar.__init__",
- kwlist, &PyGalagoAccount_Type,
- &account, &data, &len))
- {
- return -1;
- }
-
- self->obj = (GObject *)galago_avatar_new(GALAGO_ACCOUNT(account->obj),
- data, len);
-
- if (!self->obj)
- {
- PyErr_SetString(PyExc_RuntimeError,
- "could not create GalagoAvatar object");
- return -1;
- }
-
- pygobject_register_wrapper((PyObject *)self);
-
- return 0;
-}
-%%
override galago_context_get_services kwargs
static PyObject *
_wrap_galago_context_get_services(PyGObject *self, PyObject *args,
@@ -189,11 +156,11 @@
static char *kwlist[] = { "id", "origin", "query", NULL };
char *id;
PyObject *py_origin = NULL;
- int query = TRUE;
+ PyObject *query = Py_True;
GalagoPerson *ret;
GalagoOrigin origin = GALAGO_REMOTE;
- if (!PyArg_ParseTupleAndKeywords(args, kwargs, "s|Oi:get_person",
+ if (!PyArg_ParseTupleAndKeywords(args, kwargs, "s|OO:get_person",
kwlist, &id, &py_origin, &query))
{
return NULL;
@@ -205,7 +172,8 @@
return NULL;
}
- return pygobject_new((GObject *)galago_get_person(id, origin, query));
+ return pygobject_new((GObject *)galago_get_person(id, origin,
+ PyObject_IsTrue(query)));
}
%%
override galago_get_people kwargs
@@ -240,11 +208,11 @@
static char *kwlist[] = { "id", "origin", "query", NULL };
char *id;
PyObject *py_origin = NULL;
- int query = TRUE;
+ PyObject *query = Py_True;
GalagoOrigin origin = GALAGO_REMOTE;
GalagoService *ret;
- if (!PyArg_ParseTupleAndKeywords(args, kwargs, "s|Oi:get_service",
+ if (!PyArg_ParseTupleAndKeywords(args, kwargs, "s|OO:get_service",
kwlist, &id, &py_origin, &query))
{
return NULL;
@@ -256,7 +224,8 @@
return NULL;
}
- return pygobject_new((GObject *)galago_get_service(id, origin, query));
+ return pygobject_new(
+ (GObject *)galago_get_service(id, origin, PyObject_IsTrue(query)));
}
%%
override galago_get_services kwargs
@@ -310,7 +279,7 @@
PyObject *query = Py_True;
if (!PyArg_ParseTupleAndKeywords(args, kwargs,
- "|OO:GalagoPerson.get_accounts",
+ "|O:GalagoPerson.get_accounts",
kwlist, &query))
{
return NULL;
@@ -398,38 +367,6 @@
return Py_None;
}
%%
-override galago_photo_new kwargs
-static int
-_wrap_galago_photo_new(PyGObject *self, PyObject *args, PyObject *kwargs)
-{
- static char *kwlist[] = { "person", "data", NULL };
- PyGObject *person;
- guchar *data;
- gsize len;
-
- if (!PyArg_ParseTupleAndKeywords(args, kwargs,
- "O!s#:GalagoAvatar.__init__",
- kwlist, &PyGalagoPerson_Type,
- &person, &data, &len))
- {
- return -1;
- }
-
- self->obj = (GObject *)galago_photo_new(GALAGO_PERSON(person->obj),
- data, len);
-
- if (!self->obj)
- {
- PyErr_SetString(PyExc_RuntimeError,
- "could not create GalagoPhoto object");
- return -1;
- }
-
- pygobject_register_wrapper((PyObject *)self);
-
- return 0;
-}
-%%
override galago_presence_set_statuses kwargs
static PyObject *
_wrap_galago_presence_set_statuses(PyGObject *self, PyObject *args,
Modified: trunk/galago-python/tests/Makefile.am
===================================================================
--- trunk/galago-python/tests/Makefile.am 2005-11-28 05:15:42 UTC (rev 2349)
+++ trunk/galago-python/tests/Makefile.am 2005-11-28 05:18:00 UTC (rev 2350)
@@ -1,3 +1,4 @@
EXTRA_DIST = \
+ avatar.png \
get-presence.py \
presence-feed.py
Added: trunk/galago-python/tests/avatar.png
===================================================================
(Binary files differ)
Property changes on: trunk/galago-python/tests/avatar.png
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Modified: trunk/galago-python/tests/presence-feed.py
===================================================================
--- trunk/galago-python/tests/presence-feed.py 2005-11-28 05:15:42 UTC (rev 2349)
+++ trunk/galago-python/tests/presence-feed.py 2005-11-28 05:18:00 UTC (rev 2350)
@@ -16,7 +16,7 @@
# Set up our person's AIM account
account = aim_service.create_account(me, "GalagoAIMUser")
- presence = galago.Presence(account)
+ presence = account.create_presence()
presence.set_idle(True, 60 * 5)
@@ -27,10 +27,10 @@
# Add contacts to our AIM account
person = galago.create_person("gonkulator-1")
contact = aim_service.create_account(person, "lottabs2")
- presence = galago.Presence(contact)
+ presence = contact.create_presence()
presence.set_idle(True, 60 * 20)
account.add_contact(contact)
-
+ contact.set_avatar(galago.Image(""));
try:
f = open("avatar.png", "r")
avatar = galago.Avatar(contact, f.read())
@@ -41,7 +41,7 @@
# Set up our person's Jabber account
account = jabber_service.create_account(me, "jabberuser at galago.sf.net")
- presence = galago.Presence(account)
+ presence = account.create_presence()
status = galago.Status(galago.STATUS_AVAILABLE, "available",
"Available", True)
@@ -50,7 +50,7 @@
# Add contacts to our Jabber account
person = galago.create_person("cae-1")
contact = jabber_service.create_account(person, "caedan at jabber.org")
- presence = galago.Presence(contact)
+ presence = contact.create_presence()
status = galago.Status(galago.STATUS_AVAILABLE, "available",
"Available", True)
@@ -59,7 +59,7 @@
account.add_contact(contact)
contact = jabber_service.create_account(person, "caelum at chipx86.com")
- presence = galago.Presence(contact)
+ presence = contact.create_presence()
status = galago.Status(galago.STATUS_OFFLINE, "offline", "Offline", True)
presence.add_status(status)
More information about the galago-commits
mailing list