[network-manager-openconnect/danw/cleanup-bgo746693] all: fix indenting
- From: Jiří Klimeš <jklimes src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [network-manager-openconnect/danw/cleanup-bgo746693] all: fix indenting
- Date: Wed, 25 Mar 2015 12:30:05 +0000 (UTC)
commit 68b21d15d6d4cb04c3942c89e63516fd20e69f3f
Author: Jiří Klimeš <jklimes redhat com>
Date: Wed Mar 25 13:28:26 2015 +0100
all: fix indenting
properties/auth-helpers.c | 4 +-
properties/nm-openconnect.c | 40 +++++++++++-----------
src/nm-openconnect-service-openconnect-helper.c | 4 +-
src/nm-openconnect-service.c | 5 ++-
4 files changed, 27 insertions(+), 26 deletions(-)
---
diff --git a/properties/auth-helpers.c b/properties/auth-helpers.c
index 905c1fe..919ddfc 100644
--- a/properties/auth-helpers.c
+++ b/properties/auth-helpers.c
@@ -77,7 +77,7 @@ tls_pw_init_auth_widget (GtkBuilder *builder,
gtk_file_chooser_add_filter (GTK_FILE_CHOOSER (widget), filter);
gtk_file_chooser_set_local_only (GTK_FILE_CHOOSER (widget), TRUE);
gtk_file_chooser_button_set_title (GTK_FILE_CHOOSER_BUTTON (widget),
- _("Choose your personal
certificate..."));
+ _("Choose your personal certificate..."));
g_signal_connect (G_OBJECT (widget), "selection-changed", G_CALLBACK (changed_cb), user_data);
if (s_vpn) {
@@ -93,7 +93,7 @@ tls_pw_init_auth_widget (GtkBuilder *builder,
gtk_file_chooser_add_filter (GTK_FILE_CHOOSER (widget), filter);
gtk_file_chooser_set_local_only (GTK_FILE_CHOOSER (widget), TRUE);
gtk_file_chooser_button_set_title (GTK_FILE_CHOOSER_BUTTON (widget),
- _("Choose your private key..."));
+ _("Choose your private key..."));
g_signal_connect (G_OBJECT (widget), "selection-changed", G_CALLBACK (changed_cb), user_data);
if (s_vpn) {
diff --git a/properties/nm-openconnect.c b/properties/nm-openconnect.c
index 00f4ce0..478e394 100644
--- a/properties/nm-openconnect.c
+++ b/properties/nm-openconnect.c
@@ -68,16 +68,16 @@
static void openconnect_plugin_ui_interface_init (NMVpnPluginUiInterface *iface_class);
G_DEFINE_TYPE_EXTENDED (OpenconnectPluginUi, openconnect_plugin_ui, G_TYPE_OBJECT, 0,
- G_IMPLEMENT_INTERFACE (NM_TYPE_VPN_PLUGIN_UI_INTERFACE,
-
openconnect_plugin_ui_interface_init))
+ G_IMPLEMENT_INTERFACE (NM_TYPE_VPN_PLUGIN_UI_INTERFACE,
+ openconnect_plugin_ui_interface_init))
/************** UI widget class **************/
static void openconnect_plugin_ui_widget_interface_init (NMVpnPluginUiWidgetInterface *iface_class);
G_DEFINE_TYPE_EXTENDED (OpenconnectPluginUiWidget, openconnect_plugin_ui_widget, G_TYPE_OBJECT, 0,
- G_IMPLEMENT_INTERFACE (NM_TYPE_VPN_PLUGIN_UI_WIDGET_INTERFACE,
-
openconnect_plugin_ui_widget_interface_init))
+ G_IMPLEMENT_INTERFACE (NM_TYPE_VPN_PLUGIN_UI_WIDGET_INTERFACE,
+ openconnect_plugin_ui_widget_interface_init))
#define OPENCONNECT_PLUGIN_UI_WIDGET_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o),
OPENCONNECT_TYPE_PLUGIN_UI_WIDGET, OpenconnectPluginUiWidgetPrivate))
@@ -446,8 +446,8 @@ init_token_mode_options (GtkComboBox *token_mode)
static gboolean
init_token_ui (OpenconnectPluginUiWidget *self,
- OpenconnectPluginUiWidgetPrivate *priv,
- NMSettingVPN *s_vpn)
+ OpenconnectPluginUiWidgetPrivate *priv,
+ NMSettingVPN *s_vpn)
{
GtkWidget *widget;
GtkComboBox *token_mode;
@@ -669,21 +669,21 @@ update_connection (NMVpnPluginUiWidgetInterface *iface,
/* These are different for every login session, and should not be stored */
nm_setting_set_secret_flags (NM_SETTING (s_vpn), "gwcert",
- NM_SETTING_SECRET_FLAG_NOT_SAVED, NULL);
+ NM_SETTING_SECRET_FLAG_NOT_SAVED, NULL);
nm_setting_set_secret_flags (NM_SETTING (s_vpn), "cookie",
- NM_SETTING_SECRET_FLAG_NOT_SAVED, NULL);
+ NM_SETTING_SECRET_FLAG_NOT_SAVED, NULL);
nm_setting_set_secret_flags (NM_SETTING (s_vpn), "gateway",
- NM_SETTING_SECRET_FLAG_NOT_SAVED, NULL);
+ NM_SETTING_SECRET_FLAG_NOT_SAVED, NULL);
/* These are purely internal data for the auth-dialog, and should be stored */
nm_setting_set_secret_flags (NM_SETTING (s_vpn), "xmlconfig",
- NM_SETTING_SECRET_FLAG_NONE, NULL);
+ NM_SETTING_SECRET_FLAG_NONE, NULL);
nm_setting_set_secret_flags (NM_SETTING (s_vpn), "lasthost",
- NM_SETTING_SECRET_FLAG_NONE, NULL);
+ NM_SETTING_SECRET_FLAG_NONE, NULL);
nm_setting_set_secret_flags (NM_SETTING (s_vpn), "autoconnect",
- NM_SETTING_SECRET_FLAG_NONE, NULL);
+ NM_SETTING_SECRET_FLAG_NONE, NULL);
nm_setting_set_secret_flags (NM_SETTING (s_vpn), "certsigs",
- NM_SETTING_SECRET_FLAG_NONE, NULL);
+ NM_SETTING_SECRET_FLAG_NONE, NULL);
/* Note that the auth-dialog will also store "extra" secrets for form
entries, depending on the arbitrary forms that we're offered by the
server during authentication. We can't know about those in advance,
@@ -811,7 +811,7 @@ ui_factory (NMVpnPluginUiInterface *iface, NMConnection *connection, GError **er
static void
get_property (GObject *object, guint prop_id,
- GValue *value, GParamSpec *pspec)
+ GValue *value, GParamSpec *pspec)
{
switch (prop_id) {
case NM_VPN_PLUGIN_UI_INTERFACE_PROP_NAME:
@@ -837,16 +837,16 @@ openconnect_plugin_ui_class_init (OpenconnectPluginUiClass *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-openconnect-service-openconnect-helper.c b/src/nm-openconnect-service-openconnect-helper.c
index 2fa6852..18a37a9 100644
--- a/src/nm-openconnect-service-openconnect-helper.c
+++ b/src/nm-openconnect-service-openconnect-helper.c
@@ -631,7 +631,7 @@ main (int argc, char *argv[])
if (g_hash_table_size (ip4config)) {
g_hash_table_insert (config, NM_VPN_PLUGIN_CONFIG_HAS_IP4,
- bool_to_gvalue (TRUE));
+ bool_to_gvalue (TRUE));
} else {
g_hash_table_destroy (ip4config);
ip4config = NULL;
@@ -639,7 +639,7 @@ main (int argc, char *argv[])
if (g_hash_table_size (ip6config)) {
g_hash_table_insert (config, NM_VPN_PLUGIN_CONFIG_HAS_IP6,
- bool_to_gvalue (TRUE));
+ bool_to_gvalue (TRUE));
} else {
g_hash_table_destroy (ip6config);
ip6config = NULL;
diff --git a/src/nm-openconnect-service.c b/src/nm-openconnect-service.c
index 92d40d9..34ece9b 100644
--- a/src/nm-openconnect-service.c
+++ b/src/nm-openconnect-service.c
@@ -71,7 +71,7 @@ static const char *openconnect_binary_paths[] =
NULL
};
-#define NM_OPENCONNECT_HELPER_PATH LIBEXECDIR"/nm-openconnect-service-openconnect-helper"
+#define NM_OPENCONNECT_HELPER_PATH LIBEXECDIR"/nm-openconnect-service-openconnect-helper"
typedef struct {
const char *name;
@@ -661,7 +661,8 @@ int main (int argc, char *argv[])
g_option_context_add_main_entries (opt_ctx, options, NULL);
g_option_context_set_summary (opt_ctx,
- _("nm-openconnect-service provides integrated Cisco AnyConnect SSL VPN capability to
NetworkManager."));
+ _("nm-openconnect-service provides integrated "
+ "Cisco AnyConnect SSL VPN 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]