Merge tag 'upstream/1.0.2'

Upstream version 1.0.2

1 files changed, 19 insertions, 3 deletions

diff --git a/src/settings/nm-settings-connection.h b/src/settings/nm-settings-connection.h
index 254e927b..49661f38 100644
--- a/src/settings/nm-settings-connection.h
+++ b/src/settings/nm-settings-connection.h
@@ -46,9 +46,11 @@ G_BEGIN_DECLS
 #define NM_SETTINGS_CONNECTION_UPDATED_BY_USER "updated-by-user"
 
 /* Properties */
-#define NM_SETTINGS_CONNECTION_VISIBLE "visible"
-#define NM_SETTINGS_CONNECTION_UNSAVED "unsaved"
-#define NM_SETTINGS_CONNECTION_FLAGS   "flags"
+#define NM_SETTINGS_CONNECTION_VISIBLE  "visible"
+#define NM_SETTINGS_CONNECTION_UNSAVED  "unsaved"
+#define NM_SETTINGS_CONNECTION_READY    "ready"
+#define NM_SETTINGS_CONNECTION_FLAGS    "flags"
+#define NM_SETTINGS_CONNECTION_FILENAME "filename"
 
 
 /**
@@ -95,6 +97,11 @@ struct _NMSettingsConnectionClass {
 	GObjectClass parent;
 
 	/* virtual methods */
+	void (*replace_and_commit) (NMSettingsConnection *connection,
+	                            NMConnection *new_connection,
+	                            NMSettingsConnectionCommitFunc callback,
+	                            gpointer user_data);
+
 	void (*commit_changes) (NMSettingsConnection *connection,
 	                        NMSettingsConnectionCommitFunc callback,
 	                        gpointer user_data);
@@ -116,6 +123,7 @@ void nm_settings_connection_commit_changes (NMSettingsConnection *connection,
 gboolean nm_settings_connection_replace_settings (NMSettingsConnection *self,
                                                   NMConnection *new_connection,
                                                   gboolean update_unsaved,
+                                                  const char *log_diff_name,
                                                   GError **error);
 
 void nm_settings_connection_replace_and_commit (NMSettingsConnection *self,
@@ -196,6 +204,14 @@ gboolean nm_settings_connection_can_autoconnect (NMSettingsConnection *connectio
 gboolean nm_settings_connection_get_nm_generated (NMSettingsConnection *connection);
 gboolean nm_settings_connection_get_nm_generated_assumed (NMSettingsConnection *connection);
 
+gboolean nm_settings_connection_get_ready (NMSettingsConnection *connection);
+void     nm_settings_connection_set_ready (NMSettingsConnection *connection,
+                                           gboolean ready);
+
+void        nm_settings_connection_set_filename (NMSettingsConnection *connection,
+                                                 const char *filename);
+const char *nm_settings_connection_get_filename (NMSettingsConnection *connection);
+
 G_END_DECLS
 
 #endif /* __NETWORKMANAGER_SETTINGS_CONNECTION_H__ */