|
 |
1efd99 |
From 40b92b6b4fa4eb81c2b746365a6a056b3666ee81 Mon Sep 17 00:00:00 2001
|
|
|
1efd99 |
From: Victor Toso <me@victortoso.com>
|
|
|
1efd99 |
Date: Fri, 9 Jun 2017 17:27:32 +0200
|
|
|
1efd99 |
Subject: [PATCH] remote-viewer-connect: Keep the 'dialog' window on top
|
|
|
1efd99 |
|
|
|
1efd99 |
Otherwise, in kiosk mode, it'll be hidden from user.
|
|
|
1efd99 |
|
|
|
1efd99 |
Resolves: https://bugzilla.redhat.com/show_bug.cgi?id=1459800
|
|
|
1efd99 |
|
|
|
1efd99 |
Signed-off-by: Victor Toso <victortoso@redhat.com>
|
|
|
1efd99 |
Acked-by: Eduardo Lima (Etrunko) <etrunko@redhat.com>
|
|
|
1efd99 |
---
|
|
|
1efd99 |
src/remote-viewer-connect.c | 3 ++-
|
|
|
1efd99 |
src/remote-viewer-connect.h | 2 +-
|
|
|
1efd99 |
src/remote-viewer.c | 3 ++-
|
|
|
1efd99 |
3 files changed, 5 insertions(+), 3 deletions(-)
|
|
|
1efd99 |
|
|
|
1efd99 |
diff --git a/src/remote-viewer-connect.c b/src/remote-viewer-connect.c
|
|
|
1efd99 |
index 2fbc5ff..14594ac 100644
|
|
|
1efd99 |
--- a/src/remote-viewer-connect.c
|
|
|
1efd99 |
+++ b/src/remote-viewer-connect.c
|
|
|
1efd99 |
@@ -172,7 +172,7 @@ make_label_small(GtkLabel* label)
|
|
|
1efd99 |
* @return FALSE if Cancel is pressed or dialog is closed
|
|
|
1efd99 |
*/
|
|
|
1efd99 |
gboolean
|
|
|
1efd99 |
-remote_viewer_connect_dialog(gchar **uri)
|
|
|
1efd99 |
+remote_viewer_connect_dialog(GtkWindow *main_window, gchar **uri)
|
|
|
1efd99 |
{
|
|
|
1efd99 |
GtkWidget *window, *label, *entry, *recent, *connect_button, *cancel_button;
|
|
|
1efd99 |
GtkRecentFilter *rfilter;
|
|
|
1efd99 |
@@ -192,6 +192,7 @@ remote_viewer_connect_dialog(gchar **uri)
|
|
|
1efd99 |
g_return_val_if_fail(builder != NULL, GTK_RESPONSE_NONE);
|
|
|
1efd99 |
|
|
|
1efd99 |
window = GTK_WIDGET(gtk_builder_get_object(builder, "remote-viewer-connection-window"));
|
|
|
1efd99 |
+ gtk_window_set_transient_for(GTK_WINDOW(window), main_window);
|
|
|
1efd99 |
connect_button = GTK_WIDGET(gtk_builder_get_object(builder, "connect-button"));
|
|
|
1efd99 |
cancel_button = GTK_WIDGET(gtk_builder_get_object(builder, "cancel-button"));
|
|
|
1efd99 |
label = GTK_WIDGET(gtk_builder_get_object(builder, "example-label"));
|
|
|
1efd99 |
diff --git a/src/remote-viewer-connect.h b/src/remote-viewer-connect.h
|
|
|
1efd99 |
index f00581e..99779ef 100644
|
|
|
1efd99 |
--- a/src/remote-viewer-connect.h
|
|
|
1efd99 |
+++ b/src/remote-viewer-connect.h
|
|
|
1efd99 |
@@ -23,7 +23,7 @@
|
|
|
1efd99 |
|
|
|
1efd99 |
#include <gtk/gtk.h>
|
|
|
1efd99 |
|
|
|
1efd99 |
-gboolean remote_viewer_connect_dialog(gchar **uri);
|
|
|
1efd99 |
+gboolean remote_viewer_connect_dialog(GtkWindow *main_window, gchar **uri);
|
|
|
1efd99 |
|
|
|
1efd99 |
#endif /* REMOTE_VIEWER_CONNECT_H */
|
|
|
1efd99 |
|
|
|
1efd99 |
diff --git a/src/remote-viewer.c b/src/remote-viewer.c
|
|
|
1efd99 |
index d927f8a..7834dac 100644
|
|
|
1efd99 |
--- a/src/remote-viewer.c
|
|
|
1efd99 |
+++ b/src/remote-viewer.c
|
|
|
1efd99 |
@@ -1122,7 +1122,8 @@ remote_viewer_start(VirtViewerApp *app, GError **err)
|
|
|
1efd99 |
#endif
|
|
|
1efd99 |
retry_dialog:
|
|
|
1efd99 |
if (priv->open_recent_dialog) {
|
|
|
1efd99 |
- if (!remote_viewer_connect_dialog(&guri)) {
|
|
|
1efd99 |
+ VirtViewerWindow *main_window = virt_viewer_app_get_main_window(app);
|
|
|
1efd99 |
+ if (!remote_viewer_connect_dialog(virt_viewer_window_get_window(main_window), &guri)) {
|
|
|
1efd99 |
g_set_error_literal(&error,
|
|
|
1efd99 |
VIRT_VIEWER_ERROR, VIRT_VIEWER_ERROR_CANCELLED,
|
|
|
1efd99 |
_("No connection was chosen"));
|