Merge tag 'upstream/1.5.90' into experimental

Upstream version 1.5.90

1 files changed, 8 insertions, 17 deletions

diff --git a/src/nm-firewall-manager.h b/src/nm-firewall-manager.h
index 92fac8e2..a00ee451 100644
--- a/src/nm-firewall-manager.h
+++ b/src/nm-firewall-manager.h
@@ -26,30 +26,21 @@
 #define FIREWALL_DBUS_INTERFACE       "org.fedoraproject.FirewallD1"
 #define FIREWALL_DBUS_INTERFACE_ZONE  "org.fedoraproject.FirewallD1.zone"
 
-#define NM_TYPE_FIREWALL_MANAGER				(nm_firewall_manager_get_type ())
-#define NM_FIREWALL_MANAGER(obj)				(G_TYPE_CHECK_INSTANCE_CAST ((obj), NM_TYPE_FIREWALL_MANAGER, NMFirewallManager))
-#define NM_FIREWALL_MANAGER_CLASS(klass)		(G_TYPE_CHECK_CLASS_CAST ((klass),  NM_TYPE_FIREWALL_MANAGER, NMFirewallManagerClass))
-#define NM_IS_FIREWALL_MANAGER(obj)				(G_TYPE_CHECK_INSTANCE_TYPE ((obj), NM_TYPE_FIREWALL_MANAGER))
-#define NM_IS_FIREWALL_MANAGER_CLASS(klass)		(G_TYPE_CHECK_CLASS_TYPE ((klass),  NM_TYPE_FIREWALL_MANAGER))
-#define NM_FIREWALL_MANAGER_GET_CLASS(obj)		(G_TYPE_INSTANCE_GET_CLASS ((obj),  NM_TYPE_FIREWALL_MANAGER, NMFirewallManagerClass))
+#define NM_TYPE_FIREWALL_MANAGER                (nm_firewall_manager_get_type ())
+#define NM_FIREWALL_MANAGER(obj)                (G_TYPE_CHECK_INSTANCE_CAST ((obj), NM_TYPE_FIREWALL_MANAGER, NMFirewallManager))
+#define NM_FIREWALL_MANAGER_CLASS(klass)        (G_TYPE_CHECK_CLASS_CAST ((klass),  NM_TYPE_FIREWALL_MANAGER, NMFirewallManagerClass))
+#define NM_IS_FIREWALL_MANAGER(obj)             (G_TYPE_CHECK_INSTANCE_TYPE ((obj), NM_TYPE_FIREWALL_MANAGER))
+#define NM_IS_FIREWALL_MANAGER_CLASS(klass)     (G_TYPE_CHECK_CLASS_TYPE ((klass),  NM_TYPE_FIREWALL_MANAGER))
+#define NM_FIREWALL_MANAGER_GET_CLASS(obj)      (G_TYPE_INSTANCE_GET_CLASS ((obj),  NM_TYPE_FIREWALL_MANAGER, NMFirewallManagerClass))
 
 #define NM_FIREWALL_MANAGER_AVAILABLE "available"
 
 #define NM_FIREWALL_MANAGER_STARTED "started"
 
-struct _NMFirewallManagerCallId;
 typedef struct _NMFirewallManagerCallId *NMFirewallManagerCallId;
 
-typedef struct {
-	GObject parent;
-} NMFirewallManager;
-
-typedef struct {
-	GObjectClass parent;
-
-	/* Signals */
-	void (*started) (NMFirewallManager *manager);
-} NMFirewallManagerClass;
+typedef struct _NMFirewallManager NMFirewallManager;
+typedef struct _NMFirewallManagerClass NMFirewallManagerClass;
 
 GType nm_firewall_manager_get_type (void);