Updating branch refs/heads/master
to 1d5d93c03ad5bb05691f0448ff8b58b777db36c3 (commit)
from 3e3005d27e6becc628c42e5975264b47605dcfa8 (commit)
commit 1d5d93c03ad5bb05691f0448ff8b58b777db36c3
Author: Igor Slepchin <igor.slepc...@gmail.com>
Date: Wed Aug 22 16:39:33 2012 -0400
Code style fixes.
dialogs/keyboard-settings/xfce-keyboard-settings.c | 8 ++++----
xfsettingsd/keyboard-layout.c | 20 ++++++++++----------
2 files changed, 14 insertions(+), 14 deletions(-)
diff --git a/dialogs/keyboard-settings/xfce-keyboard-settings.c
b/dialogs/keyboard-settings/xfce-keyboard-settings.c
index cc7e81c..134e766 100644
--- a/dialogs/keyboard-settings/xfce-keyboard-settings.c
+++ b/dialogs/keyboard-settings/xfce-keyboard-settings.c
@@ -1175,7 +1175,7 @@ xfce_keyboard_settings_set_layout (XfceKeyboardSettings
*settings)
XKB_TREE_LAYOUTS, &val_layout,
XKB_TREE_VARIANTS, &val_variant, -1);
if (val_variant == NULL)
- val_variant = g_strdup("");
+ val_variant = g_strdup ("");
if (val_layout)
{
@@ -1199,7 +1199,7 @@ xfce_keyboard_settings_set_layout (XfceKeyboardSettings
*settings)
XKB_TREE_LAYOUTS, &val_layout,
XKB_TREE_VARIANTS, &val_variant, -1);
if (val_variant == NULL)
- val_variant = g_strdup("");
+ val_variant = g_strdup ("");
if (val_layout)
{
@@ -1601,7 +1601,7 @@ static void
xfce_keyboard_settings_up_layout_button_cb (GtkWidget *widget,
XfceKeyboardSettings *settings)
{
- xfce_keyboard_settings_layout_move(widget, settings, MOVE_LAYOUT_UP);
+ xfce_keyboard_settings_layout_move (widget, settings, MOVE_LAYOUT_UP);
}
@@ -1610,7 +1610,7 @@ static void
xfce_keyboard_settings_down_layout_button_cb (GtkWidget *widget,
XfceKeyboardSettings *settings)
{
- xfce_keyboard_settings_layout_move(widget, settings, MOVE_LAYOUT_DOWN);
+ xfce_keyboard_settings_layout_move (widget, settings, MOVE_LAYOUT_DOWN);
}
diff --git a/xfsettingsd/keyboard-layout.c b/xfsettingsd/keyboard-layout.c
index 6c0f0c3..f4ee672 100644
--- a/xfsettingsd/keyboard-layout.c
+++ b/xfsettingsd/keyboard-layout.c
@@ -225,14 +225,14 @@ xfce_keyboard_layout_helper_set (XfceKeyboardLayoutHelper
*helper,
if (!helper->xkb_disable_settings)
{
- xfconf_values = g_strjoinv(",", *xkl_config_option);
+ xfconf_values = g_strjoinv (",", *xkl_config_option);
xkl_values = xfconf_channel_get_string (helper->channel,
xfconf_option_name,
xfconf_values);
if (g_strcmp0 (xfconf_values, xkl_values) != 0)
{
values = g_strsplit_set (xkl_values, ",", 0);
- g_strfreev(*xkl_config_option);
+ g_strfreev (*xkl_config_option);
*xkl_config_option = values;
xkl_config_rec_activate (helper->config, helper->engine);
@@ -279,7 +279,7 @@ xfce_keyboard_layout_get_option (gchar **options,
for (iter = options; iter && *iter; iter++)
{
- if (g_str_has_prefix(*iter, option_name))
+ if (g_str_has_prefix (*iter, option_name))
{
option_value = *iter;
}
@@ -288,13 +288,13 @@ xfce_keyboard_layout_get_option (gchar **options,
gchar *tmp = other_options;
if (other_options)
{
- other_options = g_strconcat(other_options, ",", *iter, NULL);
+ other_options = g_strconcat (other_options, ",", *iter, NULL);
}
else
{
- other_options = g_strdup(*iter);
+ other_options = g_strdup (*iter);
}
- g_free(tmp);
+ g_free (tmp);
}
}
@@ -327,23 +327,23 @@ xfce_keyboard_layout_helper_set_option
(XfceKeyboardLayoutHelper *helper,
}
else
{
- if (strlen(option_value) != 0)
+ if (strlen (option_value) != 0)
{
options_string = g_strconcat (option_value, ",",
other_options, NULL);
}
else
{
- options_string = strdup(other_options);
+ options_string = strdup (other_options);
}
}
g_strfreev (helper->config->options);
- helper->config->options = g_strsplit(options_string, ",", 0);
+ helper->config->options = g_strsplit (options_string, ",", 0);
xkl_config_rec_activate (helper->config, helper->engine);
xfsettings_dbg (XFSD_DEBUG_KEYBOARD_LAYOUT, "set %s to \"%s\"",
xkb_option_name, option_value);
- g_free(options_string);
+ g_free (options_string);
}
g_free (other_options);
_______________________________________________
Xfce4-commits mailing list
Xfce4-commits@xfce.org
https://mail.xfce.org/mailman/listinfo/xfce4-commits
