[Xfce4-commits] <xfce4-settings:master> Revert "Keep the shortcut dialog above other windows."

[Jérôme Guelfucci]

Updating branch refs/heads/master
         to 5e1aedff6e3b9b84429d38db4f0558d423cf7d08 (commit)
       from 276875f5f784894b1c75c1b7dd93b599a6235a4c (commit)

commit 5e1aedff6e3b9b84429d38db4f0558d423cf7d08
Author: Jérôme Guelfucci <jeromeg at xfce.org>
Date:   Wed Dec 19 23:03:56 2012 +0100

    Revert "Keep the shortcut dialog above other windows."
    
    This reverts commit a04edfc41ab2035383793ca8315e2e61351108c2.
    
    Error and conflict dialogs are kept under the grab dialog which makes
    them unusable.

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

diff --git a/dialogs/keyboard-settings/xfce-keyboard-settings.c b/dialogs/keyboard-settings/xfce-keyboard-settings.c
index fd8b70e..917e35e 100644
--- a/dialogs/keyboard-settings/xfce-keyboard-settings.c
+++ b/dialogs/keyboard-settings/xfce-keyboard-settings.c
@@ -678,12 +678,6 @@ xfce_keyboard_settings_edit_shortcut (XfceKeyboardSettings *settings,
       /* Request a new shortcut from the user */
       dialog = xfce_shortcut_dialog_new ("commands", command, command);
       g_signal_connect (dialog, "validate-shortcut", G_CALLBACK (xfce_keyboard_settings_validate_shortcut), settings);
-
-      /* Try to keep the window above as it grabs the keyboard, we don't
-       * want users to wonder why the keyboard does not work in another
-       * window */
-      gtk_window_set_keep_above (GTK_WINDOW (dialog), TRUE);
-
       response = xfce_shortcut_dialog_run (XFCE_SHORTCUT_DIALOG (dialog), gtk_widget_get_toplevel (GTK_WIDGET (tree_view)));
 
       if (G_LIKELY (response == GTK_RESPONSE_OK))
@@ -1008,11 +1002,6 @@ xfce_keyboard_settings_add_button_clicked (XfceKeyboardSettings *settings,
       shortcut_dialog = xfce_shortcut_dialog_new ("commands", command, command);
       g_signal_connect (shortcut_dialog, "validate-shortcut", G_CALLBACK (xfce_keyboard_settings_validate_shortcut), settings);
 
-      /* Try to keep the window above as it grabs the keyboard, we don't
-       * want users to wonder why the keyboard does not work in another
-       * window */
-      gtk_window_set_keep_above (GTK_WINDOW (shortcut_dialog), TRUE);
-
       /* Run shortcut dialog until a valid shortcut is entered or the dialog is cancelled */
       parent = gtk_builder_get_object (GTK_BUILDER (settings), "keyboard-shortcuts-dialog");
       response = xfce_shortcut_dialog_run (XFCE_SHORTCUT_DIALOG (shortcut_dialog), GTK_WIDGET (parent));