aboutsummaryrefslogtreecommitdiff
path: root/src/plugins
diff options
context:
space:
mode:
Diffstat (limited to 'src/plugins')
-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.c6
-rw-r--r--src/plugins/cinterion/mm-shared-cinterion.h2
-rw-r--r--src/plugins/huawei/mm-broadband-modem-huawei.c6
-rw-r--r--src/plugins/simtech/mm-broadband-modem-qmi-simtech.c8
-rw-r--r--src/plugins/simtech/mm-broadband-modem-simtech.c8
-rw-r--r--src/plugins/simtech/mm-shared-simtech.c16
-rw-r--r--src/plugins/simtech/mm-shared-simtech.h2
-rw-r--r--src/plugins/ublox/mm-broadband-modem-ublox.c8
11 files changed, 40 insertions, 40 deletions
diff --git a/src/plugins/cinterion/mm-broadband-modem-cinterion.c b/src/plugins/cinterion/mm-broadband-modem-cinterion.c
index 7ae1d9d1..387a9609 100644
--- a/src/plugins/cinterion/mm-broadband-modem-cinterion.c
+++ b/src/plugins/cinterion/mm-broadband-modem-cinterion.c
@@ -46,7 +46,7 @@ static void iface_modem_init (MMIfaceModemInterface *iface);
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_voice_init (MMIfaceModemVoiceInterface *iface);
static void iface_modem_time_init (MMIfaceModemTimeInterface *iface);
static void iface_modem_signal_init (MMIfaceModemSignalInterface *iface);
static void shared_cinterion_init (MMSharedCinterion *iface);
@@ -54,7 +54,7 @@ static void shared_cinterion_init (MMSharedCinterion *iface);
static MMIfaceModemInterface *iface_modem_parent;
static MMIfaceModem3gppInterface *iface_modem_3gpp_parent;
static MMIfaceModemLocationInterface *iface_modem_location_parent;
-static MMIfaceModemVoice *iface_modem_voice_parent;
+static MMIfaceModemVoiceInterface *iface_modem_voice_parent;
static MMIfaceModemTimeInterface *iface_modem_time_parent;
static MMIfaceModemSignalInterface *iface_modem_signal_parent;
@@ -3554,7 +3554,7 @@ peek_parent_location_interface (MMSharedCinterion *self)
}
static void
-iface_modem_voice_init (MMIfaceModemVoice *iface)
+iface_modem_voice_init (MMIfaceModemVoiceInterface *iface)
{
iface_modem_voice_parent = g_type_interface_peek_parent (iface);
@@ -3572,7 +3572,7 @@ iface_modem_voice_init (MMIfaceModemVoice *iface)
iface->cleanup_unsolicited_events_finish = mm_shared_cinterion_voice_cleanup_unsolicited_events_finish;
}
-static MMIfaceModemVoice *
+static MMIfaceModemVoiceInterface *
peek_parent_voice_interface (MMSharedCinterion *self)
{
return iface_modem_voice_parent;
diff --git a/src/plugins/cinterion/mm-broadband-modem-mbim-cinterion.c b/src/plugins/cinterion/mm-broadband-modem-mbim-cinterion.c
index ea3adef1..e2d44479 100644
--- a/src/plugins/cinterion/mm-broadband-modem-mbim-cinterion.c
+++ b/src/plugins/cinterion/mm-broadband-modem-mbim-cinterion.c
@@ -32,13 +32,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_voice_init (MMIfaceModemVoiceInterface *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 MMIfaceModemVoiceInterface *iface_modem_voice_parent;
static MMIfaceModemTimeInterface *iface_modem_time_parent;
G_DEFINE_TYPE_EXTENDED (MMBroadbandModemMbimCinterion, mm_broadband_modem_mbim_cinterion, MM_TYPE_BROADBAND_MODEM_MBIM, 0,
@@ -114,7 +114,7 @@ peek_parent_location_interface (MMSharedCinterion *self)
}
static void
-iface_modem_voice_init (MMIfaceModemVoice *iface)
+iface_modem_voice_init (MMIfaceModemVoiceInterface *iface)
{
iface_modem_voice_parent = g_type_interface_peek_parent (iface);
@@ -132,7 +132,7 @@ iface_modem_voice_init (MMIfaceModemVoice *iface)
iface->cleanup_unsolicited_events_finish = mm_shared_cinterion_voice_cleanup_unsolicited_events_finish;
}
-static MMIfaceModemVoice *
+static MMIfaceModemVoiceInterface *
peek_parent_voice_interface (MMSharedCinterion *self)
{
return iface_modem_voice_parent;
diff --git a/src/plugins/cinterion/mm-broadband-modem-qmi-cinterion.c b/src/plugins/cinterion/mm-broadband-modem-qmi-cinterion.c
index 6475d155..821f9e32 100644
--- a/src/plugins/cinterion/mm-broadband-modem-qmi-cinterion.c
+++ b/src/plugins/cinterion/mm-broadband-modem-qmi-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_voice_init (MMIfaceModemVoiceInterface *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 MMIfaceModemVoiceInterface *iface_modem_voice_parent;
static MMIfaceModemTimeInterface *iface_modem_time_parent;
G_DEFINE_TYPE_EXTENDED (MMBroadbandModemQmiCinterion, mm_broadband_modem_qmi_cinterion, MM_TYPE_BROADBAND_MODEM_QMI, 0,
@@ -113,7 +113,7 @@ peek_parent_location_interface (MMSharedCinterion *self)
}
static void
-iface_modem_voice_init (MMIfaceModemVoice *iface)
+iface_modem_voice_init (MMIfaceModemVoiceInterface *iface)
{
iface_modem_voice_parent = g_type_interface_peek_parent (iface);
@@ -131,7 +131,7 @@ iface_modem_voice_init (MMIfaceModemVoice *iface)
iface->cleanup_unsolicited_events_finish = mm_shared_cinterion_voice_cleanup_unsolicited_events_finish;
}
-static MMIfaceModemVoice *
+static MMIfaceModemVoiceInterface *
peek_parent_voice_interface (MMSharedCinterion *self)
{
return iface_modem_voice_parent;
diff --git a/src/plugins/cinterion/mm-shared-cinterion.c b/src/plugins/cinterion/mm-shared-cinterion.c
index 47b86018..fe2651c9 100644
--- a/src/plugins/cinterion/mm-shared-cinterion.c
+++ b/src/plugins/cinterion/mm-shared-cinterion.c
@@ -53,9 +53,9 @@ typedef struct {
FeatureSupport sgpss_support;
FeatureSupport sgpsc_support;
/* voice */
- MMIfaceModemVoice *iface_modem_voice_parent;
- FeatureSupport slcc_support;
- GRegex *slcc_regex;
+ MMIfaceModemVoiceInterface *iface_modem_voice_parent;
+ FeatureSupport slcc_support;
+ GRegex *slcc_regex;
/* time */
MMIfaceModemTimeInterface *iface_modem_time_parent;
GRegex *ctzu_regex;
diff --git a/src/plugins/cinterion/mm-shared-cinterion.h b/src/plugins/cinterion/mm-shared-cinterion.h
index f26aac96..bc9fe986 100644
--- a/src/plugins/cinterion/mm-shared-cinterion.h
+++ b/src/plugins/cinterion/mm-shared-cinterion.h
@@ -47,7 +47,7 @@ struct _MMSharedCinterion {
MMIfaceModemLocationInterface * (* peek_parent_location_interface) (MMSharedCinterion *self);
/* Peek voice interface of the parent class of the object */
- MMIfaceModemVoice * (* peek_parent_voice_interface) (MMSharedCinterion *self);
+ MMIfaceModemVoiceInterface * (* peek_parent_voice_interface) (MMSharedCinterion *self);
/* Peek time interface of the parent class of the object */
MMIfaceModemTimeInterface * (* peek_parent_time_interface) (MMSharedCinterion *self);
diff --git a/src/plugins/huawei/mm-broadband-modem-huawei.c b/src/plugins/huawei/mm-broadband-modem-huawei.c
index 0b11f044..673f3f3d 100644
--- a/src/plugins/huawei/mm-broadband-modem-huawei.c
+++ b/src/plugins/huawei/mm-broadband-modem-huawei.c
@@ -56,14 +56,14 @@ 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 (MMIfaceModemTimeInterface *iface);
-static void iface_modem_voice_init (MMIfaceModemVoice *iface);
+static void iface_modem_voice_init (MMIfaceModemVoiceInterface *iface);
static void iface_modem_signal_init (MMIfaceModemSignalInterface *iface);
static MMIfaceModemInterface *iface_modem_parent;
static MMIfaceModem3gppInterface *iface_modem_3gpp_parent;
static MMIfaceModemLocationInterface *iface_modem_location_parent;
static MMIfaceModemCdma *iface_modem_cdma_parent;
-static MMIfaceModemVoice *iface_modem_voice_parent;
+static MMIfaceModemVoiceInterface *iface_modem_voice_parent;
G_DEFINE_TYPE_EXTENDED (MMBroadbandModemHuawei, mm_broadband_modem_huawei, MM_TYPE_BROADBAND_MODEM, 0,
G_IMPLEMENT_INTERFACE (MM_TYPE_IFACE_MODEM, iface_modem_init)
@@ -5085,7 +5085,7 @@ iface_modem_time_init (MMIfaceModemTimeInterface *iface)
}
static void
-iface_modem_voice_init (MMIfaceModemVoice *iface)
+iface_modem_voice_init (MMIfaceModemVoiceInterface *iface)
{
iface_modem_voice_parent = g_type_interface_peek_parent (iface);
diff --git a/src/plugins/simtech/mm-broadband-modem-qmi-simtech.c b/src/plugins/simtech/mm-broadband-modem-qmi-simtech.c
index 7ae1dde2..d670b26d 100644
--- a/src/plugins/simtech/mm-broadband-modem-qmi-simtech.c
+++ b/src/plugins/simtech/mm-broadband-modem-qmi-simtech.c
@@ -29,11 +29,11 @@
#include "mm-shared-simtech.h"
static void iface_modem_location_init (MMIfaceModemLocationInterface *iface);
-static void iface_modem_voice_init (MMIfaceModemVoice *iface);
+static void iface_modem_voice_init (MMIfaceModemVoiceInterface *iface);
static void shared_simtech_init (MMSharedSimtech *iface);
static MMIfaceModemLocationInterface *iface_modem_location_parent;
-static MMIfaceModemVoice *iface_modem_voice_parent;
+static MMIfaceModemVoiceInterface *iface_modem_voice_parent;
G_DEFINE_TYPE_EXTENDED (MMBroadbandModemQmiSimtech, mm_broadband_modem_qmi_simtech, MM_TYPE_BROADBAND_MODEM_QMI, 0,
G_IMPLEMENT_INTERFACE (MM_TYPE_IFACE_MODEM_LOCATION, iface_modem_location_init)
@@ -90,7 +90,7 @@ peek_parent_location_interface (MMSharedSimtech *self)
}
static void
-iface_modem_voice_init (MMIfaceModemVoice *iface)
+iface_modem_voice_init (MMIfaceModemVoiceInterface *iface)
{
iface_modem_voice_parent = g_type_interface_peek_parent (iface);
@@ -110,7 +110,7 @@ iface_modem_voice_init (MMIfaceModemVoice *iface)
iface->cleanup_in_call_audio_channel_finish = mm_shared_simtech_voice_cleanup_in_call_audio_channel_finish;
}
-static MMIfaceModemVoice *
+static MMIfaceModemVoiceInterface *
peek_parent_voice_interface (MMSharedSimtech *self)
{
return iface_modem_voice_parent;
diff --git a/src/plugins/simtech/mm-broadband-modem-simtech.c b/src/plugins/simtech/mm-broadband-modem-simtech.c
index e70dbd4a..49ac86e3 100644
--- a/src/plugins/simtech/mm-broadband-modem-simtech.c
+++ b/src/plugins/simtech/mm-broadband-modem-simtech.c
@@ -40,13 +40,13 @@
static void iface_modem_init (MMIfaceModemInterface *iface);
static void iface_modem_3gpp_init (MMIfaceModem3gppInterface *iface);
static void iface_modem_location_init (MMIfaceModemLocationInterface *iface);
-static void iface_modem_voice_init (MMIfaceModemVoice *iface);
+static void iface_modem_voice_init (MMIfaceModemVoiceInterface *iface);
static void shared_simtech_init (MMSharedSimtech *iface);
static MMIfaceModemInterface *iface_modem_parent;
static MMIfaceModem3gppInterface *iface_modem_3gpp_parent;
static MMIfaceModemLocationInterface *iface_modem_location_parent;
-static MMIfaceModemVoice *iface_modem_voice_parent;
+static MMIfaceModemVoiceInterface *iface_modem_voice_parent;
G_DEFINE_TYPE_EXTENDED (MMBroadbandModemSimtech, mm_broadband_modem_simtech, MM_TYPE_BROADBAND_MODEM, 0,
G_IMPLEMENT_INTERFACE (MM_TYPE_IFACE_MODEM, iface_modem_init)
@@ -1495,7 +1495,7 @@ peek_parent_location_interface (MMSharedSimtech *self)
}
static void
-iface_modem_voice_init (MMIfaceModemVoice *iface)
+iface_modem_voice_init (MMIfaceModemVoiceInterface *iface)
{
iface_modem_voice_parent = g_type_interface_peek_parent (iface);
@@ -1516,7 +1516,7 @@ iface_modem_voice_init (MMIfaceModemVoice *iface)
}
-static MMIfaceModemVoice *
+static MMIfaceModemVoiceInterface *
peek_parent_voice_interface (MMSharedSimtech *self)
{
return iface_modem_voice_parent;
diff --git a/src/plugins/simtech/mm-shared-simtech.c b/src/plugins/simtech/mm-shared-simtech.c
index 8992d7b8..117ea65e 100644
--- a/src/plugins/simtech/mm-shared-simtech.c
+++ b/src/plugins/simtech/mm-shared-simtech.c
@@ -49,14 +49,14 @@ typedef struct {
MMModemLocationSource enabled_sources;
FeatureSupport cgps_support;
/* voice */
- MMIfaceModemVoice *iface_modem_voice_parent;
- FeatureSupport cpcmreg_support;
- FeatureSupport clcc_urc_support;
- GRegex *clcc_urc_regex;
- GRegex *voice_call_regex;
- GRegex *missed_call_regex;
- GRegex *cring_regex;
- GRegex *rxdtmf_regex;
+ MMIfaceModemVoiceInterface *iface_modem_voice_parent;
+ FeatureSupport cpcmreg_support;
+ FeatureSupport clcc_urc_support;
+ GRegex *clcc_urc_regex;
+ GRegex *voice_call_regex;
+ GRegex *missed_call_regex;
+ GRegex *cring_regex;
+ GRegex *rxdtmf_regex;
} Private;
static void
diff --git a/src/plugins/simtech/mm-shared-simtech.h b/src/plugins/simtech/mm-shared-simtech.h
index 028c5894..13e0eee6 100644
--- a/src/plugins/simtech/mm-shared-simtech.h
+++ b/src/plugins/simtech/mm-shared-simtech.h
@@ -41,7 +41,7 @@ struct _MMSharedSimtech {
MMIfaceModemLocationInterface * (* peek_parent_location_interface) (MMSharedSimtech *self);
/* Peek voice interface of the parent class of the object */
- MMIfaceModemVoice * (* peek_parent_voice_interface) (MMSharedSimtech *self);
+ MMIfaceModemVoiceInterface * (* peek_parent_voice_interface) (MMSharedSimtech *self);
};
GType mm_shared_simtech_get_type (void);
diff --git a/src/plugins/ublox/mm-broadband-modem-ublox.c b/src/plugins/ublox/mm-broadband-modem-ublox.c
index f64240b0..86371bbc 100644
--- a/src/plugins/ublox/mm-broadband-modem-ublox.c
+++ b/src/plugins/ublox/mm-broadband-modem-ublox.c
@@ -34,10 +34,10 @@
#include "mm-modem-helpers-ublox.h"
#include "mm-ublox-enums-types.h"
-static void iface_modem_init (MMIfaceModemInterface *iface);
-static void iface_modem_voice_init (MMIfaceModemVoice *iface);
+static void iface_modem_init (MMIfaceModemInterface *iface);
+static void iface_modem_voice_init (MMIfaceModemVoiceInterface *iface);
-static MMIfaceModemVoice *iface_modem_voice_parent;
+static MMIfaceModemVoiceInterface *iface_modem_voice_parent;
G_DEFINE_TYPE_EXTENDED (MMBroadbandModemUblox, mm_broadband_modem_ublox, MM_TYPE_BROADBAND_MODEM, 0,
G_IMPLEMENT_INTERFACE (MM_TYPE_IFACE_MODEM, iface_modem_init)
@@ -2046,7 +2046,7 @@ iface_modem_init (MMIfaceModemInterface *iface)
}
static void
-iface_modem_voice_init (MMIfaceModemVoice *iface)
+iface_modem_voice_init (MMIfaceModemVoiceInterface *iface)
{
iface_modem_voice_parent = g_type_interface_peek_parent (iface);