Remove unused code.

git-svn-id: svn+ssh://svn.enlightenment.org/var/svn/e/trunk/e_dbus@37508 7cbeb6ba-43b4-40fd-8cce-4c39aea84d33

diff --git a/src/lib/nm/e_nm.c b/src/lib/nm/e_nm.c
index 38f826e..998cc3f 100644 (file)
--- a/src/lib/nm/e_nm.c
+++ b/src/lib/nm/e_nm.c
@@ -90,18 +90,6 @@ cb_device_removed(void *data, DBusMessage *msg)
     nmi->device_removed(&(nmi->nm), device);
 }
 
-#if 0
-static int
-cb_devices(void *data, void *reply)
-{
-  E_NM_Internal *nmi;
-
-  nmi = data;
-  nmi->devices = reply;
-  return 1;
-}
-#endif
-
 EAPI int
 e_nm_get(int (*cb_func)(void *data, E_NM *nm), void *data)
 {
@@ -143,9 +131,6 @@ e_nm_free(E_NM *nm)
   if (!nm) return;
   nmi = (E_NM_Internal *)nm;
   if (nmi->nm.active_connections) ecore_list_destroy(nmi->nm.active_connections);
-#if 0
-  if (nmi->devices) ecore_list_destroy(nmi->devices);
-#endif
   if (nmi->handlers)
   {
     E_DBus_Signal_Handler *sh;

diff --git a/src/lib/nm/e_nm_device.c b/src/lib/nm/e_nm_device.c
index e0405cc..efb8fee 100644 (file)
--- a/src/lib/nm/e_nm_device.c
+++ b/src/lib/nm/e_nm_device.c
@@ -9,9 +9,6 @@
 #include <string.h>
 
 static void property_device_type(Property_Data *data, DBusMessageIter *iter);
-#if 0
-static void property_ip4_config(void *data, DBusMessageIter *iter);
-#endif
 
 static Property device_wired_properties[] = {
   { .name = "HwAddress", .sig = "s", .offset = offsetof(E_NM_Device, wired.hw_address) },
@@ -43,39 +40,6 @@ static Property device_properties[] = {
   { .name = NULL }
 };
 
-#if 0
-static void
-property_ip4_config(void *data, DBusMessageIter *iter)
-{
-  E_NM_Data *d;
-  E_NM_Device *device;
-  const char *str;
-
-  d = data;
-  if (!nm_check_arg_type(iter, 'o')) goto error;
-
-  device = d->reply;
-  dbus_message_iter_get_basic(iter, &str);
-  device->ip4_config = strdup(str);
-  e_nm_ip4_config_get(&(d->nmi->nm), str, NULL, NULL);
-
-  d->property++;
-  if (d->property->name)
-    e_nm_device_properties_get(d->nmi->conn, d->object, d->property->name, property, d);
-  else
-  {
-    if (d->cb_func) d->cb_func(d->data, d->reply);
-    e_nm_data_free(d);
-  }
-  return;
-
-error:
-  if (d->reply) free(d->reply); /* TODO: Correct free for object */
-  if (d->cb_func) d->cb_func(d->data, NULL);
-  e_nm_data_free(d);
-}
-#endif
-
 static void
 cb_state_changed(void *data, DBusMessage *msg)
 {

diff --git a/src/lib/nm/e_nm_ip4_config.c b/src/lib/nm/e_nm_ip4_config.c
index c3dc974..b93f57f 100644 (file)
--- a/src/lib/nm/e_nm_ip4_config.c
+++ b/src/lib/nm/e_nm_ip4_config.c
@@ -4,6 +4,7 @@
 #include <string.h>
 
 static Property ip4_config_properties[] = {
+       /* TODO */
 #if 0
   { .name = "Addresses", .sig = "aau", .offset = offsetof(E_NM_IP4_Config, addresses) },
   { .name = "Nameservers", .sig = "au", .offset = offsetof(E_NM_IP4_Config, nameservers) },

diff --git a/src/lib/nm/e_nm_private.h b/src/lib/nm/e_nm_private.h
index f02f1e9..f654091 100644 (file)
--- a/src/lib/nm/e_nm_private.h
+++ b/src/lib/nm/e_nm_private.h
@@ -47,9 +47,6 @@ struct E_NM_Internal
   int  (*device_added)(E_NM *nm, const char *device);
   int  (*device_removed)(E_NM *nm, const char *device);
   Ecore_List *handlers;
-#if 0
-  Ecore_List *devices;
-#endif
 
   void *data;
 };