fdo-mirrors/NetworkManager
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/NetworkManager/NetworkManager.git synced 2026-05-05 20:28:15 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

2007-09-26 Dan Williams <dcbw@redhat.com>

Browse source 
* src/vpn-manager/nm-vpn-manager.c
		- (new_vpn_error, impl_vpn_manager_connect): set errors



git-svn-id: http://svn-archive.gnome.org/svn/NetworkManager/trunk@2894 4912f4e0-d625-0410-9fb7-b9a5a253dbdc
This commit is contained in:
Dan Williams 2007-09-27 02:24:35 +00:00
parent 98fb1e171c
commit 36bb36a119
2 changed files with 33 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
ChangeLog
View file

@ -1,3 +1,8 @@
2007-09-26 Dan Williams <dcbw@redhat.com>
* src/vpn-manager/nm-vpn-manager.c
- (new_vpn_error, impl_vpn_manager_connect): set errors
2007-09-26 Dan Williams <dcbw@redhat.com>
* introspection/nm-vpn-plugin.xml

32
src/vpn-manager/nm-vpn-manager.c
View file

@ -115,6 +115,28 @@ find_device (NMVPNManager *manager, const char *device_path)
return NULL;
}
static GError *
new_vpn_error (const gchar *format, ...)
{
GError *err;
va_list args;
gchar *msg;
static GQuark domain_quark = 0;
if (domain_quark == 0)
domain_quark = g_quark_from_static_string ("nm_vpn_error");
va_start (args, format);
msg = g_strdup_vprintf (format, args);
va_end (args);
err = g_error_new_literal (domain_quark, 1, (const gchar *) msg);
g_free (msg);
return err;
}
static gboolean
impl_vpn_manager_connect (NMVPNManager *manager,
const char *connection_type,
@ -131,7 +153,8 @@ impl_vpn_manager_connect (NMVPNManager *manager,
device = find_device (manager, device_path);
if (!device) {
/* FIXME: set error */
*err = new_vpn_error ("%s.%d: No active device was found.",
__FILE__, __LINE__);
goto out;
}
@ -144,7 +167,8 @@ impl_vpn_manager_connect (NMVPNManager *manager,
NM_CONNECTION_TYPE_SYSTEM,
connection_path);
if (connection == NULL) {
/* FIXME: set error */
*err = new_vpn_error ("%s.%d: VPN connection could not be found.",
__FILE__, __LINE__);
goto out;
}
@ -152,8 +176,8 @@ impl_vpn_manager_connect (NMVPNManager *manager,
if (vpn_connection)
*vpn_connection_path = g_strdup (nm_vpn_connection_get_object_path (vpn_connection));
else {
/* FIXME: set error */
g_object_unref (connection);
*err = new_vpn_error ("%s.%d: VPN connection could not be started.",
__FILE__, __LINE__);
}
out: