Set the RCW as part of it's own Gtk window group

2 files changed, 6 insertions, 4 deletions

diff --git a/src/rcw.c b/src/rcw.c
index 3231f2d3b..eafab9aa1 100644
--- a/src/rcw.c
+++ b/src/rcw.c
@@ -3219,6 +3219,9 @@ static RemminaConnectionWindow *rcw_create_scrolled(gint width, gint height, gbo
 	 * call unrealize() and will destroy a GtkSocket */
 	gtk_widget_show(grid);
 	gtk_widget_show(GTK_WIDGET(cnnwin));
+	GtkWindowGroup * wingrp = gtk_window_group_new ();
+	gtk_window_group_add_window (wingrp, GTK_WINDOW(cnnwin));
+	gtk_window_set_transient_for(GTK_WINDOW(cnnwin), NULL);
 
 	if (maximize)
 		gtk_window_maximize(GTK_WINDOW(cnnwin));
diff --git a/src/rmnews.c b/src/rmnews.c
index 17427b692..77214e40c 100644
--- a/src/rmnews.c
+++ b/src/rmnews.c
@@ -213,14 +213,13 @@ void rmnews_show_news(GtkWindow *parent)
 	/* Connect signals */
 	gtk_builder_connect_signals(rmnews_news_dialog->builder, NULL);
 
+	/* Show the non-modal news dialog */
+	gtk_widget_show_all(GTK_WIDGET(rmnews_news_dialog->dialog));
+	gtk_window_present(GTK_WINDOW(rmnews_news_dialog->dialog));
 	if (parent)
 		gtk_window_set_transient_for(GTK_WINDOW(rmnews_news_dialog->dialog), parent);
-
 	gtk_window_set_modal (GTK_WINDOW(rmnews_news_dialog->dialog), TRUE);
 
-	/* Show the non-modal news dialog */
-	gtk_widget_show_all(GTK_WIDGET(rmnews_news_dialog->dialog));
-	gtk_window_present(GTK_WINDOW(rmnews_news_dialog->dialog));
 
 }