Updating branch refs/heads/jeromeg/keyboard-shortcuts
to 7e1349870e58425e92b05fd143c4c2d55775d966 (commit)
from 4f0d394aec8618acea49a030873cc271fd4253b6 (commit)
commit 7e1349870e58425e92b05fd143c4c2d55775d966
Author: Jérôme Guelfucci <jero...@xfce.org>
Date: Sat Dec 22 10:32:33 2012 +0100
Use parent when showing warning.
libxfce4kbd-private/xfce-shortcuts.c | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/libxfce4kbd-private/xfce-shortcuts.c
b/libxfce4kbd-private/xfce-shortcuts.c
index ba8019e..45357fb 100644
--- a/libxfce4kbd-private/xfce-shortcuts.c
+++ b/libxfce4kbd-private/xfce-shortcuts.c
@@ -96,7 +96,7 @@ xfce_shortcut_conflict_dialog (GtkWindow *parent,
/* This shortcut already exists in the provider, we don't want it twice
*/
/* Warn the user */
- xfce_dialog_show_warning (NULL, _("Please use another key combination."),
+ xfce_dialog_show_warning (parent, _("Please use another key
combination."),
_("%s already triggers this action."),
shortcut);
return GTK_RESPONSE_REJECT;
_______________________________________________
Xfce4-commits mailing list
Xfce4-commits@xfce.org
https://mail.xfce.org/mailman/listinfo/xfce4-commits
