[Xfce4-commits] <xfce4-settings:master> Add debugging to keyboard shortcuts object.

[Nick Schermer]

Updating branch refs/heads/master
         to 2cd7e60c47b681c00aedf548e837dfd9c3a44059 (commit)
       from 409ddc9e044d5c5e97d439c1f27259940f66a029 (commit)

commit 2cd7e60c47b681c00aedf548e837dfd9c3a44059
Author: Nick Schermer <nick at xfce.org>
Date:   Wed Feb 23 22:42:54 2011 +0100

    Add debugging to keyboard shortcuts object.

 xfsettingsd/debug.c              |    1 +
 xfsettingsd/debug.h              |   12 ++++++------
 xfsettingsd/keyboard-shortcuts.c |   26 +++++++++++++++++---------
 3 files changed, 24 insertions(+), 15 deletions(-)

diff --git a/xfsettingsd/debug.c b/xfsettingsd/debug.c
index 3dffa0e..477c53c 100644
--- a/xfsettingsd/debug.c
+++ b/xfsettingsd/debug.c
@@ -36,6 +36,7 @@ static const GDebugKey dbg_keys[] =
     { "fontconfig", XFSD_DEBUG_FONTCONFIG },
     { "keyboard-layout", XFSD_DEBUG_KEYBOARD_LAYOUT },
     { "keyboards", XFSD_DEBUG_KEYBOARDS },
+    { "keyboard-shortcuts", XFSD_DEBUG_KEYBOARD_SHORTCUTS },
 };
 
 
diff --git a/xfsettingsd/debug.h b/xfsettingsd/debug.h
index 6c07f29..68d7f07 100644
--- a/xfsettingsd/debug.h
+++ b/xfsettingsd/debug.h
@@ -21,14 +21,14 @@
 
 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_KEYBOARD_LAYOUT = 1 << 3,
-   XFSD_DEBUG_KEYBOARDS       = 1 << 4,
-
+   XFSD_DEBUG_XSETTINGS          = 1 << 1,
+   XFSD_DEBUG_FONTCONFIG         = 1 << 2,
+   XFSD_DEBUG_KEYBOARD_LAYOUT    = 1 << 3,
+   XFSD_DEBUG_KEYBOARDS          = 1 << 4,
+   XFSD_DEBUG_KEYBOARD_SHORTCUTS = 1 << 5,
 }
 XfsdDebugDomain;
 
diff --git a/xfsettingsd/keyboard-shortcuts.c b/xfsettingsd/keyboard-shortcuts.c
index cf1ed5a..6b0d229 100644
--- a/xfsettingsd/keyboard-shortcuts.c
+++ b/xfsettingsd/keyboard-shortcuts.c
@@ -43,6 +43,7 @@
 #include <libxfce4kbd-private/xfce-shortcuts-provider.h>
 #include <libxfce4kbd-private/xfce-shortcuts-grabber.h>
 
+#include "debug.h"
 #include "keyboard-shortcuts.h"
 
 
@@ -146,8 +147,9 @@ xfce_keyboard_shortcuts_helper_shortcut_added (XfceShortcutsProvider       *prov
                                                XfceKeyboardShortcutsHelper *helper)
 {
   g_return_if_fail (XFCE_IS_KEYBOARD_SHORTCUTS_HELPER (helper));
-  DBG ("shortcut = %s", shortcut);
   xfce_shortcuts_grabber_add (helper->grabber, shortcut);
+
+  xfsettings_dbg (XFSD_DEBUG_KEYBOARD_SHORTCUTS, "add \"%s\"", shortcut);
 }
 
 
@@ -158,8 +160,9 @@ xfce_keyboard_shortcuts_helper_shortcut_removed (XfceShortcutsProvider       *pr
                                                  XfceKeyboardShortcutsHelper *helper)
 {
   g_return_if_fail (XFCE_IS_KEYBOARD_SHORTCUTS_HELPER (helper));
-  DBG ("shortcut = %s", shortcut);
   xfce_shortcuts_grabber_remove (helper->grabber, shortcut);
+
+  xfsettings_dbg (XFSD_DEBUG_KEYBOARD_SHORTCUTS, "remove \"%s\"", shortcut);
 }
 
 
@@ -171,8 +174,10 @@ _xfce_keyboard_shortcuts_helper_load_shortcut (XfceShortcut                *shor
   g_return_if_fail (shortcut != NULL);
   g_return_if_fail (XFCE_IS_KEYBOARD_SHORTCUTS_HELPER (helper));
 
-  DBG ("shortcut = %s", shortcut->shortcut);
   xfce_shortcuts_grabber_add (helper->grabber, shortcut->shortcut);
+
+  xfsettings_dbg_filtered (XFSD_DEBUG_KEYBOARD_SHORTCUTS, "loaded \"%s\" => \"%s\"",
+                           shortcut->shortcut, shortcut->command);
 }
 
 
@@ -187,6 +192,7 @@ xfce_keyboard_shortcuts_helper_load_shortcuts (XfceKeyboardShortcutsHelper *help
   /* Load shortcuts one by one */
   shortcuts = xfce_shortcuts_provider_get_shortcuts (helper->provider);
   g_list_foreach (shortcuts, (GFunc) _xfce_keyboard_shortcuts_helper_load_shortcut, helper);
+  xfsettings_dbg (XFSD_DEBUG_KEYBOARD_SHORTCUTS, "%d shortcuts loaded", g_list_length (shortcuts));
   xfce_shortcuts_free (shortcuts);
 }
 
@@ -210,16 +216,18 @@ xfce_keyboard_shortcuts_helper_shortcut_activated (XfceShortcutsGrabber        *
   if (shortcut == NULL || g_utf8_strlen (shortcut, -1) == 0)
     return;
 
-  DBG  ("shortcut = %s", shortcut);
-
   /* Get shortcut from the provider */
   sc = xfce_shortcuts_provider_get_shortcut (helper->provider, shortcut);
 
   if (G_UNLIKELY (sc == NULL))
-    return;
-
-  DBG ("command = %s, snotify = %s (time = %d)",
-       sc->command, sc->snotify ? "true" : "false", timestamp);
+   {
+      xfsettings_dbg (XFSD_DEBUG_KEYBOARD_SHORTCUTS, "\"%s\" not found", shortcut);
+      return;
+   }
+
+  xfsettings_dbg (XFSD_DEBUG_KEYBOARD_SHORTCUTS,
+                  "activated \"%s\" (command=\"%s\", snotify=%d, stamp=%d)",
+                  shortcut, sc->command, sc->snotify, timestamp);
 
   /* Handle the argv ourselfs, because xfce_spawn_command_line_on_screen() does
    * not accept a custom timestamp for startup notification */