[Xfce4-commits] <xfce4-xkb-plugin:master> Fix mixed declarations and code.

[Jérôme Guelfucci]

Updating branch refs/heads/master
         to 791728bd4f31fd2e3cfd423fec5828d7b716b5fe (commit)
       from fcdb970b2d3cd1e0d4a579dd583dcdc2c38d54cf (commit)

commit 791728bd4f31fd2e3cfd423fec5828d7b716b5fe
Author: Jérôme Guelfucci <jeromeg at xfce.org>
Date:   Thu Apr 28 20:17:20 2011 +0200

    Fix mixed declarations and code.

 panel-plugin/xkb-config.c |   11 +++++------
 1 files changed, 5 insertions(+), 6 deletions(-)

diff --git a/panel-plugin/xkb-config.c b/panel-plugin/xkb-config.c
index 5efa7b5..375b138 100644
--- a/panel-plugin/xkb-config.c
+++ b/panel-plugin/xkb-config.c
@@ -331,14 +331,14 @@ xkb_config_update_settings (t_xkb_settings *settings)
 void
 xkb_config_window_changed (guint new_window_id, guint application_id)
 {
-    g_assert (config != NULL);
-
     gint group;
     gpointer key, value;
     GHashTable *hashtable;
     guint id;
     gint DEBUG_FOUND = 0;
 
+    g_assert (config != NULL);
+
     id = 0;
     hashtable = NULL;
 
@@ -439,8 +439,7 @@ xkb_config_get_group_name (gint group)
     if (group == -1)
         group = xkb_config_get_current_group ();
 
-    gchar *result = config->group_names[group];
-    return result;
+    return config->group_names[group];
 }
 
 gchar*
@@ -505,12 +504,12 @@ xkb_config_xkl_config_changed (XklEngine *engine)
 gint
 xkb_config_variant_index_for_group (gint group)
 {
-    g_return_val_if_fail (config != NULL, 0);
-
     gpointer presult;
     gint result;
     gchar *key;
 
+    g_return_val_if_fail (config != NULL, 0);
+
     if (group == -1) group = xkb_config_get_current_group ();
 
     key = config->group_names[group];