Enlightenment CVS committal
Author : rephorm
Project : e17
Module : libs/ecore
Dir : e17/libs/ecore/src/lib/ecore_dbus
Modified Files:
Ecore_DBus.h ecore_dbus_marshal.c ecore_dbus_object.c
ecore_dbus_utils.c
Log Message:
add data pointer to method callbacks
clean up some warnings
===================================================================
RCS file: /cvs/e/e17/libs/ecore/src/lib/ecore_dbus/Ecore_DBus.h,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -3 -r1.20 -r1.21
--- Ecore_DBus.h 27 Sep 2006 23:37:01 -0000 1.20
+++ Ecore_DBus.h 29 Sep 2006 03:05:21 -0000 1.21
@@ -46,7 +46,7 @@
typedef struct _Ecore_DBus_Message_Field Ecore_DBus_Message_Field;
typedef struct _Ecore_DBus_Address Ecore_DBus_Address;
- typedef void (*Ecore_DBus_Method_Call_Cb) (Ecore_DBus_Event_Method_Call
*event);
+ typedef void (*Ecore_DBus_Method_Call_Cb) (void *data,
Ecore_DBus_Event_Method_Call *event);
typedef struct _Ecore_DBus_Object Ecore_DBus_Object;
typedef struct _Ecore_DBus_Object_Method Ecore_DBus_Object_Method;
@@ -66,6 +66,7 @@
char *name;
Ecore_DBus_Method_Call_Cb func;
+ void *data;
};
struct _Ecore_DBus_Object_Registry
{
@@ -219,6 +220,7 @@
EAPI void ecore_dbus_message_print(Ecore_DBus_Message *msg);
EAPI void *ecore_dbus_message_header_field_get(Ecore_DBus_Message
*msg, Ecore_DBus_Message_Header_Field field);
EAPI void *ecore_dbus_message_body_field_get(Ecore_DBus_Message
*msg, unsigned int pos);
+ EAPI int ecore_dbus_message_serial_get(Ecore_DBus_Message *m);
/* methods */
EAPI int ecore_dbus_method_hello(Ecore_DBus_Server *svr,
Ecore_DBus_Method_Return_Cb method_cb, Ecore_DBus_Error_Cb, void *data);
@@ -248,7 +250,7 @@
EAPI Ecore_DBus_Object *ecore_dbus_object_add(Ecore_DBus_Server
*svr, const char *path);
EAPI void ecore_dbus_object_free(Ecore_DBus_Object
*obj);
- EAPI Ecore_DBus_Object_Method
*ecore_dbus_object_method_add(Ecore_DBus_Object *obj, const char *interface,
const char *method_name, Ecore_DBus_Method_Call_Cb func);
+ EAPI Ecore_DBus_Object_Method
*ecore_dbus_object_method_add(Ecore_DBus_Object *obj, const char *interface,
const char *method_name, Ecore_DBus_Method_Call_Cb func, void *data);
EAPI void
ecore_dbus_object_method_remove(Ecore_DBus_Object *obj,
Ecore_DBus_Object_Method *method);
EAPI void
ecore_dbus_object_method_free(Ecore_DBus_Object_Method *method);
===================================================================
RCS file: /cvs/e/e17/libs/ecore/src/lib/ecore_dbus/ecore_dbus_marshal.c,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -3 -r1.4 -r1.5
--- ecore_dbus_marshal.c 29 Sep 2006 02:04:06 -0000 1.4
+++ ecore_dbus_marshal.c 29 Sep 2006 03:05:21 -0000 1.5
@@ -162,7 +162,7 @@
_ecore_dbus_message_append_byte(msg, type);
_ecore_dbus_message_append_byte(msg, '\0');
- f->value = _ecore_dbus_message_marshal(msg, &type, data);
+ f->value = _ecore_dbus_message_marshal(msg, (char *)&type, data);
ecore_list_remove_first(msg->recurse);
return f;
}
===================================================================
RCS file: /cvs/e/e17/libs/ecore/src/lib/ecore_dbus/ecore_dbus_object.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -3 -r1.2 -r1.3
--- ecore_dbus_object.c 27 Sep 2006 19:32:45 -0000 1.2
+++ ecore_dbus_object.c 29 Sep 2006 03:05:21 -0000 1.3
@@ -56,10 +56,7 @@
keys = ecore_hash_keys(event->server->objects);
printf("Keys\n----\n");
while ((key = ecore_list_next(keys)))
- {
- char *s;
printf(" %s => %d\n", key,
(int)ecore_hash_get(event->server->objects, key));
- }
ecore_list_destroy(keys);
@@ -88,7 +85,7 @@
if (method)
{
printf("[ecore_dbus] method found %s\n", event->header.member);
- method->func(event);
+ method->func(method->data, event);
return 0;
}
@@ -141,7 +138,7 @@
/* object methods */
EAPI Ecore_DBus_Object_Method *
-ecore_dbus_object_method_add(Ecore_DBus_Object *obj, const char *interface,
const char *method_name, Ecore_DBus_Method_Call_Cb func)
+ecore_dbus_object_method_add(Ecore_DBus_Object *obj, const char *interface,
const char *method_name, Ecore_DBus_Method_Call_Cb func, void *data)
{
Ecore_DBus_Object_Method *m;
char buf[PATH_MAX];
@@ -154,6 +151,7 @@
m->name = strdup(method_name);
m->func = func;
+ m->data = data;
ecore_list_append(obj->methods, m);
===================================================================
RCS file: /cvs/e/e17/libs/ecore/src/lib/ecore_dbus/ecore_dbus_utils.c,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -3 -r1.6 -r1.7
--- ecore_dbus_utils.c 29 Sep 2006 02:04:06 -0000 1.6
+++ ecore_dbus_utils.c 29 Sep 2006 03:05:21 -0000 1.7
@@ -263,4 +263,5 @@
}
signature++;
}
+ return 0;
}
-------------------------------------------------------------------------
Take Surveys. Earn Cash. Influence the Future of IT
Join SourceForge.net's Techsay panel and you'll get the chance to share your
opinions on IT & business topics through brief surveys -- and earn cash
http://www.techsay.com/default.php?page=join.php&p=sourceforge&CID=DEVDEV
_______________________________________________
enlightenment-cvs mailing list
enlightenment-cvs@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
