aboutsummaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorBen Chan <benchan@chromium.org>2017-02-02 16:45:01 -0800
committerAleksander Morgado <aleksander@aleksander.es>2017-02-03 10:05:14 +0100
commit31655bb5a5e2c806cee23b9ee41c2e663c5decbd (patch)
tree65df1333c681dceac4ad6424aa09cc6244631b20 /src
parentf20f2d04282f673cebc2ce9262c5b10adab82fa2 (diff)
glib: remove invocations of g_type_init()
g_type_init() has been deprecated (and also marked with the attribute 'deprecated') since glib 2.36 as the type system is automatically initialized. Since the minimum version of glib required by ModemManager is 2.36, calling g_type_init() isn't necessarily in the ModemManager code.
Diffstat (limited to 'src')
-rw-r--r--src/main.c2
-rw-r--r--src/tests/test-at-serial-port.c1
-rw-r--r--src/tests/test-modem-helpers-qmi.c1
-rw-r--r--src/tests/test-modem-helpers.c1
-rw-r--r--src/tests/test-qcdm-serial-port.c3
-rw-r--r--src/tests/test-sms-part-3gpp.c1
-rw-r--r--src/tests/test-sms-part-cdma.c1
-rw-r--r--src/tests/test-udev-rules.c1
8 files changed, 0 insertions, 11 deletions
diff --git a/src/main.c b/src/main.c
index d83baaf9..ada3927c 100644
--- a/src/main.c
+++ b/src/main.c
@@ -136,8 +136,6 @@ main (int argc, char *argv[])
GError *err = NULL;
guint name_id;
- g_type_init ();
-
/* Setup application context */
mm_context_init (argc, argv);
diff --git a/src/tests/test-at-serial-port.c b/src/tests/test-at-serial-port.c
index c0be5fa1..2173f207 100644
--- a/src/tests/test-at-serial-port.c
+++ b/src/tests/test-at-serial-port.c
@@ -86,7 +86,6 @@ _mm_log (const char *loc,
int main (int argc, char **argv)
{
- g_type_init ();
g_test_init (&argc, &argv, NULL);
g_test_add_func ("/ModemManager/AT-serial/echo-removal", at_serial_echo_removal);
diff --git a/src/tests/test-modem-helpers-qmi.c b/src/tests/test-modem-helpers-qmi.c
index 0f020f39..f85430c6 100644
--- a/src/tests/test-modem-helpers-qmi.c
+++ b/src/tests/test-modem-helpers-qmi.c
@@ -333,7 +333,6 @@ int main (int argc, char **argv)
{
setlocale (LC_ALL, "");
- g_type_init ();
g_test_init (&argc, &argv, NULL);
g_test_add_func ("/MM/QMI/Current-Capabilities/UML290", test_uml290);
diff --git a/src/tests/test-modem-helpers.c b/src/tests/test-modem-helpers.c
index cd5ddfa1..fdcac10e 100644
--- a/src/tests/test-modem-helpers.c
+++ b/src/tests/test-modem-helpers.c
@@ -3387,7 +3387,6 @@ int main (int argc, char **argv)
gint result;
DevidItem *item = &devids[0];
- g_type_init ();
g_test_init (&argc, &argv, NULL);
suite = g_test_get_root ();
diff --git a/src/tests/test-qcdm-serial-port.c b/src/tests/test-qcdm-serial-port.c
index 1f88fad9..ac73a5bf 100644
--- a/src/tests/test-qcdm-serial-port.c
+++ b/src/tests/test-qcdm-serial-port.c
@@ -213,9 +213,6 @@ qcdm_test_child (int fd, GAsyncReadyCallback cb)
gboolean success;
GError *error = NULL;
- /* In the child */
- g_type_init ();
-
loop = g_main_loop_new (NULL, FALSE);
port = mm_port_serial_qcdm_new_fd (fd);
diff --git a/src/tests/test-sms-part-3gpp.c b/src/tests/test-sms-part-3gpp.c
index 21822f09..dcf4cc87 100644
--- a/src/tests/test-sms-part-3gpp.c
+++ b/src/tests/test-sms-part-3gpp.c
@@ -865,7 +865,6 @@ int main (int argc, char **argv)
{
setlocale (LC_ALL, "");
- g_type_init ();
g_test_init (&argc, &argv, NULL);
g_test_add_func ("/MM/SMS/3GPP/PDU-Parser/pdu1", test_pdu1);
diff --git a/src/tests/test-sms-part-cdma.c b/src/tests/test-sms-part-cdma.c
index 17d78966..91b7c3ce 100644
--- a/src/tests/test-sms-part-cdma.c
+++ b/src/tests/test-sms-part-cdma.c
@@ -529,7 +529,6 @@ int main (int argc, char **argv)
{
setlocale (LC_ALL, "");
- g_type_init ();
g_test_init (&argc, &argv, NULL);
g_test_add_func ("/MM/SMS/CDMA/PDU-Parser/pdu1", test_pdu1);
diff --git a/src/tests/test-udev-rules.c b/src/tests/test-udev-rules.c
index 469885df..07e9b8db 100644
--- a/src/tests/test-udev-rules.c
+++ b/src/tests/test-udev-rules.c
@@ -70,7 +70,6 @@ int main (int argc, char **argv)
{
setlocale (LC_ALL, "");
- g_type_init ();
g_test_init (&argc, &argv, NULL);
g_test_add_func ("/MM/test-udev-rules/load-cleanup-core", test_load_cleanup_core);