Updating branch refs/heads/bluesabre/display-settings
to 454bb81a61aa4743e58db8ef1a142a5995138f39 (commit)
from cd952f2777ffa11e48c003f0795ba5d55c798340 (commit)
commit 454bb81a61aa4743e58db8ef1a142a5995138f39
Author: Jérôme Guelfucci <jero...@xfce.org>
Date: Sun Dec 30 10:31:42 2012 +0100
Remove ignore_property argument in xfce_keyboard_settings_get_shortcut_info.
This argument was not used and it clutters the logs.
dialogs/keyboard-settings/xfce-keyboard-settings.c | 14 ++++----------
1 file changed, 4 insertions(+), 10 deletions(-)
diff --git a/dialogs/keyboard-settings/xfce-keyboard-settings.c
b/dialogs/keyboard-settings/xfce-keyboard-settings.c
index a7529c8..b6f8b0c 100644
--- a/dialogs/keyboard-settings/xfce-keyboard-settings.c
+++ b/dialogs/keyboard-settings/xfce-keyboard-settings.c
@@ -120,8 +120,7 @@ static gboolean
xfce_keyboard_settings_validate_shortcut (X
const gchar *shortcut,
XfceKeyboardSettings *settings);
static XfceKeyboardShortcutInfo *xfce_keyboard_settings_get_shortcut_info
(XfceKeyboardSettings *settings,
-
const gchar *shortcut,
-
const gchar *ignore_property);
+
const gchar *shortcut);
static void xfce_keyboard_settings_free_shortcut_info
(XfceKeyboardShortcutInfo *info);
static void xfce_keyboard_settings_shortcut_added
(XfceShortcutsProvider *provider,
const gchar *shortcut,
@@ -777,7 +776,6 @@ xfce_keyboard_settings_validate_shortcut
(XfceShortcutDialog *dialog,
XfceKeyboardSettings *settings)
{
XfceKeyboardShortcutInfo *info;
- gchar *property;
gboolean accepted = TRUE;
gint response;
@@ -795,9 +793,7 @@ xfce_keyboard_settings_validate_shortcut
(XfceShortcutDialog *dialog,
DBG ("Validating shortcut = %s", shortcut);
- property = g_strconcat (CUSTOM_BASE_PROPERTY, "/", shortcut, NULL);
- info = xfce_keyboard_settings_get_shortcut_info (settings, shortcut,
property);
- g_free (property);
+ info = xfce_keyboard_settings_get_shortcut_info (settings, shortcut);
if (G_UNLIKELY (info != NULL))
{
@@ -838,8 +834,7 @@ xfce_keyboard_settings_validate_shortcut
(XfceShortcutDialog *dialog,
static XfceKeyboardShortcutInfo *
xfce_keyboard_settings_get_shortcut_info (XfceKeyboardSettings *settings,
- const gchar *shortcut,
- const gchar
*ignore_property)
+ const gchar *shortcut)
{
XfceKeyboardShortcutInfo *info = NULL;
GList *iter;
@@ -849,7 +844,7 @@ xfce_keyboard_settings_get_shortcut_info
(XfceKeyboardSettings *settings,
g_return_val_if_fail (XFCE_IS_KEYBOARD_SETTINGS (settings), FALSE);
g_return_val_if_fail (shortcut != NULL, FALSE);
- DBG ("shortcut = %s, ignore_property = %s", shortcut, ignore_property);
+ DBG ("Looking for shortcut info for %s", shortcut);
providers = xfce_shortcuts_provider_get_providers ();
@@ -864,7 +859,6 @@ xfce_keyboard_settings_get_shortcut_info
(XfceKeyboardSettings *settings,
if (G_LIKELY (sc != NULL))
{
- /* Check ignore_property and change shortcut info struct */
info = g_new0 (XfceKeyboardShortcutInfo, 1);
info->provider = g_object_ref (iter->data);
info->shortcut = sc;
_______________________________________________
Xfce4-commits mailing list
Xfce4-commits@xfce.org
https://mail.xfce.org/mailman/listinfo/xfce4-commits
