summaryrefslogtreecommitdiff
path: root/src/settings/nm-settings-connection.h
diff options
context:
space:
mode:
Diffstat (limited to 'src/settings/nm-settings-connection.h')
-rw-r--r--src/settings/nm-settings-connection.h38
1 files changed, 31 insertions, 7 deletions
diff --git a/src/settings/nm-settings-connection.h b/src/settings/nm-settings-connection.h
index 7875afbe2..0c2ca849b 100644
--- a/src/settings/nm-settings-connection.h
+++ b/src/settings/nm-settings-connection.h
@@ -16,7 +16,7 @@
* 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
*
* (C) Copyright 2008 Novell, Inc.
- * (C) Copyright 2008 - 2011 Red Hat, Inc.
+ * (C) Copyright 2008 - 2013 Red Hat, Inc.
*/
#ifndef NM_SETTINGS_CONNECTION_H
@@ -24,6 +24,7 @@
#include <nm-connection.h>
#include "nm-settings-flags.h"
+#include "nm-auth-subject.h"
#include <net/ethernet.h>
G_BEGIN_DECLS
@@ -35,15 +36,20 @@ G_BEGIN_DECLS
#define NM_IS_SETTINGS_CONNECTION_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), NM_TYPE_SETTINGS_CONNECTION))
#define NM_SETTINGS_CONNECTION_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), NM_TYPE_SETTINGS_CONNECTION, NMSettingsConnectionClass))
+/* Signals */
#define NM_SETTINGS_CONNECTION_UPDATED "updated"
#define NM_SETTINGS_CONNECTION_REMOVED "removed"
#define NM_SETTINGS_CONNECTION_GET_SECRETS "get-secrets"
#define NM_SETTINGS_CONNECTION_CANCEL_SECRETS "cancel-secrets"
+/* Emitted when connection is changed by a user action */
+#define NM_SETTINGS_CONNECTION_UPDATED_BY_USER "updated-by-user"
+
+/* Properties */
#define NM_SETTINGS_CONNECTION_VISIBLE "visible"
+#define NM_SETTINGS_CONNECTION_UNSAVED "unsaved"
typedef struct _NMSettingsConnection NMSettingsConnection;
-
typedef struct _NMSettingsConnectionClass NMSettingsConnectionClass;
typedef void (*NMSettingsConnectionCommitFunc) (NMSettingsConnection *connection,
@@ -81,11 +87,12 @@ void nm_settings_connection_commit_changes (NMSettingsConnection *connection,
gpointer user_data);
gboolean nm_settings_connection_replace_settings (NMSettingsConnection *self,
- NMConnection *new_settings,
+ NMConnection *new_connection,
+ gboolean update_unsaved,
GError **error);
void nm_settings_connection_replace_and_commit (NMSettingsConnection *self,
- NMConnection *new_settings,
+ NMConnection *new_connection,
NMSettingsConnectionCommitFunc callback,
gpointer user_data);
@@ -101,11 +108,10 @@ typedef void (*NMSettingsConnectionSecretsFunc) (NMSettingsConnection *connectio
gpointer user_data);
guint32 nm_settings_connection_get_secrets (NMSettingsConnection *connection,
- gboolean filter_by_uid,
- gulong uid,
+ NMAuthSubject *subject,
const char *setting_name,
NMSettingsGetSecretsFlags flags,
- const char *hint,
+ const char **hints,
NMSettingsConnectionSecretsFunc callback,
gpointer callback_data,
GError **error);
@@ -122,6 +128,8 @@ gboolean nm_settings_connection_check_permission (NMSettingsConnection *self,
void nm_settings_connection_signal_remove (NMSettingsConnection *self);
+gboolean nm_settings_connection_get_unsaved (NMSettingsConnection *self);
+
gboolean nm_settings_connection_get_timestamp (NMSettingsConnection *connection,
guint64 *out_timestamp);
@@ -141,6 +149,22 @@ void nm_settings_connection_add_seen_bssid (NMSettingsConnection *connection,
void nm_settings_connection_read_and_fill_seen_bssids (NMSettingsConnection *connection);
+int nm_settings_connection_get_autoconnect_retries (NMSettingsConnection *connection);
+void nm_settings_connection_set_autoconnect_retries (NMSettingsConnection *connection,
+ int retries);
+void nm_settings_connection_reset_autoconnect_retries (NMSettingsConnection *connection);
+
+gint32 nm_settings_connection_get_autoconnect_retry_time (NMSettingsConnection *connection);
+
+NMDeviceStateReason nm_settings_connection_get_autoconnect_blocked_reason (NMSettingsConnection *connection);
+void nm_settings_connection_set_autoconnect_blocked_reason (NMSettingsConnection *connection,
+ NMDeviceStateReason reason);
+
+gboolean nm_settings_connection_can_autoconnect (NMSettingsConnection *connection);
+
+void nm_settings_connection_set_nm_generated (NMSettingsConnection *connection);
+gboolean nm_settings_connection_get_nm_generated (NMSettingsConnection *connection);
+
G_END_DECLS
#endif /* NM_SETTINGS_CONNECTION_H */