Delete device proxy.

6 files changed, 5 insertions, 35 deletions

diff --git a/lib/Makefile.am b/lib/Makefile.am
index 17ab045..8c490eb 100644
--- a/lib/Makefile.am
+++ b/lib/Makefile.am
@@ -24,7 +24,6 @@ libneardal_la_include_HEADERS = neardal.h neardal_errors.h
 nodist_libgenerated_la_SOURCES = \
 	$(builddir)/neard_manager_proxy.c $(builddir)/neard_manager_proxy.h \
 	$(builddir)/neard_tag_proxy.c $(builddir)/neard_tag_proxy.h \
-	$(builddir)/neard_device_proxy.c $(builddir)/neard_device_proxy.h \
 	$(builddir)/neard_adapter_proxy.c $(builddir)/neard_adapter_proxy.h \
 	$(builddir)/neardal_agent.c $(builddir)/neardal_agent.h \
 	$(builddir)/dbus-object-manager.c $(builddir)/dbus-object-manager.h \
@@ -51,9 +50,6 @@ neard_tag_proxy.c neard_tag_proxy.h: interface/org.neard.Tag.xml
 neard_manager_proxy.c neard_manager_proxy.h: interface/org.neard.Manager.xml
 	$(run-gdbus)
 
-neard_device_proxy.c neard_device_proxy.h: interface/org.neard.Device.xml
-	$(run-gdbus)
-
 %.c: interface/%.xml
 	$(run-gdbus) --interface-prefix="org.freedesktop.DBus."
 
@@ -62,7 +58,6 @@ CLEANFILES = $(nodist_libgenerated_la_SOURCES)
 EXTRA_DIST = \
 	interface/org.neard.Adapter.xml \
 	interface/org.neard.Agent.xml \
-	interface/org.neard.Device.xml \
 	interface/org.neard.Manager.xml \
 	interface/org.neard.Tag.xml \
 	interface/dbus-object-manager.xml \
diff --git a/lib/interface/org.neard.Device.xml b/lib/interface/org.neard.Device.xml
deleted file mode 100644
index 987e3fa..0000000
--- a/lib/interface/org.neard.Device.xml
+++ /dev/null
@@ -1,21 +0,0 @@
-<!DOCTYPE node PUBLIC "-//freedesktop//DTD D-BUS Object Introspection 1.0//EN"
-"http://www.freedesktop.org/standards/dbus/1.0/introspect.dtd">
-
-<node>
-	<interface name="org.neard.Device">
-		<method name="GetProperties">
-			<arg name="properties" type="a{sv}" direction="out"/>
-		</method>
-		<method name="SetProperty">
-			<arg name="name" type="s" direction="in"/>
-			<arg name="value" type="v" direction="in"/>
-		</method>
-		<method name="Push">
-			<arg name="attributes" type="a{sv}" direction="in"/>
-		</method>
-		<signal name="PropertyChanged">
-			<arg name="name" type="s"/>
-			<arg name="value" type="v"/>
-		</signal>
-	</interface>
-</node>
diff --git a/lib/neardal_adapter.c b/lib/neardal_adapter.c
index 9dd15d5..836ea21 100644
--- a/lib/neardal_adapter.c
+++ b/lib/neardal_adapter.c
@@ -95,7 +95,7 @@ void neardal_adp_prv_cb_tag_lost(OrgNeardTag *proxy,
  * neardal_adp_prv_cb_dev_found: Callback called when a NFC dev is
  * found
  ****************************************************************************/
-void  neardal_adp_prv_cb_dev_found(OrgNeardDevice *proxy,
+void  neardal_adp_prv_cb_dev_found(void *proxy,
 					     const gchar *arg_unnamed_arg0,
 					     void        *user_data)
 {
@@ -125,7 +125,7 @@ void  neardal_adp_prv_cb_dev_found(OrgNeardDevice *proxy,
  * neardal_adp_prv_cb_dev_lost: Callback called when a NFC dev is
  * lost (removed)
  ****************************************************************************/
-void neardal_adp_prv_cb_dev_lost(OrgNeardDevice *proxy,
+void neardal_adp_prv_cb_dev_lost(void *proxy,
 					   const gchar *arg_unnamed_arg0,
 					   void *user_data)
 {
@@ -274,7 +274,7 @@ static void neardal_adp_prv_cb_property_changed(OrgNeardAdapter *proxy,
 			while (g_list_length(adpProp->devList)) {
 				node = g_list_first(adpProp->devList);
 				devProp = (DevProp *) node->data;
-				neardal_adp_prv_cb_dev_lost(devProp->proxy,
+				neardal_adp_prv_cb_dev_lost(NULL,
 							       devProp->name,
 							       devProp->parent);
 			}
diff --git a/lib/neardal_device.c b/lib/neardal_device.c
index e94bdff..253cee4 100644
--- a/lib/neardal_device.c
+++ b/lib/neardal_device.c
@@ -23,8 +23,6 @@
 #include <glib.h>
 #include <glib-object.h>
 
-#include "neard_device_proxy.h"
-
 #include "neardal.h"
 #include "neardal_prv.h"
 
diff --git a/lib/neardal_device.h b/lib/neardal_device.h
index 560d81d..954e53a 100644
--- a/lib/neardal_device.h
+++ b/lib/neardal_device.h
@@ -21,14 +21,12 @@
 #ifndef NEARDAL_DEV_H
 #define NEARDAL_DEV_H
 
-#include "neard_device_proxy.h"
 #include "neardal_record.h"
 
 #define NEARD_DEV_SIG_PROPCHANGED	"property-changed"
 
 /* NEARDAL Dev Properties */
 typedef struct {
-	OrgNeardDevice	*proxy;	  /* proxy to Neard NEARDAL Dev interface */
 	gchar		*name;	  /* DBus interface name (as identifier) */
 	void		*parent;  /* parent (adapter ) */
 	gboolean	notified; /* Already notified to client? */
diff --git a/lib/neardal_manager.c b/lib/neardal_manager.c
index f5e7de0..e9608c1 100644
--- a/lib/neardal_manager.c
+++ b/lib/neardal_manager.c
@@ -96,9 +96,9 @@ error:
 	g_free(adapter);
 }
 
-void neardal_adp_prv_cb_dev_found(OrgNeardDevice *proxy,
+void neardal_adp_prv_cb_dev_found(void *proxy,
 				const gchar *arg_unnamed_arg0, void *user_data);
-void neardal_adp_prv_cb_dev_lost(OrgNeardDevice *proxy,
+void neardal_adp_prv_cb_dev_lost(void *proxy,
 				const gchar *arg_unnamed_arg0, void *user_data);
 
 static AdpProp *neardal_adapter_find_by_child(const char *path)