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

Add context to autocomplete_with_func and use it for omemo trust command

Browse Source 
Fix #1068
This commit is contained in:
Paul Fariello
2020-01-30 23:44:43 +01:00
parent 8fba8a8958
commit a52e3ea1d8
26 changed files with 164 additions and 134 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/config/accounts.c
View File

@@ -97,13 +97,13 @@ accounts_close(void)
}
char*
accounts_find_enabled(const char *const prefix, gboolean previous)
accounts_find_enabled(const char *const prefix, gboolean previous, void *context)
{
return autocomplete_complete(enabled_ac, prefix, TRUE, previous);
}
char*
accounts_find_all(const char *const prefix, gboolean previous)
accounts_find_all(const char *const prefix, gboolean previous, void *context)
{
return autocomplete_complete(all_ac, prefix, TRUE, previous);
}

4
src/config/accounts.h
View File

@@ -44,8 +44,8 @@
void accounts_load(void);
void accounts_close(void);
char* accounts_find_all(const char *const prefix, gboolean previous);
char* accounts_find_enabled(const char *const prefix, gboolean previous);
char* accounts_find_all(const char *const prefix, gboolean previous, void *context);
char* accounts_find_enabled(const char *const prefix, gboolean previous, void *context);
void accounts_reset_all_search(void);
void accounts_reset_enabled_search(void);
void accounts_add(const char *jid, const char *altdomain, const int port, const char *const tls_policy);

4
src/config/preferences.c
View File

@@ -218,7 +218,7 @@ prefs_close(void)
}
char*
prefs_autocomplete_boolean_choice(const char *const prefix, gboolean previous)
prefs_autocomplete_boolean_choice(const char *const prefix, gboolean previous, void *context)
{
return autocomplete_complete(boolean_choice_ac, prefix, TRUE, previous);
}
@@ -230,7 +230,7 @@ prefs_reset_boolean_choice(void)
}
char*
prefs_autocomplete_room_trigger(const char *const prefix, gboolean previous)
prefs_autocomplete_room_trigger(const char *const prefix, gboolean previous, void *context)
{
return autocomplete_complete(room_trigger_ac, prefix, TRUE, previous);
}

4
src/config/preferences.h
View File

@@ -183,10 +183,10 @@ void prefs_reload(void);
char* prefs_find_login(char *prefix);
void prefs_reset_login_search(void);
char* prefs_autocomplete_boolean_choice(const char *const prefix, gboolean previous);
char* prefs_autocomplete_boolean_choice(const char *const prefix, gboolean previous, void *context);
void prefs_reset_boolean_choice(void);
char* prefs_autocomplete_room_trigger(const char *const prefix, gboolean previous);
char* prefs_autocomplete_room_trigger(const char *const prefix, gboolean previous, void *context);
void prefs_reset_room_trigger_ac(void);
gint prefs_get_gone(void);

2
src/config/tlscerts.c
View File

@@ -369,7 +369,7 @@ tlscerts_get_trusted(const char * const fingerprint)
}
char*
tlscerts_complete(const char *const prefix, gboolean previous)
tlscerts_complete(const char *const prefix, gboolean previous, void *context)
{
return autocomplete_complete(certs_ac, prefix, TRUE, previous);
}

2
src/config/tlscerts.h
View File

@@ -90,7 +90,7 @@ void tlscerts_free(TLSCertificate *cert);
GList* tlscerts_list(void);
char* tlscerts_complete(const char *const prefix, gboolean previous);
char* tlscerts_complete(const char *const prefix, gboolean previous, void *context);
void tlscerts_reset_ac(void);