Merge tag 'upstream/1.1.90' into experimental

Upstream version 1.1.90

1 files changed, 7 insertions, 8 deletions

diff --git a/src/nm-connection-provider.h b/src/nm-connection-provider.h
index 8d5f7a69..2485c56f 100644
--- a/src/nm-connection-provider.h
+++ b/src/nm-connection-provider.h
@@ -16,15 +16,14 @@
 #ifndef __NETWORKMANAGER_CONNECTION_PROVIDER_H__
 #define __NETWORKMANAGER_CONNECTION_PROVIDER_H__
 
-#include <glib-object.h>
 #include <nm-connection.h>
 
-#include "nm-types.h"
+#include "nm-default.h"
 
-#define NM_TYPE_CONNECTION_PROVIDER      (nm_connection_provider_get_type ())
-#define NM_CONNECTION_PROVIDER(obj)      (G_TYPE_CHECK_INSTANCE_CAST ((obj), NM_TYPE_CONNECTION_PROVIDER, NMConnectionProvider))
-#define NM_IS_CONNECTION_PROVIDER(obj)   (G_TYPE_CHECK_INSTANCE_TYPE ((obj), NM_TYPE_CONNECTION_PROVIDER))
-#define NM_CONNECTION_PROVIDER_GET_INTERFACE(obj) (G_TYPE_INSTANCE_GET_INTERFACE ((obj), NM_TYPE_CONNECTION_PROVIDER, NMConnectionProvider))
+#define NM_TYPE_CONNECTION_PROVIDER               (nm_connection_provider_get_type ())
+#define NM_CONNECTION_PROVIDER(obj)               (G_TYPE_CHECK_INSTANCE_CAST ((obj), NM_TYPE_CONNECTION_PROVIDER, NMConnectionProvider))
+#define NM_IS_CONNECTION_PROVIDER(obj)            (G_TYPE_CHECK_INSTANCE_TYPE ((obj), NM_TYPE_CONNECTION_PROVIDER))
+#define NM_CONNECTION_PROVIDER_GET_INTERFACE(obj) (G_TYPE_INSTANCE_GET_INTERFACE ((obj), NM_TYPE_CONNECTION_PROVIDER, NMConnectionProviderInterface))
 
 #define NM_CP_SIGNAL_CONNECTION_ADDED        "cp-connection-added"
 #define NM_CP_SIGNAL_CONNECTION_UPDATED      "cp-connection-updated"
@@ -44,7 +43,7 @@ typedef gboolean (*NMConnectionFilterFunc) (NMConnectionProvider *provider,
                                             gpointer func_data);
 
 
-struct _NMConnectionProvider {
+typedef struct {
 	GTypeInterface g_iface;
 
 	/* Methods */
@@ -72,7 +71,7 @@ struct _NMConnectionProvider {
 
 	void (*connection_removed) (NMConnectionProvider *self, NMConnection *connection);
 
-};
+} NMConnectionProviderInterface;
 
 GType nm_connection_provider_get_type (void);