devs/cproof
1
2
Fork 1
Code Issues 43 Pull Requests 6 Actions Packages Projects 1 Releases Wiki Activity

Merge branch 'master' into readline

Browse Source 
Conflicts:
	src/ui/inputwin.c
This commit is contained in:
James Booth
2015-02-09 21:28:08 +00:00
parent 916ee1dc13 6682f243ce
commit 51ccb69580
6 changed files with 27 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
src/command/command.c
View File

@@ -1659,7 +1659,7 @@ cmd_reset_autocomplete()
autocomplete_reset(autoconnect_ac);
autocomplete_reset(theme_ac);
if (theme_load_ac != NULL) {
autocomplete_reset(theme_load_ac);
autocomplete_free(theme_load_ac);
theme_load_ac = NULL;
}
autocomplete_reset(account_ac);
@@ -2468,11 +2468,12 @@ _theme_autocomplete(const char * const input)
if (theme_load_ac == NULL) {
theme_load_ac = autocomplete_new();
GSList *themes = theme_list();
while (themes != NULL) {
autocomplete_add(theme_load_ac, themes->data);
themes = g_slist_next(themes);
GSList *curr = themes;
while (curr != NULL) {
autocomplete_add(theme_load_ac, curr->data);
curr = g_slist_next(curr);
}
g_slist_free(themes);
g_slist_free_full(themes, g_free);
autocomplete_add(theme_load_ac, "default");
}
result = autocomplete_param_with_ac(input, "/theme set", theme_load_ac, TRUE);