[epiphany] shortcuts-window: fix rebase problem

[Iulian Radu <iulianradu src gnome org>]

commit 58d8e1ee2482f37a671ffc6f343220f5000b8cc3
Author: Iulian Radu <iulian radu67 gmail com>
Date:   Mon Jul 11 19:30:58 2016 +0300

    shortcuts-window: fix rebase problem

 src/ephy-shell.c      |    2 +-
 src/window-commands.c |    4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)
---
diff --git a/src/ephy-shell.c b/src/ephy-shell.c
index 95f8d89..7a5ff1e 100644
--- a/src/ephy-shell.c
+++ b/src/ephy-shell.c
@@ -202,7 +202,7 @@ show_shortcuts (GSimpleAction *action,
 
   window = gtk_application_get_active_window (GTK_APPLICATION (ephy_shell));
 
-  window_cmd_help_shortcuts (NULL, GTK_WIDGET (window));
+  window_cmd_show_shortcuts (NULL, NULL, EPHY_WINDOW (window));
 }
 
 static void
diff --git a/src/window-commands.c b/src/window-commands.c
index 1bc8a99..6b14b7e 100644
--- a/src/window-commands.c
+++ b/src/window-commands.c
@@ -146,8 +146,8 @@ window_cmd_show_shortcuts (GSimpleAction *action,
     g_object_unref (builder);
   }
 
-  if (gtk_window_get_transient_for (GTK_WINDOW (shortcuts_window)) != GTK_WINDOW (window))
-    gtk_window_set_transient_for (GTK_WINDOW (shortcuts_window), GTK_WINDOW (window));
+  if (gtk_window_get_transient_for (GTK_WINDOW (shortcuts_window)) != GTK_WINDOW (user_data))
+    gtk_window_set_transient_for (GTK_WINDOW (shortcuts_window), GTK_WINDOW (user_data));
 
   gtk_window_present (GTK_WINDOW (shortcuts_window));
 }