summaryrefslogtreecommitdiff
path: root/libnm-glib
diff options
context:
space:
mode:
authorLubomir Rintel <lkundrak@v3.sk>2018-01-02 15:47:37 +0100
committerLubomir Rintel <lkundrak@v3.sk>2018-01-18 11:45:36 +0100
commit8a46b25cfa8c33daa8af37bb8103ca02286001b1 (patch)
tree1725f84d8c42af42d1153aeaa71e63be8854bc93 /libnm-glib
parent1443bf77e8cefc6f2d49f1e7f4140155ad73551b (diff)
downloadNetworkManager-8a46b25cfa8c33daa8af37bb8103ca02286001b1.tar.gz
all: require glib 2.40lr/glib-2-40
RHEL 7.1 and Ubuntu 14.04 LTS both have this. https://bugzilla.gnome.org/show_bug.cgi?id=792323
Diffstat (limited to 'libnm-glib')
-rw-r--r--libnm-glib/libnm-glib-test.c2
-rw-r--r--libnm-glib/libnm_glib.c2
2 files changed, 0 insertions, 4 deletions
diff --git a/libnm-glib/libnm-glib-test.c b/libnm-glib/libnm-glib-test.c
index c3c0ff19c3..5f15a51062 100644
--- a/libnm-glib/libnm-glib-test.c
+++ b/libnm-glib/libnm-glib-test.c
@@ -400,8 +400,6 @@ main (int argc, char *argv[])
{
NMClient *client;
- nm_g_type_init ();
-
client = nm_client_new ();
if (!client) {
exit (1);
diff --git a/libnm-glib/libnm_glib.c b/libnm-glib/libnm_glib.c
index ec25a2d974..2c0b9657c8 100644
--- a/libnm-glib/libnm_glib.c
+++ b/libnm-glib/libnm_glib.c
@@ -495,8 +495,6 @@ libnm_glib_init (void)
{
libnm_glib_ctx *ctx = NULL;
- nm_g_type_init ();
-
if (!g_thread_supported ())
g_thread_init (NULL);
dbus_g_thread_init ();