sharpetronics/geany
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge branch 'techee/leaks'

Browse Source 
Merges PR #417.
This commit is contained in:
Colomban Wendling 2015-03-04 22:57:02 +01:00
commit e1c35d2dc1
3 changed files with 10 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/highlighting.c
View File

@ -58,7 +58,7 @@
#define GEANY_WHITESPACE_CHARS " \t" "!\"#$%&'()*+,-./:;<=>?@[\\]^`{|}~" #define GEANY_WHITESPACE_CHARS " \t" "!\"#$%&'()*+,-./:;<=>?@[\\]^`{|}~"
static gchar *whitespace_chars; static gchar *whitespace_chars = NULL;
typedef struct typedef struct
@ -112,7 +112,7 @@ static struct
gint fold_draw_line; gint fold_draw_line;
gchar *wordchars; gchar *wordchars;
} common_style_set; } common_style_set = { { { 0 } }, 0, 0, 0, NULL };
/* For filetypes.common [named_styles] section. /* For filetypes.common [named_styles] section.
@ -577,7 +577,9 @@ static void styleset_common_init(GKeyFile *config, GKeyFile *config_home)
get_keyfile_int(config, config_home, "styling", "line_height", get_keyfile_int(config, config_home, "styling", "line_height",
0, 0, &common_style_set.styling[GCS_LINE_HEIGHT]); 0, 0, &common_style_set.styling[GCS_LINE_HEIGHT]);
g_free(common_style_set.wordchars);
get_keyfile_wordchars(config, config_home, &common_style_set.wordchars); get_keyfile_wordchars(config, config_home, &common_style_set.wordchars);
g_free(whitespace_chars);
whitespace_chars = get_keyfile_whitespace_chars(config, config_home); whitespace_chars = get_keyfile_whitespace_chars(config, config_home);
} }

4
src/keyfile.c
View File

@ -673,7 +673,11 @@ void configuration_load_session_files(GKeyFile *config, gboolean read_recent_fil
/* the project may load another list than the main setting */ /* the project may load another list than the main setting */
if (session_files != NULL) if (session_files != NULL)
{
foreach_ptr_array(tmp_array, i, session_files)
g_strfreev(tmp_array);
g_ptr_array_free(session_files, TRUE); g_ptr_array_free(session_files, TRUE);
}
session_files = g_ptr_array_new(); session_files = g_ptr_array_new();
have_session_files = TRUE; have_session_files = TRUE;

3
src/project.c
View File

@ -440,6 +440,7 @@ static void destroy_project(gboolean open_default)
g_free(app->project->description); g_free(app->project->description);
g_free(app->project->file_name); g_free(app->project->file_name);
g_free(app->project->base_path); g_free(app->project->base_path);
g_strfreev(app->project->file_patterns);
g_free(app->project); g_free(app->project);
app->project = NULL; app->project = NULL;
@ -813,7 +814,7 @@ static gboolean update_config(const PropertyDialogElements *e, gboolean new_proj
buffer = gtk_text_view_get_buffer(GTK_TEXT_VIEW(e->description)); buffer = gtk_text_view_get_buffer(GTK_TEXT_VIEW(e->description));
gtk_text_buffer_get_start_iter(buffer, &start); gtk_text_buffer_get_start_iter(buffer, &start);
gtk_text_buffer_get_end_iter(buffer, &end); gtk_text_buffer_get_end_iter(buffer, &end);
SETPTR(p->description, g_strdup(gtk_text_buffer_get_text(buffer, &start, &end, FALSE))); SETPTR(p->description, gtk_text_buffer_get_text(buffer, &start, &end, FALSE));
foreach_slist(node, stash_groups) foreach_slist(node, stash_groups)
stash_group_update(node->data, e->dialog); stash_group_update(node->data, e->dialog);