diff options
| author | Antenore Gatta <antenore@simbiosi.org> | 2018-07-19 14:02:35 +0300 |
|---|---|---|
| committer | Antenore Gatta <antenore@simbiosi.org> | 2018-07-19 14:02:35 +0300 |
| commit | 7004a51c01367ae508e3f18e7fdb3a73b7bcd0f5 (patch) | |
| tree | 26f06ae44ed96800e4afbe0ce7cf9fb2f63dc0b4 | |
| parent | 0a06c7b21d689237ad2e5b548a2b0beb5d155364 (diff) | |
| parent | 6a178eb4d98de4766242fc8b93c5e4d835fbcc71 (diff) | |
Merge branch 'feature/dynamic-colors-memory-handling' into 'master'
Feature/dynamic colors memory handling
See merge request Remmina/Remmina!1683
| -rw-r--r-- | src/remmina_ssh_plugin.c | 12 |
1 files changed, 5 insertions, 7 deletions
diff --git a/src/remmina_ssh_plugin.c b/src/remmina_ssh_plugin.c index f15c7a108..04dcace17 100644 --- a/src/remmina_ssh_plugin.c +++ b/src/remmina_ssh_plugin.c @@ -40,7 +40,6 @@ #if defined (HAVE_LIBSSH) && defined (HAVE_LIBVTE) -#include <stdlib.h> #include <gtk/gtk.h> #include <glib/gi18n.h> #include <gio/gio.h> @@ -1159,10 +1158,8 @@ remmina_ssh_plugin_load_terminal_palettes(gpointer *ssh_terminal_palette_new) while ((filename = g_dir_read_name(system_data_dir))) { if (!g_file_test(filename, G_FILE_TEST_IS_DIR)) { if (g_str_has_suffix(filename, ".colors")) { - gchar *menu_str = malloc(strlen(filename) + 1); - strcpy(menu_str, filename); - char *t2 = strrchr(menu_str, '.'); - t2[0] = 0; + gsize len = strrchr(filename, '.') - filename; + gchar *menu_str = g_strndup(filename, len); if (g_list_find_custom(files, menu_str,compare) == NULL) { files = g_list_insert_sorted(files, menu_str, compare); } @@ -1236,10 +1233,11 @@ remmina_ssh_plugin_register(void) remmina_plugin_service = &remmina_plugin_manager_service; - RemminaProtocolSettingOpt *settings = malloc(sizeof(remmina_ssh_advanced_settings)); + unsigned int rec_size = sizeof(remmina_ssh_advanced_settings) / sizeof(RemminaProtocolSetting); + + RemminaProtocolSettingOpt *settings = g_new(RemminaProtocolSettingOpt, rec_size); // preset new settings with (old) static remmina_ssh_advanced_settings data - unsigned int rec_size = sizeof(remmina_ssh_advanced_settings) / sizeof(RemminaProtocolSetting); for (int ii=0; ii < rec_size; ii++) { settings[ii].type = remmina_ssh_advanced_settings[ii].type; settings[ii].name = remmina_ssh_advanced_settings[ii].name; |