Enlightenment CVS committal
Author : sebastid
Project : e17
Module : libs/ecore
Dir : e17/libs/ecore/src/bin
Modified Files:
Makefile.am ecore_dbus_test.c
Added Files:
ecore_dbus_hal_test.c
Log Message:
More DBus work. Should soon be able to interact with haldaemon.
===================================================================
RCS file: /cvs/e/e17/libs/ecore/src/bin/Makefile.am,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -3 -r1.20 -r1.21
--- Makefile.am 20 Jul 2006 16:48:32 -0000 1.20
+++ Makefile.am 26 Jul 2006 20:43:28 -0000 1.21
@@ -94,7 +94,8 @@
ecore_test \
ecore_evas_test \
ecore_config \
-ecore_dbus_test
+ecore_dbus_test \
+ecore_dbus_hal_test
ecore_test_SOURCES = \
ecore_test.c
@@ -179,6 +180,23 @@
$(INCLUDES)
ecore_dbus_test_DEPENDENCIES = \
+$(top_builddir)/src/lib/ecore/libecore.la \
+$(ECORE_DBUS_LIB)
+
+
+ecore_dbus_hal_test_SOURCES = \
+ecore_dbus_hal_test.c \
+ecore_dbus_test.h
+
+ecore_dbus_hal_test_LDADD = \
+$(top_builddir)/src/lib/ecore/libecore.la \
+$(ECORE_DBUS_LIB)
+
+ecore_dbus_hal_test_CFLAGS = \
+$(CFLAGS) \
+$(INCLUDES)
+
+ecore_dbus_hal_test_DEPENDENCIES = \
$(top_builddir)/src/lib/ecore/libecore.la \
$(ECORE_DBUS_LIB)
===================================================================
RCS file: /cvs/e/e17/libs/ecore/src/bin/ecore_dbus_test.c,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -3 -r1.6 -r1.7
--- ecore_dbus_test.c 26 Jul 2006 12:08:06 -0000 1.6
+++ ecore_dbus_test.c 26 Jul 2006 20:43:28 -0000 1.7
@@ -5,9 +5,11 @@
#ifdef BUILD_ECORE_DBUS
-static int _ecore_dbus_event_server_add(void *udata, int ev_type, void *ev);
-static int _ecore_dbus_event_server_del(void *udata, int ev_type, void *ev);
-static int _ecore_dbus_event_server_data(void *udata, int ev_type, void *ev);
+static int ecore_dbus_event_server_add(void *udata, int ev_type, void *ev);
+static int ecore_dbus_event_server_del(void *udata, int ev_type, void *ev);
+static int ecore_dbus_event_server_data(void *udata, int ev_type, void *ev);
+
+static const char * event_type_get(Ecore_DBus_Message_Type type);
int
main(int argc, char **argv)
@@ -29,11 +31,11 @@
printf("Connected!\n");
handler[i++] = ecore_event_handler_add(ECORE_DBUS_EVENT_SERVER_ADD,
- _ecore_dbus_event_server_add,
NULL);
+ ecore_dbus_event_server_add,
NULL);
handler[i++] = ecore_event_handler_add(ECORE_DBUS_EVENT_SERVER_DEL,
- _ecore_dbus_event_server_del,
NULL);
+ ecore_dbus_event_server_del,
NULL);
handler[i++] = ecore_event_handler_add(ECORE_DBUS_EVENT_SERVER_DATA,
- _ecore_dbus_event_server_data,
NULL);
+ ecore_dbus_event_server_data,
NULL);
ecore_main_loop_begin();
@@ -47,36 +49,38 @@
}
static int
-_ecore_dbus_event_server_add(void *udata, int ev_type, void *ev)
+ecore_dbus_event_server_add(void *udata, int ev_type, void *ev)
{
Ecore_DBus_Event_Server_Add *event;
int ret;
event = ev;
- printf("_ecore_dbus_event_server_add\n");
+ printf("ecore_dbus_event_server_add\n");
ret = ecore_dbus_method_hello(event->server);
printf("ret: %d\n", ret);
return 0;
}
static int
-_ecore_dbus_event_server_del(void *udata, int ev_type, void *ev)
+ecore_dbus_event_server_del(void *udata, int ev_type, void *ev)
{
Ecore_DBus_Event_Server_Del *event;
event = ev;
- printf("_ecore_dbus_event_server_del\n");
+ printf("ecore_dbus_event_server_del\n");
+ ecore_main_loop_quit();
return 0;
}
static int
-_ecore_dbus_event_server_data(void *udata, int ev_type, void *ev)
+ecore_dbus_event_server_data(void *udata, int ev_type, void *ev)
{
Ecore_DBus_Event_Server_Data *event;
event = ev;
+ printf("ecore_dbus_event_server_data %s %s\n", event_type_get(event->type),
event->member);
if (event->type != ECORE_DBUS_MESSAGE_TYPE_METHOD_RETURN) return 0;
- printf("_ecore_dbus_event_server_data %s\n", event->member);
+ if (!event->member) return 0;
if (!strcmp(event->member, "org.freedesktop.DBus.Hello"))
{
printf("List names\n");
@@ -101,6 +105,25 @@
ecore_main_loop_quit();
}
return 0;
+}
+
+static const char *
+event_type_get(Ecore_DBus_Message_Type type)
+{
+ switch (type)
+ {
+ case ECORE_DBUS_MESSAGE_TYPE_INVALID:
+ return "ECORE_DBUS_MESSAGE_TYPE_INVALID";
+ case ECORE_DBUS_MESSAGE_TYPE_METHOD_CALL:
+ return "ECORE_DBUS_MESSAGE_TYPE_CALL";
+ case ECORE_DBUS_MESSAGE_TYPE_METHOD_RETURN:
+ return "ECORE_DBUS_MESSAGE_TYPE_RETURN";
+ case ECORE_DBUS_MESSAGE_TYPE_ERROR:
+ return "ECORE_DBUS_MESSAGE_TYPE_ERROR";
+ case ECORE_DBUS_MESSAGE_TYPE_SIGNAL:
+ return "ECORE_DBUS_MESSAGE_TYPE_SIGNAL";
+ }
+ return "UNKNOWN";
}
#else
int
-------------------------------------------------------------------------
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
