[network-manager-openconnect] build: minor updates

[Dan Winship <danw src gnome org>]

commit 80493c029d21712f68c4c1372f2a98cb8450a045
Author: Dan Winship <danw gnome org>
Date:   Mon Feb 18 18:00:56 2013 -0500

    build: minor updates
    
    Only call g_type_init() on older glibs.
    
    Add a missing #include (that presumably used to get accidentally
    pulled in by something else).

 src/nm-openconnect-service-openconnect-helper.c |    2 ++
 src/nm-openconnect-service.c                    |    3 +++
 2 files changed, 5 insertions(+), 0 deletions(-)
---
diff --git a/src/nm-openconnect-service-openconnect-helper.c b/src/nm-openconnect-service-openconnect-helper.c
index 33b2851..2fa6852 100644
--- a/src/nm-openconnect-service-openconnect-helper.c
+++ b/src/nm-openconnect-service-openconnect-helper.c
@@ -479,7 +479,9 @@ main (int argc, char *argv[])
        GError *err = NULL;
        struct in_addr temp_addr;
 
+#if !GLIB_CHECK_VERSION (2, 35, 0)
        g_type_init ();
+#endif
 
        /* openconnect gives us a "reason" code.  If we are given one,
         * don't proceed unless its "connect".
diff --git a/src/nm-openconnect-service.c b/src/nm-openconnect-service.c
index a52776b..53f299d 100644
--- a/src/nm-openconnect-service.c
+++ b/src/nm-openconnect-service.c
@@ -40,6 +40,7 @@
 #include <net/if.h>
 #include <pwd.h>
 #include <grp.h>
+#include <locale.h>
 #include <glib/gi18n.h>
 
 #include <nm-setting-vpn.h>
@@ -641,7 +642,9 @@ int main (int argc, char *argv[])
                {NULL}
        };
 
+#if !GLIB_CHECK_VERSION (2, 35, 0)
        g_type_init ();
+#endif
 
        /* locale will be set according to environment LC_* variables */
        setlocale (LC_ALL, "");