diff options
| author | James Booth <boothj5@gmail.com> | 2014-05-14 21:01:54 +0100 |
|---|---|---|
| committer | James Booth <boothj5@gmail.com> | 2014-05-14 21:01:54 +0100 |
| commit | 75898a777ae6d5132311df2640ed46969301b946 (patch) | |
| tree | 3bd5b97f8cdda0d3d73cf7b858f8c7866d7cc776 | |
| parent | bd55e7a9783eb51cfd05ba4b9a689acada64b262 (diff) | |
| download | profani-tty-75898a777ae6d5132311df2640ed46969301b946.tar.gz | |
More tidy of bookmark autocomplete
| -rw-r--r-- | src/command/command.c | 38 |
1 files changed, 18 insertions, 20 deletions
diff --git a/src/command/command.c b/src/command/command.c index c2a6091e..6dadcb64 100644 --- a/src/command/command.c +++ b/src/command/command.c @@ -1665,21 +1665,21 @@ _bookmark_autocomplete(char *input, int *size) gboolean result; gchar **args = parse_args(input, 3, 8, &result); + gboolean handle_options = result && (g_strv_length(args) > 2); - if (result && ((strcmp(args[0], "add") == 0) || (strcmp(args[0], "update") == 0)) ) { - GString *beginning = g_string_new("/bookmark "); + if (handle_options && ((strcmp(args[0], "add") == 0) || (strcmp(args[0], "update") == 0)) ) { + GString *beginning = g_string_new("/bookmark"); gboolean autojoin = FALSE; int num_args = g_strv_length(args); - if (num_args > 2) { - g_string_append(beginning, args[0]); + g_string_append(beginning, " "); + g_string_append(beginning, args[0]); + g_string_append(beginning, " "); + g_string_append(beginning, args[1]); + if (num_args == 4 && g_strcmp0(args[2], "autojoin") == 0) { g_string_append(beginning, " "); - g_string_append(beginning, args[1]); - if (num_args == 4 && g_strcmp0(args[2], "autojoin") == 0) { - g_string_append(beginning, " "); - g_string_append(beginning, args[2]); - autojoin = TRUE; - } + g_string_append(beginning, args[2]); + autojoin = TRUE; } if (num_args > 4) { @@ -1706,16 +1706,14 @@ _bookmark_autocomplete(char *input, int *size) } } - if (num_args > 2) { - if (autojoin) { - found = autocomplete_param_with_func(input, size, beginning->str, prefs_autocomplete_boolean_choice); - } else { - found = autocomplete_param_with_ac(input, size, beginning->str, bookmark_property_ac); - } - g_string_free(beginning, TRUE); - if (found != NULL) { - return found; - } + if (autojoin) { + found = autocomplete_param_with_func(input, size, beginning->str, prefs_autocomplete_boolean_choice); + } else { + found = autocomplete_param_with_ac(input, size, beginning->str, bookmark_property_ac); + } + g_string_free(beginning, TRUE); + if (found != NULL) { + return found; } } |