[Xfce4-commits] <xfce4-xkb-plugin:4.10_panel_support> Code style fixes
Igor Slepchin
noreply at xfce.org
Tue Jun 18 00:44:07 CEST 2013
Updating branch refs/heads/4.10_panel_support
to 87848f49da72aa7a100f055edeb186f2b9f64895 (commit)
from 74218e0ede839f0b4fde84991126540d275d0e5f (commit)
commit 87848f49da72aa7a100f055edeb186f2b9f64895
Author: Igor Slepchin <igor.slepchin at gmail.com>
Date: Mon Jun 17 17:55:34 2013 -0400
Code style fixes
panel-plugin/xfce4-xkb-plugin.c | 4 ++--
panel-plugin/xkb-config.c | 4 ++--
panel-plugin/xkb-settings-dialog.c | 28 ++++++++++++++--------------
3 files changed, 18 insertions(+), 18 deletions(-)
diff --git a/panel-plugin/xfce4-xkb-plugin.c b/panel-plugin/xfce4-xkb-plugin.c
index 914b61e..16e1443 100644
--- a/panel-plugin/xfce4-xkb-plugin.c
+++ b/panel-plugin/xfce4-xkb-plugin.c
@@ -460,10 +460,10 @@ xkb_refresh_gui (t_xkb *xkb)
gtk_widget_queue_draw_area (xkb->btn, 0, 0,
xkb->button_hsize, xkb->button_vsize);
- display = gdk_display_get_default();
+ display = gdk_display_get_default ();
if (display)
{
- gtk_tooltip_trigger_tooltip_query(display);
+ gtk_tooltip_trigger_tooltip_query (display);
}
}
diff --git a/panel-plugin/xkb-config.c b/panel-plugin/xkb-config.c
index 045d1d5..16046f0 100644
--- a/panel-plugin/xkb-config.c
+++ b/panel-plugin/xkb-config.c
@@ -334,7 +334,7 @@ xkb_config_update_settings (t_xkb_settings *settings)
xkl_config_rec_reset (config->config_rec);
if (!xkl_config_rec_get_from_server (config->config_rec, config->engine))
{
- DBG ("ERROR: can't get xkl config: [%s]", xkl_get_last_error());
+ DBG ("ERROR: can't get xkl config: [%s]", xkl_get_last_error ());
}
/* XklConfigRec uses for NULL for empty variant instead of "".
@@ -662,7 +662,7 @@ xkb_config_activate_xkl_record (void)
if (!rc)
{
- DBG ("ERROR: can't activate xkl config: [%s]", xkl_get_last_error());
+ DBG ("ERROR: can't activate xkl config: [%s]", xkl_get_last_error ());
}
return rc;
diff --git a/panel-plugin/xkb-settings-dialog.c b/panel-plugin/xkb-settings-dialog.c
index 3c86f83..70a5912 100644
--- a/panel-plugin/xkb-settings-dialog.c
+++ b/panel-plugin/xkb-settings-dialog.c
@@ -112,7 +112,7 @@ static char *
xci_desc_to_utf8 (XklConfigItem * ci)
{
char *sd = g_strstrip (ci->description);
- return sd[0] == 0 ? g_strdup (ci->name) : g_strdup(sd);
+ return sd[0] == 0 ? g_strdup (ci->name) : g_strdup (sd);
}
/**/
@@ -236,7 +236,7 @@ xkb_settings_set_toggle_option_combo_default_value (t_xkb *xkb)
}
else
{
- while (gtk_tree_model_iter_next(model, &iter))
+ while (gtk_tree_model_iter_next (model, &iter))
{
g_free (id);
gtk_tree_model_get (model, &iter, NOM, &id, -1);
@@ -313,7 +313,7 @@ xkb_settings_set_kbd_combo_default_value (t_xkb *xkb)
gtk_combo_box_set_active_iter (GTK_COMBO_BOX (xkb->kbd_model_combo), &iter);
else
{
- while (gtk_tree_model_iter_next(model, &iter))
+ while (gtk_tree_model_iter_next (model, &iter))
{
g_free (id);
gtk_tree_model_get (model, &iter, NOM, &id, -1);
@@ -386,7 +386,7 @@ xkb_settings_edit_layout (GtkWidget *widget, t_xkb *xkb)
gchar **strings;
selection = gtk_tree_view_get_selection (GTK_TREE_VIEW (xkb->layout_tree_view));
- strings = g_strsplit_set(c, ",", 0);
+ strings = g_strsplit_set (c, ",", 0);
if (gtk_tree_selection_get_selected (selection, &model, &iter))
{
@@ -400,7 +400,7 @@ xkb_settings_edit_layout (GtkWidget *widget, t_xkb *xkb)
}
g_strfreev (strings);
}
- g_free(c);
+ g_free (c);
xkb_settings_edit_layout_btn_show (GTK_TREE_VIEW (xkb->layout_tree_view), xkb);
}
@@ -414,7 +414,7 @@ xkb_settings_add_layout (GtkWidget *widget, t_xkb *xkb)
GtkTreeIter iter;
gchar **strings;
- strings = g_strsplit_set(c, ",", 0);
+ strings = g_strsplit_set (c, ",", 0);
gtk_list_store_append (xkb->layout_store, &iter);
gtk_list_store_set (xkb->layout_store, &iter,
DEFAULT_LAYOUT, FALSE,
@@ -845,7 +845,7 @@ xkb_settings_layout_dialog_run (enum change_layout action)
gtk_window_set_icon_name (GTK_WINDOW (dialog), "xfce4-keyboard");
- treestore = gtk_tree_store_new(2, G_TYPE_STRING, G_TYPE_STRING);
+ treestore = gtk_tree_store_new (2, G_TYPE_STRING, G_TYPE_STRING);
xkl_config_registry_foreach_layout (registry, (ConfigItemProcessFunc)
xkb_settings_add_layout_to_available_layouts_tree, treestore);
@@ -875,7 +875,7 @@ xkb_settings_layout_dialog_run (enum change_layout action)
gtk_container_add (GTK_CONTAINER (scrolledw), tree_view);
gtk_widget_show (GTK_WIDGET (tree_view));
- gtk_window_set_default_size(GTK_WINDOW (dialog), 400, 400);
+ gtk_window_set_default_size (GTK_WINDOW (dialog), 400, 400);
gtk_widget_show (dialog);
response = gtk_dialog_run (GTK_DIALOG (dialog));
@@ -901,12 +901,12 @@ xkb_settings_layout_dialog_run (enum change_layout action)
tree_path = gtk_tree_model_get_path (model, &iter);
if (gtk_tree_path_get_depth (tree_path) == 1)
- result = g_strconcat(id, ",", NULL);
+ result = g_strconcat (id, ",", NULL);
else
{
gchar *tmp;
- if (!gtk_tree_path_up(tree_path))
+ if (!gtk_tree_path_up (tree_path))
{
g_free (id);
gtk_tree_path_free (tree_path);
@@ -914,7 +914,7 @@ xkb_settings_layout_dialog_run (enum change_layout action)
return NULL;
}
- if (!gtk_tree_model_get_iter(model, &iter, tree_path))
+ if (!gtk_tree_model_get_iter (model, &iter, tree_path))
{
g_free (id);
gtk_tree_path_free (tree_path);
@@ -1005,15 +1005,15 @@ xkb_settings_update_from_ui (t_xkb *xkb)
if (is_default) xkb->settings->default_group = i;
i++;
- tmp = g_strconcat(kbd_config->layouts, ",", layouts, NULL);
+ tmp = g_strconcat (kbd_config->layouts, ",", layouts, NULL);
g_free (kbd_config->layouts);
kbd_config->layouts = tmp;
g_free (layouts);
if (variants != NULL)
- tmp = g_strconcat(kbd_config->variants, ",", variants, NULL);
+ tmp = g_strconcat (kbd_config->variants, ",", variants, NULL);
else
- tmp = g_strconcat(kbd_config->variants, ",", NULL);
+ tmp = g_strconcat (kbd_config->variants, ",", NULL);
g_free (kbd_config->variants);
kbd_config->variants = tmp;
More information about the Xfce4-commits
mailing list