diff options
| author | Antenore Gatta (tmow) <antenore@simbiosi.org> | 2022-05-10 12:01:44 +0300 |
|---|---|---|
| committer | Antenore Gatta (tmow) <antenore@simbiosi.org> | 2022-05-10 12:01:44 +0300 |
| commit | 69819a263dde92db18b2f38126da536b7a21024a (patch) | |
| tree | 9c7391edb61bceb98af73cf4b44437006120c757 /plugins | |
| parent | 5d965746397e606a22eef76ebacf31f8c7091c65 (diff) | |
Cannot disable shared folder
Diffstat (limited to 'plugins')
| -rw-r--r-- | plugins/rdp/rdp_plugin.c | 20 | ||||
| -rw-r--r-- | plugins/spice/spice_plugin.c | 2 |
2 files changed, 13 insertions, 9 deletions
diff --git a/plugins/rdp/rdp_plugin.c b/plugins/rdp/rdp_plugin.c index b96d2eebc..efe1a4ab8 100644 --- a/plugins/rdp/rdp_plugin.c +++ b/plugins/rdp/rdp_plugin.c @@ -1906,12 +1906,17 @@ static gboolean remmina_rdp_main(RemminaProtocolWidget *gp) cs = remmina_plugin_service->file_get_string(remminafile, "sharefolder"); if (cs != NULL && cs[0] != '\0') { - REMMINA_PLUGIN_DEBUG("Share folder set to %s", cs); - CLPARAM **p; - size_t count; - p = remmina_rdp_CommandLineParseCommaSeparatedValuesEx("drive", g_strdup(cs), &count); - status = freerdp_client_add_device_channel(rfi->settings, count, p); - g_free(p); + REMMINA_PLUGIN_DEBUG("[Deprecated->migrating] - Old sharefolder %s to \"drive \"", cs); + if (!remmina_plugin_service->file_get_string(remminafile, "drive")) { + remmina_plugin_service->file_set_string(remminafile, "drive", g_strdup(cs)); + remmina_plugin_service->file_set_string(remminafile, "sharefolder", NULL); + REMMINA_PLUGIN_DEBUG("[Deprecated->migrated] - drive set to %s", g_strdup(cs)); + } + //CLPARAM **p; + //size_t count; + //p = remmina_rdp_CommandLineParseCommaSeparatedValuesEx("drive", g_strdup(cs), &count); + //status = freerdp_client_add_device_channel(rfi->settings, count, p); + //g_free(p); } cs = remmina_plugin_service->file_get_string(remminafile, "drive"); if (cs != NULL && cs[0] != '\0') { @@ -2792,7 +2797,7 @@ static const RemminaProtocolSetting remmina_rdp_basic_settings[] = { REMMINA_PROTOCOL_SETTING_TYPE_TEXT, "username", N_("Username"), FALSE, NULL, NULL, NULL, NULL }, { REMMINA_PROTOCOL_SETTING_TYPE_PASSWORD, "password", N_("Password"), FALSE, NULL, NULL, NULL, NULL }, { REMMINA_PROTOCOL_SETTING_TYPE_TEXT, "domain", N_("Domain"), FALSE, NULL, NULL, NULL, NULL }, - { REMMINA_PROTOCOL_SETTING_TYPE_FOLDER, "sharefolder", N_("Share folder"), FALSE, NULL, N_("Use “Redirect directory” in the advanced tab for multiple directories"), NULL, NULL }, + { REMMINA_PROTOCOL_SETTING_TYPE_TEXT, "drive", N_("Share folder"), FALSE, NULL, drive_tooltip, NULL, NULL }, { REMMINA_PROTOCOL_SETTING_TYPE_CHECK, "restricted-admin", N_("Restricted admin mode"), FALSE, NULL, NULL, NULL, NULL }, { REMMINA_PROTOCOL_SETTING_TYPE_TEXT, "pth", N_("Password hash"), FALSE, NULL, N_("Restricted admin mode password hash"), NULL, NULL }, { REMMINA_PROTOCOL_SETTING_TYPE_CHECK, "left-handed", N_("Left-handed mouse support"), TRUE, NULL, N_("Swap left and right mouse buttons for left-handed mouse support"), NULL, NULL }, @@ -2832,7 +2837,6 @@ static const RemminaProtocolSetting remmina_rdp_advanced_settings[] = { REMMINA_PROTOCOL_SETTING_TYPE_TEXT, "gateway_username", N_("Remote Desktop Gateway username"), FALSE, NULL, NULL }, { REMMINA_PROTOCOL_SETTING_TYPE_PASSWORD, "gateway_password", N_("Remote Desktop Gateway password"), FALSE, NULL, NULL }, { REMMINA_PROTOCOL_SETTING_TYPE_TEXT, "gateway_domain", N_("Remote Desktop Gateway domain"), FALSE, NULL, NULL }, - { REMMINA_PROTOCOL_SETTING_TYPE_TEXT, "drive", N_("Redirect directory"), FALSE, NULL, drive_tooltip }, { REMMINA_PROTOCOL_SETTING_TYPE_TEXT, "clientname", N_("Client name"), FALSE, NULL, NULL }, { REMMINA_PROTOCOL_SETTING_TYPE_COMBO, "clientbuild", N_("Client build"), FALSE, clientbuild_list, clientbuild_tooltip }, { REMMINA_PROTOCOL_SETTING_TYPE_TEXT, "exec", N_("Start-up program"), FALSE, NULL, NULL }, diff --git a/plugins/spice/spice_plugin.c b/plugins/spice/spice_plugin.c index 643a2a1db..c666aa6ae 100644 --- a/plugins/spice/spice_plugin.c +++ b/plugins/spice/spice_plugin.c @@ -676,7 +676,7 @@ static const RemminaProtocolSetting remmina_plugin_spice_basic_settings[] = { REMMINA_PROTOCOL_SETTING_TYPE_PASSWORD, "password", N_("User password"), FALSE, NULL, NULL, NULL, NULL }, { REMMINA_PROTOCOL_SETTING_TYPE_CHECK, "usetls", N_("Use TLS encryption"), FALSE, NULL, NULL, NULL, NULL }, { REMMINA_PROTOCOL_SETTING_TYPE_FILE, "cacert", N_("Server CA certificate"), FALSE, NULL, NULL, NULL, NULL }, - { REMMINA_PROTOCOL_SETTING_TYPE_FOLDER, "sharefolder", N_("Share folder"), FALSE, NULL, NULL, NULL, NULL }, + { REMMINA_PROTOCOL_SETTING_TYPE_TEXT, "sharefolder", N_("Share folder"), FALSE, NULL, NULL, NULL, NULL }, { REMMINA_PROTOCOL_SETTING_TYPE_END, NULL, NULL, FALSE, NULL, NULL, NULL, NULL } }; |