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

Remove snippets_global_pattern global and use user_data instead.

Browse Source 
git-svn-id: https://geany.svn.sourceforge.net/svnroot/geany/trunk@5731 ea778897-0a13-0410-b9d1-a72fbfd435f5
This commit is contained in:
Nick Treleaven 2011-04-19 16:43:23 +00:00
parent a89ba90b15
commit 57b043666c
1 changed files with 3 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
src/editor.c
View File

@ -2289,22 +2289,17 @@ static const gchar *snippets_find_completion_by_name(const gchar *type, const gc
} }
/* This is very ugly but passing the pattern to ac_replace_specials() doesn't work because it is
* modified when replacing a completion but the foreach function still passes the old pointer
* to ac_replace_specials, so we use a global pointer outside of ac_replace_specials and
* ac_complete_constructs. Any hints to improve this are welcome. */
static GString *snippets_global_pattern = NULL;
static void snippets_replace_specials(gpointer key, gpointer value, gpointer user_data) static void snippets_replace_specials(gpointer key, gpointer value, gpointer user_data)
{ {
gchar *needle; gchar *needle;
GString *pattern = user_data;
g_return_if_fail(key != NULL); g_return_if_fail(key != NULL);
g_return_if_fail(value != NULL); g_return_if_fail(value != NULL);
needle = g_strconcat("%", (gchar*) key, "%", NULL); needle = g_strconcat("%", (gchar*) key, "%", NULL);
utils_string_replace_all(snippets_global_pattern, needle, (gchar*) value); utils_string_replace_all(pattern, needle, (gchar*) value);
g_free(needle); g_free(needle);
} }
@ -2502,9 +2497,7 @@ static void snippets_make_replacements(GeanyEditor *editor, GString *pattern)
specials = g_hash_table_lookup(snippet_hash, "Special"); specials = g_hash_table_lookup(snippet_hash, "Special");
if (G_LIKELY(specials != NULL)) if (G_LIKELY(specials != NULL))
{ {
/* ugly hack using global_pattern */ g_hash_table_foreach(specials, snippets_replace_specials, pattern);
snippets_global_pattern = pattern;
g_hash_table_foreach(specials, snippets_replace_specials, NULL);
} }
/* now transform other wildcards */ /* now transform other wildcards */