diff options
Diffstat (limited to 'src/command/command.c')
-rw-r--r-- | src/command/command.c | 27 |
1 files changed, 18 insertions, 9 deletions
diff --git a/src/command/command.c b/src/command/command.c index 14b7aa48..a5b468ba 100644 --- a/src/command/command.c +++ b/src/command/command.c @@ -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); |