Skip to content
GitLab
Projects
Groups
Snippets
/
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
Menu
Open sidebar
GNOME
NetworkManager-libreswan
Commits
dd7122b5
Commit
dd7122b5
authored
Mar 18, 2014
by
Jiří Klimeš
Browse files
core: NMVPNPlugin initialization changed to use GInitable (rh #1050934)
https://bugzilla.redhat.com/show_bug.cgi?id=1050934
parent
ba343812
Changes
2
Hide whitespace changes
Inline
Side-by-side
configure.ac
View file @
dd7122b5
...
...
@@ -57,7 +57,7 @@ AC_DEFINE_UNQUOTED(GETTEXT_PACKAGE,"$GETTEXT_PACKAGE", [Gettext package])
IT_PROG_INTLTOOL([0.35])
AM_GLIB_GNU_GETTEXT
PKG_CHECK_MODULES(GLIB, g
lib
-2.0 >= 2.32)
PKG_CHECK_MODULES(GLIB, g
io-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"
...
...
src/nm-openswan-service.c
View file @
dd7122b5
...
...
@@ -15,7 +15,7 @@
* with this program; if not, write to the Free Software Foundation, Inc.,
* 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
*
* Copyright (C) 2010 - 201
1
Red Hat, Inc.
* Copyright (C) 2010 - 201
4
Red Hat, Inc.
*/
#include
<config.h>
...
...
@@ -31,6 +31,7 @@
#include
<locale.h>
#include
<glib/gi18n.h>
#include
<gio/gio.h>
#include
<nm-setting-vpn.h>
#include
"nm-openswan-service.h"
...
...
@@ -803,9 +804,18 @@ nm_openswan_plugin_class_init (NMOPENSWANPluginClass *openswan_class)
NMOPENSWANPlugin
*
nm_openswan_plugin_new
(
void
)
{
return
(
NMOPENSWANPlugin
*
)
g_object_new
(
NM_TYPE_OPENSWAN_PLUGIN
,
NM_VPN_PLUGIN_DBUS_SERVICE_NAME
,
NM_DBUS_SERVICE_OPENSWAN
,
NULL
);
NMOPENSWANPlugin
*
plugin
;
GError
*
error
=
NULL
;
plugin
=
g_initable_new
(
NM_TYPE_OPENSWAN_PLUGIN
,
NULL
,
&
error
,
NM_VPN_PLUGIN_DBUS_SERVICE_NAME
,
NM_DBUS_SERVICE_OPENSWAN
,
NULL
);
if
(
!
plugin
)
{
g_warning
(
"%s"
,
error
->
message
);
g_error_free
(
error
);
}
return
plugin
;
}
static
void
...
...
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment