From f0d2575f8834a45f3b5182922a0ec5f24a8e2e1d Mon Sep 17 00:00:00 2001 From: ratcash Date: Tue, 12 Nov 2019 19:59:50 +0100 Subject: [PATCH 1/3] Use alternative split char --- widget/remote_server_dialog.vala | 2 +- widget/terminal.vala | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/widget/remote_server_dialog.vala b/widget/remote_server_dialog.vala index 1bcc44bd..d80484de 100644 --- a/widget/remote_server_dialog.vala +++ b/widget/remote_server_dialog.vala @@ -122,7 +122,7 @@ namespace Widgets { string[]? server_infos = null; if (server_info != null) { - server_infos = server_info.split("@"); + server_infos = server_info.split("|"); } box = new Gtk.Box(Gtk.Orientation.VERTICAL, 0); diff --git a/widget/terminal.vala b/widget/terminal.vala index 0b5f0246..b2be3b3c 100644 --- a/widget/terminal.vala +++ b/widget/terminal.vala @@ -1486,7 +1486,7 @@ namespace Widgets { ssh_script_content = ssh_script_content.concat("%s\n".printf(line)); } - string[] server_infos = server_info.split("@"); + string[] server_infos = server_info.split("|"); string password = ""; if (server_info.length > 2) { From fd6bd88c35935589df043b9eff53c558a4091fd0 Mon Sep 17 00:00:00 2001 From: ratcash Date: Wed, 13 Nov 2019 08:42:03 +0100 Subject: [PATCH 2/3] backward compatibility for previous file format --- widget/remote_panel.vala | 2 +- widget/remote_server_dialog.vala | 4 ++++ widget/terminal.vala | 4 ++++ 3 files changed, 9 insertions(+), 1 deletion(-) diff --git a/widget/remote_panel.vala b/widget/remote_panel.vala index 499a9acc..85dd884e 100644 --- a/widget/remote_panel.vala +++ b/widget/remote_panel.vala @@ -288,7 +288,7 @@ namespace Widgets { // Use ',' as array-element-separator instead of ';'. config_file.set_list_separator (','); - string gname = "%s@%s@%i".printf(user, server_address, port); + string gname = "%s|%s|%i".printf(user, server_address, port); config_file.set_string(gname, "Name", name); config_file.set_string(gname, "GroupName", group_name); config_file.set_string(gname, "Command", command); diff --git a/widget/remote_server_dialog.vala b/widget/remote_server_dialog.vala index d80484de..80478425 100644 --- a/widget/remote_server_dialog.vala +++ b/widget/remote_server_dialog.vala @@ -123,6 +123,10 @@ namespace Widgets { string[]? server_infos = null; if (server_info != null) { server_infos = server_info.split("|"); + if (server_infos.length == 1) { + // old file format + server_infos = server_info.split("@"); + } } box = new Gtk.Box(Gtk.Orientation.VERTICAL, 0); diff --git a/widget/terminal.vala b/widget/terminal.vala index b2be3b3c..744e299e 100644 --- a/widget/terminal.vala +++ b/widget/terminal.vala @@ -1487,6 +1487,10 @@ namespace Widgets { } string[] server_infos = server_info.split("|"); + if (server_infos.length == 1) { + // old file format + server_infos = server_info.split("@"); + } string password = ""; if (server_info.length > 2) { From 9b2e70d363d8bc1f166c046e6c7053ada5bd6ffb Mon Sep 17 00:00:00 2001 From: ratcash Date: Tue, 19 Nov 2019 11:42:31 +0100 Subject: [PATCH 3/3] use colon as a separator --- widget/remote_panel.vala | 2 +- widget/remote_server_dialog.vala | 2 +- widget/terminal.vala | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/widget/remote_panel.vala b/widget/remote_panel.vala index 85dd884e..e569396d 100644 --- a/widget/remote_panel.vala +++ b/widget/remote_panel.vala @@ -288,7 +288,7 @@ namespace Widgets { // Use ',' as array-element-separator instead of ';'. config_file.set_list_separator (','); - string gname = "%s|%s|%i".printf(user, server_address, port); + string gname = "%s:%s:%i".printf(user, server_address, port); config_file.set_string(gname, "Name", name); config_file.set_string(gname, "GroupName", group_name); config_file.set_string(gname, "Command", command); diff --git a/widget/remote_server_dialog.vala b/widget/remote_server_dialog.vala index 80478425..9f17e165 100644 --- a/widget/remote_server_dialog.vala +++ b/widget/remote_server_dialog.vala @@ -122,7 +122,7 @@ namespace Widgets { string[]? server_infos = null; if (server_info != null) { - server_infos = server_info.split("|"); + server_infos = server_info.split(":"); if (server_infos.length == 1) { // old file format server_infos = server_info.split("@"); diff --git a/widget/terminal.vala b/widget/terminal.vala index 744e299e..44d59143 100644 --- a/widget/terminal.vala +++ b/widget/terminal.vala @@ -1486,7 +1486,7 @@ namespace Widgets { ssh_script_content = ssh_script_content.concat("%s\n".printf(line)); } - string[] server_infos = server_info.split("|"); + string[] server_infos = server_info.split(":"); if (server_infos.length == 1) { // old file format server_infos = server_info.split("@");