Enlightenment CVS committal
Author : sebastid
Project : e17
Module : libs/ecore
Dir : e17/libs/ecore/src/lib/ecore_dbus
Modified Files:
Ecore_DBus.h ecore_dbus.c ecore_dbus_private.h
Log Message:
Update the event structure for DBus.
===================================================================
RCS file: /cvs/e/e17/libs/ecore/src/lib/ecore_dbus/Ecore_DBus.h,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -3 -r1.11 -r1.12
--- Ecore_DBus.h 25 Jul 2006 16:03:05 -0000 1.11
+++ Ecore_DBus.h 26 Jul 2006 12:08:06 -0000 1.12
@@ -46,6 +46,15 @@
ECORE_DBUS_BUS_ACTIVATION
} Ecore_DBus_Type;
+ typedef enum _Ecore_DBus_Message_Type
+ {
+ ECORE_DBUS_MESSAGE_TYPE_INVALID,
+ ECORE_DBUS_MESSAGE_TYPE_METHOD_CALL,
+ ECORE_DBUS_MESSAGE_TYPE_METHOD_RETURN,
+ ECORE_DBUS_MESSAGE_TYPE_ERROR,
+ ECORE_DBUS_MESSAGE_TYPE_SIGNAL
+ } Ecore_DBus_Message_Type;
+
typedef enum _Ecore_DBus_Data_Type
{
ECORE_DBUS_DATA_TYPE_INVALID = ((int) '\0'),
@@ -83,9 +92,10 @@
struct _Ecore_DBus_Event_Server_Data
{
- Ecore_DBus_Server *server;
- char *method;
- Ecore_DBus_Message *message;
+ Ecore_DBus_Server *server;
+ Ecore_DBus_Message_Type type;
+ char *member;
+ Ecore_DBus_Message *message;
};
typedef enum _Ecore_DBus_Message_Header_Field
===================================================================
RCS file: /cvs/e/e17/libs/ecore/src/lib/ecore_dbus/ecore_dbus.c,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -3 -r1.15 -r1.16
--- ecore_dbus.c 25 Jul 2006 16:03:05 -0000 1.15
+++ ecore_dbus.c 26 Jul 2006 12:08:06 -0000 1.16
@@ -377,9 +377,10 @@
method = NULL;
}
ev = malloc(sizeof(Ecore_DBus_Event_Server_Data));
+ ev->type = msg->type;
ev->server = svr;
ev->message = msg;
- ev->method = method;
+ ev->member = method;
ecore_event_add(ECORE_DBUS_EVENT_SERVER_DATA, ev,
_ecore_dbus_event_server_data_free, NULL);
}
@@ -394,6 +395,6 @@
event = ev;
_ecore_dbus_message_free(event->message);
- if (event->method) free(event->method);
+ if (event->member) free(event->member);
free(ev);
}
===================================================================
RCS file: /cvs/e/e17/libs/ecore/src/lib/ecore_dbus/ecore_dbus_private.h,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -3 -r1.7 -r1.8
--- ecore_dbus_private.h 25 Jul 2006 16:03:05 -0000 1.7
+++ ecore_dbus_private.h 26 Jul 2006 12:08:06 -0000 1.8
@@ -54,15 +54,6 @@
ECORE_DBUS_AUTH_TYPE_SKEY
} Ecore_DBus_Auth_Type;
-typedef enum _Ecore_DBus_Message_Type
-{
- ECORE_DBUS_MESSAGE_TYPE_INVALID,
- ECORE_DBUS_MESSAGE_TYPE_METHOD_CALL,
- ECORE_DBUS_MESSAGE_TYPE_METHOD_RETURN,
- ECORE_DBUS_MESSAGE_TYPE_ERROR,
- ECORE_DBUS_MESSAGE_TYPE_SIGNAL
-} Ecore_DBus_Message_Type;
-
struct _Ecore_DBus_Server
{
Ecore_List2 __list_data;
-------------------------------------------------------------------------
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
