diff options
| author | Sjoerd Simons <sjoerd@luon.net> | 2013-10-25 21:21:07 +0200 |
|---|---|---|
| committer | Sjoerd Simons <sjoerd@luon.net> | 2013-10-25 21:21:07 +0200 |
| commit | e83d1de9b746dbc078ac1cf45f1798e1bc6b7e2f (patch) | |
| tree | c36a40d79a5ae7d2bbca7d240d0a6f664049b435 /libnm-glib/nm-client.h | |
| parent | 26283b4c9e5035574a6c168003e7f1da53a8f32a (diff) | |
| parent | a4256940da049f91bbbea5e53e469a59ea9c10f7 (diff) | |
Merge tag 'upstream/0.9.8.8' into experimental
Upstream version 0.9.8.8
Diffstat (limited to 'libnm-glib/nm-client.h')
| -rw-r--r-- | libnm-glib/nm-client.h | 20 |
1 files changed, 20 insertions, 0 deletions
diff --git a/libnm-glib/nm-client.h b/libnm-glib/nm-client.h index 6c83e4ce..b4da609f 100644 --- a/libnm-glib/nm-client.h +++ b/libnm-glib/nm-client.h @@ -32,6 +32,7 @@ #include "nm-object.h" #include "nm-device.h" #include "nm-active-connection.h" +#include "nm-vpn-connection.h" G_BEGIN_DECLS @@ -53,6 +54,9 @@ G_BEGIN_DECLS #define NM_CLIENT_WIMAX_ENABLED "wimax-enabled" #define NM_CLIENT_WIMAX_HARDWARE_ENABLED "wimax-hardware-enabled" #define NM_CLIENT_ACTIVE_CONNECTIONS "active-connections" +#define NM_CLIENT_CONNECTIVITY "connectivity" +#define NM_CLIENT_PRIMARY_CONNECTION "primary-connection" +#define NM_CLIENT_ACTIVATING_CONNECTION "activating-connection" /** * NMClientPermission: @@ -212,6 +216,22 @@ NMClientPermissionResult nm_client_get_permission_result (NMClient *client, gboolean nm_client_get_logging (NMClient *client, char **level, char **domains, GError **error); gboolean nm_client_set_logging (NMClient *client, const char *level, const char *domains, GError **error); +NMConnectivityState nm_client_get_connectivity (NMClient *client); + +NMConnectivityState nm_client_check_connectivity (NMClient *client, + GCancellable *cancellable, + GError **error); +void nm_client_check_connectivity_async (NMClient *client, + GCancellable *cancellable, + GAsyncReadyCallback callback, + gpointer user_data); +NMConnectivityState nm_client_check_connectivity_finish (NMClient *client, + GAsyncResult *result, + GError **error); + +NMActiveConnection *nm_client_get_primary_connection (NMClient *client); +NMActiveConnection *nm_client_get_activating_connection (NMClient *client); + G_END_DECLS #endif /* NM_CLIENT_H */ |