iface-modem-signal: use G_DECLARE|DEFINE_INTERFACE() macros

8 files changed, 45 insertions, 71 deletions

diff --git a/src/mm-broadband-modem-mbim.c b/src/mm-broadband-modem-mbim.c
index d15c56f1..c25f93df 100644
--- a/src/mm-broadband-modem-mbim.c
+++ b/src/mm-broadband-modem-mbim.c
@@ -57,7 +57,7 @@ static void iface_modem_3gpp_profile_manager_init (MMIfaceModem3gppProfileManage
 static void iface_modem_3gpp_ussd_init            (MMIfaceModem3gppUssdInterface           *iface);
 static void iface_modem_location_init             (MMIfaceModemLocationInterface           *iface);
 static void iface_modem_messaging_init            (MMIfaceModemMessagingInterface          *iface);
-static void iface_modem_signal_init               (MMIfaceModemSignal                      *iface);
+static void iface_modem_signal_init               (MMIfaceModemSignalInterface             *iface);
 static void iface_modem_sar_init                  (MMIfaceModemSarInterface                *iface);
 #if defined WITH_QMI && QMI_MBIM_QMUX_SUPPORTED
 static void shared_qmi_init                       (MMSharedQmi                             *iface);
@@ -66,7 +66,7 @@ static void shared_qmi_init                       (MMSharedQmi
 #if defined WITH_QMI && QMI_MBIM_QMUX_SUPPORTED
 static MMIfaceModemLocationInterface  *iface_modem_location_parent;
 #endif
-static MMIfaceModemSignal             *iface_modem_signal_parent;
+static MMIfaceModemSignalInterface    *iface_modem_signal_parent;
 static MMIfaceModemInterface          *iface_modem_parent;
 
 G_DEFINE_TYPE_EXTENDED (MMBroadbandModemMbim, mm_broadband_modem_mbim, MM_TYPE_BROADBAND_MODEM, 0,
@@ -10321,7 +10321,7 @@ iface_modem_messaging_init (MMIfaceModemMessagingInterface *iface)
 }
 
 static void
-iface_modem_signal_init (MMIfaceModemSignal *iface)
+iface_modem_signal_init (MMIfaceModemSignalInterface *iface)
 {
     iface_modem_signal_parent = g_type_interface_peek_parent (iface);
 
diff --git a/src/mm-broadband-modem-qmi.c b/src/mm-broadband-modem-qmi.c
index 87e62e35..cec24d8f 100644
--- a/src/mm-broadband-modem-qmi.c
+++ b/src/mm-broadband-modem-qmi.c
@@ -64,7 +64,7 @@ static void iface_modem_location_init             (MMIfaceModemLocationInterface
 static void iface_modem_oma_init                  (MMIfaceModemOma                         *iface);
 static void iface_modem_firmware_init             (MMIfaceModemFirmwareInterface           *iface);
 static void iface_modem_sar_init                  (MMIfaceModemSarInterface                *iface);
-static void iface_modem_signal_init               (MMIfaceModemSignal                      *iface);
+static void iface_modem_signal_init               (MMIfaceModemSignalInterface             *iface);
 static void shared_qmi_init                       (MMSharedQmi                             *iface);
 
 static MMIfaceModemLocationInterface  *iface_modem_location_parent;
@@ -14141,7 +14141,7 @@ iface_modem_sar_init (MMIfaceModemSarInterface *iface)
 }
 
 static void
-iface_modem_signal_init (MMIfaceModemSignal *iface)
+iface_modem_signal_init (MMIfaceModemSignalInterface *iface)
 {
     iface->check_support = signal_check_support;
     iface->check_support_finish = signal_check_support_finish;
diff --git a/src/mm-broadband-modem.c b/src/mm-broadband-modem.c
index 2f367944..88d76bd8 100644
--- a/src/mm-broadband-modem.c
+++ b/src/mm-broadband-modem.c
@@ -71,7 +71,7 @@ static void iface_modem_location_init             (MMIfaceModemLocationInterface
 static void iface_modem_messaging_init            (MMIfaceModemMessagingInterface          *iface);
 static void iface_modem_voice_init                (MMIfaceModemVoice                       *iface);
 static void iface_modem_time_init                 (MMIfaceModemTime                        *iface);
-static void iface_modem_signal_init               (MMIfaceModemSignal                      *iface);
+static void iface_modem_signal_init               (MMIfaceModemSignalInterface             *iface);
 static void iface_modem_oma_init                  (MMIfaceModemOma                         *iface);
 static void iface_modem_firmware_init             (MMIfaceModemFirmwareInterface           *iface);
 static void iface_modem_sar_init                  (MMIfaceModemSarInterface                *iface);
@@ -13754,7 +13754,7 @@ iface_modem_time_init (MMIfaceModemTime *iface)
 }
 
 static void
-iface_modem_signal_init (MMIfaceModemSignal *iface)
+iface_modem_signal_init (MMIfaceModemSignalInterface *iface)
 {
     iface->check_support        = modem_signal_check_support;
     iface->check_support_finish = modem_signal_check_support_finish;
diff --git a/src/mm-iface-modem-signal.c b/src/mm-iface-modem-signal.c
index 3e791b7a..b2a7fe61 100644
--- a/src/mm-iface-modem-signal.c
+++ b/src/mm-iface-modem-signal.c
@@ -29,6 +29,8 @@
 static GQuark support_checked_quark;
 static GQuark supported_quark;
 
+G_DEFINE_INTERFACE (MMIfaceModemSignal, mm_iface_modem_signal, MM_TYPE_IFACE_MODEM)
+
 /*****************************************************************************/
 /* Private data context */
 
@@ -232,7 +234,7 @@ load_values_ready (MMIfaceModemSignal *self,
     g_autoptr(MMSignal) lte = NULL;
     g_autoptr(MMSignal) nr5g = NULL;
 
-    if (!MM_IFACE_MODEM_SIGNAL_GET_INTERFACE (self)->load_values_finish (
+    if (!MM_IFACE_MODEM_SIGNAL_GET_IFACE (self)->load_values_finish (
             self,
             res,
             &cdma,
@@ -252,7 +254,7 @@ load_values_ready (MMIfaceModemSignal *self,
 static gboolean
 query_signal_values (MMIfaceModemSignal *self)
 {
-    MM_IFACE_MODEM_SIGNAL_GET_INTERFACE (self)->load_values (
+    MM_IFACE_MODEM_SIGNAL_GET_IFACE (self)->load_values (
         self,
         NULL,
         (GAsyncReadyCallback)load_values_ready,
@@ -310,7 +312,7 @@ setup_thresholds_ready (MMIfaceModemSignal *self,
 {
     GError *error = NULL;
 
-    if (!MM_IFACE_MODEM_SIGNAL_GET_INTERFACE (self)->setup_thresholds_finish (self, res, &error))
+    if (!MM_IFACE_MODEM_SIGNAL_GET_IFACE (self)->setup_thresholds_finish (self, res, &error))
         g_task_return_error (task, error);
     else {
         /* launch a query right away */
@@ -331,8 +333,8 @@ thresholds_restart (MMIfaceModemSignal  *self,
 
     task = g_task_new (self, NULL, callback, user_data);
 
-    if (!MM_IFACE_MODEM_SIGNAL_GET_INTERFACE (self)->setup_thresholds ||
-        !MM_IFACE_MODEM_SIGNAL_GET_INTERFACE (self)->setup_thresholds_finish) {
+    if (!MM_IFACE_MODEM_SIGNAL_GET_IFACE (self)->setup_thresholds ||
+        !MM_IFACE_MODEM_SIGNAL_GET_IFACE (self)->setup_thresholds_finish) {
         g_task_return_boolean (task, TRUE);
         g_object_unref (task);
         return;
@@ -347,7 +349,7 @@ thresholds_restart (MMIfaceModemSignal  *self,
                 priv->rssi_threshold,
                 priv->error_rate_threshold ? "enabled" : "disabled");
 
-    MM_IFACE_MODEM_SIGNAL_GET_INTERFACE (self)->setup_thresholds (
+    MM_IFACE_MODEM_SIGNAL_GET_IFACE (self)->setup_thresholds (
         self,
         priv->rssi_threshold,
         priv->error_rate_threshold,
@@ -488,8 +490,8 @@ handle_setup_thresholds_auth_ready (MMBaseModem                  *_self,
         return;
     }
 
-    if (!MM_IFACE_MODEM_SIGNAL_GET_INTERFACE (self)->setup_thresholds ||
-        !MM_IFACE_MODEM_SIGNAL_GET_INTERFACE (self)->setup_thresholds_finish) {
+    if (!MM_IFACE_MODEM_SIGNAL_GET_IFACE (self)->setup_thresholds ||
+        !MM_IFACE_MODEM_SIGNAL_GET_IFACE (self)->setup_thresholds_finish) {
         mm_dbus_method_invocation_return_error_literal (ctx->invocation, MM_CORE_ERROR, MM_CORE_ERROR_UNSUPPORTED,
                                                         "Cannot setup thresholds: operation not supported");
         handle_setup_thresholds_context_free (ctx);
@@ -677,7 +679,7 @@ check_support_ready (MMIfaceModemSignal *self,
     InitializationContext *ctx;
     GError *error = NULL;
 
-    if (!MM_IFACE_MODEM_SIGNAL_GET_INTERFACE (self)->check_support_finish (self, res, &error)) {
+    if (!MM_IFACE_MODEM_SIGNAL_GET_IFACE (self)->check_support_finish (self, res, &error)) {
         if (error) {
             /* This error shouldn't be treated as critical */
             mm_obj_dbg (self, "extended signal support check failed: %s", error->message);
@@ -736,9 +738,9 @@ interface_initialization_step (GTask *task)
                                 supported_quark,
                                 GUINT_TO_POINTER (FALSE));
 
-            if (MM_IFACE_MODEM_SIGNAL_GET_INTERFACE (self)->check_support &&
-                MM_IFACE_MODEM_SIGNAL_GET_INTERFACE (self)->check_support_finish) {
-                MM_IFACE_MODEM_SIGNAL_GET_INTERFACE (self)->check_support (
+            if (MM_IFACE_MODEM_SIGNAL_GET_IFACE (self)->check_support &&
+                MM_IFACE_MODEM_SIGNAL_GET_IFACE (self)->check_support_finish) {
+                MM_IFACE_MODEM_SIGNAL_GET_IFACE (self)->check_support (
                     self,
                     (GAsyncReadyCallback)check_support_ready,
                     task);
@@ -837,44 +839,21 @@ mm_iface_modem_signal_shutdown (MMIfaceModemSignal *self)
 /*****************************************************************************/
 
 static void
-iface_modem_signal_init (gpointer g_iface)
+mm_iface_modem_signal_default_init (MMIfaceModemSignalInterface *iface)
 {
-    static gboolean initialized = FALSE;
+    static gsize initialized = 0;
 
-    if (initialized)
+    if (!g_once_init_enter (&initialized))
         return;
 
     /* Properties */
-    g_object_interface_install_property
-        (g_iface,
-         g_param_spec_object (MM_IFACE_MODEM_SIGNAL_DBUS_SKELETON,
-                              "Signal DBus skeleton",
-                              "DBus skeleton for the Signal interface",
-                              MM_GDBUS_TYPE_MODEM_SIGNAL_SKELETON,
-                              G_PARAM_READWRITE));
-
-    initialized = TRUE;
-}
-
-GType
-mm_iface_modem_signal_get_type (void)
-{
-    static GType iface_modem_signal_type = 0;
-
-    if (!G_UNLIKELY (iface_modem_signal_type)) {
-        static const GTypeInfo info = {
-            sizeof (MMIfaceModemSignal), /* class_size */
-            iface_modem_signal_init,     /* base_init */
-            NULL,                      /* base_finalize */
-        };
-
-        iface_modem_signal_type = g_type_register_static (G_TYPE_INTERFACE,
-                                                          "MMIfaceModemSignal",
-                                                          &info,
-                                                          0);
-
-        g_type_interface_add_prerequisite (iface_modem_signal_type, MM_TYPE_IFACE_MODEM);
-    }
-
-    return iface_modem_signal_type;
+    g_object_interface_install_property (
+        iface,
+        g_param_spec_object (MM_IFACE_MODEM_SIGNAL_DBUS_SKELETON,
+                             "Signal DBus skeleton",
+                             "DBus skeleton for the Signal interface",
+                             MM_GDBUS_TYPE_MODEM_SIGNAL_SKELETON,
+                             G_PARAM_READWRITE));
+
+    g_once_init_leave (&initialized, 1);
 }
diff --git a/src/mm-iface-modem-signal.h b/src/mm-iface-modem-signal.h
index d359659d..fc521ff1 100644
--- a/src/mm-iface-modem-signal.h
+++ b/src/mm-iface-modem-signal.h
@@ -23,16 +23,14 @@
 #define _LIBMM_INSIDE_MM
 #include <libmm-glib.h>
 
-#define MM_TYPE_IFACE_MODEM_SIGNAL               (mm_iface_modem_signal_get_type ())
-#define MM_IFACE_MODEM_SIGNAL(obj)               (G_TYPE_CHECK_INSTANCE_CAST ((obj), MM_TYPE_IFACE_MODEM_SIGNAL, MMIfaceModemSignal))
-#define MM_IS_IFACE_MODEM_SIGNAL(obj)            (G_TYPE_CHECK_INSTANCE_TYPE ((obj), MM_TYPE_IFACE_MODEM_SIGNAL))
-#define MM_IFACE_MODEM_SIGNAL_GET_INTERFACE(obj) (G_TYPE_INSTANCE_GET_INTERFACE ((obj), MM_TYPE_IFACE_MODEM_SIGNAL, MMIfaceModemSignal))
+#include "mm-iface-modem.h"
 
-#define MM_IFACE_MODEM_SIGNAL_DBUS_SKELETON "iface-modem-signal-dbus-skeleton"
+#define MM_TYPE_IFACE_MODEM_SIGNAL mm_iface_modem_signal_get_type ()
+G_DECLARE_INTERFACE (MMIfaceModemSignal, mm_iface_modem_signal, MM, IFACE_MODEM_SIGNAL, MMIfaceModem)
 
-typedef struct _MMIfaceModemSignal MMIfaceModemSignal;
+#define MM_IFACE_MODEM_SIGNAL_DBUS_SKELETON "iface-modem-signal-dbus-skeleton"
 
-struct _MMIfaceModemSignal {
+struct _MMIfaceModemSignalInterface {
     GTypeInterface g_iface;
 
     /* Check for Messaging support (async) */
@@ -70,9 +68,6 @@ struct _MMIfaceModemSignal {
 
 };
 
-GType mm_iface_modem_signal_get_type (void);
-G_DEFINE_AUTOPTR_CLEANUP_FUNC (MMIfaceModemSignal, g_object_unref)
-
 /* Initialize Signal interface (async) */
 void     mm_iface_modem_signal_initialize        (MMIfaceModemSignal *self,
                                                   GCancellable *cancellable,
diff --git a/src/plugins/cinterion/mm-broadband-modem-cinterion.c b/src/plugins/cinterion/mm-broadband-modem-cinterion.c
index 92d349a6..673c7261 100644
--- a/src/plugins/cinterion/mm-broadband-modem-cinterion.c
+++ b/src/plugins/cinterion/mm-broadband-modem-cinterion.c
@@ -48,7 +48,7 @@ static void iface_modem_messaging_init (MMIfaceModemMessagingInterface *iface);
 static void iface_modem_location_init  (MMIfaceModemLocationInterface  *iface);
 static void iface_modem_voice_init     (MMIfaceModemVoice              *iface);
 static void iface_modem_time_init      (MMIfaceModemTime               *iface);
-static void iface_modem_signal_init    (MMIfaceModemSignal             *iface);
+static void iface_modem_signal_init    (MMIfaceModemSignalInterface    *iface);
 static void shared_cinterion_init      (MMSharedCinterion              *iface);
 
 static MMIfaceModemInterface         *iface_modem_parent;
@@ -56,7 +56,7 @@ static MMIfaceModem3gppInterface     *iface_modem_3gpp_parent;
 static MMIfaceModemLocationInterface *iface_modem_location_parent;
 static MMIfaceModemVoice             *iface_modem_voice_parent;
 static MMIfaceModemTime              *iface_modem_time_parent;
-static MMIfaceModemSignal            *iface_modem_signal_parent;
+static MMIfaceModemSignalInterface   *iface_modem_signal_parent;
 
 G_DEFINE_TYPE_EXTENDED (MMBroadbandModemCinterion, mm_broadband_modem_cinterion, MM_TYPE_BROADBAND_MODEM, 0,
                         G_IMPLEMENT_INTERFACE (MM_TYPE_IFACE_MODEM, iface_modem_init)
@@ -3605,7 +3605,7 @@ shared_cinterion_init (MMSharedCinterion *iface)
 }
 
 static void
-iface_modem_signal_init (MMIfaceModemSignal *iface)
+iface_modem_signal_init (MMIfaceModemSignalInterface *iface)
 {
     iface_modem_signal_parent   = g_type_interface_peek_parent (iface);
 
diff --git a/src/plugins/huawei/mm-broadband-modem-huawei.c b/src/plugins/huawei/mm-broadband-modem-huawei.c
index eb71e6a5..d195d76c 100644
--- a/src/plugins/huawei/mm-broadband-modem-huawei.c
+++ b/src/plugins/huawei/mm-broadband-modem-huawei.c
@@ -57,7 +57,7 @@ static void iface_modem_location_init  (MMIfaceModemLocationInterface *iface);
 static void iface_modem_cdma_init      (MMIfaceModemCdma              *iface);
 static void iface_modem_time_init      (MMIfaceModemTime              *iface);
 static void iface_modem_voice_init     (MMIfaceModemVoice             *iface);
-static void iface_modem_signal_init    (MMIfaceModemSignal            *iface);
+static void iface_modem_signal_init    (MMIfaceModemSignalInterface   *iface);
 
 static MMIfaceModemInterface         *iface_modem_parent;
 static MMIfaceModem3gppInterface     *iface_modem_3gpp_parent;
@@ -5108,7 +5108,7 @@ iface_modem_voice_init (MMIfaceModemVoice *iface)
 }
 
 static void
-iface_modem_signal_init (MMIfaceModemSignal *iface)
+iface_modem_signal_init (MMIfaceModemSignalInterface *iface)
 {
     iface->check_support = signal_check_support;
     iface->check_support_finish = signal_check_support_finish;
diff --git a/src/plugins/xmm/mm-broadband-modem-xmm.c b/src/plugins/xmm/mm-broadband-modem-xmm.c
index 9998efd2..b2ab6b35 100644
--- a/src/plugins/xmm/mm-broadband-modem-xmm.c
+++ b/src/plugins/xmm/mm-broadband-modem-xmm.c
@@ -29,7 +29,7 @@
 
 static void iface_modem_init          (MMIfaceModemInterface         *iface);
 static void shared_xmm_init           (MMSharedXmm                   *iface);
-static void iface_modem_signal_init   (MMIfaceModemSignal            *iface);
+static void iface_modem_signal_init   (MMIfaceModemSignalInterface   *iface);
 static void iface_modem_location_init (MMIfaceModemLocationInterface *iface);
 
 static MMIfaceModemLocationInterface *iface_modem_location_parent;
@@ -128,7 +128,7 @@ peek_parent_location_interface (MMSharedXmm *self)
 }
 
 static void
-iface_modem_signal_init (MMIfaceModemSignal *iface)
+iface_modem_signal_init (MMIfaceModemSignalInterface *iface)
 {
     iface->check_support        = mm_shared_xmm_signal_check_support;
     iface->check_support_finish = mm_shared_xmm_signal_check_support_finish;