[Xfce4-commits] <xfce4-settings:nick/xsettingsd-merge> Add some debugging to keyboard layout object.

[Nick Schermer]

Updating branch refs/heads/nick/xsettingsd-merge
         to 47ae435d8742a32bcbc51fd48daccf0a4f6fb40a (commit)
       from c7415c395177f20ec4aa3057246fada399878a33 (commit)

commit 47ae435d8742a32bcbc51fd48daccf0a4f6fb40a
Author: Nick Schermer <nick at xfce.org>
Date:   Wed Feb 23 22:17:28 2011 +0100

    Add some debugging to keyboard layout object.

 xfsettingsd/debug.c           |    1 +
 xfsettingsd/debug.h           |    7 ++++---
 xfsettingsd/keyboard-layout.c |   13 +++++++++++--
 3 files changed, 16 insertions(+), 5 deletions(-)

diff --git a/xfsettingsd/debug.c b/xfsettingsd/debug.c
index 4a15357..bce4bab 100644
--- a/xfsettingsd/debug.c
+++ b/xfsettingsd/debug.c
@@ -34,6 +34,7 @@ static const GDebugKey dbg_keys[] =
 {
     { "xsettings",  XFSD_DEBUG_XSETTINGS },
     { "fontconfig", XFSD_DEBUG_FONTCONFIG },
+    { "keyboard-layout", XFSD_DEBUG_KEYBOARD_LAYOUT },
 };
 
 
diff --git a/xfsettingsd/debug.h b/xfsettingsd/debug.h
index 7f60516..f6674ad 100644
--- a/xfsettingsd/debug.h
+++ b/xfsettingsd/debug.h
@@ -21,11 +21,12 @@
 
 typedef enum
 {
-   XFSD_DEBUG_YES       = 1 << 0,
+   XFSD_DEBUG_YES             = 1 << 0,
 
    /* filter levels */
-   XFSD_DEBUG_XSETTINGS  = 1 << 1,
-   XFSD_DEBUG_FONTCONFIG = 1 << 2
+   XFSD_DEBUG_XSETTINGS       = 1 << 1,
+   XFSD_DEBUG_FONTCONFIG      = 1 << 2,
+   XFSD_DEBUG_KEYBOARD_LAYOUT = 1 << 3,
 
 }
 XfsdDebugDomain;
diff --git a/xfsettingsd/keyboard-layout.c b/xfsettingsd/keyboard-layout.c
index 21dbb49..129f158 100644
--- a/xfsettingsd/keyboard-layout.c
+++ b/xfsettingsd/keyboard-layout.c
@@ -42,6 +42,7 @@
 #include <libxklavier/xklavier.h>
 #endif /* HAVE_LIBXKLAVIER */
 
+#include "debug.h"
 #include "keyboard-layout.h"
 
 static void xfce_keyboard_layout_helper_process_xmodmap           (void);
@@ -127,6 +128,8 @@ xfce_keyboard_layout_helper_process_xmodmap (void)
 
         xmodmap_command = g_strconcat ("xmodmap ", xmodmap_path, NULL);
 
+        xfsettings_dbg (XFSD_DEBUG_KEYBOARD_LAYOUT, "spawning \"%s\"", xmodmap_command);
+
         /* Launch the xmodmap command and only print errors when in debugging mode */
         if (!g_spawn_command_line_async (xmodmap_command, &error))
         {
@@ -148,6 +151,8 @@ xfce_keyboard_layout_helper_set_model (XfceKeyboardLayoutHelper *helper)
         g_free (helper->config->model);
         helper->config->model = xkbmodel;
         xkl_config_rec_activate (helper->config, helper->engine);
+
+        xfsettings_dbg (XFSD_DEBUG_KEYBOARD_LAYOUT, "set model to \"%s\"", xkbmodel);
     }
 #endif /* HAVE_LIBXKLAVIER */
 }
@@ -167,8 +172,10 @@ xfce_keyboard_layout_helper_set_layout (XfceKeyboardLayoutHelper *helper)
         g_strfreev(helper->config->layouts);
         helper->config->layouts = layouts;
         xkl_config_rec_activate (helper->config, helper->engine);
-        g_free (val_layout);
         g_free (default_layouts);
+
+        xfsettings_dbg (XFSD_DEBUG_KEYBOARD_LAYOUT, "set layouts to \"%s\"", val_layout);
+        g_free (val_layout);
     }
 #endif /* HAVE_LIBXKLAVIER */
 }
@@ -188,8 +195,10 @@ xfce_keyboard_layout_helper_set_variant (XfceKeyboardLayoutHelper *helper)
         g_strfreev(helper->config->variants);
         helper->config->variants = variants;
         xkl_config_rec_activate (helper->config, helper->engine);
-        g_free (val_variant);
         g_free (default_variants);
+
+        xfsettings_dbg (XFSD_DEBUG_KEYBOARD_LAYOUT, "set variant to \"%s\"", val_variant);
+        g_free (val_variant);
     }
 #endif /* HAVE_LIBXKLAVIER */
 }