New upstream version 1.22.0 upstream/1.22.0

1 files changed, 17 insertions, 36 deletions

diff --git a/src/nm-firewall-manager.h b/src/nm-firewall-manager.h
index ceca58be..689e6b06 100644
--- a/src/nm-firewall-manager.h
+++ b/src/nm-firewall-manager.h
@@ -1,30 +1,11 @@
-/* NetworkManager -- Network link manager
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License along
- * with this program; if not, write to the Free Software Foundation, Inc.,
- * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
- *
+// SPDX-License-Identifier: GPL-2.0+
+/*
  * Copyright (C) 2011 Red Hat, Inc.
  */
 
 #ifndef __NETWORKMANAGER_FIREWALL_MANAGER_H__
 #define __NETWORKMANAGER_FIREWALL_MANAGER_H__
 
-#define FIREWALL_DBUS_SERVICE         "org.fedoraproject.FirewallD1"
-#define FIREWALL_DBUS_PATH            "/org/fedoraproject/FirewallD1"
-#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))
@@ -34,7 +15,7 @@
 
 #define NM_FIREWALL_MANAGER_STATE_CHANGED "state-changed"
 
-typedef struct _NMFirewallManagerCallId *NMFirewallManagerCallId;
+typedef struct _NMFirewallManagerCallId NMFirewallManagerCallId;
 
 typedef struct _NMFirewallManager NMFirewallManager;
 typedef struct _NMFirewallManagerClass NMFirewallManagerClass;
@@ -46,22 +27,22 @@ NMFirewallManager *nm_firewall_manager_get (void);
 gboolean nm_firewall_manager_get_running (NMFirewallManager *self);
 
 typedef void (*NMFirewallManagerAddRemoveCallback) (NMFirewallManager *self,
-                                                    NMFirewallManagerCallId call_id,
+                                                    NMFirewallManagerCallId *call_id,
                                                     GError *error,
                                                     gpointer user_data);
 
-NMFirewallManagerCallId nm_firewall_manager_add_or_change_zone (NMFirewallManager *mgr,
-                                                                const char *iface,
-                                                                const char *zone,
-                                                                gboolean add,
-                                                                NMFirewallManagerAddRemoveCallback callback,
-                                                                gpointer user_data);
-NMFirewallManagerCallId nm_firewall_manager_remove_from_zone (NMFirewallManager *mgr,
-                                                              const char *iface,
-                                                              const char *zone,
-                                                              NMFirewallManagerAddRemoveCallback callback,
-                                                              gpointer user_data);
-
-void nm_firewall_manager_cancel_call (NMFirewallManagerCallId fw_call);
+NMFirewallManagerCallId *nm_firewall_manager_add_or_change_zone (NMFirewallManager *mgr,
+                                                                 const char *iface,
+                                                                 const char *zone,
+                                                                 gboolean add,
+                                                                 NMFirewallManagerAddRemoveCallback callback,
+                                                                 gpointer user_data);
+NMFirewallManagerCallId *nm_firewall_manager_remove_from_zone (NMFirewallManager *mgr,
+                                                               const char *iface,
+                                                               const char *zone,
+                                                               NMFirewallManagerAddRemoveCallback callback,
+                                                               gpointer user_data);
+
+void nm_firewall_manager_cancel_call (NMFirewallManagerCallId *call_id);
 
 #endif /* __NETWORKMANAGER_FIREWALL_MANAGER_H__ */