Updating branch refs/heads/jeromeg/keyboard-shortcuts
to 7d933f37584a08775607d9c93e713de02f48a45b (commit)
from 556ffdb3fd2e6e414de8cb347f2c9d8251aebf9d (commit)
commit 7d933f37584a08775607d9c93e713de02f48a45b
Author: Jérôme Guelfucci <[email protected]>
Date: Thu Dec 20 11:05:58 2012 +0100
Pass parent to conflict dialog.
settings-dialogs/xfwm4-settings.c | 3 ++-
1 files changed, 2 insertions(+), 1 deletions(-)
diff --git a/settings-dialogs/xfwm4-settings.c
b/settings-dialogs/xfwm4-settings.c
index 6746d27..64dea66 100644
--- a/settings-dialogs/xfwm4-settings.c
+++ b/settings-dialogs/xfwm4-settings.c
@@ -1909,7 +1909,8 @@ xfwm_settings_validate_shortcut (XfceShortcutDialog
*dialog,
{
if (G_LIKELY (!g_str_equal (xfce_shortcut_dialog_get_action (dialog),
other_shortcut->command)))
{
- response = xfce_shortcut_conflict_dialog
(xfce_shortcuts_provider_get_name (settings->priv->provider),
+ response = xfce_shortcut_conflict_dialog (GTK_WINDOW (dialog),
+
xfce_shortcuts_provider_get_name (settings->priv->provider),
xfce_shortcuts_provider_get_name (other_provider),
shortcut,
xfce_shortcut_dialog_get_action_name (dialog),
_______________________________________________
Xfce4-commits mailing list
[email protected]
https://mail.xfce.org/mailman/listinfo/xfce4-commits
