diff options
author | James Booth <boothj5@gmail.com> | 2015-02-06 22:05:38 +0000 |
---|---|---|
committer | James Booth <boothj5@gmail.com> | 2015-02-06 22:05:38 +0000 |
commit | b7a8e7d942ef0c4f114c6d290c48c4286e846e4d (patch) | |
tree | d43dff1e89102487e88fbd473a3ecf1a350ab611 | |
parent | f08657fa9afee6ea74dfdb9660dd4d23f20ee43f (diff) | |
parent | bec95afc8b4ba3d86b0a74d68285042c7c40948e (diff) | |
download | profani-tty-b7a8e7d942ef0c4f114c6d290c48c4286e846e4d.tar.gz |
Merge branch 'master' into readline
-rw-r--r-- | .gitignore | 1 | ||||
-rw-r--r-- | src/command/command.c | 4 | ||||
-rw-r--r-- | src/contact.c | 2 | ||||
-rw-r--r-- | src/ui/window.c | 1 |
4 files changed, 3 insertions, 5 deletions
diff --git a/.gitignore b/.gitignore index be11f141..09d5c04d 100644 --- a/.gitignore +++ b/.gitignore @@ -64,3 +64,4 @@ profanity.workspace m4/ test.sh clean-test.sh +callgrind.out.* diff --git a/src/command/command.c b/src/command/command.c index bed6e396..20063616 100644 --- a/src/command/command.c +++ b/src/command/command.c @@ -1466,10 +1466,6 @@ cmd_init(void) autocomplete_add(time_ac, "seconds"); autocomplete_add(time_ac, "off"); - time_ac = autocomplete_new(); - autocomplete_add(time_ac, "minutes"); - autocomplete_add(time_ac, "seconds"); - resource_ac = autocomplete_new(); autocomplete_add(resource_ac, "set"); autocomplete_add(resource_ac, "off"); diff --git a/src/contact.c b/src/contact.c index f16f1679..943be374 100644 --- a/src/contact.c +++ b/src/contact.c @@ -381,7 +381,7 @@ void p_contact_set_presence(const PContact contact, Resource *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 diff --git a/src/ui/window.c b/src/ui/window.c index 46d2e85c..e235dda5 100644 --- a/src/ui/window.c +++ b/src/ui/window.c @@ -331,6 +331,7 @@ win_free(ProfWin* window) buffer_free(window->layout->buffer); delwin(window->layout->win); } + free(window->layout); if (window->type == WIN_CHAT) { ProfChatWin *chatwin = (ProfChatWin*)window; |