diff options
| author | Dan Williams <dcbw@redhat.com> | 2011-01-13 13:03:02 -0600 |
|---|---|---|
| committer | Dan Williams <dcbw@redhat.com> | 2011-01-13 13:03:02 -0600 |
| commit | b5f3aa7120c2cff17d515087e675b5f16f1a06c7 (patch) | |
| tree | 6bb907b0857c19dcdbc21c57de5e12a1cee710b3 /libnm-glib/nm-client.h | |
| parent | 2d9cd80c870d6eb209605d927c0b4144c85a25cb (diff) | |
| download | NetworkManager-b5f3aa7120c2cff17d515087e675b5f16f1a06c7.tar.gz | |
libnm-glib: pass NMClient as first callback argument to activation callbacks
Better matches glib style.
Diffstat (limited to 'libnm-glib/nm-client.h')
| -rw-r--r-- | libnm-glib/nm-client.h | 12 |
1 files changed, 7 insertions, 5 deletions
diff --git a/libnm-glib/nm-client.h b/libnm-glib/nm-client.h index eae04c5d2c..bdc5ab81fb 100644 --- a/libnm-glib/nm-client.h +++ b/libnm-glib/nm-client.h @@ -18,7 +18,7 @@ * Boston, MA 02110-1301 USA. * * Copyright (C) 2007 - 2008 Novell, Inc. - * Copyright (C) 2007 - 2010 Red Hat, Inc. + * Copyright (C) 2007 - 2011 Red Hat, Inc. */ #ifndef NM_CLIENT_H @@ -107,9 +107,10 @@ 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, +typedef void (*NMClientActivateDeviceFn) (NMClient *client, const char *object_path, - GError *error); + GError *error, + gpointer user_data); void nm_client_activate_connection (NMClient *client, const char *connection_path, @@ -118,10 +119,11 @@ void nm_client_activate_connection (NMClient *client, NMClientActivateDeviceFn callback, gpointer user_data); -typedef void (*NMClientAddActivateFn) (gpointer user_data, +typedef void (*NMClientAddActivateFn) (NMClient *client, const char *connection_path, const char *active_path, - GError *error); + GError *error, + gpointer user_data); void nm_client_add_and_activate_connection (NMClient *client, NMConnection *partial, |