diff options
| author | Michael Biebl <biebl@debian.org> | 2011-10-28 23:04:21 +0200 |
|---|---|---|
| committer | Michael Biebl <biebl@debian.org> | 2011-10-28 23:04:21 +0200 |
| commit | bc5840a47a748ffc2b6e7ec24c3dc5ba79664ca8 (patch) | |
| tree | bace204fa423c7489da190c08c2e86242c6b4588 /libnm-glib/nm-device.c | |
| parent | 0ed641587611afffa0b2cd38d5c70bdb480fa241 (diff) | |
| parent | 485d149fe80915d94ed49ea6c2c0552cf7a3e79a (diff) | |
Merge commit 'upstream/0.9.1.95'
Diffstat (limited to 'libnm-glib/nm-device.c')
| -rw-r--r-- | libnm-glib/nm-device.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/libnm-glib/nm-device.c b/libnm-glib/nm-device.c index f06c1e4a..1f9f3671 100644 --- a/libnm-glib/nm-device.c +++ b/libnm-glib/nm-device.c @@ -1475,8 +1475,9 @@ deactivate_cb (DBusGProxy *proxy, /** * nm_device_disconnect: * @device: a #NMDevice - * @callback: (scope async): callback to be called when disconnect operation completes - * @user_data: caller-specific data passed to @callback + * @callback: (scope async) (allow-none): callback to be called when disconnect + * operation completes + * @user_data: (closure): caller-specific data passed to @callback * * Disconnects the device if currently connected, and prevents the device from * automatically connecting to networks until the next manual network connection |