[Xfce4-commits] <xfce4-settings:master> Set parent window for the conflict dialog.

[Jérôme Guelfucci]

Updating branch refs/heads/master
         to b1b9fa1598e54093c4a9682b875f083dfb0a2a74 (commit)
       from 849aa7824f8a482496c05b1fd77099e062d1c92b (commit)

commit b1b9fa1598e54093c4a9682b875f083dfb0a2a74
Author: Jérôme Guelfucci <jeromeg at xfce.org>
Date:   Thu Dec 20 11:03:03 2012 +0100

    Set parent window for the conflict dialog.

 dialogs/keyboard-settings/xfce-keyboard-settings.c |    3 ++-
 1 files changed, 2 insertions(+), 1 deletions(-)

diff --git a/dialogs/keyboard-settings/xfce-keyboard-settings.c b/dialogs/keyboard-settings/xfce-keyboard-settings.c
index 1e83e75..0a01e1a 100644
--- a/dialogs/keyboard-settings/xfce-keyboard-settings.c
+++ b/dialogs/keyboard-settings/xfce-keyboard-settings.c
@@ -797,7 +797,8 @@ xfce_keyboard_settings_validate_shortcut (XfceShortcutDialog   *dialog,
 
   if (G_UNLIKELY (info != NULL))
     {
-      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 (info->provider),
                                                 shortcut,
                                                 xfce_shortcut_dialog_get_action_name (dialog),