Merge tag 'upstream/1.5.90' into experimental

Upstream version 1.5.90

1 files changed, 1 insertions, 7 deletions

diff --git a/src/settings/nm-settings.h b/src/settings/nm-settings.h
index a0be42ee..c8a7ebae 100644
--- a/src/settings/nm-settings.h
+++ b/src/settings/nm-settings.h
@@ -61,13 +61,7 @@ typedef gboolean (*NMConnectionFilterFunc) (NMSettings *settings,
                                             NMConnection *connection,
                                             gpointer func_data);
 
-struct _NMSettings {
-	NMExportedObject parent_instance;
-};
-
-typedef struct {
-	NMExportedObjectClass parent_class;
-} NMSettingsClass;
+typedef struct _NMSettingsClass NMSettingsClass;
 
 typedef void (*NMSettingsSetHostnameCb) (const char *name, gboolean result, gpointer user_data);