libqmi-glib: completely hide the implicit CTL Client in the API

6 files changed, 17 insertions, 43 deletions

diff --git a/build-aux/qmi-codegen/Client.py b/build-aux/qmi-codegen/Client.py
index f2f92ee..1672f71 100644
--- a/build-aux/qmi-codegen/Client.py
+++ b/build-aux/qmi-codegen/Client.py
@@ -99,17 +99,20 @@ class Client:
             '\n')
         hfile.write(string.Template(template).substitute(translations))
 
-        # Emit class source
-        template = (
-            '\n'
-            '/**\n'
-            ' * SECTION: ${hyphened}\n'
-            ' * @title: ${camelcase}\n'
-            ' * @short_description: #QmiClient for the ${service} service.\n'
-            ' *\n'
-            ' * #QmiClient which handles operations in the ${service} service.\n'
-            ' */\n'
-            '\n'
+        # Emit class source. Documentation skipped for the CTL service.
+        template = ''
+        if self.service != 'CTL':
+            template += (
+                '\n'
+                '/**\n'
+                ' * SECTION: ${hyphened}\n'
+                ' * @title: ${camelcase}\n'
+                ' * @short_description: #QmiClient for the ${service} service.\n'
+                ' *\n'
+                ' * #QmiClient which handles operations in the ${service} service.\n'
+                ' */\n'
+                '\n')
+        template += (
             'G_DEFINE_TYPE (${camelcase}, ${underscore}, QMI_TYPE_CLIENT);\n')
 
         if has_indications:
diff --git a/docs/reference/libqmi-glib/Makefile.am b/docs/reference/libqmi-glib/Makefile.am
index 1366904..b4cfef6 100644
--- a/docs/reference/libqmi-glib/Makefile.am
+++ b/docs/reference/libqmi-glib/Makefile.am
@@ -8,7 +8,6 @@ DOC_MAIN_SGML_FILE = $(DOC_MODULE)-docs.xml
 # Sections file building
 ALL_SECTIONS = \
 	$(srcdir)/libqmi-glib-common.sections \
-	$(top_builddir)/libqmi-glib/generated/qmi-ctl.sections \
 	$(top_builddir)/libqmi-glib/generated/qmi-dms.sections \
 	$(top_builddir)/libqmi-glib/generated/qmi-nas.sections \
 	$(top_builddir)/libqmi-glib/generated/qmi-wds.sections \
@@ -42,7 +41,8 @@ CFILE_GLOB = \
 # Headers to ignore
 IGNORE_HFILES = \
 	qmi-enums-private.h \
-	qmi-enum-types-private.h
+	qmi-enum-types-private.h \
+	qmi-ctl.h
 
 # CFLAGS and LDFLAGS for compiling scan program. Only needed
 # if $(DOC_MODULE).types is non-empty.
diff --git a/docs/reference/libqmi-glib/libqmi-glib-common.sections b/docs/reference/libqmi-glib/libqmi-glib-common.sections
index 96ed8a9..e732215 100644
--- a/docs/reference/libqmi-glib/libqmi-glib-common.sections
+++ b/docs/reference/libqmi-glib/libqmi-glib-common.sections
@@ -33,7 +33,6 @@ qmi_client_get_type
 <FILE>qmi-device</FILE>
 <TITLE>QmiDevice</TITLE>
 QMI_DEVICE_FILE
-QMI_DEVICE_CLIENT_CTL
 QmiDevice
 QmiDeviceClass
 qmi_device_new
diff --git a/docs/reference/libqmi-glib/libqmi-glib-docs.xml b/docs/reference/libqmi-glib/libqmi-glib-docs.xml
index 2c0d62d..c567d6c 100644
--- a/docs/reference/libqmi-glib/libqmi-glib-docs.xml
+++ b/docs/reference/libqmi-glib/libqmi-glib-docs.xml
@@ -51,17 +51,6 @@
   </chapter>
 
   <chapter>
-    <title>Control Service (CTL)</title>
-    <xi:include href="xml/qmi-client-ctl.xml"/>
-    <xi:include href="xml/qmi-message-ctl-set-instance-id.xml"/>
-    <xi:include href="xml/qmi-message-ctl-get-version-info.xml"/>
-    <xi:include href="xml/qmi-message-ctl-allocate-cid.xml"/>
-    <xi:include href="xml/qmi-message-ctl-release-cid.xml"/>
-    <xi:include href="xml/qmi-message-ctl-set-data-format.xml"/>
-    <xi:include href="xml/qmi-message-ctl-sync.xml"/>
-  </chapter>
-
-  <chapter>
     <title>Device Management Service (DMS)</title>
     <xi:include href="xml/qmi-client-dms.xml"/>
     <xi:include href="xml/qmi-enums-dms.xml"/>
diff --git a/libqmi-glib/qmi-device.c b/libqmi-glib/qmi-device.c
index 549296c..811a54d 100644
--- a/libqmi-glib/qmi-device.c
+++ b/libqmi-glib/qmi-device.c
@@ -58,7 +58,6 @@ G_DEFINE_TYPE_EXTENDED (QmiDevice, qmi_device, G_TYPE_OBJECT, 0,
 enum {
     PROP_0,
     PROP_FILE,
-    PROP_CLIENT_CTL,
     PROP_LAST
 };
 
@@ -1997,10 +1996,6 @@ set_property (GObject *object,
         self->priv->path = g_file_get_path (self->priv->file);
         self->priv->path_display = g_filename_display_name (self->priv->path);
         break;
-    case PROP_CLIENT_CTL:
-        /* Not writable */
-        g_assert_not_reached ();
-        break;
     default:
         G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
         break;
@@ -2019,9 +2014,6 @@ get_property (GObject *object,
     case PROP_FILE:
         g_value_set_object (value, self->priv->file);
         break;
-    case PROP_CLIENT_CTL:
-        g_value_set_object (value, self->priv->client_ctl);
-        break;
     default:
         G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
         break;
@@ -2131,12 +2123,4 @@ qmi_device_class_init (QmiDeviceClass *klass)
                              G_TYPE_FILE,
                              G_PARAM_READWRITE | G_PARAM_CONSTRUCT_ONLY);
     g_object_class_install_property (object_class, PROP_FILE, properties[PROP_FILE]);
-
-    properties[PROP_CLIENT_CTL] =
-        g_param_spec_object (QMI_DEVICE_CLIENT_CTL,
-                             "CTL client",
-                             "Implicit CTL client",
-                             QMI_TYPE_CLIENT_CTL,
-                             G_PARAM_READABLE);
-    g_object_class_install_property (object_class, PROP_CLIENT_CTL, properties[PROP_CLIENT_CTL]);
 }
diff --git a/libqmi-glib/qmi-device.h b/libqmi-glib/qmi-device.h
index f43a73f..f00bd03 100644
--- a/libqmi-glib/qmi-device.h
+++ b/libqmi-glib/qmi-device.h
@@ -47,8 +47,7 @@ typedef struct _QmiDevice QmiDevice;
 typedef struct _QmiDeviceClass QmiDeviceClass;
 typedef struct _QmiDevicePrivate QmiDevicePrivate;
 
-#define QMI_DEVICE_FILE       "device-file"
-#define QMI_DEVICE_CLIENT_CTL "device-client-ctl"
+#define QMI_DEVICE_FILE "device-file"
 
 /**
  * QmiDevice: