[network-manager-openconnect/jk/openconnect-plugin-init] core: NMVPNPlugin initialization changed to use GInitable (rh #1050934)

[Jiří Klimeš <jklimes src gnome org>]

commit a9ed3d0aeefb884b31c2bbf6e82f2fcfe670c8f3
Author: Jiří Klimeš <jklimes redhat com>
Date:   Mon Mar 17 17:28:29 2014 +0100

    core: NMVPNPlugin initialization changed to use GInitable (rh #1050934)
    
    https://bugzilla.redhat.com/show_bug.cgi?id=1050934

 configure.ac                 |    2 +-
 src/nm-openconnect-service.c |   18 ++++++++++++++----
 2 files changed, 15 insertions(+), 5 deletions(-)
---
diff --git a/configure.ac b/configure.ac
index 43699c1..84add56 100644
--- a/configure.ac
+++ b/configure.ac
@@ -52,7 +52,7 @@ AC_DEFINE_UNQUOTED(GETTEXT_PACKAGE,"$GETTEXT_PACKAGE", [Gettext package])
 IT_PROG_INTLTOOL([0.35])
 AM_GLIB_GNU_GETTEXT
 
-PKG_CHECK_MODULES(GLIB, glib-2.0 >= 2.32)
+PKG_CHECK_MODULES(GLIB, gio-unix-2.0 >= 2.32)
 AC_SUBST(GLIB_CFLAGS)
 AC_SUBST(GLIB_LIBS)
 GLIB_CFLAGS="$GLIB_CFLAGS -DGLIB_VERSION_MIN_REQUIRED=GLIB_VERSION_2_32"
diff --git a/src/nm-openconnect-service.c b/src/nm-openconnect-service.c
index 7dcf964..e8911d7 100644
--- a/src/nm-openconnect-service.c
+++ b/src/nm-openconnect-service.c
@@ -18,7 +18,7 @@
  *   Copyright © 2008 - 2009 Intel Corporation.
  *
  * Based on nm-vpnc-service.c:
- *   Copyright © 2005 - 2008 Red Hat, Inc.
+ *   Copyright © 2005 - 2014 Red Hat, Inc.
  *   Copyright © 2007 - 2008 Novell, Inc.
  */
 
@@ -42,6 +42,7 @@
 #include <grp.h>
 #include <locale.h>
 #include <glib/gi18n.h>
+#include <gio/gio.h>
 
 #include <nm-setting-vpn.h>
 #include "nm-openconnect-service.h"
@@ -597,9 +598,18 @@ nm_openconnect_plugin_class_init (NMOPENCONNECTPluginClass *openconnect_class)
 NMOPENCONNECTPlugin *
 nm_openconnect_plugin_new (void)
 {
-       return (NMOPENCONNECTPlugin *) g_object_new (NM_TYPE_OPENCONNECT_PLUGIN,
-                                                    NM_VPN_PLUGIN_DBUS_SERVICE_NAME, 
NM_DBUS_SERVICE_OPENCONNECT,
-                                                    NULL);
+       NMOPENCONNECTPlugin *plugin;
+       GError *error = NULL;
+
+       plugin = g_initable_new (NM_TYPE_OPENCONNECT_PLUGIN, NULL, &error,
+                                NM_VPN_PLUGIN_DBUS_SERVICE_NAME, NM_DBUS_SERVICE_OPENCONNECT,
+                                NULL);
+       if (!plugin) {
+               g_warning ("%s", error->message);
+               g_error_free (error);
+       }
+
+       return plugin;
 }
 
 static void