system/NetworkManager
system/NetworkManager
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/NetworkManager/NetworkManager synced 2024-07-23 11:14:29 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

2008-03-31 Dan Williams <dcbw@redhat.com>

Browse source 
* libnm-glib/nm-client.c
	  libnm-glib/nm-client.h
		- (activate_cb): pass the new active connection to callback; fix
			message when no callback is specified



git-svn-id: http://svn-archive.gnome.org/svn/NetworkManager/trunk@3518 4912f4e0-d625-0410-9fb7-b9a5a253dbdc
This commit is contained in:
Dan Williams 2008-03-31 14:47:19 +00:00
parent 9498555625
commit 59731b9cbd
3 changed files with 13 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
ChangeLog
View file

@ -1,3 +1,10 @@
2008-03-31 Dan Williams <dcbw@redhat.com>
* libnm-glib/nm-client.c
libnm-glib/nm-client.h
- (activate_cb): pass the new active connection to callback; fix
message when no callback is specified
2008-03-30 Dan Williams <dcbw@redhat.com>
* libnm-util/nm-setting-wireless-security.c

12
libnm-glib/nm-client.c
View file

@ -603,18 +603,16 @@ typedef struct {
static void
activate_cb (DBusGProxy *proxy,
char *active_connection,
GError *err,
char *path,
GError *error,
gpointer user_data)
{
ActivateDeviceInfo *info = (ActivateDeviceInfo *) user_data;
if (info->fn)
info->fn (info->user_data, err);
else
nm_warning ("Device activation failed: %s", err->message);
/* FIXME: Free err as well? */
info->fn (info->user_data, path, error);
else if (error)
nm_warning ("Device activation failed: (%d) %s", error->code, error->message);
g_slice_free (ActivateDeviceInfo, info);
}

2
libnm-glib/nm-client.h
View file

@ -45,7 +45,7 @@ NMClient *nm_client_new (void);
const GPtrArray *nm_client_get_devices (NMClient *client);
NMDevice *nm_client_get_device_by_path (NMClient *client, const char *object_path);
typedef void (*NMClientActivateDeviceFn) (gpointer user_data, GError *error);
typedef void (*NMClientActivateDeviceFn) (gpointer user_data, const char *object_path, GError *error);
void nm_client_activate_connection (NMClient *client,
const char *service_name,