[network-manager-openvpn/danw/cleanup-bgo746693] all: fix indenting



commit 999aeb952367a7707aabebf3f198c3f694fe5679
Author: Jiří Klimeš <jklimes redhat com>
Date:   Wed Mar 25 13:40:38 2015 +0100

    all: fix indenting

 properties/auth-helpers.c  |    4 ++--
 properties/import-export.c |    2 +-
 properties/nm-openvpn.c    |   22 +++++++++++-----------
 src/nm-openvpn-service.c   |    7 ++++---
 4 files changed, 18 insertions(+), 17 deletions(-)
---
diff --git a/properties/auth-helpers.c b/properties/auth-helpers.c
index 17ac78a..4936b7e 100644
--- a/properties/auth-helpers.c
+++ b/properties/auth-helpers.c
@@ -318,7 +318,7 @@ init_one_pw_combo (GtkBuilder *builder,
 
 static void
 pw_setup (GtkBuilder *builder,
-          GtkSizeGroup *group, 
+          GtkSizeGroup *group,
           NMSettingVPN *s_vpn,
           const char *prefix,
           ChangedCallback changed_cb,
@@ -2050,7 +2050,7 @@ advanced_dialog_new_hash_from_dialog (GtkWidget *dialog, GError **error)
                                gtk_tree_model_get (model, &iter, TA_DIR_COL_NUM, &direction, -1);
                                if (direction >= 0) {
                                        g_hash_table_insert (hash, g_strdup (NM_OPENVPN_KEY_TA_DIR),
-                                                            g_strdup_printf ("%d", direction));              
                          
+                                                            g_strdup_printf ("%d", direction));
                                }
                        }
                }
diff --git a/properties/import-export.c b/properties/import-export.c
index 66d2e43..a0f7570 100644
--- a/properties/import-export.c
+++ b/properties/import-export.c
@@ -287,7 +287,7 @@ do_import (const char *path, char **lines, GError **error)
        s_vpn = NM_SETTING_VPN (nm_setting_vpn_new ());
 
        g_object_set (s_vpn, NM_SETTING_VPN_SERVICE_TYPE, NM_DBUS_SERVICE_OPENVPN, NULL);
-       
+
        /* Get the default path for ca, cert, key file, these files maybe
         * in same path with the configuration file */
        if (g_path_is_absolute (path))
diff --git a/properties/nm-openvpn.c b/properties/nm-openvpn.c
index deb6df1..33dcc63 100644
--- a/properties/nm-openvpn.c
+++ b/properties/nm-openvpn.c
@@ -49,7 +49,7 @@
 
 #define OPENVPN_PLUGIN_NAME    _("OpenVPN")
 #define OPENVPN_PLUGIN_DESC    _("Compatible with the OpenVPN server.")
-#define OPENVPN_PLUGIN_SERVICE NM_DBUS_SERVICE_OPENVPN 
+#define OPENVPN_PLUGIN_SERVICE NM_DBUS_SERVICE_OPENVPN
 
 
 /************** plugin class **************/
@@ -57,16 +57,16 @@
 static void openvpn_plugin_ui_interface_init (NMVpnPluginUiInterface *iface_class);
 
 G_DEFINE_TYPE_EXTENDED (OpenvpnPluginUi, openvpn_plugin_ui, G_TYPE_OBJECT, 0,
-                                               G_IMPLEMENT_INTERFACE (NM_TYPE_VPN_PLUGIN_UI_INTERFACE,
-                                                                                          
openvpn_plugin_ui_interface_init))
+                        G_IMPLEMENT_INTERFACE (NM_TYPE_VPN_PLUGIN_UI_INTERFACE,
+                                               openvpn_plugin_ui_interface_init))
 
 /************** UI widget class **************/
 
 static void openvpn_plugin_ui_widget_interface_init (NMVpnPluginUiWidgetInterface *iface_class);
 
 G_DEFINE_TYPE_EXTENDED (OpenvpnPluginUiWidget, openvpn_plugin_ui_widget, G_TYPE_OBJECT, 0,
-                                               G_IMPLEMENT_INTERFACE (NM_TYPE_VPN_PLUGIN_UI_WIDGET_INTERFACE,
-                                                                                          
openvpn_plugin_ui_widget_interface_init))
+                        G_IMPLEMENT_INTERFACE (NM_TYPE_VPN_PLUGIN_UI_WIDGET_INTERFACE,
+                                               openvpn_plugin_ui_widget_interface_init))
 
 #define OPENVPN_PLUGIN_UI_WIDGET_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), 
OPENVPN_TYPE_PLUGIN_UI_WIDGET, OpenvpnPluginUiWidgetPrivate))
 
@@ -774,16 +774,16 @@ openvpn_plugin_ui_class_init (OpenvpnPluginUiClass *req_class)
        object_class->get_property = get_property;
 
        g_object_class_override_property (object_class,
-                                                                         
NM_VPN_PLUGIN_UI_INTERFACE_PROP_NAME,
-                                                                         NM_VPN_PLUGIN_UI_INTERFACE_NAME);
+                                         NM_VPN_PLUGIN_UI_INTERFACE_PROP_NAME,
+                                         NM_VPN_PLUGIN_UI_INTERFACE_NAME);
 
        g_object_class_override_property (object_class,
-                                                                         
NM_VPN_PLUGIN_UI_INTERFACE_PROP_DESC,
-                                                                         NM_VPN_PLUGIN_UI_INTERFACE_DESC);
+                                         NM_VPN_PLUGIN_UI_INTERFACE_PROP_DESC,
+                                         NM_VPN_PLUGIN_UI_INTERFACE_DESC);
 
        g_object_class_override_property (object_class,
-                                                                         
NM_VPN_PLUGIN_UI_INTERFACE_PROP_SERVICE,
-                                                                         NM_VPN_PLUGIN_UI_INTERFACE_SERVICE);
+                                         NM_VPN_PLUGIN_UI_INTERFACE_PROP_SERVICE,
+                                         NM_VPN_PLUGIN_UI_INTERFACE_SERVICE);
 }
 
 static void
diff --git a/src/nm-openvpn-service.c b/src/nm-openvpn-service.c
index 4912082..8282573 100644
--- a/src/nm-openvpn-service.c
+++ b/src/nm-openvpn-service.c
@@ -64,7 +64,7 @@
 static gboolean debug = FALSE;
 static GMainLoop *loop = NULL;
 
-#define NM_OPENVPN_HELPER_PATH         LIBEXECDIR"/nm-openvpn-service-openvpn-helper"
+#define NM_OPENVPN_HELPER_PATH LIBEXECDIR"/nm-openvpn-service-openvpn-helper"
 
 G_DEFINE_TYPE (NMOpenvpnPlugin, nm_openvpn_plugin, NM_TYPE_VPN_PLUGIN)
 
@@ -83,7 +83,7 @@ typedef struct {
 } NMOpenvpnPluginIOData;
 
 typedef struct {
-       GPid    pid;
+       GPid pid;
        guint connect_timer;
        guint connect_count;
        NMOpenvpnPluginIOData *io_data;
@@ -1670,7 +1670,8 @@ main (int argc, char *argv[])
        g_option_context_add_main_entries (opt_ctx, options, NULL);
 
        g_option_context_set_summary (opt_ctx,
-               _("nm-openvpn-service provides integrated OpenVPN capability to NetworkManager."));
+                                     _("nm-openvpn-service provides integrated "
+                                       "OpenVPN capability to NetworkManager."));
 
        g_option_context_parse (opt_ctx, &argc, &argv, NULL);
        g_option_context_free (opt_ctx);


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]