From 198b5ee4f69591630b1484ca0186e991ef4aea1b Mon Sep 17 00:00:00 2001
From: rephorm <rephorm>
Date: Wed, 27 Sep 2006 00:02:30 +0000
Subject: [PATCH] add quick test of object/method API

SVN revision: 26172
---
 .../ecore/src/bin/ecore_dbus_receiver_test.c  | 24 +++++++++++++++++--
 legacy/ecore/src/bin/ecore_dbus_test.c        |  8 ++++---
 2 files changed, 27 insertions(+), 5 deletions(-)

diff --git a/legacy/ecore/src/bin/ecore_dbus_receiver_test.c b/legacy/ecore/src/bin/ecore_dbus_receiver_test.c
index e529bafef9..996fc38d40 100644
--- a/legacy/ecore/src/bin/ecore_dbus_receiver_test.c
+++ b/legacy/ecore/src/bin/ecore_dbus_receiver_test.c
@@ -12,6 +12,9 @@ static int ecore_dbus_event_method_call(void *udata, int ev_type, void *ev);
 static void ecore_dbus_method_add_match_cb(void *data, Ecore_DBus_Method_Return *reply);
 static void ecore_dbus_method_error_cb(void *data, const char *error);
 
+static void _test_object_init(Ecore_DBus_Server *svr);
+
+
 static Ecore_DBus_Server *svr = NULL;
 
 int
@@ -56,9 +59,9 @@ ecore_dbus_event_server_add(void *udata, int ev_type, void *ev)
 
    event = ev;
    printf("ecore_dbus_event_server_add\n");
- 
+
    ecore_dbus_method_request_name(event->server, "org.enlightenment.Test", 0, NULL, ecore_dbus_method_error_cb, NULL);
-   ecore_dbus_method_add_match(event->server, "type=method_call,interface=org.enlightenment.Test", ecore_dbus_method_add_match_cb, ecore_dbus_method_error_cb, NULL);
+   _test_object_init(event->server);
    return 0;
 }
 
@@ -99,6 +102,23 @@ ecore_dbus_method_error_cb(void *data, const char *error)
    ecore_main_loop_quit();
 }
 
+
+static void
+_test_object_test(Ecore_DBus_Event_Method_Call *event)
+{
+   printf("received call to test!\n");
+}
+
+static void
+_test_object_init(Ecore_DBus_Server *svr)
+{
+   Ecore_DBus_Object *obj;
+   printf("init object!\n");
+   if (!svr) return;
+   obj = ecore_dbus_object_add(svr, "/org/enlightenment/test");
+   ecore_dbus_object_method_add(obj, "org.enlightenment.Test", "Test", _test_object_test);
+}
+
 #else
 int
 main(int argc, const char **argv)
diff --git a/legacy/ecore/src/bin/ecore_dbus_test.c b/legacy/ecore/src/bin/ecore_dbus_test.c
index 8d454ca448..debfc6a397 100644
--- a/legacy/ecore/src/bin/ecore_dbus_test.c
+++ b/legacy/ecore/src/bin/ecore_dbus_test.c
@@ -19,13 +19,12 @@ static Ecore_DBus_Server *svr = NULL;
 int
 main(int argc, char **argv)
 {
-   char *bus_addr = NULL, *socket_name = NULL;
    ecore_dbus_init();
 
    svr = ecore_dbus_server_session_connect(NULL);
    if (!svr)
      {
-	printf("Couldn't connect to dbus system server (%s)!\n", socket_name);
+	printf("Couldn't connect to dbus session server!\n");
      }
    else
      {
@@ -61,7 +60,7 @@ ecore_dbus_event_server_add(void *udata, int ev_type, void *ev)
 				ecore_dbus_method_list_names_cb,
 				ecore_dbus_method_error_cb, NULL);
    ecore_dbus_message_new_method_call(event->server,
-				      "/org/enlightenment/Test" /*path*/,
+				      "/org/enlightenment/test" /*path*/,
 				      "org.enlightenment.Test" /*interface*/,
 				      "Test" /*method*/,
 				      "org.enlightenment.Test" /*destination*/,
@@ -140,6 +139,7 @@ event_type_get(Ecore_DBus_Message_Type type)
      }
    return "UNKNOWN";
 }
+
 #else
 int
 main(int argc, const char **argv)
@@ -148,3 +148,5 @@ main(int argc, const char **argv)
    return -1;
 }
 #endif
+
+