shared-option: use G_DECLARE|DEFINE_INTERFACE() macros

4 files changed, 10 insertions, 33 deletions

diff --git a/src/plugins/option/mm-broadband-modem-hso.c b/src/plugins/option/mm-broadband-modem-hso.c
index 12abe897..2dd09768 100644
--- a/src/plugins/option/mm-broadband-modem-hso.c
+++ b/src/plugins/option/mm-broadband-modem-hso.c
@@ -36,7 +36,7 @@
 #include "mm-bearer-list.h"
 #include "mm-shared-option.h"
 
-static void shared_option_init        (MMSharedOption                *iface);
+static void shared_option_init        (MMSharedOptionInterface       *iface);
 static void iface_modem_init          (MMIfaceModemInterface         *iface);
 static void iface_modem_3gpp_init     (MMIfaceModem3gppInterface     *iface);
 static void iface_modem_location_init (MMIfaceModemLocationInterface *iface);
@@ -782,7 +782,7 @@ mm_broadband_modem_hso_init (MMBroadbandModemHso *self)
 }
 
 static void
-shared_option_init (MMSharedOption *iface)
+shared_option_init (MMSharedOptionInterface *iface)
 {
 }
 
diff --git a/src/plugins/option/mm-broadband-modem-option.c b/src/plugins/option/mm-broadband-modem-option.c
index 427bfba2..546418d6 100644
--- a/src/plugins/option/mm-broadband-modem-option.c
+++ b/src/plugins/option/mm-broadband-modem-option.c
@@ -33,7 +33,7 @@
 #include "mm-broadband-modem-option.h"
 #include "mm-shared-option.h"
 
-static void shared_option_init    (MMSharedOption            *iface);
+static void shared_option_init    (MMSharedOptionInterface   *iface);
 static void iface_modem_init      (MMIfaceModemInterface     *iface);
 static void iface_modem_3gpp_init (MMIfaceModem3gppInterface *iface);
 
@@ -1200,7 +1200,7 @@ mm_broadband_modem_option_init (MMBroadbandModemOption *self)
 }
 
 static void
-shared_option_init (MMSharedOption *iface)
+shared_option_init (MMSharedOptionInterface *iface)
 {
 }
 
diff --git a/src/plugins/option/mm-shared-option.c b/src/plugins/option/mm-shared-option.c
index a06888a1..3c17e8a8 100644
--- a/src/plugins/option/mm-shared-option.c
+++ b/src/plugins/option/mm-shared-option.c
@@ -28,6 +28,8 @@
 #include "mm-sim-option.h"
 #include "mm-shared-option.h"
 
+G_DEFINE_INTERFACE (MMSharedOption, mm_shared_option, MM_TYPE_IFACE_MODEM)
+
 /*****************************************************************************/
 /* Create SIM (Modem inteface) */
 
@@ -53,25 +55,6 @@ mm_shared_option_create_sim (MMIfaceModem        *self,
 /*****************************************************************************/
 
 static void
-shared_option_init (gpointer g_iface)
-{
-}
-
-GType
-mm_shared_option_get_type (void)
+mm_shared_option_default_init (MMSharedOptionInterface *iface)
 {
-    static GType shared_option_type = 0;
-
-    if (!G_UNLIKELY (shared_option_type)) {
-        static const GTypeInfo info = {
-            sizeof (MMSharedOption),  /* class_size */
-            shared_option_init,       /* base_init */
-            NULL,                  /* base_finalize */
-        };
-
-        shared_option_type = g_type_register_static (G_TYPE_INTERFACE, "MMSharedOption", &info, 0);
-        g_type_interface_add_prerequisite (shared_option_type, MM_TYPE_IFACE_MODEM);
-    }
-
-    return shared_option_type;
 }
diff --git a/src/plugins/option/mm-shared-option.h b/src/plugins/option/mm-shared-option.h
index 0d4baf60..f76f2e33 100644
--- a/src/plugins/option/mm-shared-option.h
+++ b/src/plugins/option/mm-shared-option.h
@@ -26,19 +26,13 @@
 #include "mm-iface-modem.h"
 #include "mm-iface-modem-location.h"
 
-#define MM_TYPE_SHARED_OPTION                   (mm_shared_option_get_type ())
-#define MM_SHARED_OPTION(obj)                   (G_TYPE_CHECK_INSTANCE_CAST ((obj), MM_TYPE_SHARED_OPTION, MMSharedOption))
-#define MM_IS_SHARED_OPTION(obj)                (G_TYPE_CHECK_INSTANCE_TYPE ((obj), MM_TYPE_SHARED_OPTION))
-#define MM_SHARED_OPTION_GET_INTERFACE(obj)     (G_TYPE_INSTANCE_GET_INTERFACE ((obj), MM_TYPE_SHARED_OPTION, MMSharedOption))
+#define MM_TYPE_SHARED_OPTION mm_shared_option_get_type ()
+G_DECLARE_INTERFACE (MMSharedOption, mm_shared_option, MM, SHARED_OPTION, MMIfaceModem)
 
-typedef struct _MMSharedOption MMSharedOption;
-
-struct _MMSharedOption {
+struct _MMSharedOptionInterface {
     GTypeInterface g_iface;
 };
 
-GType mm_shared_option_get_type (void);
-
 void       mm_shared_option_create_sim        (MMIfaceModem         *self,
                                                GAsyncReadyCallback   callback,
                                                gpointer              user_data);