devs/profanity
2
0
Fork 0
mirror of https://git.jabber.space/devs/cproof.git synced 2026-07-19 19:26:20 +00:00
Code Issues Packages Projects Releases Wiki Activity

Renamed roster autocomplete functions

Browse Source
This commit is contained in:
James Booth
2014-11-22 21:13:33 +00:00
parent c0420e9cfb
commit e8a65e3b68
5 changed files with 38 additions and 38 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
src/command/command.c
View File

@@ -1864,7 +1864,7 @@ _cmd_complete_parameters(char *input, int *size)
gchar *contact_choices[] = { "/msg", "/info", "/status" };
for (i = 0; i < ARRAY_SIZE(contact_choices); i++) {
result = autocomplete_param_with_func(input, size, contact_choices[i],
roster_find_contact);
roster_contact_autocomplete);
if (result != NULL) {
ui_replace_input(input, result, size);
g_free(result);
@@ -1875,7 +1875,7 @@ _cmd_complete_parameters(char *input, int *size)
gchar *resource_choices[] = { "/caps", "/software", "/ping" };
for (i = 0; i < ARRAY_SIZE(resource_choices); i++) {
result = autocomplete_param_with_func(input, size, resource_choices[i],
roster_find_resource);
roster_fulljid_autocomplete);
if (result != NULL) {
ui_replace_input(input, result, size);
g_free(result);
@@ -1884,7 +1884,7 @@ _cmd_complete_parameters(char *input, int *size)
}
}
result = autocomplete_param_with_func(input, size, "/invite", roster_find_contact);
result = autocomplete_param_with_func(input, size, "/invite", roster_contact_autocomplete);
if (result != NULL) {
ui_replace_input(input, result, size);
g_free(result);
@@ -2013,7 +2013,7 @@ _who_autocomplete(char *input, int *size)
"/who unavailable" };
for (i = 0; i < ARRAY_SIZE(group_commands); i++) {
result = autocomplete_param_with_func(input, size, group_commands[i], roster_find_group);
result = autocomplete_param_with_func(input, size, group_commands[i], roster_group_autocomplete);
if (result != NULL) {
return result;
}
@@ -2032,15 +2032,15 @@ static char *
_roster_autocomplete(char *input, int *size)
{
char *result = NULL;
result = autocomplete_param_with_func(input, size, "/roster nick", roster_find_jid);
result = autocomplete_param_with_func(input, size, "/roster nick", roster_barejid_autocomplete);
if (result != NULL) {
return result;
}
result = autocomplete_param_with_func(input, size, "/roster clearnick", roster_find_jid);
result = autocomplete_param_with_func(input, size, "/roster clearnick", roster_barejid_autocomplete);
if (result != NULL) {
return result;
}
result = autocomplete_param_with_func(input, size, "/roster remove", roster_find_jid);
result = autocomplete_param_with_func(input, size, "/roster remove", roster_barejid_autocomplete);
if (result != NULL) {
return result;
}
@@ -2068,24 +2068,24 @@ static char *
_group_autocomplete(char *input, int *size)
{
char *result = NULL;
result = autocomplete_param_with_func(input, size, "/group show", roster_find_group);
result = autocomplete_param_with_func(input, size, "/group show", roster_group_autocomplete);
if (result != NULL) {
return result;
}
result = autocomplete_param_no_with_func(input, size, "/group add", 4, roster_find_contact);
result = autocomplete_param_no_with_func(input, size, "/group add", 4, roster_contact_autocomplete);
if (result != NULL) {
return result;
}
result = autocomplete_param_no_with_func(input, size, "/group remove", 4, roster_find_contact);
result = autocomplete_param_no_with_func(input, size, "/group remove", 4, roster_contact_autocomplete);
if (result != NULL) {
return result;
}
result = autocomplete_param_with_func(input, size, "/group add", roster_find_group);
result = autocomplete_param_with_func(input, size, "/group add", roster_group_autocomplete);
if (result != NULL) {
return result;
}
result = autocomplete_param_with_func(input, size, "/group remove", roster_find_group);
result = autocomplete_param_with_func(input, size, "/group remove", roster_group_autocomplete);
if (result != NULL) {
return result;
}
@@ -2307,7 +2307,7 @@ _otr_autocomplete(char *input, int *size)
{
char *found = NULL;
found = autocomplete_param_with_func(input, size, "/otr start", roster_find_contact);
found = autocomplete_param_with_func(input, size, "/otr start", roster_contact_autocomplete);
if (found != NULL) {
return found;
}
@@ -2326,7 +2326,7 @@ _otr_autocomplete(char *input, int *size)
g_string_append(beginning, " ");
g_string_append(beginning, args[1]);
found = autocomplete_param_with_func(input, size, beginning->str, roster_find_contact);
found = autocomplete_param_with_func(input, size, beginning->str, roster_contact_autocomplete);
g_string_free(beginning, TRUE);
if (found != NULL) {
g_strfreev(args);