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

2
src/xmpp/blocking.c
View File

@@ -93,7 +93,7 @@ blocked_list(void)
}
char*
blocked_ac_find(const char *const search_str, gboolean previous)
blocked_ac_find(const char *const search_str, gboolean previous, void *context)
{
return autocomplete_complete(blocked_ac, search_str, TRUE, previous);
}

2
src/xmpp/bookmark.c
View File

@@ -222,7 +222,7 @@ bookmark_get_list(void)
}
char*
bookmark_find(const char *const search_str, gboolean previous)
bookmark_find(const char *const search_str, gboolean previous, void *context)
{
return autocomplete_complete(bookmark_ac, search_str, TRUE, previous);
}

4
src/xmpp/muc.c
View File

@@ -181,13 +181,13 @@ muc_confserver_reset_ac(void)
}
char*
muc_invites_find(const char *const search_str, gboolean previous)
muc_invites_find(const char *const search_str, gboolean previous, void *context)
{
return autocomplete_complete(invite_ac, search_str, TRUE, previous);
}
char*
muc_confserver_find(const char *const search_str, gboolean previous)
muc_confserver_find(const char *const search_str, gboolean previous, void *context)
{
return autocomplete_complete(confservers_ac, search_str, TRUE, previous);
}

4
src/xmpp/muc.h
View File

@@ -126,7 +126,7 @@ char* muc_roster_nick_change_complete(const char *const room, const char *const
void muc_confserver_add(const char *const server);
void muc_confserver_reset_ac(void);
char* muc_confserver_find(const char *const search_str, gboolean previous);
char* muc_confserver_find(const char *const search_str, gboolean previous, void *context);
void muc_confserver_clear(void);
void muc_invites_add(const char *const room, const char *const password);
@@ -135,7 +135,7 @@ gint muc_invites_count(void);
GList* muc_invites(void);
gboolean muc_invites_contain(const char *const room);
void muc_invites_reset_ac(void);
char* muc_invites_find(const char *const search_str, gboolean previous);
char* muc_invites_find(const char *const search_str, gboolean previous, void *context);
void muc_invites_clear(void);
char* muc_invite_password(const char *const room);

2
src/xmpp/presence.c
View File

@@ -161,7 +161,7 @@ presence_clear_sub_requests(void)
}
char*
presence_sub_request_find(const char *const search_str, gboolean previous)
presence_sub_request_find(const char *const search_str, gboolean previous, void *context)
{
return autocomplete_complete(sub_requests_ac, search_str, TRUE, previous);
}

8
src/xmpp/roster_list.c
View File

@@ -487,7 +487,7 @@ roster_has_pending_subscriptions(void)
}
char*
roster_contact_autocomplete(const char *const search_str, gboolean previous)
roster_contact_autocomplete(const char *const search_str, gboolean previous, void *context)
{
assert(roster != NULL);
@@ -495,7 +495,7 @@ roster_contact_autocomplete(const char *const search_str, gboolean previous)
}
char*
roster_fulljid_autocomplete(const char *const search_str, gboolean previous)
roster_fulljid_autocomplete(const char *const search_str, gboolean previous, void *context)
{
assert(roster != NULL);
@@ -550,7 +550,7 @@ roster_get_groups(void)
}
char*
roster_group_autocomplete(const char *const search_str, gboolean previous)
roster_group_autocomplete(const char *const search_str, gboolean previous, void *context)
{
assert(roster != NULL);
@@ -558,7 +558,7 @@ roster_group_autocomplete(const char *const search_str, gboolean previous)
}
char*
roster_barejid_autocomplete(const char *const search_str, gboolean previous)
roster_barejid_autocomplete(const char *const search_str, gboolean previous, void *context)
{
assert(roster != NULL);

8
src/xmpp/roster_list.h
View File

@@ -63,12 +63,12 @@ char* roster_barejid_from_name(const char *const name);
GSList* roster_get_contacts(roster_ord_t order);
GSList* roster_get_contacts_online(void);
gboolean roster_has_pending_subscriptions(void);
char* roster_contact_autocomplete(const char *const search_str, gboolean previous);
char* roster_fulljid_autocomplete(const char *const search_str, gboolean previous);
char* roster_contact_autocomplete(const char *const search_str, gboolean previous, void *context);
char* roster_fulljid_autocomplete(const char *const search_str, gboolean previous, void *context);
GSList* roster_get_group(const char *const group, roster_ord_t order);
GList* roster_get_groups(void);
char* roster_group_autocomplete(const char *const search_str, gboolean previous);
char* roster_barejid_autocomplete(const char *const search_str, gboolean previous);
char* roster_group_autocomplete(const char *const search_str, gboolean previous, void *context);
char* roster_barejid_autocomplete(const char *const search_str, gboolean previous, void *context);
GSList* roster_get_contacts_by_presence(const char *const presence);
char* roster_get_msg_display_name(const char *const barejid, const char *const resource);
gint roster_compare_name(PContact a, PContact b);

6
src/xmpp/xmpp.h
View File

@@ -188,7 +188,7 @@ void presence_subscription(const char *const jid, const jabber_subscr_t action);
GList* presence_get_subscription_requests(void);
gint presence_sub_request_count(void);
void presence_reset_sub_request_search(void);
char* presence_sub_request_find(const char *const search_str, gboolean previous);
char* presence_sub_request_find(const char *const search_str, gboolean previous, void *context);
void presence_join_room(const char *const room, const char *const nick, const char *const passwd);
void presence_change_room_nick(const char *const room, const char *const nick);
void presence_leave_chat_room(const char *const room_jid);
@@ -237,7 +237,7 @@ gboolean bookmark_update(const char *jid, const char *nick, const char *password
gboolean bookmark_remove(const char *jid);
gboolean bookmark_join(const char *jid);
GList* bookmark_get_list(void);
char* bookmark_find(const char *const search_str, gboolean previous);
char* bookmark_find(const char *const search_str, gboolean previous, void *context);
void bookmark_autocomplete_reset(void);
gboolean bookmark_exists(const char *const room);
@@ -250,7 +250,7 @@ void roster_send_remove(const char *const barejid);
GList* blocked_list(void);
gboolean blocked_add(char *jid);
gboolean blocked_remove(char *jid);
char* blocked_ac_find(const char *const search_str, gboolean previous);
char* blocked_ac_find(const char *const search_str, gboolean previous, void *context);
void blocked_ac_reset(void);
void form_destroy(DataForm *form);