Merge branch 'debian/master' into ubuntu/master

1 files changed, 26 insertions, 23 deletions

diff --git a/libnm-core/nm-setting-proxy.h b/libnm-core/nm-setting-proxy.h
index d5913315..7af13be5 100644
--- a/libnm-core/nm-setting-proxy.h
+++ b/libnm-core/nm-setting-proxy.h
@@ -1,4 +1,4 @@
-// SPDX-License-Identifier: LGPL-2.1+
+/* SPDX-License-Identifier: LGPL-2.1+ */
 /*
  * Copyright (C) 2016 Atul Anand <atulhjp@gmail.com>.
  */
@@ -6,8 +6,8 @@
 #ifndef __NM_SETTING_PROXY_H__
 #define __NM_SETTING_PROXY_H__
 
-#if !defined (__NETWORKMANAGER_H_INSIDE__) && !defined (NETWORKMANAGER_COMPILATION)
-#error "Only <NetworkManager.h> can be included directly."
+#if !defined(__NETWORKMANAGER_H_INSIDE__) && !defined(NETWORKMANAGER_COMPILATION)
+    #error "Only <NetworkManager.h> can be included directly."
 #endif
 
 #include "nm-setting.h"
@@ -24,23 +24,26 @@ G_BEGIN_DECLS
  * Since: 1.6
  */
 typedef enum {
-	NM_SETTING_PROXY_METHOD_NONE = 0,
-	NM_SETTING_PROXY_METHOD_AUTO = 1,
+    NM_SETTING_PROXY_METHOD_NONE = 0,
+    NM_SETTING_PROXY_METHOD_AUTO = 1,
 } NMSettingProxyMethod;
 
-#define NM_TYPE_SETTING_PROXY            (nm_setting_proxy_get_type ())
-#define NM_SETTING_PROXY(obj)            (G_TYPE_CHECK_INSTANCE_CAST ((obj), NM_TYPE_SETTING_PROXY, NMSettingProxy))
-#define NM_SETTING_PROXY_CLASS(klass)    (G_TYPE_CHECK_CLASS_CAST ((klass), NM_TYPE_SETTING_PROXY, NMSettingProxyClass))
-#define NM_IS_SETTING_PROXY(obj)         (G_TYPE_CHECK_INSTANCE_TYPE ((obj), NM_TYPE_SETTING_PROXY))
-#define NM_IS_SETTING_PROXY_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), NM_TYPE_SETTING_PROXY))
-#define NM_SETTING_PROXY_GET_CLASS(obj)  (G_TYPE_INSTANCE_GET_CLASS ((obj), NM_TYPE_SETTING_PROXY, NMSettingProxyClass))
+#define NM_TYPE_SETTING_PROXY (nm_setting_proxy_get_type())
+#define NM_SETTING_PROXY(obj) \
+    (G_TYPE_CHECK_INSTANCE_CAST((obj), NM_TYPE_SETTING_PROXY, NMSettingProxy))
+#define NM_SETTING_PROXY_CLASS(klass) \
+    (G_TYPE_CHECK_CLASS_CAST((klass), NM_TYPE_SETTING_PROXY, NMSettingProxyClass))
+#define NM_IS_SETTING_PROXY(obj)         (G_TYPE_CHECK_INSTANCE_TYPE((obj), NM_TYPE_SETTING_PROXY))
+#define NM_IS_SETTING_PROXY_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE((klass), NM_TYPE_SETTING_PROXY))
+#define NM_SETTING_PROXY_GET_CLASS(obj) \
+    (G_TYPE_INSTANCE_GET_CLASS((obj), NM_TYPE_SETTING_PROXY, NMSettingProxyClass))
 
 #define NM_SETTING_PROXY_SETTING_NAME "proxy"
 
-#define NM_SETTING_PROXY_METHOD "method"
+#define NM_SETTING_PROXY_METHOD       "method"
 #define NM_SETTING_PROXY_BROWSER_ONLY "browser-only"
-#define NM_SETTING_PROXY_PAC_URL "pac-url"
-#define NM_SETTING_PROXY_PAC_SCRIPT "pac-script"
+#define NM_SETTING_PROXY_PAC_URL      "pac-url"
+#define NM_SETTING_PROXY_PAC_SCRIPT   "pac-script"
 
 /**
  * NMSettingProxy:
@@ -48,29 +51,29 @@ typedef enum {
  * WWW Proxy Settings
  */
 struct _NMSettingProxy {
-	NMSetting parent;
+    NMSetting parent;
 };
 
 typedef struct {
-	NMSettingClass parent;
+    NMSettingClass parent;
 
-	gpointer padding[4];
+    gpointer padding[4];
 } NMSettingProxyClass;
 
 NM_AVAILABLE_IN_1_6
-GType nm_setting_proxy_get_type (void);
+GType nm_setting_proxy_get_type(void);
 
 NM_AVAILABLE_IN_1_6
-NMSetting *nm_setting_proxy_new (void);
+NMSetting *nm_setting_proxy_new(void);
 
 NM_AVAILABLE_IN_1_6
-NMSettingProxyMethod nm_setting_proxy_get_method (NMSettingProxy *setting);
+NMSettingProxyMethod nm_setting_proxy_get_method(NMSettingProxy *setting);
 NM_AVAILABLE_IN_1_6
-gboolean nm_setting_proxy_get_browser_only (NMSettingProxy *setting);
+gboolean nm_setting_proxy_get_browser_only(NMSettingProxy *setting);
 NM_AVAILABLE_IN_1_6
-const char *nm_setting_proxy_get_pac_url (NMSettingProxy *setting);
+const char *nm_setting_proxy_get_pac_url(NMSettingProxy *setting);
 NM_AVAILABLE_IN_1_6
-const char *nm_setting_proxy_get_pac_script (NMSettingProxy *setting);
+const char *nm_setting_proxy_get_pac_script(NMSettingProxy *setting);
 
 G_END_DECLS