aniani/profanity
1
0
Fork 0
mirror of https://github.com/profanity-im/profanity.git synced 2024-12-04 14:46:46 -05:00
Code

Merge branch 'master' into readline

Browse Source
This commit is contained in:
James Booth 2015-02-06 22:05:38 +00:00
commit b7a8e7d942
4 changed files with 3 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
.gitignore vendored
View File

@ -64,3 +64,4 @@ profanity.workspace
m4/ m4/
test.sh test.sh
clean-test.sh clean-test.sh
callgrind.out.*

4
src/command/command.c
View File

@ -1466,10 +1466,6 @@ cmd_init(void)
autocomplete_add(time_ac, "seconds"); autocomplete_add(time_ac, "seconds");
autocomplete_add(time_ac, "off"); autocomplete_add(time_ac, "off");
time_ac = autocomplete_new();
autocomplete_add(time_ac, "minutes");
autocomplete_add(time_ac, "seconds");
resource_ac = autocomplete_new(); resource_ac = autocomplete_new();
autocomplete_add(resource_ac, "set"); autocomplete_add(resource_ac, "set");
autocomplete_add(resource_ac, "off"); autocomplete_add(resource_ac, "off");

2
src/contact.c
View File

@ -381,7 +381,7 @@ void
p_contact_set_presence(const PContact contact, Resource *resource) p_contact_set_presence(const PContact contact, Resource *resource)
{ {
g_hash_table_replace(contact->available_resources, strdup(resource->name), resource); g_hash_table_replace(contact->available_resources, strdup(resource->name), resource);
autocomplete_add(contact->resource_ac, strdup(resource->name)); autocomplete_add(contact->resource_ac, resource->name);
} }
void void

1
src/ui/window.c
View File

@ -331,6 +331,7 @@ win_free(ProfWin* window)
buffer_free(window->layout->buffer); buffer_free(window->layout->buffer);
delwin(window->layout->win); delwin(window->layout->win);
} }
free(window->layout);
if (window->type == WIN_CHAT) { if (window->type == WIN_CHAT) {
ProfChatWin *chatwin = (ProfChatWin*)window; ProfChatWin *chatwin = (ProfChatWin*)window;