Imported Upstream version 1.1.90 upstream/1.1.90

1 files changed, 15 insertions, 15 deletions

diff --git a/src/nm-active-connection.h b/src/nm-active-connection.h
index 4db5e6ff..f57f2081 100644
--- a/src/nm-active-connection.h
+++ b/src/nm-active-connection.h
@@ -21,8 +21,7 @@
 #ifndef __NETWORKMANAGER_ACTIVE_CONNECTION_H__
 #define __NETWORKMANAGER_ACTIVE_CONNECTION_H__
 
-#include <glib-object.h>
-#include "nm-types.h"
+#include "nm-exported-object.h"
 #include "nm-connection.h"
 
 #define NM_TYPE_ACTIVE_CONNECTION            (nm_active_connection_get_type ())
@@ -50,7 +49,7 @@
 #define NM_ACTIVE_CONNECTION_MASTER          "master"
 
 /* Internal non-exported properties */
-#define NM_ACTIVE_CONNECTION_INT_CONNECTION     "int-connection"
+#define NM_ACTIVE_CONNECTION_INT_SETTINGS_CONNECTION "int-settings-connection"
 #define NM_ACTIVE_CONNECTION_INT_DEVICE         "int-device"
 #define NM_ACTIVE_CONNECTION_INT_SUBJECT        "int-subject"
 #define NM_ACTIVE_CONNECTION_INT_MASTER         "int-master"
@@ -61,11 +60,11 @@
 #define NM_ACTIVE_CONNECTION_DEVICE_METERED_CHANGED  "device-metered-changed"
 
 struct _NMActiveConnection {
-	GObject parent;
+	NMExportedObject parent;
 };
 
 typedef struct {
-	GObjectClass parent;
+	NMExportedObjectClass parent;
 
 	/* re-emits device state changes as a convenience for subclasses for
 	 * device states >= DISCONNECTED.
@@ -93,24 +92,23 @@ typedef void (*NMActiveConnectionAuthResultFunc) (NMActiveConnection *self,
                                                   gpointer user_data2);
 
 void          nm_active_connection_authorize (NMActiveConnection *self,
+                                              NMConnection *initial_connection,
                                               NMActiveConnectionAuthResultFunc result_func,
                                               gpointer user_data1,
                                               gpointer user_data2);
 
-void          nm_active_connection_export (NMActiveConnection *self);
+NMSettingsConnection *nm_active_connection_get_settings_connection (NMActiveConnection *self);
+NMConnection *nm_active_connection_get_applied_connection (NMActiveConnection *self);
 
-NMConnection *nm_active_connection_get_connection (NMActiveConnection *self);
+NMSettingsConnection *_nm_active_connection_get_settings_connection (NMActiveConnection *self);
 
-void          nm_active_connection_set_connection (NMActiveConnection *self,
-                                                   NMConnection *connection);
+void          nm_active_connection_set_settings_connection (NMActiveConnection *self,
+                                                            NMSettingsConnection *connection);
 
-const char *  nm_active_connection_get_id         (NMActiveConnection *self);
+gboolean      nm_active_connection_has_unmodified_applied_connection (NMActiveConnection *self,
+                                                                      NMSettingCompareFlags compare_flags);
 
-const char *  nm_active_connection_get_uuid       (NMActiveConnection *self);
-
-const char *  nm_active_connection_get_connection_type (NMActiveConnection *self);
-
-const char *  nm_active_connection_get_path (NMActiveConnection *self);
+const char *  nm_active_connection_get_settings_connection_id         (NMActiveConnection *self);
 
 const char *  nm_active_connection_get_specific_object (NMActiveConnection *self);
 
@@ -152,4 +150,6 @@ void          nm_active_connection_set_assumed (NMActiveConnection *self,
 
 gboolean      nm_active_connection_get_assumed (NMActiveConnection *self);
 
+void          nm_active_connection_clear_secrets (NMActiveConnection *self);
+
 #endif /* __NETWORKMANAGER_ACTIVE_CONNECTION_H__ */