[Xfce4-commits] <xfce4-xkb-plugin:master> Fix function declaration.

[Jérôme Guelfucci]

Updating branch refs/heads/master
         to 2d42fe32f23ff5557caa1318273956d16f28ae8e (commit)
       from 34b85247f435b86b2b1b863025314a1f19e99630 (commit)

commit 2d42fe32f23ff5557caa1318273956d16f28ae8e
Author: Jérôme Guelfucci <jeromeg at xfce.org>
Date:   Thu Apr 28 20:10:41 2011 +0200

    Fix function declaration.

 panel-plugin/xkb-config.c |   20 +++++++++-----------
 panel-plugin/xkb-config.h |   14 +++++++-------
 2 files changed, 16 insertions(+), 18 deletions(-)

diff --git a/panel-plugin/xkb-config.c b/panel-plugin/xkb-config.c
index 9906cd2..5efa7b5 100644
--- a/panel-plugin/xkb-config.c
+++ b/panel-plugin/xkb-config.c
@@ -192,10 +192,8 @@ xkb_config_initialize_xkb_options (t_xkb_settings *settings)
 }
 
 static void
-xkb_config_free ()
+xkb_config_free (void)
 {
-    gint i;
-
     g_assert (config != NULL);
 
     if (config->group_names) g_free (config->group_names);
@@ -206,8 +204,8 @@ xkb_config_free ()
     g_hash_table_destroy (config->application_map);
 }
 
-void 
-xkb_config_finalize () 
+void
+xkb_config_finalize (void)
 {
     xkb_config_free ();
 
@@ -216,8 +214,8 @@ xkb_config_finalize ()
     xkl_engine_stop_listen (config->engine, XKLL_TRACK_KEYBOARD_STATE);
 }
 
-gint
-xkb_config_get_current_group ()
+static gint
+xkb_config_get_current_group (void)
 {
     XklState* state = xkl_engine_get_current_state (config->engine);
     return state->group;
@@ -239,7 +237,7 @@ xkb_config_set_group (gint group)
 }
 
 gboolean
-xkb_config_next_group ()
+xkb_config_next_group (void)
 {
     xkl_engine_lock_group (config->engine,
             xkl_engine_get_next_group (config->engine));
@@ -422,9 +420,9 @@ xkb_config_window_closed (guint window_id)
 }
 
 
-gint 
-xkb_config_get_group_count () 
-{ 
+gint
+xkb_config_get_group_count (void)
+{
     g_assert (config != NULL);
 
     return config->group_count;
diff --git a/panel-plugin/xkb-config.h b/panel-plugin/xkb-config.h
index d53eaa6..43fd47d 100644
--- a/panel-plugin/xkb-config.h
+++ b/panel-plugin/xkb-config.h
@@ -62,16 +62,16 @@ typedef void        (*XkbCallback)                  (gint current_group,
                                                      gboolean groups_changed,
                                                      gpointer user_data);
 
-gboolean    xkb_config_initialize                   (t_xkb_settings *settings, 
-                                                     XkbCallback callback, 
+gboolean    xkb_config_initialize                   (t_xkb_settings *settings,
+                                                     XkbCallback callback,
                                                      gpointer data);
-void        xkb_config_finalize                     ();
+void        xkb_config_finalize                     (void);
 gboolean    xkb_config_update_settings              (t_xkb_settings *settings);
-gint        xkb_config_get_group_count              ();
+gint        xkb_config_get_group_count              (void);
 gchar*      xkb_config_get_group_name               (gint group);
 gchar*      xkb_config_get_variant                  (gint group);
 gboolean    xkb_config_set_group                    (gint group);
-gboolean    xkb_config_next_group                   ();
+gboolean    xkb_config_next_group                   (void);
 gint        xkb_config_variant_index_for_group      (gint group);
 
 void        xkb_config_window_changed               (guint new_window_id,
@@ -81,8 +81,8 @@ void        xkb_config_window_closed                (guint window_id);
 
 /* TODO: remove this function - xkl structures should not be used outside xkb-config */
 XklConfigRegistry*
-            xkb_config_get_xkl_registry             ();
-gint        xkb_config_get_max_layout_number        ();
+            xkb_config_get_xkl_registry             (void);
+gint        xkb_config_get_max_layout_number        (void);
 
 #ifdef DEBUG