[Xfce4-commits] <xfce4-xkb-plugin:4.10_panel_support> Fix XKB_DEBUG macros

[Igor Slepchin]

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

commit 213590fc41e272541f057b13a67fb1850877b145
Author: Igor Slepchin <igor.slepchin at gmail.com>
Date:   Tue Apr 2 16:47:02 2013 -0400

    Fix XKB_DEBUG macros

 panel-plugin/xkb-config.h |   28 +++++++++++++++-------------
 1 files changed, 15 insertions(+), 13 deletions(-)

diff --git a/panel-plugin/xkb-config.h b/panel-plugin/xkb-config.h
index c251e53..c91a734 100644
--- a/panel-plugin/xkb-config.h
+++ b/panel-plugin/xkb-config.h
@@ -91,30 +91,32 @@ gint              xkb_config_get_max_layout_number        (void);
 #define XKB_DEBUG(...) \
     do { g_fprintf (stderr, "[[ XFCE XKB PLUGIN ]]: "__VA_ARGS__); g_fprintf (stderr, "\n"); } while (0)
 
-#define XKB_DEBUG_KBD(kbd, msg) g_printf("DUMPING KEYBOARD SETTINGS [[[%s]]] {%d}: ", msg, kbd);\
+#define XKB_DEBUG_KBD(kbd, msg) g_printf("DUMPING KEYBOARD SETTINGS [[[%s]]] {%p}: ", msg, kbd);\
     if (kbd) { \
         g_printf ("\n\
-          model: %s [%d]\n\
-          layouts: %s [%d]\n\
-          variants: %s [%d]\n\
-          options: %s [%d]\n", \
+          model: %s [%p]\n\
+          layouts: %s [%p]\n\
+          variants: %s [%p]\n\
+          toggle: %s [%p]\n\
+          compose_key: %s [%p]\n", \
                 kbd->model, kbd->model, \
                 kbd->layouts, kbd->layouts, \
                 kbd->variants, kbd->variants, \
-                kbd->options, kbd->options); \
+                kbd->toggle_option, kbd->toggle_option,   \
+                kbd->compose_key_position, kbd->compose_key_position); \
     } else { \
         g_printf("NULL\n"); \
     }
 
-#define XKB_DEBUG_CONFIG_REC(crec, msg) g_printf("DUMPING CONFIG REC [[[%s]]] {%d}: ", msg, (int) crec);\
+#define XKB_DEBUG_CONFIG_REC(crec, msg) g_printf("DUMPING CONFIG REC [[[%s]]] {%p}: ", msg, crec);\
     if (crec) { \
         g_printf ("\n\
-            model: %s [%d]\n\
-            layouts: %s [%d]\n\
-            variants: %s [%d]\n", \
-                crec->model, (int) crec->model, \
-                g_strjoinv (",", crec->layouts), (int) crec->layouts, \
-                g_strjoinv (",", crec->variants), (int) crec->variants); \
+            model: %s [%p]\n\
+            layouts: %s [%p]\n\
+            variants: %s [%p]\n", \
+                crec->model, crec->model, \
+                g_strjoinv (",", crec->layouts), crec->layouts, \
+                g_strjoinv (",", crec->variants), crec->variants); \
     } else { \
         g_printf ("NULL\n"); \
     }