modem/ofono: use oface for properties and descs of managed objects

ModemOface provides the removed functionality.

2 files changed, 8 insertions, 191 deletions

diff --git a/modem/ofono.c b/modem/ofono.c
index 30aa30f..3d1f165 100644
--- a/modem/ofono.c
+++ b/modem/ofono.c
@@ -61,10 +61,12 @@ modem_type_dbus_ao (void)
 }
 
 GType
-modem_type_dbus_desc_array (void)
+modem_type_dbus_managed_array (void)
 {
   static gsize type = 0;
 
+  /* a(oa{sv}) */
+
   if (g_once_init_enter (&type))
     {
       GType stype = dbus_g_type_get_struct ("GValueArray",
@@ -139,98 +141,8 @@ modem_ofono_get_bus (void)
   return bus;
 }
 
-static void
-reply_to_set_property (DBusGProxy *proxy,
-		       DBusGProxyCall *call,
-		       gpointer _request)
-{
-  ModemRequest *request = _request;
-  gpointer object = modem_request_object (request);
-  ModemOfonoVoidReply *callback = modem_request_callback (request);
-  gpointer user_data = modem_request_user_data (request);
-  GError *error = NULL;
-
-  if (!dbus_g_proxy_end_call (proxy, call, &error, G_TYPE_INVALID))
-    {
-      modem_error_fix (&error);
-    }
-
-  if (callback)
-    callback (object, request, error, user_data);
-
-  if (error)
-    g_error_free (error);
-}
-
-static void
-reply_to_get_properties (DBusGProxy *proxy,
-			 DBusGProxyCall *call,
-			 gpointer _request)
-{
-  GHashTable *properties = NULL;
-  ModemRequest *request = _request;
-  gpointer object = modem_request_object (request);
-  ModemOfonoPropsReply *callback = modem_request_callback (request);
-  gpointer user_data = modem_request_user_data (request);
-  GError *error = NULL;
-
-  if (!dbus_g_proxy_end_call (proxy, call, &error,
-	  MODEM_TYPE_DBUS_DICT, &properties,
-	  G_TYPE_INVALID))
-    {
-      modem_error_fix (&error);
-    }
-
-  if (callback)
-    callback (object, request, properties, error, user_data);
-
-  if (error)
-    g_error_free (error);
-  if (properties)
-    g_hash_table_unref (properties);
-}
-
-static void
-reply_to_get_descs (DBusGProxy *proxy,
-		    DBusGProxyCall *call,
-		    gpointer _request)
-{
-  GPtrArray *calls = NULL;
-  ModemRequest *request = _request;
-  gpointer object = modem_request_object (request);
-  ModemOfonoGetDescsReply *callback = modem_request_callback (request);
-  gpointer user_data = modem_request_user_data (request);
-  GError *error = NULL;
-
-  if (!dbus_g_proxy_end_call (proxy, call, &error,
-          MODEM_TYPE_DBUS_DESC_ARRAY, &calls,
-          G_TYPE_INVALID))
-    modem_error_fix (&error);
-
-  if (callback)
-    callback (object, request, calls, error, user_data);
-
-  if (error)
-    g_error_free (error);
-  if (calls)
-    g_ptr_array_free (calls, TRUE);
-}
-
-ModemRequest *
-modem_ofono_request_descs (gpointer object,
-			   DBusGProxy *proxy,
-			   char const *method,
-			   ModemOfonoGetDescsReply *callback,
-			   gpointer userdata)
-{
-  return modem_request_begin (object,
-      proxy, method, reply_to_get_descs,
-      G_CALLBACK (callback), userdata,
-      G_TYPE_INVALID);
-}
-
 void
-modem_ofono_debug_desc (char const *name,
+modem_ofono_debug_managed (char const *name,
 			char const *object_path,
 			GHashTable *properties)
 {
@@ -259,59 +171,3 @@ modem_ofono_proxy (char const *object_path, char const *interface)
       object_path,
       interface);
 }
-
-ModemRequest *
-modem_ofono_proxy_set_property (DBusGProxy *proxy,
-				char const *property, GValue *value,
-				ModemOfonoVoidReply *callback,
-				gpointer object, gpointer user_data)
-{
-  return modem_request_begin (object, proxy,
-      "SetProperty",
-      reply_to_set_property,
-      G_CALLBACK (callback), user_data,
-      G_TYPE_STRING, property,
-      G_TYPE_VALUE, value,
-      G_TYPE_INVALID);
-}
-
-ModemRequest *
-modem_ofono_proxy_request_properties (DBusGProxy *proxy,
-				      ModemOfonoPropsReply *callback,
-				      gpointer object,
-				      gpointer user_data)
-{
-  return modem_request_begin (object, proxy,
-      "GetProperties",
-      reply_to_get_properties,
-      G_CALLBACK (callback), user_data,
-      G_TYPE_INVALID);
-}
-
-void
-modem_ofono_proxy_connect_to_property_changed (DBusGProxy *proxy,
-					       ModemOfonoPropChangedCb callback,
-					       gpointer user_data)
-{
-  if (callback)
-    {
-      dbus_g_proxy_add_signal (proxy, "PropertyChanged",
-	  G_TYPE_STRING, G_TYPE_VALUE, G_TYPE_INVALID);
-      dbus_g_proxy_connect_signal (proxy, "PropertyChanged",
-	  G_CALLBACK (callback), user_data, NULL);
-    }
-}
-
-
-void
-modem_ofono_proxy_disconnect_from_property_changed (
-    DBusGProxy *proxy,
-    ModemOfonoPropChangedCb callback,
-    gpointer user_data)
-{
-  if (callback)
-    {
-      dbus_g_proxy_disconnect_signal (proxy, "PropertyChanged",
-	  G_CALLBACK (callback), user_data);
-    }
-}
diff --git a/modem/ofono.h b/modem/ofono.h
index 9580ed9..0de1deb 100644
--- a/modem/ofono.h
+++ b/modem/ofono.h
@@ -53,32 +53,14 @@ G_BEGIN_DECLS
 #define MODEM_TYPE_DBUS_DICT modem_type_dbus_dict ()
 #define MODEM_TYPE_ARRAY_OF_PATHS modem_type_dbus_ao ()
 
-/* D-Bus type a{oa{sv}} for oFono path-property list */
-#define MODEM_TYPE_DBUS_DESC_ARRAY modem_type_dbus_desc_array ()
-
-/* ---------------------------------------------------------------------- */
-
-typedef void ModemOfonoPropChangedCb (DBusGProxy *proxy,
-    char const *property,
-    GValue const *value, gpointer user_data);
-
-typedef void ModemOfonoPropsReply (gpointer object,
-    ModemRequest *request, GHashTable *properties,
-    GError const *error, gpointer user_data);
-
-typedef void ModemOfonoVoidReply (gpointer object,
-    ModemRequest *request,
-    GError const *error, gpointer user_data);
-
-typedef void ModemOfonoGetDescsReply (gpointer object,
-    ModemRequest *request, GPtrArray *descs,
-    GError const *error, gpointer user_data);
+/* D-Bus type a{oa{sv}} for oFono managed object list */
+#define MODEM_TYPE_DBUS_MANAGED_ARRAY modem_type_dbus_managed_array ()
 
 /* ---------------------------------------------------------------------- */
 
 GType modem_type_dbus_dict (void);
 GType modem_type_dbus_ao (void);
-GType modem_type_dbus_desc_array (void);
+GType modem_type_dbus_managed_array (void);
 GQuark modem_ofono_iface_quark_sim (void);
 GQuark modem_ofono_iface_quark_call_manager (void);
 GQuark modem_ofono_iface_quark_sms (void);
@@ -86,28 +68,7 @@ void modem_ofono_init_quarks (void);
 
 DBusGProxy *modem_ofono_proxy (char const *object_path, char const *interface);
 
-ModemRequest *modem_ofono_proxy_set_property (DBusGProxy *proxy,
-  char const *property, GValue *value,
-  ModemOfonoVoidReply *callback,
-  gpointer object, gpointer user_data);
-
-ModemRequest *modem_ofono_proxy_request_properties (DBusGProxy *proxy,
-    ModemOfonoPropsReply *callback,
-    gpointer object, gpointer user_data);
-
-void modem_ofono_proxy_connect_to_property_changed (DBusGProxy *proxy,
-    ModemOfonoPropChangedCb callback,
-    gpointer user_data);
-
-void modem_ofono_proxy_disconnect_from_property_changed (DBusGProxy *proxy,
-    ModemOfonoPropChangedCb callback,
-    gpointer user_data);
-
-ModemRequest *modem_ofono_request_descs (gpointer object,
-    DBusGProxy *proxy, char const *method,
-    ModemOfonoGetDescsReply *callback, gpointer user_dat);
-
-void modem_ofono_debug_desc (char const *name,
+void modem_ofono_debug_managed (char const *name,
     char const *object_path,
     GHashTable *properties);