edbus: Dont create proxy of FDO.Peer

Patch by: José Roberto de Souza  <zehortigoza@profusion.mobi>

SVN revision: 80711

diff --git a/src/lib/EDBus.h b/src/lib/EDBus.h
index fac8890..ef1eec1 100644 (file)
--- a/src/lib/EDBus.h
+++ b/src/lib/EDBus.h
@@ -96,6 +96,7 @@ extern "C" {
 #define EDBUS_FDO_INTERFACE_PROPERTIES "org.freedesktop.DBus.Properties"
 #define EDBUS_FDO_INTERFACE_OBJECT_MANAGER "org.freedesktop.DBus.ObjectManager"
 #define EDBUS_FDO_INTERFACE_INTROSPECTABLE "org.freedesktop.DBus.Introspectable"
+#define EDBUS_FDO_INTEFACE_PEER "org.freedesktop.DBus.Peer"
 
 typedef struct _EDBus_Version
 {

diff --git a/src/lib/edbus_object.c b/src/lib/edbus_object.c
index 004560e..1a4f9b5 100644 (file)
--- a/src/lib/edbus_object.c
+++ b/src/lib/edbus_object.c
@@ -639,26 +639,23 @@ edbus_object_proxy_del(EDBus_Object *obj, EDBus_Proxy *proxy, const char *interf
    return eina_hash_del(obj->proxies, interface, proxy);
 }
 
-static EDBus_Proxy *
-get_peer_proxy(EDBus_Object *obj)
-{
-   return edbus_proxy_get(obj, "org.freedesktop.DBus.Peer");
-}
-
 EAPI EDBus_Pending *
 edbus_object_peer_ping(EDBus_Object *obj, EDBus_Message_Cb cb, const void *data)
 {
+   EDBus_Message *msg;
    EDBUS_OBJECT_CHECK_RETVAL(obj, NULL);
-   return edbus_proxy_call(get_peer_proxy(obj), "Ping", cb,
-                           data, -1, "");
+   msg = edbus_object_method_call_new(obj, EDBUS_FDO_INTEFACE_PEER, "Ping");
+   return edbus_object_send(obj, msg, cb, data, -1);
 }
 
 EAPI EDBus_Pending *
 edbus_object_peer_machine_id_get(EDBus_Object *obj, EDBus_Message_Cb cb, const void *data)
 {
+   EDBus_Message *msg;
    EDBUS_OBJECT_CHECK_RETVAL(obj, NULL);
-   return edbus_proxy_call(get_peer_proxy(obj), "GetMachineId", cb,
-                           data, -1, "");
+   msg = edbus_object_method_call_new(obj, EDBUS_FDO_INTEFACE_PEER,
+                                      "GetMachineId");
+   return edbus_object_send(obj, msg, cb, data, -1);
 }
 
 EAPI EDBus_Pending *