diff options
| author | Giovanni Panozzo <giovanni@panozzo.it> | 2019-11-02 13:41:26 +0300 |
|---|---|---|
| committer | Giovanni Panozzo <giovanni@panozzo.it> | 2019-11-02 13:41:26 +0300 |
| commit | 2f0ddda9cc7ae7d8c4a3631181354aa6a25ee542 (patch) | |
| tree | 249a53deec5cf374248d8a0f544e3546fdd4b136 /src | |
| parent | ad9fc53bb7294e1cf7800c57bc5da85231245b71 (diff) | |
Fix some crashes, set correct ssh field where needed
Diffstat (limited to 'src')
| -rw-r--r-- | src/remmina_sftp_plugin.c | 2 | ||||
| -rw-r--r-- | src/remmina_ssh.c | 13 | ||||
| -rw-r--r-- | src/remmina_ssh_plugin.c | 4 |
3 files changed, 10 insertions, 9 deletions
diff --git a/src/remmina_sftp_plugin.c b/src/remmina_sftp_plugin.c index 89351c8d2..07698ebb9 100644 --- a/src/remmina_sftp_plugin.c +++ b/src/remmina_sftp_plugin.c @@ -177,7 +177,7 @@ remmina_plugin_sftp_main_thread(gpointer data) } if (!cont) { if (sftp) remmina_sftp_free(sftp); - IDLE_ADD((GSourceFunc)remmina_plugin_service->protocol_plugin_signal_connection_closed, gp); + remmina_plugin_service->protocol_plugin_signal_connection_closed(gp); return NULL; } diff --git a/src/remmina_ssh.c b/src/remmina_ssh.c index b2e56fe98..8e9e8849e 100644 --- a/src/remmina_ssh.c +++ b/src/remmina_ssh.c @@ -272,7 +272,7 @@ remmina_ssh_auth_auto_pubkey(RemminaSSH *ssh, RemminaProtocolWidget *gp, Remmina ret = remmina_protocol_widget_panel_auth(gp, (disablepasswordstoring ? 0 : REMMINA_MESSAGE_PANEL_FLAG_SAVEPASSWORD), _("SSH credentials"), NULL, - remmina_file_get_string(remminafile, "ssh_privatekey"), + remmina_file_get_string(remminafile, "ssh_passphrase"), NULL, _("SSH private key passphrase")); if (ret == GTK_RESPONSE_OK) { @@ -503,7 +503,7 @@ remmina_ssh_auth_gui(RemminaSSH *ssh, RemminaProtocolWidget *gp, RemminaFile *re if (g_strcmp0(pwdtype, "ssh_passphrase") == 0) { ret = remmina_protocol_widget_panel_auth(gp, (disablepasswordstoring ? 0 : REMMINA_MESSAGE_PANEL_FLAG_SAVEPASSWORD), _("SSH credentials"), NULL, - remmina_file_get_string(remminafile, "ssh_privatekey"), + remmina_file_get_string(remminafile, "ssh_passphrase"), NULL, _("SSH private key passphrase")); if (ret == GTK_RESPONSE_OK) { @@ -516,15 +516,15 @@ remmina_ssh_auth_gui(RemminaSSH *ssh, RemminaProtocolWidget *gp, RemminaFile *re g_free(pwd); } else return -1; } else if (g_strcmp0(pwdtype, "ssh_password") == 0) { - ret = remmina_protocol_widget_panel_auth(gp, (disablepasswordstoring ? 0 : REMMINA_MESSAGE_PANEL_FLAG_SAVEPASSWORD) | REMMINA_MESSAGE_PANEL_FLAG_USERNAME, - _("SSH tunnel credentials"), + ret = remmina_protocol_widget_panel_auth(gp, (disablepasswordstoring ? 0 : REMMINA_MESSAGE_PANEL_FLAG_SAVEPASSWORD) | REMMINA_MESSAGE_PANEL_FLAG_USERNAME, + _("SSH credentials"), remmina_file_get_string(remminafile, "ssh_username"), remmina_file_get_string(remminafile, "ssh_password"), NULL, NULL); if (ret == GTK_RESPONSE_OK) { pwd = remmina_protocol_widget_get_username(gp); - remmina_file_set_string(remminafile, "username", pwd); + remmina_file_set_string(remminafile, "ssh_username", pwd); g_free(pwd); pwd = remmina_protocol_widget_get_password(gp); save_password = remmina_protocol_widget_get_savepassword(gp); @@ -536,8 +536,9 @@ remmina_ssh_auth_gui(RemminaSSH *ssh, RemminaProtocolWidget *gp, RemminaFile *re } else return -1; } else { + /* ??? */ ret = remmina_protocol_widget_panel_auth(gp, (disablepasswordstoring ? 0 : REMMINA_MESSAGE_PANEL_FLAG_SAVEPASSWORD) | REMMINA_MESSAGE_PANEL_FLAG_USERNAME, - _("SSH credentials"), + _("SSH ? credentials"), remmina_file_get_string(remminafile, "username"), remmina_file_get_string(remminafile, "password"), NULL, diff --git a/src/remmina_ssh_plugin.c b/src/remmina_ssh_plugin.c index 358283d6c..2d6f61929 100644 --- a/src/remmina_ssh_plugin.c +++ b/src/remmina_ssh_plugin.c @@ -328,7 +328,7 @@ remmina_plugin_ssh_main_thread(gpointer data) } if (!cont) { if (shell) remmina_ssh_shell_free(shell); - IDLE_ADD((GSourceFunc)remmina_plugin_service->protocol_plugin_signal_connection_closed, gp); + remmina_plugin_service->protocol_plugin_signal_connection_closed(gp); return NULL; } @@ -853,7 +853,7 @@ remmina_plugin_ssh_open_connection(RemminaProtocolWidget *gp) if (pthread_create(&gpdata->thread, NULL, remmina_plugin_ssh_main_thread, gp)) { remmina_plugin_service->protocol_plugin_set_error(gp, - "Failed to initialize pthread. Falling back to non-thread mode…"); + "Failed to initialize pthread. Falling back to non-thread mode…"); gpdata->thread = 0; return FALSE; } else { |