diff options
Diffstat (limited to 'src/nm-active-connection.h')
| -rw-r--r-- | src/nm-active-connection.h | 15 |
1 files changed, 6 insertions, 9 deletions
diff --git a/src/nm-active-connection.h b/src/nm-active-connection.h index 9b6a49ef..b28c2b02 100644 --- a/src/nm-active-connection.h +++ b/src/nm-active-connection.h @@ -21,10 +21,9 @@ #ifndef __NETWORKMANAGER_ACTIVE_CONNECTION_H__ #define __NETWORKMANAGER_ACTIVE_CONNECTION_H__ -#include "nm-exported-object.h" +#include "c-list/src/c-list.h" #include "nm-connection.h" - -#include "nm-utils/c-list.h" +#include "nm-dbus-object.h" #define NM_TYPE_ACTIVE_CONNECTION (nm_active_connection_get_type ()) #define NM_ACTIVE_CONNECTION(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), NM_TYPE_ACTIVE_CONNECTION, NMActiveConnection)) @@ -72,7 +71,7 @@ struct _NMActiveConnectionPrivate; struct _NMActiveConnection { - NMExportedObject parent; + NMDBusObject parent; struct _NMActiveConnectionPrivate *_priv; /* active connection can be tracked in a list by NMManager. This is @@ -81,7 +80,7 @@ struct _NMActiveConnection { }; typedef struct { - NMExportedObjectClass parent; + NMDBusObjectClass parent; /* re-emits device state changes as a convenience for subclasses for * device states >= DISCONNECTED. @@ -110,14 +109,12 @@ GType nm_active_connection_get_type (void); typedef void (*NMActiveConnectionAuthResultFunc) (NMActiveConnection *self, gboolean success, const char *error_desc, - gpointer user_data1, - gpointer user_data2); + gpointer user_data); void nm_active_connection_authorize (NMActiveConnection *self, NMConnection *initial_connection, NMActiveConnectionAuthResultFunc result_func, - gpointer user_data1, - gpointer user_data2); + gpointer user_data); NMSettingsConnection *nm_active_connection_get_settings_connection (NMActiveConnection *self); NMConnection *nm_active_connection_get_applied_connection (NMActiveConnection *self); |