From 66d4f115470e822b1f12435ecafa3b9771774271 Mon Sep 17 00:00:00 2001 From: Antenore Gatta Date: Wed, 11 Feb 2015 22:13:04 +0100 Subject: [PATCH 1/3] Fixes FreeRDP/Remmina#460 --- remmina/src/remmina_main.c | 23 +++++++---------------- 1 file changed, 7 insertions(+), 16 deletions(-) diff --git a/remmina/src/remmina_main.c b/remmina/src/remmina_main.c index 390ea4eb77..b5262d0bf6 100644 --- a/remmina/src/remmina_main.c +++ b/remmina/src/remmina_main.c @@ -502,10 +502,7 @@ static void remmina_main_on_action_tools_externaltools(GtkAction *action, gpoint static void remmina_main_file_editor_destroy(GtkWidget *widget, gpointer user_data) { TRACE_CALL("remmina_main_file_editor_destroy"); - if (GTK_IS_WIDGET(remminamain)) - { - remmina_main_load_files(TRUE); - } + remmina_main_load_files(TRUE); } static void remmina_main_on_action_connection_new(GtkAction *action, gpointer user_data) @@ -528,12 +525,9 @@ static void remmina_main_on_action_connection_copy(GtkAction *action, gpointer u return; widget = remmina_file_editor_new_copy(remminamain->priv->selected_filename); - if (widget) - { - g_signal_connect(G_OBJECT(widget), "destroy", G_CALLBACK(remmina_main_file_editor_destroy), remminamain); - gtk_window_set_transient_for(GTK_WINDOW(widget), remminamain->window); - gtk_widget_show(widget); - } + g_signal_connect(G_OBJECT(widget), "destroy", G_CALLBACK(remmina_main_file_editor_destroy), remminamain); + gtk_window_set_transient_for(GTK_WINDOW(widget), remminamain->window); + gtk_widget_show(widget); } static void remmina_main_on_action_connection_edit(GtkAction *action, gpointer user_data) @@ -545,12 +539,9 @@ static void remmina_main_on_action_connection_edit(GtkAction *action, gpointer u return; widget = remmina_file_editor_new_from_filename(remminamain->priv->selected_filename); - if (widget) - { - g_signal_connect(G_OBJECT(widget), "destroy", G_CALLBACK(remmina_main_file_editor_destroy), remminamain); - gtk_window_set_transient_for(GTK_WINDOW(widget), remminamain->window); - gtk_widget_show(widget); - } + g_signal_connect(G_OBJECT(widget), "destroy", G_CALLBACK(remmina_main_file_editor_destroy), remminamain); + gtk_window_set_transient_for(GTK_WINDOW(widget), remminamain->window); + gtk_widget_show(widget); } static void remmina_main_on_action_connection_delete(GtkAction *action, gpointer user_data) From 32ceca030630b2f9aeeed9ef429386de1d0ecf08 Mon Sep 17 00:00:00 2001 From: Antenore Gatta Date: Wed, 11 Feb 2015 23:49:12 +0100 Subject: [PATCH 2/3] Fixes FreeRDP/Remmina#460 - reverted 'if suppression' as may cause an expected bug if files are removed --- remmina/src/remmina_main.c | 18 ++++++++++++------ 1 file changed, 12 insertions(+), 6 deletions(-) diff --git a/remmina/src/remmina_main.c b/remmina/src/remmina_main.c index b5262d0bf6..5f1f6f2c5c 100644 --- a/remmina/src/remmina_main.c +++ b/remmina/src/remmina_main.c @@ -525,9 +525,12 @@ static void remmina_main_on_action_connection_copy(GtkAction *action, gpointer u return; widget = remmina_file_editor_new_copy(remminamain->priv->selected_filename); - g_signal_connect(G_OBJECT(widget), "destroy", G_CALLBACK(remmina_main_file_editor_destroy), remminamain); - gtk_window_set_transient_for(GTK_WINDOW(widget), remminamain->window); - gtk_widget_show(widget); + if (widget) + { + g_signal_connect(G_OBJECT(widget), "destroy", G_CALLBACK(remmina_main_file_editor_destroy), remminamain); + gtk_window_set_transient_for(GTK_WINDOW(widget), remminamain->window); + gtk_widget_show(widget); + } } static void remmina_main_on_action_connection_edit(GtkAction *action, gpointer user_data) @@ -539,9 +542,12 @@ static void remmina_main_on_action_connection_edit(GtkAction *action, gpointer u return; widget = remmina_file_editor_new_from_filename(remminamain->priv->selected_filename); - g_signal_connect(G_OBJECT(widget), "destroy", G_CALLBACK(remmina_main_file_editor_destroy), remminamain); - gtk_window_set_transient_for(GTK_WINDOW(widget), remminamain->window); - gtk_widget_show(widget); + if (widget) + { + g_signal_connect(G_OBJECT(widget), "destroy", G_CALLBACK(remmina_main_file_editor_destroy), remminamain); + gtk_window_set_transient_for(GTK_WINDOW(widget), remminamain->window); + gtk_widget_show(widget); + } } static void remmina_main_on_action_connection_delete(GtkAction *action, gpointer user_data) From 5997c2a3b673263ae055752e5146905644b182b3 Mon Sep 17 00:00:00 2001 From: Antenore Gatta Date: Thu, 12 Feb 2015 22:34:25 +0100 Subject: [PATCH 3/3] Fixes FreeRDP/Remmina#460 - spaces to tabs --- remmina/src/remmina_main.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/remmina/src/remmina_main.c b/remmina/src/remmina_main.c index 5f1f6f2c5c..4908cecf21 100644 --- a/remmina/src/remmina_main.c +++ b/remmina/src/remmina_main.c @@ -502,7 +502,7 @@ static void remmina_main_on_action_tools_externaltools(GtkAction *action, gpoint static void remmina_main_file_editor_destroy(GtkWidget *widget, gpointer user_data) { TRACE_CALL("remmina_main_file_editor_destroy"); - remmina_main_load_files(TRUE); + remmina_main_load_files(TRUE); } static void remmina_main_on_action_connection_new(GtkAction *action, gpointer user_data)