Author: nick
Date: 2008-09-08 10:06:12 +0000 (Mon, 08 Sep 2008)
New Revision: 27753
Modified:
xfce4-settings/trunk/dialogs/keyboard-settings/frap-shortcuts.c
xfce4-settings/trunk/xfce4-settings-helper/frap-shortcuts.c
xfce4-settings/trunk/xfce4-settings-helper/keyboard-shortcuts.c
xfce4-settings/trunk/xfce4-settings-helper/pointers.c
Log:
* Disable the shortcuts debug output in release builds.
Modified: xfce4-settings/trunk/dialogs/keyboard-settings/frap-shortcuts.c
===================================================================
--- xfce4-settings/trunk/dialogs/keyboard-settings/frap-shortcuts.c
2008-09-08 09:47:35 UTC (rev 27752)
+++ xfce4-settings/trunk/dialogs/keyboard-settings/frap-shortcuts.c
2008-09-08 10:06:12 UTC (rev 27753)
@@ -419,7 +419,9 @@
/* Parse the shortcut */
frap_shortcuts_parse_accelerator (shortcut, &keyval, &modifiers);
+#ifndef NDEBUG
g_debug ("grab_shortcut: shortcut = %s, keyval = 0x%x, modifiers = 0x%x,
ungrab = %i", shortcut, keyval, modifiers, ungrab);
+#endif
/* Determine mask containing ignored modifier bits */
ignore_mask = frap_shortcuts_x11_get_ignore_mask ();
Modified: xfce4-settings/trunk/xfce4-settings-helper/frap-shortcuts.c
===================================================================
--- xfce4-settings/trunk/xfce4-settings-helper/frap-shortcuts.c 2008-09-08
09:47:35 UTC (rev 27752)
+++ xfce4-settings/trunk/xfce4-settings-helper/frap-shortcuts.c 2008-09-08
10:06:12 UTC (rev 27753)
@@ -419,7 +419,9 @@
/* Parse the shortcut */
frap_shortcuts_parse_accelerator (shortcut, &keyval, &modifiers);
+#ifndef NDEBUG
g_debug ("grab_shortcut: shortcut = %s, keyval = 0x%x, modifiers = 0x%x,
ungrab = %i", shortcut, keyval, modifiers, ungrab);
+#endif
/* Determine mask containing ignored modifier bits */
ignore_mask = frap_shortcuts_x11_get_ignore_mask ();
Modified: xfce4-settings/trunk/xfce4-settings-helper/keyboard-shortcuts.c
===================================================================
--- xfce4-settings/trunk/xfce4-settings-helper/keyboard-shortcuts.c
2008-09-08 09:47:35 UTC (rev 27752)
+++ xfce4-settings/trunk/xfce4-settings-helper/keyboard-shortcuts.c
2008-09-08 10:06:12 UTC (rev 27753)
@@ -271,11 +271,15 @@
display = gdk_display_get_default ();
+#ifndef NDEBUG
g_debug ("shortcut_callback: shortcut = %s", shortcut);
+#endif
if ((action = g_hash_table_lookup (helper->shortcuts, shortcut)) != NULL)
{
+#ifndef NDEBUG
g_debug ("shortcut_callback: action = %s", action);
+#endif
/* Determine active monitor */
screen = xfce_gdk_display_locate_monitor_with_pointer (display,
&monitor);
@@ -310,7 +314,9 @@
/* Remove shortcut and ungrab keys if we're monitoring it already */
if (G_LIKELY (g_hash_table_lookup (helper->shortcuts, property + 1)))
{
+#ifndef NDEBUG
g_debug ("property_changed: removing shortcut = %s", property + 1);
+#endif
/* Remove shortcut from the hash table */
g_hash_table_remove (helper->shortcuts, property + 1);
@@ -329,14 +335,18 @@
{
if (type == FRAP_SHORTCUTS_EXECUTE)
{
+#ifndef NDEBUG
g_debug ("property_changed: changing action of shortcut = %s
to %s", property + 1, action);
+#endif
/* Replace the current action. The key combination hasn't
changed so don't ungrab/grab */
g_hash_table_replace (helper->shortcuts, property + 1,
g_strdup (action));
}
else
{
+#ifndef NDEBUG
g_debug ("property_changed: removing shortcut = %s",
property + 1);
+#endif
/* Remove shortcut from the hash table */
g_hash_table_remove (helper->shortcuts, property + 1);
@@ -349,7 +359,9 @@
{
if (type == FRAP_SHORTCUTS_EXECUTE)
{
+#ifndef NDEBUG
g_debug ("property_changed: adding shortcut = %s", property
+ 1);
+#endif
/* Insert shortcut into the hash table */
g_hash_table_insert (helper->shortcuts, g_strdup (property +
1), g_strdup (action));
Modified: xfce4-settings/trunk/xfce4-settings-helper/pointers.c
===================================================================
--- xfce4-settings/trunk/xfce4-settings-helper/pointers.c 2008-09-08
09:47:35 UTC (rev 27752)
+++ xfce4-settings/trunk/xfce4-settings-helper/pointers.c 2008-09-08
10:06:12 UTC (rev 27753)
@@ -274,7 +274,7 @@
static gint
xfce_pointers_helper_gcd (gint num,
- gint denom)
+ gint denom)
{
/* calc the greatest common divisor using euclidean's algorithm */
return (denom != 0 ? xfce_pointers_helper_gcd (denom, num % denom) : num);
_______________________________________________
Xfce4-commits mailing list
Xfce4-commits@xfce.org
http://foo-projects.org/mailman/listinfo/xfce4-commits
