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

Merge branch 'master' into openpgp

Browse Source
This commit is contained in:
James Booth
2015-06-17 19:55:52 +01:00
parent 8fde14879a e00a03f916
commit 1af3565cbd
7 changed files with 139 additions and 185 deletions
Download Patch File Download Diff File Expand all files Collapse all files

27
src/command/command.c
View File

@@ -1830,7 +1830,8 @@ cmd_reset_autocomplete(ProfWin *window)
autocomplete_reset(pgp_ac);
if (window->type == WIN_CHAT) {
ProfChatWin *chatwin = wins_get_current_chat();
ProfChatWin *chatwin = (ProfChatWin*)window;
assert(chatwin->memcheck == PROFCHATWIN_MEMCHECK);
PContact contact = roster_get_contact(chatwin->barejid);
if (contact) {
p_contact_resource_ac_reset(contact);
@@ -1838,13 +1839,15 @@ cmd_reset_autocomplete(ProfWin *window)
}
if (window->type == WIN_MUC) {
ProfMucWin *mucwin = wins_get_current_muc();
ProfMucWin *mucwin = (ProfMucWin*)window;
assert(mucwin->memcheck == PROFMUCWIN_MEMCHECK);
muc_autocomplete_reset(mucwin->roomjid);
muc_jid_autocomplete_reset(mucwin->roomjid);
}
if (window->type == WIN_MUC_CONFIG) {
ProfMucConfWin *confwin = wins_get_current_muc_conf();
ProfMucConfWin *confwin = (ProfMucConfWin*)window;
assert(confwin->memcheck == PROFCONFWIN_MEMCHECK);
if (confwin->form) {
form_reset_autocompleters(confwin->form);
}
@@ -1958,7 +1961,8 @@ _cmd_complete_parameters(ProfWin *window, const char * const input)
// autocomplete nickname in chat rooms
if (window->type == WIN_MUC) {
ProfMucWin *mucwin = wins_get_current_muc();
ProfMucWin *mucwin = (ProfMucWin*)window;
assert(mucwin->memcheck == PROFMUCWIN_MEMCHECK);
Autocomplete nick_ac = muc_roster_ac(mucwin->roomjid);
if (nick_ac) {
gchar *nick_choices[] = { "/msg", "/info", "/caps", "/status", "/software" } ;
@@ -2497,7 +2501,8 @@ _resource_autocomplete(ProfWin *window, const char * const input)
char *found = NULL;
if (window->type == WIN_CHAT) {
ProfChatWin *chatwin = wins_get_current_chat();
ProfChatWin *chatwin = (ProfChatWin*)window;
assert(chatwin->memcheck == PROFCHATWIN_MEMCHECK);
PContact contact = roster_get_contact(chatwin->barejid);
if (contact) {
Autocomplete ac = p_contact_resource_ac(contact);
@@ -2725,7 +2730,8 @@ _kick_autocomplete(ProfWin *window, const char * const input)
char *result = NULL;
if (window->type == WIN_MUC) {
ProfMucWin *mucwin = wins_get_current_muc();
ProfMucWin *mucwin = (ProfMucWin*)window;
assert(mucwin->memcheck == PROFMUCWIN_MEMCHECK);
Autocomplete nick_ac = muc_roster_ac(mucwin->roomjid);
if (nick_ac) {
@@ -2745,7 +2751,8 @@ _ban_autocomplete(ProfWin *window, const char * const input)
char *result = NULL;
if (window->type == WIN_MUC) {
ProfMucWin *mucwin = wins_get_current_muc();
ProfMucWin *mucwin = (ProfMucWin*)window;
assert(mucwin->memcheck == PROFMUCWIN_MEMCHECK);
Autocomplete jid_ac = muc_roster_jid_ac(mucwin->roomjid);
if (jid_ac) {
@@ -2765,7 +2772,8 @@ _affiliation_autocomplete(ProfWin *window, const char * const input)
char *result = NULL;
if (window->type == WIN_MUC) {
ProfMucWin *mucwin = wins_get_current_muc();
ProfMucWin *mucwin = (ProfMucWin*)window;
assert(mucwin->memcheck == PROFMUCWIN_MEMCHECK);
gboolean parse_result;
Autocomplete jid_ac = muc_roster_jid_ac(mucwin->roomjid);
@@ -2812,7 +2820,8 @@ _role_autocomplete(ProfWin *window, const char * const input)
char *result = NULL;
if (window->type == WIN_MUC) {
ProfMucWin *mucwin = wins_get_current_muc();
ProfMucWin *mucwin = (ProfMucWin*)window;
assert(mucwin->memcheck == PROFMUCWIN_MEMCHECK);
gboolean parse_result;
Autocomplete nick_ac = muc_roster_ac(mucwin->roomjid);