aboutsummaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
Diffstat (limited to 'src')
-rw-r--r--src/mm-broadband-modem.c4
-rw-r--r--src/mm-iface-modem-time.c107
-rw-r--r--src/mm-iface-modem-time.h15
-rw-r--r--src/plugins/cinterion/mm-broadband-modem-cinterion.c8
-rw-r--r--src/plugins/cinterion/mm-broadband-modem-mbim-cinterion.c8
-rw-r--r--src/plugins/cinterion/mm-broadband-modem-qmi-cinterion.c8
-rw-r--r--src/plugins/cinterion/mm-shared-cinterion.c4
-rw-r--r--src/plugins/cinterion/mm-shared-cinterion.h2
-rw-r--r--src/plugins/huawei/mm-broadband-modem-huawei.c4
-rw-r--r--src/plugins/icera/mm-broadband-modem-icera.c4
-rw-r--r--src/plugins/novatel/mm-broadband-modem-novatel.c4
-rw-r--r--src/plugins/quectel/mm-broadband-modem-mbim-quectel.c4
-rw-r--r--src/plugins/quectel/mm-broadband-modem-qmi-quectel.c4
-rw-r--r--src/plugins/quectel/mm-broadband-modem-quectel.c4
-rw-r--r--src/plugins/sierra/mm-broadband-modem-sierra.c8
15 files changed, 80 insertions, 108 deletions
diff --git a/src/mm-broadband-modem.c b/src/mm-broadband-modem.c
index 88d76bd8..410b8e0b 100644
--- a/src/mm-broadband-modem.c
+++ b/src/mm-broadband-modem.c
@@ -70,7 +70,7 @@ static void iface_modem_simple_init (MMIfaceModemSimpleInterface
static void iface_modem_location_init (MMIfaceModemLocationInterface *iface);
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_time_init (MMIfaceModemTimeInterface *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);
@@ -13743,7 +13743,7 @@ iface_modem_voice_init (MMIfaceModemVoice *iface)
}
static void
-iface_modem_time_init (MMIfaceModemTime *iface)
+iface_modem_time_init (MMIfaceModemTimeInterface *iface)
{
iface->check_support = modem_time_check_support;
iface->check_support_finish = modem_time_check_support_finish;
diff --git a/src/mm-iface-modem-time.c b/src/mm-iface-modem-time.c
index 74ca3a6d..53d03b30 100644
--- a/src/mm-iface-modem-time.c
+++ b/src/mm-iface-modem-time.c
@@ -30,6 +30,8 @@ static GQuark support_checked_quark;
static GQuark supported_quark;
static GQuark network_timezone_context_quark;
+G_DEFINE_INTERFACE (MMIfaceModemTime, mm_iface_modem_time, MM_TYPE_IFACE_MODEM)
+
/*****************************************************************************/
void
@@ -63,7 +65,7 @@ load_network_time_ready (MMIfaceModemTime *self,
gchar *time_str;
GError *error = NULL;
- time_str = MM_IFACE_MODEM_TIME_GET_INTERFACE (self)->load_network_time_finish (self, res, &error);
+ time_str = MM_IFACE_MODEM_TIME_GET_IFACE (self)->load_network_time_finish (self, res, &error);
if (error)
mm_dbus_method_invocation_take_error (ctx->invocation, error);
else
@@ -98,8 +100,8 @@ handle_get_network_time_auth_ready (MMBaseModem *self,
return;
}
- if (!MM_IFACE_MODEM_TIME_GET_INTERFACE (self)->load_network_time ||
- !MM_IFACE_MODEM_TIME_GET_INTERFACE (self)->load_network_time_finish) {
+ if (!MM_IFACE_MODEM_TIME_GET_IFACE (self)->load_network_time ||
+ !MM_IFACE_MODEM_TIME_GET_IFACE (self)->load_network_time_finish) {
mm_dbus_method_invocation_return_error_literal (ctx->invocation, MM_CORE_ERROR, MM_CORE_ERROR_UNSUPPORTED,
"Cannot load network time: operation not supported");
handle_get_network_time_context_free (ctx);
@@ -107,7 +109,7 @@ handle_get_network_time_auth_ready (MMBaseModem *self,
}
mm_obj_info (self, "processing user request to load network time...");
- MM_IFACE_MODEM_TIME_GET_INTERFACE (self)->load_network_time (
+ MM_IFACE_MODEM_TIME_GET_IFACE (self)->load_network_time (
ctx->self,
(GAsyncReadyCallback)load_network_time_ready,
ctx);
@@ -194,7 +196,7 @@ load_network_timezone_ready (MMIfaceModemTime *self,
MMNetworkTimezone *tz;
/* Finish the async operation */
- tz = MM_IFACE_MODEM_TIME_GET_INTERFACE (self)->load_network_timezone_finish (self, res, &error);
+ tz = MM_IFACE_MODEM_TIME_GET_IFACE (self)->load_network_timezone_finish (self, res, &error);
if (!tz) {
NetworkTimezoneContext *ctx;
@@ -235,7 +237,7 @@ network_timezone_poll_cb (MMIfaceModemTime *self)
ctx = (NetworkTimezoneContext *) g_object_get_qdata (G_OBJECT (self), network_timezone_context_quark);
ctx->network_timezone_poll_id = 0;
- MM_IFACE_MODEM_TIME_GET_INTERFACE (self)->load_network_timezone (
+ MM_IFACE_MODEM_TIME_GET_IFACE (self)->load_network_timezone (
self,
(GAsyncReadyCallback)load_network_timezone_ready,
NULL);
@@ -315,8 +317,8 @@ start_network_timezone (MMIfaceModemTime *self)
NetworkTimezoneContext *ctx;
/* If loading network timezone not supported, just finish here */
- if (!MM_IFACE_MODEM_TIME_GET_INTERFACE (self)->load_network_timezone ||
- !MM_IFACE_MODEM_TIME_GET_INTERFACE (self)->load_network_timezone_finish) {
+ if (!MM_IFACE_MODEM_TIME_GET_IFACE (self)->load_network_timezone ||
+ !MM_IFACE_MODEM_TIME_GET_IFACE (self)->load_network_timezone_finish) {
mm_obj_dbg (self, "loading network timezone is not supported");
return;
}
@@ -430,7 +432,7 @@ disable_unsolicited_events_ready (MMIfaceModemTime *self,
DisablingContext *ctx;
GError *error = NULL;
- MM_IFACE_MODEM_TIME_GET_INTERFACE (self)->disable_unsolicited_events_finish (self, res, &error);
+ MM_IFACE_MODEM_TIME_GET_IFACE (self)->disable_unsolicited_events_finish (self, res, &error);
if (error) {
g_task_return_error (task, error);
g_object_unref (task);
@@ -451,7 +453,7 @@ cleanup_unsolicited_events_ready (MMIfaceModemTime *self,
DisablingContext *ctx;
GError *error = NULL;
- MM_IFACE_MODEM_TIME_GET_INTERFACE (self)->cleanup_unsolicited_events_finish (self, res, &error);
+ MM_IFACE_MODEM_TIME_GET_IFACE (self)->cleanup_unsolicited_events_finish (self, res, &error);
if (error) {
g_task_return_error (task, error);
g_object_unref (task);
@@ -486,9 +488,9 @@ interface_disabling_step (GTask *task)
case DISABLING_STEP_DISABLE_UNSOLICITED_EVENTS:
/* Allow cleaning up unsolicited events */
- if (MM_IFACE_MODEM_TIME_GET_INTERFACE (self)->disable_unsolicited_events &&
- MM_IFACE_MODEM_TIME_GET_INTERFACE (self)->disable_unsolicited_events_finish) {
- MM_IFACE_MODEM_TIME_GET_INTERFACE (self)->disable_unsolicited_events (
+ if (MM_IFACE_MODEM_TIME_GET_IFACE (self)->disable_unsolicited_events &&
+ MM_IFACE_MODEM_TIME_GET_IFACE (self)->disable_unsolicited_events_finish) {
+ MM_IFACE_MODEM_TIME_GET_IFACE (self)->disable_unsolicited_events (
self,
(GAsyncReadyCallback)disable_unsolicited_events_ready,
task);
@@ -499,9 +501,9 @@ interface_disabling_step (GTask *task)
case DISABLING_STEP_CLEANUP_UNSOLICITED_EVENTS:
/* Allow cleaning up unsolicited events */
- if (MM_IFACE_MODEM_TIME_GET_INTERFACE (self)->cleanup_unsolicited_events &&
- MM_IFACE_MODEM_TIME_GET_INTERFACE (self)->cleanup_unsolicited_events_finish) {
- MM_IFACE_MODEM_TIME_GET_INTERFACE (self)->cleanup_unsolicited_events (
+ if (MM_IFACE_MODEM_TIME_GET_IFACE (self)->cleanup_unsolicited_events &&
+ MM_IFACE_MODEM_TIME_GET_IFACE (self)->cleanup_unsolicited_events_finish) {
+ MM_IFACE_MODEM_TIME_GET_IFACE (self)->cleanup_unsolicited_events (
self,
(GAsyncReadyCallback)cleanup_unsolicited_events_ready,
task);
@@ -594,7 +596,7 @@ setup_unsolicited_events_ready (MMIfaceModemTime *self,
EnablingContext *ctx;
GError *error = NULL;
- MM_IFACE_MODEM_TIME_GET_INTERFACE (self)->setup_unsolicited_events_finish (self, res, &error);
+ MM_IFACE_MODEM_TIME_GET_IFACE (self)->setup_unsolicited_events_finish (self, res, &error);
if (error) {
g_task_return_error (task, error);
g_object_unref (task);
@@ -616,7 +618,7 @@ enable_unsolicited_events_ready (MMIfaceModemTime *self,
GError *error = NULL;
/* Not critical! */
- if (!MM_IFACE_MODEM_TIME_GET_INTERFACE (self)->enable_unsolicited_events_finish (self, res, &error)) {
+ if (!MM_IFACE_MODEM_TIME_GET_IFACE (self)->enable_unsolicited_events_finish (self, res, &error)) {
mm_obj_dbg (self, "couldn't enable unsolicited events: %s", error->message);
g_error_free (error);
}
@@ -655,9 +657,9 @@ interface_enabling_step (GTask *task)
case ENABLING_STEP_SETUP_UNSOLICITED_EVENTS:
/* Allow setting up unsolicited events */
- if (MM_IFACE_MODEM_TIME_GET_INTERFACE (self)->setup_unsolicited_events &&
- MM_IFACE_MODEM_TIME_GET_INTERFACE (self)->setup_unsolicited_events_finish) {
- MM_IFACE_MODEM_TIME_GET_INTERFACE (self)->setup_unsolicited_events (
+ if (MM_IFACE_MODEM_TIME_GET_IFACE (self)->setup_unsolicited_events &&
+ MM_IFACE_MODEM_TIME_GET_IFACE (self)->setup_unsolicited_events_finish) {
+ MM_IFACE_MODEM_TIME_GET_IFACE (self)->setup_unsolicited_events (
self,
(GAsyncReadyCallback)setup_unsolicited_events_ready,
task);
@@ -668,9 +670,9 @@ interface_enabling_step (GTask *task)
case ENABLING_STEP_ENABLE_UNSOLICITED_EVENTS:
/* Allow setting up unsolicited events */
- if (MM_IFACE_MODEM_TIME_GET_INTERFACE (self)->enable_unsolicited_events &&
- MM_IFACE_MODEM_TIME_GET_INTERFACE (self)->enable_unsolicited_events_finish) {
- MM_IFACE_MODEM_TIME_GET_INTERFACE (self)->enable_unsolicited_events (
+ if (MM_IFACE_MODEM_TIME_GET_IFACE (self)->enable_unsolicited_events &&
+ MM_IFACE_MODEM_TIME_GET_IFACE (self)->enable_unsolicited_events_finish) {
+ MM_IFACE_MODEM_TIME_GET_IFACE (self)->enable_unsolicited_events (
self,
(GAsyncReadyCallback)enable_unsolicited_events_ready,
task);
@@ -832,9 +834,7 @@ check_support_ready (MMIfaceModemTime *self,
InitializationContext *ctx;
GError *error = NULL;
- if (!MM_IFACE_MODEM_TIME_GET_INTERFACE (self)->check_support_finish (self,
- res,
- &error)) {
+ if (!MM_IFACE_MODEM_TIME_GET_IFACE (self)->check_support_finish (self, res, &error)) {
if (error) {
/* This error shouldn't be treated as critical */
mm_obj_dbg (self, "time support check failed: %s", error->message);
@@ -893,9 +893,9 @@ interface_initialization_step (GTask *task)
supported_quark,
GUINT_TO_POINTER (FALSE));
- if (MM_IFACE_MODEM_TIME_GET_INTERFACE (self)->check_support &&
- MM_IFACE_MODEM_TIME_GET_INTERFACE (self)->check_support_finish) {
- MM_IFACE_MODEM_TIME_GET_INTERFACE (self)->check_support (
+ if (MM_IFACE_MODEM_TIME_GET_IFACE (self)->check_support &&
+ MM_IFACE_MODEM_TIME_GET_IFACE (self)->check_support_finish) {
+ MM_IFACE_MODEM_TIME_GET_IFACE (self)->check_support (
self,
(GAsyncReadyCallback)check_support_ready,
task);
@@ -999,44 +999,21 @@ mm_iface_modem_time_shutdown (MMIfaceModemTime *self)
/*****************************************************************************/
static void
-iface_modem_time_init (gpointer g_iface)
+mm_iface_modem_time_default_init (MMIfaceModemTimeInterface *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_TIME_DBUS_SKELETON,
- "Time DBus skeleton",
- "DBus skeleton for the Time interface",
- MM_GDBUS_TYPE_MODEM_TIME_SKELETON,
- G_PARAM_READWRITE));
-
- initialized = TRUE;
-}
-
-GType
-mm_iface_modem_time_get_type (void)
-{
- static GType iface_modem_time_type = 0;
-
- if (!G_UNLIKELY (iface_modem_time_type)) {
- static const GTypeInfo info = {
- sizeof (MMIfaceModemTime), /* class_size */
- iface_modem_time_init, /* base_init */
- NULL, /* base_finalize */
- };
-
- iface_modem_time_type = g_type_register_static (G_TYPE_INTERFACE,
- "MMIfaceModemTime",
- &info,
- 0);
-
- g_type_interface_add_prerequisite (iface_modem_time_type, MM_TYPE_IFACE_MODEM);
- }
-
- return iface_modem_time_type;
+ g_object_interface_install_property (
+ iface,
+ g_param_spec_object (MM_IFACE_MODEM_TIME_DBUS_SKELETON,
+ "Time DBus skeleton",
+ "DBus skeleton for the Time interface",
+ MM_GDBUS_TYPE_MODEM_TIME_SKELETON,
+ G_PARAM_READWRITE));
+
+ g_once_init_leave (&initialized, 1);
}
diff --git a/src/mm-iface-modem-time.h b/src/mm-iface-modem-time.h
index 753dc837..123fad5e 100644
--- a/src/mm-iface-modem-time.h
+++ b/src/mm-iface-modem-time.h
@@ -22,16 +22,14 @@
#define _LIBMM_INSIDE_MM
#include <libmm-glib.h>
-#define MM_TYPE_IFACE_MODEM_TIME (mm_iface_modem_time_get_type ())
-#define MM_IFACE_MODEM_TIME(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), MM_TYPE_IFACE_MODEM_TIME, MMIfaceModemTime))
-#define MM_IS_IFACE_MODEM_TIME(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), MM_TYPE_IFACE_MODEM_TIME))
-#define MM_IFACE_MODEM_TIME_GET_INTERFACE(obj) (G_TYPE_INSTANCE_GET_INTERFACE ((obj), MM_TYPE_IFACE_MODEM_TIME, MMIfaceModemTime))
+#include "mm-iface-modem.h"
-#define MM_IFACE_MODEM_TIME_DBUS_SKELETON "iface-modem-time-dbus-skeleton"
+#define MM_TYPE_IFACE_MODEM_TIME mm_iface_modem_time_get_type ()
+G_DECLARE_INTERFACE (MMIfaceModemTime, mm_iface_modem_time, MM, IFACE_MODEM_TIME, MMIfaceModem)
-typedef struct _MMIfaceModemTime MMIfaceModemTime;
+#define MM_IFACE_MODEM_TIME_DBUS_SKELETON "iface-modem-time-dbus-skeleton"
-struct _MMIfaceModemTime {
+struct _MMIfaceModemTimeInterface {
GTypeInterface g_iface;
/* Check for Time support (async) */
@@ -93,9 +91,6 @@ struct _MMIfaceModemTime {
GError **error);
};
-GType mm_iface_modem_time_get_type (void);
-G_DEFINE_AUTOPTR_CLEANUP_FUNC (MMIfaceModemTime, g_object_unref)
-
/* Initialize Time interface (async) */
void mm_iface_modem_time_initialize (MMIfaceModemTime *self,
GCancellable *cancellable,
diff --git a/src/plugins/cinterion/mm-broadband-modem-cinterion.c b/src/plugins/cinterion/mm-broadband-modem-cinterion.c
index 673c7261..7ae1d9d1 100644
--- a/src/plugins/cinterion/mm-broadband-modem-cinterion.c
+++ b/src/plugins/cinterion/mm-broadband-modem-cinterion.c
@@ -47,7 +47,7 @@ static void iface_modem_3gpp_init (MMIfaceModem3gppInterface *iface);
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_time_init (MMIfaceModemTimeInterface *iface);
static void iface_modem_signal_init (MMIfaceModemSignalInterface *iface);
static void shared_cinterion_init (MMSharedCinterion *iface);
@@ -55,7 +55,7 @@ static MMIfaceModemInterface *iface_modem_parent;
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 MMIfaceModemTimeInterface *iface_modem_time_parent;
static MMIfaceModemSignalInterface *iface_modem_signal_parent;
G_DEFINE_TYPE_EXTENDED (MMBroadbandModemCinterion, mm_broadband_modem_cinterion, MM_TYPE_BROADBAND_MODEM, 0,
@@ -3579,7 +3579,7 @@ peek_parent_voice_interface (MMSharedCinterion *self)
}
static void
-iface_modem_time_init (MMIfaceModemTime *iface)
+iface_modem_time_init (MMIfaceModemTimeInterface *iface)
{
iface_modem_time_parent = g_type_interface_peek_parent (iface);
@@ -3589,7 +3589,7 @@ iface_modem_time_init (MMIfaceModemTime *iface)
iface->cleanup_unsolicited_events_finish = mm_shared_cinterion_time_cleanup_unsolicited_events_finish;
}
-static MMIfaceModemTime *
+static MMIfaceModemTimeInterface *
peek_parent_time_interface (MMSharedCinterion *self)
{
return iface_modem_time_parent;
diff --git a/src/plugins/cinterion/mm-broadband-modem-mbim-cinterion.c b/src/plugins/cinterion/mm-broadband-modem-mbim-cinterion.c
index 830ef159..ea3adef1 100644
--- a/src/plugins/cinterion/mm-broadband-modem-mbim-cinterion.c
+++ b/src/plugins/cinterion/mm-broadband-modem-mbim-cinterion.c
@@ -33,13 +33,13 @@
static void iface_modem_init (MMIfaceModemInterface *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_time_init (MMIfaceModemTimeInterface *iface);
static void shared_cinterion_init (MMSharedCinterion *iface);
static MMIfaceModemInterface *iface_modem_parent;
static MMIfaceModemLocationInterface *iface_modem_location_parent;
static MMIfaceModemVoice *iface_modem_voice_parent;
-static MMIfaceModemTime *iface_modem_time_parent;
+static MMIfaceModemTimeInterface *iface_modem_time_parent;
G_DEFINE_TYPE_EXTENDED (MMBroadbandModemMbimCinterion, mm_broadband_modem_mbim_cinterion, MM_TYPE_BROADBAND_MODEM_MBIM, 0,
G_IMPLEMENT_INTERFACE (MM_TYPE_IFACE_MODEM, iface_modem_init)
@@ -139,7 +139,7 @@ peek_parent_voice_interface (MMSharedCinterion *self)
}
static void
-iface_modem_time_init (MMIfaceModemTime *iface)
+iface_modem_time_init (MMIfaceModemTimeInterface *iface)
{
iface_modem_time_parent = g_type_interface_peek_parent (iface);
@@ -149,7 +149,7 @@ iface_modem_time_init (MMIfaceModemTime *iface)
iface->cleanup_unsolicited_events_finish = mm_shared_cinterion_time_cleanup_unsolicited_events_finish;
}
-static MMIfaceModemTime *
+static MMIfaceModemTimeInterface *
peek_parent_time_interface (MMSharedCinterion *self)
{
return iface_modem_time_parent;
diff --git a/src/plugins/cinterion/mm-broadband-modem-qmi-cinterion.c b/src/plugins/cinterion/mm-broadband-modem-qmi-cinterion.c
index 0534f768..6475d155 100644
--- a/src/plugins/cinterion/mm-broadband-modem-qmi-cinterion.c
+++ b/src/plugins/cinterion/mm-broadband-modem-qmi-cinterion.c
@@ -34,13 +34,13 @@
static void iface_modem_init (MMIfaceModemInterface *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_time_init (MMIfaceModemTimeInterface *iface);
static void shared_cinterion_init (MMSharedCinterion *iface);
static MMIfaceModemInterface *iface_modem_parent;
static MMIfaceModemLocationInterface *iface_modem_location_parent;
static MMIfaceModemVoice *iface_modem_voice_parent;
-static MMIfaceModemTime *iface_modem_time_parent;
+static MMIfaceModemTimeInterface *iface_modem_time_parent;
G_DEFINE_TYPE_EXTENDED (MMBroadbandModemQmiCinterion, mm_broadband_modem_qmi_cinterion, MM_TYPE_BROADBAND_MODEM_QMI, 0,
G_IMPLEMENT_INTERFACE (MM_TYPE_IFACE_MODEM, iface_modem_init)
@@ -138,7 +138,7 @@ peek_parent_voice_interface (MMSharedCinterion *self)
}
static void
-iface_modem_time_init (MMIfaceModemTime *iface)
+iface_modem_time_init (MMIfaceModemTimeInterface *iface)
{
iface_modem_time_parent = g_type_interface_peek_parent (iface);
@@ -148,7 +148,7 @@ iface_modem_time_init (MMIfaceModemTime *iface)
iface->cleanup_unsolicited_events_finish = mm_shared_cinterion_time_cleanup_unsolicited_events_finish;
}
-static MMIfaceModemTime *
+static MMIfaceModemTimeInterface *
peek_parent_time_interface (MMSharedCinterion *self)
{
return iface_modem_time_parent;
diff --git a/src/plugins/cinterion/mm-shared-cinterion.c b/src/plugins/cinterion/mm-shared-cinterion.c
index 2ac2ab2a..47b86018 100644
--- a/src/plugins/cinterion/mm-shared-cinterion.c
+++ b/src/plugins/cinterion/mm-shared-cinterion.c
@@ -57,8 +57,8 @@ typedef struct {
FeatureSupport slcc_support;
GRegex *slcc_regex;
/* time */
- MMIfaceModemTime *iface_modem_time_parent;
- GRegex *ctzu_regex;
+ MMIfaceModemTimeInterface *iface_modem_time_parent;
+ GRegex *ctzu_regex;
} Private;
static void
diff --git a/src/plugins/cinterion/mm-shared-cinterion.h b/src/plugins/cinterion/mm-shared-cinterion.h
index 41e99a8b..f26aac96 100644
--- a/src/plugins/cinterion/mm-shared-cinterion.h
+++ b/src/plugins/cinterion/mm-shared-cinterion.h
@@ -50,7 +50,7 @@ struct _MMSharedCinterion {
MMIfaceModemVoice * (* peek_parent_voice_interface) (MMSharedCinterion *self);
/* Peek time interface of the parent class of the object */
- MMIfaceModemTime * (* peek_parent_time_interface) (MMSharedCinterion *self);
+ MMIfaceModemTimeInterface * (* peek_parent_time_interface) (MMSharedCinterion *self);
};
GType mm_shared_cinterion_get_type (void);
diff --git a/src/plugins/huawei/mm-broadband-modem-huawei.c b/src/plugins/huawei/mm-broadband-modem-huawei.c
index d195d76c..0b11f044 100644
--- a/src/plugins/huawei/mm-broadband-modem-huawei.c
+++ b/src/plugins/huawei/mm-broadband-modem-huawei.c
@@ -55,7 +55,7 @@ static void iface_modem_3gpp_init (MMIfaceModem3gppInterface *iface);
static void iface_modem_3gpp_ussd_init (MMIfaceModem3gppUssdInterface *iface);
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_time_init (MMIfaceModemTimeInterface *iface);
static void iface_modem_voice_init (MMIfaceModemVoice *iface);
static void iface_modem_signal_init (MMIfaceModemSignalInterface *iface);
@@ -5074,7 +5074,7 @@ iface_modem_location_init (MMIfaceModemLocationInterface *iface)
}
static void
-iface_modem_time_init (MMIfaceModemTime *iface)
+iface_modem_time_init (MMIfaceModemTimeInterface *iface)
{
iface->check_support = modem_time_check_support;
iface->check_support_finish = modem_time_check_support_finish;
diff --git a/src/plugins/icera/mm-broadband-modem-icera.c b/src/plugins/icera/mm-broadband-modem-icera.c
index ed2a6030..f8532b78 100644
--- a/src/plugins/icera/mm-broadband-modem-icera.c
+++ b/src/plugins/icera/mm-broadband-modem-icera.c
@@ -42,7 +42,7 @@
static void iface_modem_init (MMIfaceModemInterface *iface);
static void iface_modem_3gpp_init (MMIfaceModem3gppInterface *iface);
static void iface_modem_3gpp_profile_manager_init (MMIfaceModem3gppProfileManagerInterface *iface);
-static void iface_modem_time_init (MMIfaceModemTime *iface);
+static void iface_modem_time_init (MMIfaceModemTimeInterface *iface);
static MMIfaceModem *iface_modem_parent;
static MMIfaceModem3gppInterface *iface_modem_3gpp_parent;
@@ -2342,7 +2342,7 @@ iface_modem_3gpp_profile_manager_init (MMIfaceModem3gppProfileManagerInterface *
}
static void
-iface_modem_time_init (MMIfaceModemTime *iface)
+iface_modem_time_init (MMIfaceModemTimeInterface *iface)
{
iface->check_support = modem_time_check_support;
iface->check_support_finish = modem_time_check_support_finish;
diff --git a/src/plugins/novatel/mm-broadband-modem-novatel.c b/src/plugins/novatel/mm-broadband-modem-novatel.c
index 586b1b50..eb7b4c89 100644
--- a/src/plugins/novatel/mm-broadband-modem-novatel.c
+++ b/src/plugins/novatel/mm-broadband-modem-novatel.c
@@ -41,7 +41,7 @@
static void iface_modem_init (MMIfaceModemInterface *iface);
static void iface_modem_messaging_init (MMIfaceModemMessagingInterface *iface);
static void iface_modem_cdma_init (MMIfaceModemCdma *iface);
-static void iface_modem_time_init (MMIfaceModemTime *iface);
+static void iface_modem_time_init (MMIfaceModemTimeInterface *iface);
static MMIfaceModemInterface *iface_modem_parent;
@@ -1595,7 +1595,7 @@ iface_modem_cdma_init (MMIfaceModemCdma *iface)
}
static void
-iface_modem_time_init (MMIfaceModemTime *iface)
+iface_modem_time_init (MMIfaceModemTimeInterface *iface)
{
iface->check_support = modem_time_check_support;
iface->check_support_finish = modem_time_check_support_finish;
diff --git a/src/plugins/quectel/mm-broadband-modem-mbim-quectel.c b/src/plugins/quectel/mm-broadband-modem-mbim-quectel.c
index c5e3eab6..c41205f6 100644
--- a/src/plugins/quectel/mm-broadband-modem-mbim-quectel.c
+++ b/src/plugins/quectel/mm-broadband-modem-mbim-quectel.c
@@ -25,7 +25,7 @@
static void iface_modem_init (MMIfaceModemInterface *iface);
static void iface_modem_firmware_init (MMIfaceModemFirmwareInterface *iface);
static void iface_modem_location_init (MMIfaceModemLocationInterface *iface);
-static void iface_modem_time_init (MMIfaceModemTime *iface);
+static void iface_modem_time_init (MMIfaceModemTimeInterface *iface);
static void shared_quectel_init (MMSharedQuectel *iface);
static MMIfaceModemInterface *iface_modem_parent;
@@ -101,7 +101,7 @@ iface_modem_location_init (MMIfaceModemLocationInterface *iface)
}
static void
-iface_modem_time_init (MMIfaceModemTime *iface)
+iface_modem_time_init (MMIfaceModemTimeInterface *iface)
{
iface->check_support = mm_shared_quectel_time_check_support;
iface->check_support_finish = mm_shared_quectel_time_check_support_finish;
diff --git a/src/plugins/quectel/mm-broadband-modem-qmi-quectel.c b/src/plugins/quectel/mm-broadband-modem-qmi-quectel.c
index 349c3013..b9283479 100644
--- a/src/plugins/quectel/mm-broadband-modem-qmi-quectel.c
+++ b/src/plugins/quectel/mm-broadband-modem-qmi-quectel.c
@@ -28,7 +28,7 @@
static void iface_modem_init (MMIfaceModemInterface *iface);
static void iface_modem_firmware_init (MMIfaceModemFirmwareInterface *iface);
static void iface_modem_location_init (MMIfaceModemLocationInterface *iface);
-static void iface_modem_time_init (MMIfaceModemTime *iface);
+static void iface_modem_time_init (MMIfaceModemTimeInterface *iface);
static void iface_modem_3gpp_profile_manager_init (MMIfaceModem3gppProfileManagerInterface *iface);
static void shared_quectel_init (MMSharedQuectel *iface);
@@ -183,7 +183,7 @@ iface_modem_location_init (MMIfaceModemLocationInterface *iface)
}
static void
-iface_modem_time_init (MMIfaceModemTime *iface)
+iface_modem_time_init (MMIfaceModemTimeInterface *iface)
{
iface->check_support = mm_shared_quectel_time_check_support;
iface->check_support_finish = mm_shared_quectel_time_check_support_finish;
diff --git a/src/plugins/quectel/mm-broadband-modem-quectel.c b/src/plugins/quectel/mm-broadband-modem-quectel.c
index 5ca5b480..8d763131 100644
--- a/src/plugins/quectel/mm-broadband-modem-quectel.c
+++ b/src/plugins/quectel/mm-broadband-modem-quectel.c
@@ -25,7 +25,7 @@
static void iface_modem_init (MMIfaceModemInterface *iface);
static void iface_modem_firmware_init (MMIfaceModemFirmwareInterface *iface);
static void iface_modem_location_init (MMIfaceModemLocationInterface *iface);
-static void iface_modem_time_init (MMIfaceModemTime *iface);
+static void iface_modem_time_init (MMIfaceModemTimeInterface *iface);
static void shared_quectel_init (MMSharedQuectel *iface);
static MMIfaceModemInterface *iface_modem_parent;
@@ -98,7 +98,7 @@ iface_modem_location_init (MMIfaceModemLocationInterface *iface)
}
static void
-iface_modem_time_init (MMIfaceModemTime *iface)
+iface_modem_time_init (MMIfaceModemTimeInterface *iface)
{
iface->check_support = mm_shared_quectel_time_check_support;
iface->check_support_finish = mm_shared_quectel_time_check_support_finish;
diff --git a/src/plugins/sierra/mm-broadband-modem-sierra.c b/src/plugins/sierra/mm-broadband-modem-sierra.c
index c9ca5514..3afd3b12 100644
--- a/src/plugins/sierra/mm-broadband-modem-sierra.c
+++ b/src/plugins/sierra/mm-broadband-modem-sierra.c
@@ -37,9 +37,9 @@
#include "mm-common-sierra.h"
#include "mm-broadband-bearer-sierra.h"
-static void iface_modem_init (MMIfaceModemInterface *iface);
-static void iface_modem_cdma_init (MMIfaceModemCdma *iface);
-static void iface_modem_time_init (MMIfaceModemTime *iface);
+static void iface_modem_init (MMIfaceModemInterface *iface);
+static void iface_modem_cdma_init (MMIfaceModemCdma *iface);
+static void iface_modem_time_init (MMIfaceModemTimeInterface *iface);
static MMIfaceModemInterface *iface_modem_parent;
static MMIfaceModemCdma *iface_modem_cdma_parent;
@@ -1919,7 +1919,7 @@ iface_modem_cdma_init (MMIfaceModemCdma *iface)
}
static void
-iface_modem_time_init (MMIfaceModemTime *iface)
+iface_modem_time_init (MMIfaceModemTimeInterface *iface)
{
iface->check_support = modem_time_check_support;
iface->check_support_finish = modem_time_check_support_finish;
generated by cgit v1.2.3-70-g09d2 (git 2.46.0) at 2025-06-08 03:48:01 +0000