diff options
| author | Denis Ollier <larchunix@users.noreply.github.com> | 2018-05-19 10:19:35 +0300 |
|---|---|---|
| committer | Denis Ollier <larchunix@users.noreply.github.com> | 2018-05-19 10:19:35 +0300 |
| commit | 504cd1e1c4e61ec1315048f01647683503a5317e (patch) | |
| tree | 6af5a5e304b9ae520071333b2cbda2ecddaa0ad5 /src/remmina_file.c | |
| parent | 4c0e915b228ad791cfc52b0f41b9059b92741d71 (diff) | |
remmina: fix loading profiles for a missing plugin
Regression from: f47a95c
Diffstat (limited to 'src/remmina_file.c')
| -rw-r--r-- | src/remmina_file.c | 56 |
1 files changed, 27 insertions, 29 deletions
diff --git a/src/remmina_file.c b/src/remmina_file.c index edcf2805d..cc85ddb18 100644 --- a/src/remmina_file.c +++ b/src/remmina_file.c @@ -220,39 +220,37 @@ remmina_file_load(const gchar *filename) if (keys) { for (i = 0; keys[i]; i++) { key = keys[i]; - if (protocol_plugin) { - if (remmina_plugin_manager_is_encrypted_setting(protocol_plugin, key)) { - s = g_key_file_get_string(gkeyfile, "remmina", key, NULL); - if (g_strcmp0(s, ".") == 0) { - if (secret_service_available) { - sec = secret_plugin->get_password(remminafile, key); - remmina_file_set_string(remminafile, key, sec); - /* Annotate in spsettings that this value comes from secret_plugin */ - g_hash_table_insert(remminafile->spsettings, g_strdup(key), NULL); - g_free(sec); - }else { - remmina_file_set_string(remminafile, key, s); - } + if (protocol_plugin && remmina_plugin_manager_is_encrypted_setting(protocol_plugin, key)) { + s = g_key_file_get_string(gkeyfile, "remmina", key, NULL); + if (g_strcmp0(s, ".") == 0) { + if (secret_service_available) { + sec = secret_plugin->get_password(remminafile, key); + remmina_file_set_string(remminafile, key, sec); + /* Annotate in spsettings that this value comes from secret_plugin */ + g_hash_table_insert(remminafile->spsettings, g_strdup(key), NULL); + g_free(sec); }else { - remmina_file_set_string_ref(remminafile, key, remmina_crypt_decrypt(s)); + remmina_file_set_string(remminafile, key, s); } - g_free(s); }else { - /* If we find "resolution", then we split it in two */ - if (strcmp(key, "resolution") == 0) { - resolution_str = g_key_file_get_string(gkeyfile, "remmina", key, NULL); - if (remmina_public_split_resolution_string(resolution_str, &w, &h)) { - remmina_file_set_string_ref(remminafile, "resolution_width", g_strdup_printf("%i", w)); - remmina_file_set_string_ref(remminafile, "resolution_height", g_strdup_printf("%i", h)); - } else { - remmina_file_set_string_ref(remminafile, "resolution_width", NULL); - remmina_file_set_string_ref(remminafile, "resolution_height", NULL); - } - g_free(resolution_str); - }else { - remmina_file_set_string_ref(remminafile, key, - g_key_file_get_string(gkeyfile, "remmina", key, NULL)); + remmina_file_set_string_ref(remminafile, key, remmina_crypt_decrypt(s)); + } + g_free(s); + }else { + /* If we find "resolution", then we split it in two */ + if (strcmp(key, "resolution") == 0) { + resolution_str = g_key_file_get_string(gkeyfile, "remmina", key, NULL); + if (remmina_public_split_resolution_string(resolution_str, &w, &h)) { + remmina_file_set_string_ref(remminafile, "resolution_width", g_strdup_printf("%i", w)); + remmina_file_set_string_ref(remminafile, "resolution_height", g_strdup_printf("%i", h)); + } else { + remmina_file_set_string_ref(remminafile, "resolution_width", NULL); + remmina_file_set_string_ref(remminafile, "resolution_height", NULL); } + g_free(resolution_str); + }else { + remmina_file_set_string_ref(remminafile, key, + g_key_file_get_string(gkeyfile, "remmina", key, NULL)); } } } |