[Xfce4-commits] <xfce4-xkb-plugin:4.10_panel_support> Fix prototypes of X-state-changed and X-config-changed callbacks. (cherry picked from commit a29286c138b5bf6d041c099237b34ffad24eff12)

[Igor Slepchin]

Updating branch refs/heads/4.10_panel_support
         to 8e661ce85c9200286e6aa0cc12514e4fb4203b5f (commit)
       from eaf0e5136c657cb1d040a01d3f1692b5b81373f9 (commit)

commit 8e661ce85c9200286e6aa0cc12514e4fb4203b5f
Author: Igor Slepchin <igor.slepchin at gmail.com>
Date:   Tue Jul 17 17:46:25 2012 -0400

    Fix prototypes of X-state-changed and X-config-changed callbacks.
    (cherry picked from commit a29286c138b5bf6d041c099237b34ffad24eff12)

 panel-plugin/xkb-config.c |   17 ++++++++++-------
 1 files changed, 10 insertions(+), 7 deletions(-)

diff --git a/panel-plugin/xkb-config.c b/panel-plugin/xkb-config.c
index 3d1a26c..3e76039 100644
--- a/panel-plugin/xkb-config.c
+++ b/panel-plugin/xkb-config.c
@@ -68,12 +68,14 @@ typedef struct
 t_xkb_config *config;
 gboolean ignore_xkl_config_change = FALSE;
 
-void                xkb_config_state_changed            (XklEngine *engine,
-                                                         XklEngineStateChange *change,
+static void         xkb_config_state_changed            (XklEngine *engine,
+                                                         XklEngineStateChange change,
                                                          gint group,
-                                                         gboolean restore);
+                                                         gboolean restore,
+                                                         gpointer user_data);
 
-void                xkb_config_xkl_config_changed       (XklEngine *engine);
+static void         xkb_config_xkl_config_changed       (XklEngine *engine,
+                                                         gpointer user_data);
 
 GdkFilterReturn     handle_xevent                       (GdkXEvent * xev,
                                                          GdkEvent * event);
@@ -542,9 +544,10 @@ xkb_config_get_variant (gint group)
 
 void
 xkb_config_state_changed (XklEngine *engine,
-                          XklEngineStateChange *change,
+                          XklEngineStateChange change,
                           gint group,
-                          gboolean restore)
+                          gboolean restore,
+                          gpointer user_data)
 {
     if (change == GROUP_CHANGED)
     {
@@ -575,7 +578,7 @@ xkb_config_state_changed (XklEngine *engine,
 }
 
 void
-xkb_config_xkl_config_changed (XklEngine *engine)
+xkb_config_xkl_config_changed (XklEngine *engine, gpointer user_data)
 {
     TRACE ("ignore_xkl_config_change: %d ", ignore_xkl_config_change);