aniani/profanity
1
0
Fork 0
mirror of https://github.com/profanity-im/profanity.git synced 2024-11-03 19:37:16 -05:00
Code

Merge branch 'master' into openpgp

Browse Source 
Conflicts:
	src/command/commands.c
	src/command/commands.h
This commit is contained in:
James Booth 2015-06-17 00:40:06 +01:00
commit 8fde14879a
25 changed files with 689 additions and 684 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
Makefile.am
View File

@ -20,6 +20,7 @@ core_sources = \
src/ui/titlebar.c src/ui/statusbar.c src/ui/inputwin.c \
src/ui/titlebar.h src/ui/statusbar.h src/ui/inputwin.h \
src/ui/console.c src/ui/notifier.c \
src/ui/win_types.h \
src/window_list.c src/window_list.h \
src/ui/rosterwin.c src/ui/occupantswin.c \
src/ui/buffer.c src/ui/buffer.h \

186
src/command/command.c
View File

@ -68,40 +68,38 @@
#include "ui/ui.h"
#include "window_list.h"
typedef char*(*autocompleter)(char*, int*);
static gboolean _cmd_execute(ProfWin *window, const char * const command, const char * const inp);
static gboolean _cmd_execute(const char * const command, const char * const inp);
static char * _cmd_complete_parameters(ProfWin *window, const char * const input);
static char * _cmd_complete_parameters(const char * const input);
static char * _sub_autocomplete(const char * const input);
static char * _notify_autocomplete(const char * const input);
static char * _theme_autocomplete(const char * const input);
static char * _autoaway_autocomplete(const char * const input);
static char * _autoconnect_autocomplete(const char * const input);
static char * _account_autocomplete(const char * const input);
static char * _who_autocomplete(const char * const input);
static char * _roster_autocomplete(const char * const input);
static char * _group_autocomplete(const char * const input);
static char * _bookmark_autocomplete(const char * const input);
static char * _otr_autocomplete(const char * const input);
static char * _connect_autocomplete(const char * const input);
static char * _statuses_autocomplete(const char * const input);
static char * _alias_autocomplete(const char * const input);
static char * _join_autocomplete(const char * const input);
static char * _log_autocomplete(const char * const input);
static char * _form_autocomplete(const char * const input);
static char * _form_field_autocomplete(const char * const input);
static char * _occupants_autocomplete(const char * const input);
static char * _kick_autocomplete(const char * const input);
static char * _ban_autocomplete(const char * const input);
static char * _affiliation_autocomplete(const char * const input);
static char * _role_autocomplete(const char * const input);
static char * _resource_autocomplete(const char * const input);
static char * _titlebar_autocomplete(const char * const input);
static char * _inpblock_autocomplete(const char * const input);
static char * _time_autocomplete(const char * const input);
static char * _receipts_autocomplete(const char * const input);
static char * _sub_autocomplete(ProfWin *window, const char * const input);
static char * _notify_autocomplete(ProfWin *window, const char * const input);
static char * _theme_autocomplete(ProfWin *window, const char * const input);
static char * _autoaway_autocomplete(ProfWin *window, const char * const input);
static char * _autoconnect_autocomplete(ProfWin *window, const char * const input);
static char * _account_autocomplete(ProfWin *window, const char * const input);
static char * _who_autocomplete(ProfWin *window, const char * const input);
static char * _roster_autocomplete(ProfWin *window, const char * const input);
static char * _group_autocomplete(ProfWin *window, const char * const input);
static char * _bookmark_autocomplete(ProfWin *window, const char * const input);
static char * _otr_autocomplete(ProfWin *window, const char * const input);
static char * _connect_autocomplete(ProfWin *window, const char * const input);
static char * _statuses_autocomplete(ProfWin *window, const char * const input);
static char * _alias_autocomplete(ProfWin *window, const char * const input);
static char * _join_autocomplete(ProfWin *window, const char * const input);
static char * _log_autocomplete(ProfWin *window, const char * const input);
static char * _form_autocomplete(ProfWin *window, const char * const input);
static char * _form_field_autocomplete(ProfWin *window, const char * const input);
static char * _occupants_autocomplete(ProfWin *window, const char * const input);
static char * _kick_autocomplete(ProfWin *window, const char * const input);
static char * _ban_autocomplete(ProfWin *window, const char * const input);
static char * _affiliation_autocomplete(ProfWin *window, const char * const input);
static char * _role_autocomplete(ProfWin *window, const char * const input);
static char * _resource_autocomplete(ProfWin *window, const char * const input);
static char * _titlebar_autocomplete(ProfWin *window, const char * const input);
static char * _inpblock_autocomplete(ProfWin *window, const char * const input);
static char * _time_autocomplete(ProfWin *window, const char * const input);
static char * _receipts_autocomplete(ProfWin *window, const char * const input);
GHashTable *commands = NULL;
@ -1741,7 +1739,7 @@ cmd_alias_remove(char *value)
// Command autocompletion functions
char*
cmd_autocomplete(const char * const input)
cmd_autocomplete(ProfWin *window, const char * const input)
{
// autocomplete command
if ((strncmp(input, "/", 1) == 0) && (!str_contains(input, strlen(input), ' '))) {
@ -1753,7 +1751,7 @@ cmd_autocomplete(const char * const input)
// autocomplete parameters
} else {
char *found = _cmd_complete_parameters(input);
char *found = _cmd_complete_parameters(window, input);
if (found) {
return found;
}
@ -1763,7 +1761,7 @@ cmd_autocomplete(const char * const input)
}
void
cmd_reset_autocomplete()
cmd_reset_autocomplete(ProfWin *window)
{
roster_reset_search_attempts();
muc_invites_reset_ac();
@ -1831,7 +1829,7 @@ cmd_reset_autocomplete()
autocomplete_reset(receipts_ac);
autocomplete_reset(pgp_ac);
if (ui_current_win_type() == WIN_CHAT) {
if (window->type == WIN_CHAT) {
ProfChatWin *chatwin = wins_get_current_chat();
PContact contact = roster_get_contact(chatwin->barejid);
if (contact) {
@ -1839,13 +1837,13 @@ cmd_reset_autocomplete()
}
}
if (ui_current_win_type() == WIN_MUC) {
if (window->type == WIN_MUC) {
ProfMucWin *mucwin = wins_get_current_muc();
muc_autocomplete_reset(mucwin->roomjid);
muc_jid_autocomplete_reset(mucwin->roomjid);
}
if (ui_current_win_type() == WIN_MUC_CONFIG) {
if (window->type == WIN_MUC_CONFIG) {
ProfMucConfWin *confwin = wins_get_current_muc_conf();
if (confwin->form) {
form_reset_autocompleters(confwin->form);
@ -1860,7 +1858,7 @@ cmd_reset_autocomplete()
* continue, FALSE otherwise
*/
gboolean
cmd_process_input(char *inp)
cmd_process_input(ProfWin *window, char *inp)
{
log_debug("Input received: %s", inp);
gboolean result = FALSE;
@ -1874,12 +1872,12 @@ cmd_process_input(char *inp)
} else if (inp[0] == '/') {
char *inp_cpy = strdup(inp);
char *command = strtok(inp_cpy, " ");
result = _cmd_execute(command, inp);
result = _cmd_execute(window, command, inp);
free(inp_cpy);
// call a default handler if input didn't start with '/'
} else {
result = cmd_execute_default(inp);
result = cmd_execute_default(window, inp);
}
return result;
@ -1888,18 +1886,18 @@ cmd_process_input(char *inp)
// Command execution
void
cmd_execute_connect(const char * const account)
cmd_execute_connect(ProfWin *window, const char * const account)
{
GString *command = g_string_new("/connect ");
g_string_append(command, account);
cmd_process_input(command->str);
cmd_process_input(window, command->str);
g_string_free(command, TRUE);
}
static gboolean
_cmd_execute(const char * const command, const char * const inp)
_cmd_execute(ProfWin *window, const char * const command, const char * const inp)
{
if (g_str_has_prefix(command, "/field") && ui_current_win_type() == WIN_MUC_CONFIG) {
if (g_str_has_prefix(command, "/field") && window->type == WIN_MUC_CONFIG) {
gboolean result = FALSE;
gchar **args = parse_args_with_freetext(inp, 1, 2, &result);
if (!result) {
@ -1908,7 +1906,7 @@ _cmd_execute(const char * const command, const char * const inp)
} else {
gchar **tokens = g_strsplit(inp, " ", 2);
char *field = tokens[0] + 1;
result = cmd_form_field(field, args);
result = cmd_form_field(window, field, args);
g_strfreev(tokens);
}
@ -1925,15 +1923,15 @@ _cmd_execute(const char * const command, const char * const inp)
ui_invalid_command_usage(cmd->help.usage, cmd->setting_func);
return TRUE;
} else {
gboolean result = cmd->func(args, cmd->help);
gboolean result = cmd->func(window, args, cmd->help);
g_strfreev(args);
return result;
}
} else {
gboolean ran_alias = FALSE;
gboolean alias_result = cmd_execute_alias(inp, &ran_alias);
gboolean alias_result = cmd_execute_alias(window, inp, &ran_alias);
if (!ran_alias) {
return cmd_execute_default(inp);
return cmd_execute_default(window, inp);
} else {
return alias_result;
}
@ -1941,7 +1939,7 @@ _cmd_execute(const char * const command, const char * const inp)
}
static char *
_cmd_complete_parameters(const char * const input)
_cmd_complete_parameters(ProfWin *window, const char * const input)
{
int i;
char *result = NULL;
@ -1959,7 +1957,7 @@ _cmd_complete_parameters(const char * const input)
}
// autocomplete nickname in chat rooms
if (ui_current_win_type() == WIN_MUC) {
if (window->type == WIN_MUC) {
ProfMucWin *mucwin = wins_get_current_muc();
Autocomplete nick_ac = muc_roster_ac(mucwin->roomjid);
if (nick_ac) {
@ -2065,9 +2063,9 @@ _cmd_complete_parameters(const char * const input)
}
parsed[i] = '\0';
char * (*ac_func)(const char * const) = g_hash_table_lookup(ac_funcs, parsed);
char * (*ac_func)(ProfWin*, const char * const) = g_hash_table_lookup(ac_funcs, parsed);
if (ac_func) {
result = ac_func(input);
result = ac_func(window, input);
if (result) {
g_hash_table_destroy(ac_funcs);
return result;
@ -2076,7 +2074,7 @@ _cmd_complete_parameters(const char * const input)
g_hash_table_destroy(ac_funcs);
if (g_str_has_prefix(input, "/field")) {
result = _form_field_autocomplete(input);
result = _form_field_autocomplete(window, input);
if (result) {
return result;
}
@ -2086,7 +2084,7 @@ _cmd_complete_parameters(const char * const input)
}
static char *
_sub_autocomplete(const char * const input)
_sub_autocomplete(ProfWin *window, const char * const input)
{
char *result = NULL;
result = autocomplete_param_with_func(input, "/sub allow", presence_sub_request_find);
@ -2106,12 +2104,11 @@ _sub_autocomplete(const char * const input)
}
static char *
_who_autocomplete(const char * const input)
_who_autocomplete(ProfWin *window, const char * const input)
{
char *result = NULL;
win_type_t win_type = ui_current_win_type();
if (win_type == WIN_MUC) {
if (window->type == WIN_MUC) {
result = autocomplete_param_with_ac(input, "/who", who_room_ac, TRUE);
if (result) {
return result;
@ -2139,7 +2136,7 @@ _who_autocomplete(const char * const input)
}
static char *
_roster_autocomplete(const char * const input)
_roster_autocomplete(ProfWin *window, const char * const input)
{
char *result = NULL;
result = autocomplete_param_with_func(input, "/roster nick", roster_barejid_autocomplete);
@ -2175,7 +2172,7 @@ _roster_autocomplete(const char * const input)
}
static char *
_group_autocomplete(const char * const input)
_group_autocomplete(ProfWin *window, const char * const input)
{
char *result = NULL;
result = autocomplete_param_with_func(input, "/group show", roster_group_autocomplete);
@ -2208,7 +2205,7 @@ _group_autocomplete(const char * const input)
}
static char *
_bookmark_autocomplete(const char * const input)
_bookmark_autocomplete(ProfWin *window, const char * const input)
{
char *found = NULL;
@ -2287,7 +2284,7 @@ _bookmark_autocomplete(const char * const input)
}
static char *
_notify_autocomplete(const char * const input)
_notify_autocomplete(ProfWin *window, const char * const input)
{
int i = 0;
char *result = NULL;
@ -2350,7 +2347,7 @@ _notify_autocomplete(const char * const input)
}
static char *
_autoaway_autocomplete(const char * const input)
_autoaway_autocomplete(ProfWin *window, const char * const input)
{
char *result = NULL;
@ -2372,7 +2369,7 @@ _autoaway_autocomplete(const char * const input)
}
static char *
_log_autocomplete(const char * const input)
_log_autocomplete(ProfWin *window, const char * const input)
{
char *result = NULL;
@ -2395,7 +2392,7 @@ _log_autocomplete(const char * const input)
}
static char *
_autoconnect_autocomplete(const char * const input)
_autoconnect_autocomplete(ProfWin *window, const char * const input)
{
char *result = NULL;
@ -2413,7 +2410,7 @@ _autoconnect_autocomplete(const char * const input)
}
static char *
_otr_autocomplete(const char * const input)
_otr_autocomplete(ProfWin *window, const char * const input)
{
char *found = NULL;
@ -2466,7 +2463,7 @@ _otr_autocomplete(const char * const input)
}
static char *
_theme_autocomplete(const char * const input)
_theme_autocomplete(ProfWin *window, const char * const input)
{
char *result = NULL;
if ((strncmp(input, "/theme load ", 12) == 0) && (strlen(input) > 12)) {
@ -2495,12 +2492,11 @@ _theme_autocomplete(const char * const input)
}
static char *
_resource_autocomplete(const char * const input)
_resource_autocomplete(ProfWin *window, const char * const input)
{
char *found = NULL;
ProfWin *current = wins_get_current();
if (current && current->type == WIN_CHAT) {
if (window->type == WIN_CHAT) {
ProfChatWin *chatwin = wins_get_current_chat();
PContact contact = roster_get_contact(chatwin->barejid);
if (contact) {
@ -2531,7 +2527,7 @@ _resource_autocomplete(const char * const input)
}
static char *
_titlebar_autocomplete(const char * const input)
_titlebar_autocomplete(ProfWin *window, const char * const input)
{
char *found = NULL;
@ -2554,7 +2550,7 @@ _titlebar_autocomplete(const char * const input)
}
static char *
_inpblock_autocomplete(const char * const input)
_inpblock_autocomplete(ProfWin *window, const char * const input)
{
char *found = NULL;
@ -2572,16 +2568,15 @@ _inpblock_autocomplete(const char * const input)
}
static char *
_form_autocomplete(const char * const input)
_form_autocomplete(ProfWin *window, const char * const input)
{
ProfWin *current = wins_get_current();
if (current->type != WIN_MUC_CONFIG) {
if (window->type != WIN_MUC_CONFIG) {
return NULL;
}
char *found = NULL;
ProfMucConfWin *confwin = (ProfMucConfWin*)current;
ProfMucConfWin *confwin = (ProfMucConfWin*)window;
DataForm *form = confwin->form;
if (form) {
found = autocomplete_param_with_ac(input, "/form help", form->tag_ac, TRUE);
@ -2599,16 +2594,15 @@ _form_autocomplete(const char * const input)
}
static char *
_form_field_autocomplete(const char * const input)
_form_field_autocomplete(ProfWin *window, const char * const input)
{
ProfWin *current = wins_get_current();
if (current->type != WIN_MUC_CONFIG) {
if (window->type != WIN_MUC_CONFIG) {
return NULL;
}
char *found = NULL;
ProfMucConfWin *confwin = (ProfMucConfWin*)current;
ProfMucConfWin *confwin = (ProfMucConfWin*)window;
DataForm *form = confwin->form;
if (form == NULL) {
return NULL;
@ -2670,7 +2664,7 @@ _form_field_autocomplete(const char * const input)
}
static char *
_occupants_autocomplete(const char * const input)
_occupants_autocomplete(ProfWin *window, const char * const input)
{
char *found = NULL;
@ -2708,7 +2702,7 @@ _occupants_autocomplete(const char * const input)
}
static char *
_time_autocomplete(const char * const input)
_time_autocomplete(ProfWin *window, const char * const input)
{
char *found = NULL;
@ -2726,11 +2720,11 @@ _time_autocomplete(const char * const input)
}
static char *
_kick_autocomplete(const char * const input)
_kick_autocomplete(ProfWin *window, const char * const input)
{
char *result = NULL;
if (ui_current_win_type() == WIN_MUC) {
if (window->type == WIN_MUC) {
ProfMucWin *mucwin = wins_get_current_muc();
Autocomplete nick_ac = muc_roster_ac(mucwin->roomjid);
@ -2746,11 +2740,11 @@ _kick_autocomplete(const char * const input)
}
static char *
_ban_autocomplete(const char * const input)
_ban_autocomplete(ProfWin *window, const char * const input)
{
char *result = NULL;
if (ui_current_win_type() == WIN_MUC) {
if (window->type == WIN_MUC) {
ProfMucWin *mucwin = wins_get_current_muc();
Autocomplete jid_ac = muc_roster_jid_ac(mucwin->roomjid);
@ -2766,11 +2760,11 @@ _ban_autocomplete(const char * const input)
}
static char *
_affiliation_autocomplete(const char * const input)
_affiliation_autocomplete(ProfWin *window, const char * const input)
{
char *result = NULL;
if (ui_current_win_type() == WIN_MUC) {
if (window->type == WIN_MUC) {
ProfMucWin *mucwin = wins_get_current_muc();
gboolean parse_result;
Autocomplete jid_ac = muc_roster_jid_ac(mucwin->roomjid);
@ -2813,11 +2807,11 @@ _affiliation_autocomplete(const char * const input)
}
static char *
_role_autocomplete(const char * const input)
_role_autocomplete(ProfWin *window, const char * const input)
{
char *result = NULL;
if (ui_current_win_type() == WIN_MUC) {
if (window->type == WIN_MUC) {
ProfMucWin *mucwin = wins_get_current_muc();
gboolean parse_result;
Autocomplete nick_ac = muc_roster_ac(mucwin->roomjid);
@ -2860,7 +2854,7 @@ _role_autocomplete(const char * const input)
}
static char *
_statuses_autocomplete(const char * const input)
_statuses_autocomplete(ProfWin *window, const char * const input)
{
char *result = NULL;
@ -2888,7 +2882,7 @@ _statuses_autocomplete(const char * const input)
}
static char *
_receipts_autocomplete(const char * const input)
_receipts_autocomplete(ProfWin *window, const char * const input)
{
char *result = NULL;
@ -2911,7 +2905,7 @@ _receipts_autocomplete(const char * const input)
}
static char *
_alias_autocomplete(const char * const input)
_alias_autocomplete(ProfWin *window, const char * const input)
{
char *result = NULL;
@ -2929,7 +2923,7 @@ _alias_autocomplete(const char * const input)
}
static char *
_connect_autocomplete(const char * const input)
_connect_autocomplete(ProfWin *window, const char * const input)
{
char *found = NULL;
gboolean result = FALSE;
@ -2964,7 +2958,7 @@ _connect_autocomplete(const char * const input)
}
static char *
_join_autocomplete(const char * const input)
_join_autocomplete(ProfWin *window, const char * const input)
{
char *found = NULL;
gboolean result = FALSE;
@ -2999,7 +2993,7 @@ _join_autocomplete(const char * const input)
}
static char *
_account_autocomplete(const char * const input)
_account_autocomplete(ProfWin *window, const char * const input)
{
char *found = NULL;
gboolean result = FALSE;

9
src/command/command.h
View File

@ -38,14 +38,15 @@
#include <glib.h>
#include "xmpp/form.h"
#include "ui/ui.h"
GHashTable *commands;
void cmd_init(void);
void cmd_uninit(void);
char* cmd_autocomplete(const char * const input);
void cmd_reset_autocomplete(void);
char* cmd_autocomplete(ProfWin *window, const char * const input);
void cmd_reset_autocomplete(ProfWin *window);
void cmd_autocomplete_add(char *value);
void cmd_autocomplete_remove(char *value);
void cmd_autocomplete_add_form_fields(DataForm *form);
@ -53,8 +54,8 @@ void cmd_autocomplete_remove_form_fields(DataForm *form);
void cmd_alias_add(char *value);
void cmd_alias_remove(char *value);
gboolean cmd_process_input(char *inp);
void cmd_execute_connect(const char * const account);
gboolean cmd_process_input(ProfWin *window, char *inp);
void cmd_execute_connect(ProfWin *window, const char * const account);
gboolean cmd_exists(char *cmd);

332
src/command/commands.c
View File

File diff suppressed because it is too large Load Diff

168
src/command/commands.h
View File

@ -35,6 +35,8 @@
#ifndef COMMANDS_H
#define COMMANDS_H
#include "ui/ui.h"
// Command help strings
typedef struct cmd_help_t {
const gchar *usage;
@ -54,7 +56,7 @@ typedef struct cmd_help_t {
*/
typedef struct cmd_t {
gchar *cmd;
gboolean (*func)(gchar **args, struct cmd_help_t help);
gboolean (*func)(ProfWin *window, gchar **args, struct cmd_help_t help);
gchar** (*parser)(const char * const inp, int min, int max, gboolean *result);
int min_args;
int max_args;
@ -62,89 +64,89 @@ typedef struct cmd_t {
CommandHelp help;
} Command;
gboolean cmd_execute_alias(const char * const inp, gboolean *ran);
gboolean cmd_execute_default(const char * inp);
gboolean cmd_execute_alias(ProfWin *window, const char * const inp, gboolean *ran);
gboolean cmd_execute_default(ProfWin *window, const char * inp);
gboolean cmd_about(gchar **args, struct cmd_help_t help);
gboolean cmd_account(gchar **args, struct cmd_help_t help);
gboolean cmd_autoaway(gchar **args, struct cmd_help_t help);
gboolean cmd_autoconnect(gchar **args, struct cmd_help_t help);
gboolean cmd_autoping(gchar **args, struct cmd_help_t help);
gboolean cmd_away(gchar **args, struct cmd_help_t help);
gboolean cmd_beep(gchar **args, struct cmd_help_t help);
gboolean cmd_caps(gchar **args, struct cmd_help_t help);
gboolean cmd_chat(gchar **args, struct cmd_help_t help);
gboolean cmd_chlog(gchar **args, struct cmd_help_t help);
gboolean cmd_clear(gchar **args, struct cmd_help_t help);
gboolean cmd_close(gchar **args, struct cmd_help_t help);
gboolean cmd_connect(gchar **args, struct cmd_help_t help);
gboolean cmd_decline(gchar **args, struct cmd_help_t help);
gboolean cmd_disco(gchar **args, struct cmd_help_t help);
gboolean cmd_disconnect(gchar **args, struct cmd_help_t help);
gboolean cmd_dnd(gchar **args, struct cmd_help_t help);
gboolean cmd_flash(gchar **args, struct cmd_help_t help);
gboolean cmd_gone(gchar **args, struct cmd_help_t help);
gboolean cmd_grlog(gchar **args, struct cmd_help_t help);
gboolean cmd_group(gchar **args, struct cmd_help_t help);
gboolean cmd_help(gchar **args, struct cmd_help_t help);
gboolean cmd_history(gchar **args, struct cmd_help_t help);
gboolean cmd_carbons(gchar **args, struct cmd_help_t help);
gboolean cmd_receipts(gchar **args, struct cmd_help_t help);
gboolean cmd_info(gchar **args, struct cmd_help_t help);
gboolean cmd_intype(gchar **args, struct cmd_help_t help);
gboolean cmd_invite(gchar **args, struct cmd_help_t help);
gboolean cmd_invites(gchar **args, struct cmd_help_t help);
gboolean cmd_join(gchar **args, struct cmd_help_t help);
gboolean cmd_leave(gchar **args, struct cmd_help_t help);
gboolean cmd_log(gchar **args, struct cmd_help_t help);
gboolean cmd_mouse(gchar **args, struct cmd_help_t help);
gboolean cmd_msg(gchar **args, struct cmd_help_t help);
gboolean cmd_nick(gchar **args, struct cmd_help_t help);
gboolean cmd_notify(gchar **args, struct cmd_help_t help);
gboolean cmd_online(gchar **args, struct cmd_help_t help);
gboolean cmd_otr(gchar **args, struct cmd_help_t help);
gboolean cmd_pgp(gchar **args, struct cmd_help_t help);
gboolean cmd_outtype(gchar **args, struct cmd_help_t help);
gboolean cmd_prefs(gchar **args, struct cmd_help_t help);
gboolean cmd_priority(gchar **args, struct cmd_help_t help);
gboolean cmd_quit(gchar **args, struct cmd_help_t help);
gboolean cmd_reconnect(gchar **args, struct cmd_help_t help);
gboolean cmd_room(gchar **args, struct cmd_help_t help);
gboolean cmd_rooms(gchar **args, struct cmd_help_t help);
gboolean cmd_bookmark(gchar **args, struct cmd_help_t help);
gboolean cmd_roster(gchar **args, struct cmd_help_t help);
gboolean cmd_software(gchar **args, struct cmd_help_t help);
gboolean cmd_splash(gchar **args, struct cmd_help_t help);
gboolean cmd_states(gchar **args, struct cmd_help_t help);
gboolean cmd_status(gchar **args, struct cmd_help_t help);
gboolean cmd_statuses(gchar **args, struct cmd_help_t help);
gboolean cmd_sub(gchar **args, struct cmd_help_t help);
gboolean cmd_theme(gchar **args, struct cmd_help_t help);
gboolean cmd_tiny(gchar **args, struct cmd_help_t help);
gboolean cmd_titlebar(gchar **args, struct cmd_help_t help);
gboolean cmd_vercheck(gchar **args, struct cmd_help_t help);
gboolean cmd_who(gchar **args, struct cmd_help_t help);
gboolean cmd_win(gchar **args, struct cmd_help_t help);
gboolean cmd_wins(gchar **args, struct cmd_help_t help);
gboolean cmd_winstidy(gchar **args, struct cmd_help_t help);
gboolean cmd_xa(gchar **args, struct cmd_help_t help);
gboolean cmd_alias(gchar **args, struct cmd_help_t help);
gboolean cmd_xmlconsole(gchar **args, struct cmd_help_t help);
gboolean cmd_ping(gchar **args, struct cmd_help_t help);
gboolean cmd_form(gchar **args, struct cmd_help_t help);
gboolean cmd_occupants(gchar **args, struct cmd_help_t help);
gboolean cmd_kick(gchar **args, struct cmd_help_t help);
gboolean cmd_ban(gchar **args, struct cmd_help_t help);
gboolean cmd_subject(gchar **args, struct cmd_help_t help);
gboolean cmd_affiliation(gchar **args, struct cmd_help_t help);
gboolean cmd_role(gchar **args, struct cmd_help_t help);
gboolean cmd_privileges(gchar **args, struct cmd_help_t help);
gboolean cmd_presence(gchar **args, struct cmd_help_t help);
gboolean cmd_wrap(gchar **args, struct cmd_help_t help);
gboolean cmd_time(gchar **args, struct cmd_help_t help);
gboolean cmd_resource(gchar **args, struct cmd_help_t help);
gboolean cmd_inpblock(gchar **args, struct cmd_help_t help);
gboolean cmd_about(ProfWin *window, gchar **args, struct cmd_help_t help);
gboolean cmd_account(ProfWin *window, gchar **args, struct cmd_help_t help);
gboolean cmd_autoaway(ProfWin *window, gchar **args, struct cmd_help_t help);
gboolean cmd_autoconnect(ProfWin *window, gchar **args, struct cmd_help_t help);
gboolean cmd_autoping(ProfWin *window, gchar **args, struct cmd_help_t help);
gboolean cmd_away(ProfWin *window, gchar **args, struct cmd_help_t help);
gboolean cmd_beep(ProfWin *window, gchar **args, struct cmd_help_t help);
gboolean cmd_caps(ProfWin *window, gchar **args, struct cmd_help_t help);
gboolean cmd_chat(ProfWin *window, gchar **args, struct cmd_help_t help);
gboolean cmd_chlog(ProfWin *window, gchar **args, struct cmd_help_t help);
gboolean cmd_clear(ProfWin *window, gchar **args, struct cmd_help_t help);
gboolean cmd_close(ProfWin *window, gchar **args, struct cmd_help_t help);
gboolean cmd_connect(ProfWin *window, gchar **args, struct cmd_help_t help);
gboolean cmd_decline(ProfWin *window, gchar **args, struct cmd_help_t help);
gboolean cmd_disco(ProfWin *window, gchar **args, struct cmd_help_t help);
gboolean cmd_disconnect(ProfWin *window, gchar **args, struct cmd_help_t help);
gboolean cmd_dnd(ProfWin *window, gchar **args, struct cmd_help_t help);
gboolean cmd_flash(ProfWin *window, gchar **args, struct cmd_help_t help);
gboolean cmd_gone(ProfWin *window, gchar **args, struct cmd_help_t help);
gboolean cmd_grlog(ProfWin *window, gchar **args, struct cmd_help_t help);
gboolean cmd_group(ProfWin *window, gchar **args, struct cmd_help_t help);
gboolean cmd_help(ProfWin *window, gchar **args, struct cmd_help_t help);
gboolean cmd_history(ProfWin *window, gchar **args, struct cmd_help_t help);
gboolean cmd_carbons(ProfWin *window, gchar **args, struct cmd_help_t help);
gboolean cmd_receipts(ProfWin *window, gchar **args, struct cmd_help_t help);
gboolean cmd_info(ProfWin *window, gchar **args, struct cmd_help_t help);
gboolean cmd_intype(ProfWin *window, gchar **args, struct cmd_help_t help);
gboolean cmd_invite(ProfWin *window, gchar **args, struct cmd_help_t help);
gboolean cmd_invites(ProfWin *window, gchar **args, struct cmd_help_t help);
gboolean cmd_join(ProfWin *window, gchar **args, struct cmd_help_t help);
gboolean cmd_leave(ProfWin *window, gchar **args, struct cmd_help_t help);
gboolean cmd_log(ProfWin *window, gchar **args, struct cmd_help_t help);
gboolean cmd_mouse(ProfWin *window, gchar **args, struct cmd_help_t help);
gboolean cmd_msg(ProfWin *window, gchar **args, struct cmd_help_t help);
gboolean cmd_nick(ProfWin *window, gchar **args, struct cmd_help_t help);
gboolean cmd_notify(ProfWin *window, gchar **args, struct cmd_help_t help);
gboolean cmd_online(ProfWin *window, gchar **args, struct cmd_help_t help);
gboolean cmd_otr(ProfWin *window, gchar **args, struct cmd_help_t help);
gboolean cmd_pgp(ProfWin *window, gchar **args, struct cmd_help_t help);
gboolean cmd_outtype(ProfWin *window, gchar **args, struct cmd_help_t help);
gboolean cmd_prefs(ProfWin *window, gchar **args, struct cmd_help_t help);
gboolean cmd_priority(ProfWin *window, gchar **args, struct cmd_help_t help);
gboolean cmd_quit(ProfWin *window, gchar **args, struct cmd_help_t help);
gboolean cmd_reconnect(ProfWin *window, gchar **args, struct cmd_help_t help);
gboolean cmd_room(ProfWin *window, gchar **args, struct cmd_help_t help);
gboolean cmd_rooms(ProfWin *window, gchar **args, struct cmd_help_t help);
gboolean cmd_bookmark(ProfWin *window, gchar **args, struct cmd_help_t help);
gboolean cmd_roster(ProfWin *window, gchar **args, struct cmd_help_t help);
gboolean cmd_software(ProfWin *window, gchar **args, struct cmd_help_t help);
gboolean cmd_splash(ProfWin *window, gchar **args, struct cmd_help_t help);
gboolean cmd_states(ProfWin *window, gchar **args, struct cmd_help_t help);
gboolean cmd_status(ProfWin *window, gchar **args, struct cmd_help_t help);
gboolean cmd_statuses(ProfWin *window, gchar **args, struct cmd_help_t help);
gboolean cmd_sub(ProfWin *window, gchar **args, struct cmd_help_t help);
gboolean cmd_theme(ProfWin *window, gchar **args, struct cmd_help_t help);
gboolean cmd_tiny(ProfWin *window, gchar **args, struct cmd_help_t help);
gboolean cmd_titlebar(ProfWin *window, gchar **args, struct cmd_help_t help);
gboolean cmd_vercheck(ProfWin *window, gchar **args, struct cmd_help_t help);
gboolean cmd_who(ProfWin *window, gchar **args, struct cmd_help_t help);
gboolean cmd_win(ProfWin *window, gchar **args, struct cmd_help_t help);
gboolean cmd_wins(ProfWin *window, gchar **args, struct cmd_help_t help);
gboolean cmd_winstidy(ProfWin *window, gchar **args, struct cmd_help_t help);
gboolean cmd_xa(ProfWin *window, gchar **args, struct cmd_help_t help);
gboolean cmd_alias(ProfWin *window, gchar **args, struct cmd_help_t help);
gboolean cmd_xmlconsole(ProfWin *window, gchar **args, struct cmd_help_t help);
gboolean cmd_ping(ProfWin *window, gchar **args, struct cmd_help_t help);
gboolean cmd_form(ProfWin *window, gchar **args, struct cmd_help_t help);
gboolean cmd_occupants(ProfWin *window, gchar **args, struct cmd_help_t help);
gboolean cmd_kick(ProfWin *window, gchar **args, struct cmd_help_t help);
gboolean cmd_ban(ProfWin *window, gchar **args, struct cmd_help_t help);
gboolean cmd_subject(ProfWin *window, gchar **args, struct cmd_help_t help);
gboolean cmd_affiliation(ProfWin *window, gchar **args, struct cmd_help_t help);
gboolean cmd_role(ProfWin *window, gchar **args, struct cmd_help_t help);
gboolean cmd_privileges(ProfWin *window, gchar **args, struct cmd_help_t help);
gboolean cmd_presence(ProfWin *window, gchar **args, struct cmd_help_t help);
gboolean cmd_wrap(ProfWin *window, gchar **args, struct cmd_help_t help);
gboolean cmd_time(ProfWin *window, gchar **args, struct cmd_help_t help);
gboolean cmd_resource(ProfWin *window, gchar **args, struct cmd_help_t help);
gboolean cmd_inpblock(ProfWin *window, gchar **args, struct cmd_help_t help);
gboolean cmd_form_field(char *tag, gchar **args);
gboolean cmd_form_field(ProfWin *window, char *tag, gchar **args);
#endif

5
src/muc.c
View File

@ -663,10 +663,9 @@ muc_roster_nick_change_complete(const char * const room,
}
char *
muc_autocomplete(const char * const input)
muc_autocomplete(ProfWin *window, const char * const input)
{
win_type_t wintype = ui_current_win_type();
if (wintype == WIN_MUC) {
if (window->type == WIN_MUC) {
ProfMucWin *mucwin = wins_get_current_muc();
ChatRoom *chat_room = g_hash_table_lookup(rooms, mucwin->roomjid);

3
src/muc.h
View File

@ -40,6 +40,7 @@
#include "contact.h"
#include "jid.h"
#include "tools/autocomplete.h"
#include "ui/win_types.h"
typedef enum {
MUC_ROLE_NONE,
@ -133,7 +134,7 @@ char* muc_subject(const char * const room);
void muc_pending_broadcasts_add(const char * const room, const char * const message);
GList * muc_pending_broadcasts(const char * const room);
char* muc_autocomplete(const char * const input);
char* muc_autocomplete(ProfWin *window, const char * const input);
void muc_autocomplete_reset(const char * const room);
gboolean muc_requires_config(const char * const room);

12
src/profanity.c
View File

@ -92,7 +92,8 @@ prof_run(const int disable_tls, char *log_level, char *account_name)
line = ui_readline();
if (line) {
cont = cmd_process_input(line);
ProfWin *window = wins_get_current();
cont = cmd_process_input(window, line);
free(line);
line = NULL;
} else {
@ -132,10 +133,10 @@ prof_handle_idle(void)
void
prof_handle_activity(void)
{
win_type_t win_type = ui_current_win_type();
jabber_conn_status_t status = jabber_get_connection_status();
ProfWin *current = wins_get_current();
if ((status == JABBER_CONNECTED) && (win_type == WIN_CHAT)) {
if ((status == JABBER_CONNECTED) && (current->type == WIN_CHAT)) {
ProfChatWin *chatwin = wins_get_current_chat();
chat_state_handle_typing(chatwin->barejid, chatwin->state);
}
@ -144,12 +145,13 @@ prof_handle_activity(void)
static void
_connect_default(const char * const account)
{
ProfWin *window = wins_get_current();
if (account) {
cmd_execute_connect(account);
cmd_execute_connect(window, account);
} else {
char *pref_connect_account = prefs_get_string(PREF_CONNECT_ACCOUNT);
if (pref_connect_account) {
cmd_execute_connect(pref_connect_account);
cmd_execute_connect(window, pref_connect_account);
prefs_free_string(pref_connect_account);
}
}

3
src/ui/console.c
View File

@ -1564,7 +1564,8 @@ cons_show_contacts(GSList *list)
void
cons_alert(void)
{
if (ui_current_win_type() != WIN_CONSOLE) {
ProfWin *current = wins_get_current();
if (current->type != WIN_CONSOLE) {
status_bar_new(1);
}
}

10
src/ui/core.c
View File

@ -689,7 +689,8 @@ ui_invalid_command_usage(const char * const usage, void (*setting_func)(void))
} else {
cons_show("");
cons_show("Usage: %s", usage);
if (ui_current_win_type() == WIN_CHAT) {
ProfWin *current = wins_get_current();
if (current->type == WIN_CHAT) {
char usage_cpy[strlen(usage) + 8];
sprintf(usage_cpy, "Usage: %s", usage);
ui_current_print_line(usage_cpy);
@ -1144,13 +1145,6 @@ ui_swap_wins(int source_win, int target_win)
return wins_swap(source_win, target_win);
}
win_type_t
ui_current_win_type(void)
{
ProfWin *current = wins_get_current();
return current->type;
}
win_type_t
ui_win_type(int index)
{

11
src/ui/inputwin.c
View File

@ -415,7 +415,8 @@ _inp_rl_getc(FILE *stream)
{
int ch = rl_getc(stream);
if (_inp_printable(ch)) {
cmd_reset_autocomplete();
ProfWin *window = wins_get_current();
cmd_reset_autocomplete(window);
}
return ch;
}
@ -435,14 +436,16 @@ _inp_rl_tab_handler(int count, int key)
return 0;
}
if ((strncmp(rl_line_buffer, "/", 1) != 0) && (ui_current_win_type() == WIN_MUC)) {
char *result = muc_autocomplete(rl_line_buffer);
ProfWin *current = wins_get_current();
if ((strncmp(rl_line_buffer, "/", 1) != 0) && (current->type == WIN_MUC)) {
char *result = muc_autocomplete(current, rl_line_buffer);
if (result) {
rl_replace_line(result, 0);
rl_point = rl_end;
}
} else if (strncmp(rl_line_buffer, "/", 1) == 0) {
char *result = cmd_autocomplete(rl_line_buffer);
ProfWin *window = wins_get_current();
char *result = cmd_autocomplete(window, rl_line_buffer);
if (result) {
rl_replace_line(result, 0);
rl_point = rl_end;

111
src/ui/ui.h
View File

@ -35,122 +35,15 @@
#ifndef UI_UI_H
#define UI_UI_H
#include "config.h"
#include <wchar.h>
#include <glib.h>
#ifdef HAVE_NCURSESW_NCURSES_H
#include <ncursesw/ncurses.h>
#elif HAVE_NCURSES_H
#include <ncurses.h>
#endif
#include "contact.h"
#include "jid.h"
#include "xmpp/xmpp.h"
#include "ui/buffer.h"
#include "chat_state.h"
#include "ui/win_types.h"
#include "muc.h"
#define LAYOUT_SPLIT_MEMCHECK 12345671
#define PROFCHATWIN_MEMCHECK 22374522
#define PROFMUCWIN_MEMCHECK 52345276
#define PROFPRIVATEWIN_MEMCHECK 77437483
#define PROFCONFWIN_MEMCHECK 64334685
#define PROFXMLWIN_MEMCHECK 87333463
#define NO_ME 1
#define NO_DATE 2
#define NO_EOL 4
#define NO_COLOUR_FROM 8
#define NO_COLOUR_DATE 16
typedef enum {
LAYOUT_SIMPLE,
LAYOUT_SPLIT
} layout_type_t;
typedef struct prof_layout_t {
layout_type_t type;
WINDOW *win;
ProfBuff buffer;
int y_pos;
int paged;
} ProfLayout;
typedef struct prof_layout_simple_t {
ProfLayout base;
} ProfLayoutSimple;
typedef struct prof_layout_split_t {
ProfLayout base;
WINDOW *subwin;
int sub_y_pos;
unsigned long memcheck;
} ProfLayoutSplit;
typedef enum {
WIN_CONSOLE,
WIN_CHAT,
WIN_MUC,
WIN_MUC_CONFIG,
WIN_PRIVATE,
WIN_XML
} win_type_t;
typedef enum {
PROF_ENC_NONE,
PROF_ENC_OTR
} prof_enc_t;
typedef struct prof_win_t {
win_type_t type;
ProfLayout *layout;
} ProfWin;
typedef struct prof_console_win_t {
ProfWin window;
} ProfConsoleWin;
typedef struct prof_chat_win_t {
ProfWin window;
char *barejid;
int unread;
ChatState *state;
prof_enc_t enc_mode;
gboolean otr_is_trusted;
char *resource_override;
gboolean history_shown;
unsigned long memcheck;
} ProfChatWin;
typedef struct prof_muc_win_t {
ProfWin window;
char *roomjid;
int unread;
gboolean showjid;
unsigned long memcheck;
} ProfMucWin;
typedef struct prof_mucconf_win_t {
ProfWin window;
char *roomjid;
DataForm *form;
unsigned long memcheck;
} ProfMucConfWin;
typedef struct prof_private_win_t {
ProfWin window;
char *fulljid;
int unread;
unsigned long memcheck;
} ProfPrivateWin;
typedef struct prof_xml_win_t {
ProfWin window;
unsigned long memcheck;
} ProfXMLWin;
// ui startup and control
void ui_init(void);
void ui_load_colours(void);
@ -193,8 +86,6 @@ int ui_close_all_wins(void);
int ui_close_read_wins(void);
// current window actions
win_type_t ui_current_win_type(void);
void ui_current_print_line(const char * const msg, ...);
void ui_current_print_formatted_line(const char show_char, int attrs, const char * const msg, ...);
void ui_current_error_line(const char * const msg);

145
src/ui/win_types.h Normal file
View File

@ -0,0 +1,145 @@
/*
* win_types.h
*
* Copyright (C) 2012 - 2015 James Booth <boothj5@gmail.com>
*
* This file is part of Profanity.
*
* Profanity is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation, either version 3 of the License, or
* (at your option) any later version.
*
* Profanity is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
* along with Profanity. If not, see <http://www.gnu.org/licenses/>.
*
* In addition, as a special exception, the copyright holders give permission to
* link the code of portions of this program with the OpenSSL library under
* certain conditions as described in each individual source file, and
* distribute linked combinations including the two.
*
* You must obey the GNU General Public License in all respects for all of the
* code used other than OpenSSL. If you modify file(s) with this exception, you
* may extend this exception to your version of the file(s), but you are not
* obligated to do so. If you do not wish to do so, delete this exception
* statement from your version. If you delete this exception statement from all
* source files in the program, then also delete it here.
*
*/
#ifndef UI_WIN_TYPES_H
#define UI_WIN_TYPES_H
#include "config.h"
#include <wchar.h>
#include <glib.h>
#ifdef HAVE_NCURSESW_NCURSES_H
#include <ncursesw/ncurses.h>
#elif HAVE_NCURSES_H
#include <ncurses.h>
#endif
#include "xmpp/xmpp.h"
#include "ui/buffer.h"
#include "chat_state.h"
#define LAYOUT_SPLIT_MEMCHECK 12345671
#define PROFCHATWIN_MEMCHECK 22374522
#define PROFMUCWIN_MEMCHECK 52345276
#define PROFPRIVATEWIN_MEMCHECK 77437483
#define PROFCONFWIN_MEMCHECK 64334685
#define PROFXMLWIN_MEMCHECK 87333463
typedef enum {
LAYOUT_SIMPLE,
LAYOUT_SPLIT
} layout_type_t;
typedef struct prof_layout_t {
layout_type_t type;
WINDOW *win;
ProfBuff buffer;
int y_pos;
int paged;
} ProfLayout;
typedef struct prof_layout_simple_t {
ProfLayout base;
} ProfLayoutSimple;
typedef struct prof_layout_split_t {
ProfLayout base;
WINDOW *subwin;
int sub_y_pos;
unsigned long memcheck;
} ProfLayoutSplit;
typedef enum {
WIN_CONSOLE,
WIN_CHAT,
WIN_MUC,
WIN_MUC_CONFIG,
WIN_PRIVATE,
WIN_XML
} win_type_t;
typedef enum {
PROF_ENC_NONE,
PROF_ENC_OTR
} prof_enc_t;
typedef struct prof_win_t {
win_type_t type;
ProfLayout *layout;
} ProfWin;
typedef struct prof_console_win_t {
ProfWin window;
} ProfConsoleWin;
typedef struct prof_chat_win_t {
ProfWin window;
char *barejid;
int unread;
ChatState *state;
prof_enc_t enc_mode;
gboolean otr_is_trusted;
char *resource_override;
gboolean history_shown;
unsigned long memcheck;
} ProfChatWin;
typedef struct prof_muc_win_t {
ProfWin window;
char *roomjid;
int unread;
gboolean showjid;
unsigned long memcheck;
} ProfMucWin;
typedef struct prof_mucconf_win_t {
ProfWin window;
char *roomjid;
DataForm *form;
unsigned long memcheck;
} ProfMucConfWin;
typedef struct prof_private_win_t {
ProfWin window;
char *fulljid;
int unread;
unsigned long memcheck;
} ProfPrivateWin;
typedef struct prof_xml_win_t {
ProfWin window;
unsigned long memcheck;
} ProfXMLWin;
#endif

110
tests/unittests/test_cmd_account.c
View File

@ -25,7 +25,7 @@ void cmd_account_shows_usage_when_not_connected_and_no_args(void **state)
expect_cons_show("Usage: some usage");
gboolean result = cmd_account(args, *help);
gboolean result = cmd_account(NULL, args, *help);
assert_true(result);
free(help);
@ -46,7 +46,7 @@ void cmd_account_shows_account_when_connected_and_no_args(void **state)
expect_memory(cons_show_account, account, account, sizeof(ProfAccount));
gboolean result = cmd_account(args, *help);
gboolean result = cmd_account(NULL, args, *help);
assert_true(result);
free(help);
@ -67,7 +67,7 @@ void cmd_account_list_shows_accounts(void **state)
expect_memory(cons_show_account_list, accounts, accounts, sizeof(accounts));
gboolean result = cmd_account(args, *help);
gboolean result = cmd_account(NULL, args, *help);
assert_true(result);
free(help);
@ -81,7 +81,7 @@ void cmd_account_show_shows_usage_when_no_arg(void **state)
expect_cons_show("Usage: some usage");
gboolean result = cmd_account(args, *help);
gboolean result = cmd_account(NULL, args, *help);
assert_true(result);
free(help);
@ -98,7 +98,7 @@ void cmd_account_show_shows_message_when_account_does_not_exist(void **state)
expect_cons_show("No such account.");
expect_cons_show("");
gboolean result = cmd_account(args, *help);
gboolean result = cmd_account(NULL, args, *help);
assert_true(result);
free(help);
@ -116,7 +116,7 @@ void cmd_account_show_shows_account_when_exists(void **state)
expect_memory(cons_show_account, account, account, sizeof(account));
gboolean result = cmd_account(args, *help);
gboolean result = cmd_account(NULL, args, *help);
assert_true(result);
free(help);
@ -130,7 +130,7 @@ void cmd_account_add_shows_usage_when_no_arg(void **state)
expect_cons_show("Usage: some usage");
gboolean result = cmd_account(args, *help);
gboolean result = cmd_account(NULL, args, *help);
assert_true(result);
free(help);
@ -147,7 +147,7 @@ void cmd_account_add_adds_account(void **state)
expect_cons_show("Account created.");
expect_cons_show("");
gboolean result = cmd_account(args, *help);
gboolean result = cmd_account(NULL, args, *help);
assert_true(result);
free(help);
@ -161,7 +161,7 @@ void cmd_account_enable_shows_usage_when_no_arg(void **state)
expect_cons_show("Usage: some usage");
gboolean result = cmd_account(args, *help);
gboolean result = cmd_account(NULL, args, *help);
assert_true(result);
free(help);
@ -178,7 +178,7 @@ void cmd_account_enable_enables_account(void **state)
expect_cons_show("Account enabled.");
expect_cons_show("");
gboolean result = cmd_account(args, *help);
gboolean result = cmd_account(NULL, args, *help);
assert_true(result);
free(help);
@ -195,7 +195,7 @@ void cmd_account_enable_shows_message_when_account_doesnt_exist(void **state)
expect_cons_show("No such account: account_name");
expect_cons_show("");
gboolean result = cmd_account(args, *help);
gboolean result = cmd_account(NULL, args, *help);
assert_true(result);
free(help);
@ -209,7 +209,7 @@ void cmd_account_disable_shows_usage_when_no_arg(void **state)
expect_cons_show("Usage: some usage");
gboolean result = cmd_account(args, *help);
gboolean result = cmd_account(NULL, args, *help);
assert_true(result);
free(help);
@ -226,7 +226,7 @@ void cmd_account_disable_disables_account(void **state)
expect_cons_show("Account disabled.");
expect_cons_show("");
gboolean result = cmd_account(args, *help);
gboolean result = cmd_account(NULL, args, *help);
assert_true(result);
free(help);
@ -243,7 +243,7 @@ void cmd_account_disable_shows_message_when_account_doesnt_exist(void **state)
expect_cons_show("No such account: account_name");
expect_cons_show("");
gboolean result = cmd_account(args, *help);
gboolean result = cmd_account(NULL, args, *help);
assert_true(result);
free(help);
@ -257,7 +257,7 @@ void cmd_account_rename_shows_usage_when_no_args(void **state)
expect_cons_show("Usage: some usage");
gboolean result = cmd_account(args, *help);
gboolean result = cmd_account(NULL, args, *help);
assert_true(result);
free(help);
@ -271,7 +271,7 @@ void cmd_account_rename_shows_usage_when_one_arg(void **state)
expect_cons_show("Usage: some usage");
gboolean result = cmd_account(args, *help);
gboolean result = cmd_account(NULL, args, *help);
assert_true(result);
free(help);
@ -289,7 +289,7 @@ void cmd_account_rename_renames_account(void **state)
expect_cons_show("Account renamed.");
expect_cons_show("");
gboolean result = cmd_account(args, *help);
gboolean result = cmd_account(NULL, args, *help);
assert_true(result);
free(help);
@ -307,7 +307,7 @@ void cmd_account_rename_shows_message_when_not_renamed(void **state)
expect_cons_show("Either account original_name doesn't exist, or account new_name already exists.");
expect_cons_show("");
gboolean result = cmd_account(args, *help);
gboolean result = cmd_account(NULL, args, *help);
assert_true(result);
free(help);
@ -321,7 +321,7 @@ void cmd_account_set_shows_usage_when_no_args(void **state)
expect_cons_show("Usage: some usage");
gboolean result = cmd_account(args, *help);
gboolean result = cmd_account(NULL, args, *help);
assert_true(result);
free(help);
@ -335,7 +335,7 @@ void cmd_account_set_shows_usage_when_one_arg(void **state)
expect_cons_show("Usage: some usage");
gboolean result = cmd_account(args, *help);
gboolean result = cmd_account(NULL, args, *help);
assert_true(result);
free(help);
@ -349,7 +349,7 @@ void cmd_account_set_shows_usage_when_two_args(void **state)
expect_cons_show("Usage: some usage");
gboolean result = cmd_account(args, *help);
gboolean result = cmd_account(NULL, args, *help);
assert_true(result);
free(help);
@ -366,7 +366,7 @@ void cmd_account_set_shows_message_when_account_doesnt_exist(void **state)
expect_cons_show("Account a_account doesn't exist");
expect_cons_show("");
gboolean result = cmd_account(args, *help);
gboolean result = cmd_account(NULL, args, *help);
assert_true(result);
free(help);
@ -382,7 +382,7 @@ void cmd_account_set_jid_shows_message_for_malformed_jid(void **state)
expect_cons_show("Malformed jid: @malformed");
gboolean result = cmd_account(args, *help);
gboolean result = cmd_account(NULL, args, *help);
assert_true(result);
free(help);
@ -402,7 +402,7 @@ void cmd_account_set_jid_sets_barejid(void **state)
expect_cons_show("Updated jid for account a_account: a_local@a_domain");
expect_cons_show("");
gboolean result = cmd_account(args, *help);
gboolean result = cmd_account(NULL, args, *help);
assert_true(result);
free(help);
@ -427,7 +427,7 @@ void cmd_account_set_jid_sets_resource(void **state)
expect_cons_show("Updated resource for account a_account: a_resource");
expect_cons_show("");
gboolean result = cmd_account(args, *help);
gboolean result = cmd_account(NULL, args, *help);
assert_true(result);
free(help);
@ -447,7 +447,7 @@ void cmd_account_set_server_sets_server(void **state)
expect_cons_show("Updated server for account a_account: a_server");
expect_cons_show("");
gboolean result = cmd_account(args, *help);
gboolean result = cmd_account(NULL, args, *help);
assert_true(result);
free(help);
@ -467,7 +467,7 @@ void cmd_account_set_resource_sets_resource(void **state)
expect_cons_show("Updated resource for account a_account: a_resource");
expect_cons_show("");
gboolean result = cmd_account(args, *help);
gboolean result = cmd_account(NULL, args, *help);
assert_true(result);
free(help);
@ -493,7 +493,7 @@ void cmd_account_set_password_sets_password(void **state)
expect_cons_show("Updated password for account a_account");
expect_cons_show("");
gboolean result = cmd_account(args, *help);
gboolean result = cmd_account(NULL, args, *help);
assert_true(result);
free(help);
@ -519,7 +519,7 @@ void cmd_account_set_eval_password_sets_eval_password(void **state)
expect_cons_show("Updated eval_password for account a_account");
expect_cons_show("");
gboolean result = cmd_account(args, *help);
gboolean result = cmd_account(NULL, args, *help);
assert_true(result);
free(help);
@ -540,7 +540,7 @@ void cmd_account_set_password_when_eval_password_set(void **state) {
expect_cons_show("Cannot set password when eval_password is set.");
gboolean result = cmd_account(args, *help);
gboolean result = cmd_account(NULL, args, *help);
assert_true(result);
free(help);
@ -561,7 +561,7 @@ void cmd_account_set_eval_password_when_password_set(void **state) {
expect_cons_show("Cannot set eval_password when password is set.");
gboolean result = cmd_account(args, *help);
gboolean result = cmd_account(NULL, args, *help);
assert_true(result);
free(help);
@ -581,7 +581,7 @@ void cmd_account_set_muc_sets_muc(void **state)
expect_cons_show("Updated muc service for account a_account: a_muc");
expect_cons_show("");
gboolean result = cmd_account(args, *help);
gboolean result = cmd_account(NULL, args, *help);
assert_true(result);
free(help);
@ -601,7 +601,7 @@ void cmd_account_set_nick_sets_nick(void **state)
expect_cons_show("Updated muc nick for account a_account: a_nick");
expect_cons_show("");
gboolean result = cmd_account(args, *help);
gboolean result = cmd_account(NULL, args, *help);
assert_true(result);
free(help);
@ -615,7 +615,7 @@ void cmd_account_show_message_for_missing_otr_policy(void **state)
expect_cons_show("Usage: Some usage");
gboolean result = cmd_account(args, *help);
gboolean result = cmd_account(NULL, args, *help);
assert_true(result);
free(help);
@ -631,7 +631,7 @@ void cmd_account_show_message_for_invalid_otr_policy(void **state)
expect_cons_show("OTR policy must be one of: manual, opportunistic or always.");
gboolean result = cmd_account(args, *help);
gboolean result = cmd_account(NULL, args, *help);
assert_true(result);
free(help);
@ -651,7 +651,7 @@ void cmd_account_set_otr_sets_otr(void **state)
expect_cons_show("Updated OTR policy for account a_account: opportunistic");
expect_cons_show("");
gboolean result = cmd_account(args, *help);
gboolean result = cmd_account(NULL, args, *help);
assert_true(result);
free(help);
@ -668,7 +668,7 @@ void cmd_account_set_status_shows_message_when_invalid_status(void **state)
expect_cons_show("Invalid status: bad_status");
expect_cons_show("");
gboolean result = cmd_account(args, *help);
gboolean result = cmd_account(NULL, args, *help);
assert_true(result);
free(help);
@ -688,7 +688,7 @@ void cmd_account_set_status_sets_status_when_valid(void **state)
expect_cons_show("Updated login status for account a_account: away");
expect_cons_show("");
gboolean result = cmd_account(args, *help);
gboolean result = cmd_account(NULL, args, *help);
assert_true(result);
free(help);
@ -708,7 +708,7 @@ void cmd_account_set_status_sets_status_when_last(void **state)
expect_cons_show("Updated login status for account a_account: last");
expect_cons_show("");
gboolean result = cmd_account(args, *help);
gboolean result = cmd_account(NULL, args, *help);
assert_true(result);
free(help);
@ -725,7 +725,7 @@ void cmd_account_set_invalid_presence_string_priority_shows_message(void **state
expect_cons_show("Invalid property: blah");
expect_cons_show("");
gboolean result = cmd_account(args, *help);
gboolean result = cmd_account(NULL, args, *help);
assert_true(result);
free(help);
@ -742,7 +742,7 @@ void cmd_account_set_last_priority_shows_message(void **state)
expect_cons_show("Invalid property: last");
expect_cons_show("");
gboolean result = cmd_account(args, *help);
gboolean result = cmd_account(NULL, args, *help);
assert_true(result);
free(help);
@ -764,7 +764,7 @@ void cmd_account_set_online_priority_sets_preference(void **state)
expect_cons_show("Updated online priority for account a_account: 10");
expect_cons_show("");
gboolean result = cmd_account(args, *help);
gboolean result = cmd_account(NULL, args, *help);
assert_true(result);
free(help);
@ -786,7 +786,7 @@ void cmd_account_set_chat_priority_sets_preference(void **state)
expect_cons_show("Updated chat priority for account a_account: 10");
expect_cons_show("");
gboolean result = cmd_account(args, *help);
gboolean result = cmd_account(NULL, args, *help);
assert_true(result);
free(help);
@ -808,7 +808,7 @@ void cmd_account_set_away_priority_sets_preference(void **state)
expect_cons_show("Updated away priority for account a_account: 10");
expect_cons_show("");
gboolean result = cmd_account(args, *help);
gboolean result = cmd_account(NULL, args, *help);
assert_true(result);
free(help);
@ -830,7 +830,7 @@ void cmd_account_set_xa_priority_sets_preference(void **state)
expect_cons_show("Updated xa priority for account a_account: 10");
expect_cons_show("");
gboolean result = cmd_account(args, *help);
gboolean result = cmd_account(NULL, args, *help);
assert_true(result);
free(help);
@ -852,7 +852,7 @@ void cmd_account_set_dnd_priority_sets_preference(void **state)
expect_cons_show("Updated dnd priority for account a_account: 10");
expect_cons_show("");
gboolean result = cmd_account(args, *help);
gboolean result = cmd_account(NULL, args, *help);
assert_true(result);
free(help);
@ -868,7 +868,7 @@ void cmd_account_set_priority_too_low_shows_message(void **state)
expect_cons_show("Value -150 out of range. Must be in -128..127.");
gboolean result = cmd_account(args, *help);
gboolean result = cmd_account(NULL, args, *help);
assert_true(result);
free(help);
@ -884,7 +884,7 @@ void cmd_account_set_priority_too_high_shows_message(void **state)
expect_cons_show("Value 150 out of range. Must be in -128..127.");
gboolean result = cmd_account(args, *help);
gboolean result = cmd_account(NULL, args, *help);
assert_true(result);
free(help);
@ -900,7 +900,7 @@ void cmd_account_set_priority_when_not_number_shows_message(void **state)
expect_cons_show("Could not convert \"abc\" to a number.");
gboolean result = cmd_account(args, *help);
gboolean result = cmd_account(NULL, args, *help);
assert_true(result);
free(help);
@ -916,7 +916,7 @@ void cmd_account_set_priority_when_empty_shows_message(void **state)
expect_cons_show("Could not convert \"\" to a number.");
gboolean result = cmd_account(args, *help);
gboolean result = cmd_account(NULL, args, *help);
assert_true(result);
free(help);
@ -956,7 +956,7 @@ void cmd_account_set_priority_updates_presence_when_account_connected_with_prese
expect_cons_show("Updated online priority for account a_account: 10");
expect_cons_show("");
gboolean result = cmd_account(args, *help);
gboolean result = cmd_account(NULL, args, *help);
assert_true(result);
free(help);
@ -970,7 +970,7 @@ void cmd_account_clear_shows_usage_when_no_args(void **state)
expect_cons_show("Usage: some usage");
gboolean result = cmd_account(args, *help);
gboolean result = cmd_account(NULL, args, *help);
assert_true(result);
free(help);
@ -984,7 +984,7 @@ void cmd_account_clear_shows_usage_when_one_arg(void **state)
expect_cons_show("Usage: some usage");
gboolean result = cmd_account(args, *help);
gboolean result = cmd_account(NULL, args, *help);
assert_true(result);
free(help);
@ -1001,7 +1001,7 @@ void cmd_account_clear_shows_message_when_account_doesnt_exist(void **state)
expect_cons_show("Account a_account doesn't exist");
expect_cons_show("");
gboolean result = cmd_account(args, *help);
gboolean result = cmd_account(NULL, args, *help);
assert_true(result);
free(help);
@ -1018,7 +1018,7 @@ void cmd_account_clear_shows_message_when_invalid_property(void **state)
expect_cons_show("Invalid property: badproperty");
expect_cons_show("");
gboolean result = cmd_account(args, *help);
gboolean result = cmd_account(NULL, args, *help);
assert_true(result);
free(help);

18
tests/unittests/test_cmd_alias.c
View File

@ -24,7 +24,7 @@ void cmd_alias_add_shows_usage_when_no_args(void **state)
expect_cons_show("Usage: some usage");
gboolean result = cmd_alias(args, *help);
gboolean result = cmd_alias(NULL, args, *help);
assert_true(result);
free(help);
@ -38,7 +38,7 @@ void cmd_alias_add_shows_usage_when_no_value(void **state)
expect_cons_show("Usage: some usage");
gboolean result = cmd_alias(args, *help);
gboolean result = cmd_alias(NULL, args, *help);
assert_true(result);
free(help);
@ -52,7 +52,7 @@ void cmd_alias_remove_shows_usage_when_no_args(void **state)
expect_cons_show("Usage: some usage");
gboolean result = cmd_alias(args, *help);
gboolean result = cmd_alias(NULL, args, *help);
assert_true(result);
free(help);
@ -66,7 +66,7 @@ void cmd_alias_show_usage_when_invalid_subcmd(void **state)
expect_cons_show("Usage: some usage");
gboolean result = cmd_alias(args, *help);
gboolean result = cmd_alias(NULL, args, *help);
assert_true(result);
free(help);
@ -79,7 +79,7 @@ void cmd_alias_add_adds_alias(void **state)
expect_cons_show("Command alias added /hc -> /help commands");
gboolean result = cmd_alias(args, *help);
gboolean result = cmd_alias(NULL, args, *help);
char *returned_val = prefs_get_alias("hc");
@ -100,7 +100,7 @@ void cmd_alias_add_shows_message_when_exists(void **state)
expect_cons_show("Command or alias '/hc' already exists.");
gboolean result = cmd_alias(args, *help);
gboolean result = cmd_alias(NULL, args, *help);
assert_true(result);
free(help);
@ -115,7 +115,7 @@ void cmd_alias_remove_removes_alias(void **state)
expect_cons_show("Command alias removed -> /hn");
gboolean result = cmd_alias(args, *help);
gboolean result = cmd_alias(NULL, args, *help);
char *returned_val = prefs_get_alias("hn");
@ -132,7 +132,7 @@ void cmd_alias_remove_shows_message_when_no_alias(void **state)
expect_cons_show("No such command alias /hn");
gboolean result = cmd_alias(args, *help);
gboolean result = cmd_alias(NULL, args, *help);
assert_true(result);
free(help);
@ -152,7 +152,7 @@ void cmd_alias_list_shows_all_aliases(void **state)
// write a custom checker to check the correct list is passed
expect_any(cons_show_aliases, aliases);
gboolean result = cmd_alias(args, *help);
gboolean result = cmd_alias(NULL, args, *help);
assert_true(result);
free(help);

47
tests/unittests/test_cmd_bookmark.c
View File

@ -27,7 +27,7 @@ static void test_with_connection_status(jabber_conn_status_t status)
will_return(jabber_get_connection_status, status);
expect_cons_show("You are not currently connected.");
gboolean result = cmd_bookmark(NULL, *help);
gboolean result = cmd_bookmark(NULL, NULL, *help);
assert_true(result);
free(help);
@ -63,13 +63,14 @@ void cmd_bookmark_shows_usage_when_no_args(void **state)
CommandHelp *help = malloc(sizeof(CommandHelp));
help->usage = "some usage";
gchar *args[] = { NULL };
ProfWin window;
window.type = WIN_CONSOLE;
will_return(jabber_get_connection_status, JABBER_CONNECTED);
will_return(ui_current_win_type, WIN_CONSOLE);
expect_cons_show("Usage: some usage");
gboolean result = cmd_bookmark(args, *help);
gboolean result = cmd_bookmark(&window, args, *help);
assert_true(result);
free(help);
@ -103,6 +104,8 @@ void cmd_bookmark_list_shows_bookmarks(void **state)
CommandHelp *help = malloc(sizeof(CommandHelp));
gchar *args[] = { "list", NULL };
GList *bookmarks = NULL;
ProfWin window;
window.type = WIN_CONSOLE;
Bookmark *bm1 = malloc(sizeof(Bookmark));
bm1->jid = strdup("room1@conf.org");
@ -132,14 +135,13 @@ void cmd_bookmark_list_shows_bookmarks(void **state)
bookmarks = g_list_append(bookmarks, bm5);
will_return(jabber_get_connection_status, JABBER_CONNECTED);
will_return(ui_current_win_type, WIN_CONSOLE);
will_return(bookmark_get_list, bookmarks);
// TODO - Custom list compare
glist_set_cmp((GCompareFunc)_cmp_bookmark);
expect_any(cons_show_bookmarks, list);
gboolean result = cmd_bookmark(args, *help);
gboolean result = cmd_bookmark(&window, args, *help);
assert_true(result);
free(help);
@ -151,13 +153,14 @@ void cmd_bookmark_add_shows_message_when_invalid_jid(void **state)
char *jid = "room";
CommandHelp *help = malloc(sizeof(CommandHelp));
gchar *args[] = { "add", jid, NULL };
ProfWin window;
window.type = WIN_CONSOLE;
will_return(jabber_get_connection_status, JABBER_CONNECTED);
will_return(ui_current_win_type, WIN_CONSOLE);
expect_cons_show("Can't add bookmark with JID 'room'; should be 'room@domain.tld'");
gboolean result = cmd_bookmark(args, *help);
gboolean result = cmd_bookmark(&window, args, *help);
assert_true(result);
free(help);
@ -168,9 +171,10 @@ void cmd_bookmark_add_adds_bookmark_with_jid(void **state)
char *jid = "room@conf.server";
CommandHelp *help = malloc(sizeof(CommandHelp));
gchar *args[] = { "add", jid, NULL };
ProfWin window;
window.type = WIN_CONSOLE;
will_return(jabber_get_connection_status, JABBER_CONNECTED);
will_return(ui_current_win_type, WIN_CONSOLE);
expect_string(bookmark_add, jid, jid);
expect_any(bookmark_add, nick);
@ -180,7 +184,7 @@ void cmd_bookmark_add_adds_bookmark_with_jid(void **state)
expect_cons_show("Bookmark added for room@conf.server.");
gboolean result = cmd_bookmark(args, *help);
gboolean result = cmd_bookmark(&window, args, *help);
assert_true(result);
free(help);
@ -191,9 +195,10 @@ void cmd_bookmark_add_adds_bookmark_with_jid_nick(void **state)
char *nick = "bob";
CommandHelp *help = malloc(sizeof(CommandHelp));
gchar *args[] = { "add", jid, "nick", nick, NULL };
ProfWin window;
window.type = WIN_CONSOLE;
will_return(jabber_get_connection_status, JABBER_CONNECTED);
will_return(ui_current_win_type, WIN_CONSOLE);
expect_string(bookmark_add, jid, jid);
expect_string(bookmark_add, nick, nick);
@ -203,7 +208,7 @@ void cmd_bookmark_add_adds_bookmark_with_jid_nick(void **state)
expect_cons_show("Bookmark added for room@conf.server.");
gboolean result = cmd_bookmark(args, *help);
gboolean result = cmd_bookmark(&window, args, *help);
assert_true(result);
free(help);
@ -214,9 +219,10 @@ void cmd_bookmark_add_adds_bookmark_with_jid_autojoin(void **state)
char *jid = "room@conf.server";
CommandHelp *help = malloc(sizeof(CommandHelp));
gchar *args[] = { "add", jid, "autojoin", "on", NULL };
ProfWin window;
window.type = WIN_CONSOLE;
will_return(jabber_get_connection_status, JABBER_CONNECTED);
will_return(ui_current_win_type, WIN_CONSOLE);
expect_string(bookmark_add, jid, jid);
expect_any(bookmark_add, nick);
@ -226,7 +232,7 @@ void cmd_bookmark_add_adds_bookmark_with_jid_autojoin(void **state)
expect_cons_show("Bookmark added for room@conf.server.");
gboolean result = cmd_bookmark(args, *help);
gboolean result = cmd_bookmark(&window, args, *help);
assert_true(result);
free(help);
@ -238,9 +244,10 @@ void cmd_bookmark_add_adds_bookmark_with_jid_nick_autojoin(void **state)
char *nick = "bob";
CommandHelp *help = malloc(sizeof(CommandHelp));
gchar *args[] = { "add", jid, "nick", nick, "autojoin", "on", NULL };
ProfWin window;
window.type = WIN_CONSOLE;
will_return(jabber_get_connection_status, JABBER_CONNECTED);
will_return(ui_current_win_type, WIN_CONSOLE);
expect_string(bookmark_add, jid, jid);
expect_string(bookmark_add, nick, nick);
@ -250,7 +257,7 @@ void cmd_bookmark_add_adds_bookmark_with_jid_nick_autojoin(void **state)
expect_cons_show("Bookmark added for room@conf.server.");
gboolean result = cmd_bookmark(args, *help);
gboolean result = cmd_bookmark(&window, args, *help);
assert_true(result);
free(help);
@ -261,16 +268,17 @@ void cmd_bookmark_remove_removes_bookmark(void **state)
char *jid = "room@conf.server";
CommandHelp *help = malloc(sizeof(CommandHelp));
gchar *args[] = { "remove", jid, NULL };
ProfWin window;
window.type = WIN_CONSOLE;
will_return(jabber_get_connection_status, JABBER_CONNECTED);
will_return(ui_current_win_type, WIN_CONSOLE);
expect_string(bookmark_remove, jid, jid);
will_return(bookmark_remove, TRUE);
expect_cons_show("Bookmark removed for room@conf.server.");
gboolean result = cmd_bookmark(args, *help);
gboolean result = cmd_bookmark(&window, args, *help);
assert_true(result);
free(help);
@ -281,16 +289,17 @@ void cmd_bookmark_remove_shows_message_when_no_bookmark(void **state)
char *jid = "room@conf.server";
CommandHelp *help = malloc(sizeof(CommandHelp));
gchar *args[] = { "remove", jid, NULL };
ProfWin window;
window.type = WIN_CONSOLE;
will_return(jabber_get_connection_status, JABBER_CONNECTED);
will_return(ui_current_win_type, WIN_CONSOLE);
expect_any(bookmark_remove, jid);
will_return(bookmark_remove, FALSE);
expect_cons_show("No bookmark exists for room@conf.server.");
gboolean result = cmd_bookmark(args, *help);
gboolean result = cmd_bookmark(&window, args, *help);
assert_true(result);
free(help);

44
tests/unittests/test_cmd_connect.c
View File

@ -22,7 +22,7 @@ static void test_with_connection_status(jabber_conn_status_t status)
expect_cons_show("You are either connected already, or a login is in process.");
gboolean result = cmd_connect(NULL, *help);
gboolean result = cmd_connect(NULL, NULL, *help);
assert_true(result);
free(help);
@ -59,7 +59,7 @@ void cmd_connect_shows_usage_when_no_server_value(void **state)
expect_cons_show("Usage: some usage");
expect_cons_show("");
gboolean result = cmd_connect(args, *help);
gboolean result = cmd_connect(NULL, args, *help);
assert_true(result);
free(help);
@ -76,7 +76,7 @@ void cmd_connect_shows_usage_when_server_no_port_value(void **state)
expect_cons_show("Usage: some usage");
expect_cons_show("");
gboolean result = cmd_connect(args, *help);
gboolean result = cmd_connect(NULL, args, *help);
assert_true(result);
free(help);
@ -93,7 +93,7 @@ void cmd_connect_shows_usage_when_no_port_value(void **state)
expect_cons_show("Usage: some usage");
expect_cons_show("");
gboolean result = cmd_connect(args, *help);
gboolean result = cmd_connect(NULL, args, *help);
assert_true(result);
free(help);
@ -110,7 +110,7 @@ void cmd_connect_shows_usage_when_port_no_server_value(void **state)
expect_cons_show("Usage: some usage");
expect_cons_show("");
gboolean result = cmd_connect(args, *help);
gboolean result = cmd_connect(NULL, args, *help);
assert_true(result);
free(help);
@ -126,7 +126,7 @@ void cmd_connect_shows_message_when_port_0(void **state)
expect_cons_show("Value 0 out of range. Must be in 1..65535.");
expect_cons_show("");
gboolean result = cmd_connect(args, *help);
gboolean result = cmd_connect(NULL, args, *help);
assert_true(result);
free(help);
@ -142,7 +142,7 @@ void cmd_connect_shows_message_when_port_minus1(void **state)
expect_cons_show("Value -1 out of range. Must be in 1..65535.");
expect_cons_show("");
gboolean result = cmd_connect(args, *help);
gboolean result = cmd_connect(NULL, args, *help);
assert_true(result);
free(help);
@ -158,7 +158,7 @@ void cmd_connect_shows_message_when_port_65536(void **state)
expect_cons_show("Value 65536 out of range. Must be in 1..65535.");
expect_cons_show("");
gboolean result = cmd_connect(args, *help);
gboolean result = cmd_connect(NULL, args, *help);
assert_true(result);
free(help);
@ -174,7 +174,7 @@ void cmd_connect_shows_message_when_port_contains_chars(void **state)
expect_cons_show("Could not convert \"52f66\" to a number.");
expect_cons_show("");
gboolean result = cmd_connect(args, *help);
gboolean result = cmd_connect(NULL, args, *help);
assert_true(result);
free(help);
@ -191,7 +191,7 @@ void cmd_connect_shows_usage_when_server_provided_twice(void **state)
expect_cons_show("Usage: some usage");
expect_cons_show("");
gboolean result = cmd_connect(args, *help);
gboolean result = cmd_connect(NULL, args, *help);
assert_true(result);
free(help);
@ -208,7 +208,7 @@ void cmd_connect_shows_usage_when_port_provided_twice(void **state)
expect_cons_show("Usage: some usage");
expect_cons_show("");
gboolean result = cmd_connect(args, *help);
gboolean result = cmd_connect(NULL, args, *help);
assert_true(result);
free(help);
@ -225,7 +225,7 @@ void cmd_connect_shows_usage_when_invalid_first_property(void **state)
expect_cons_show("Usage: some usage");
expect_cons_show("");
gboolean result = cmd_connect(args, *help);
gboolean result = cmd_connect(NULL, args, *help);
assert_true(result);
free(help);
@ -242,7 +242,7 @@ void cmd_connect_shows_usage_when_invalid_second_property(void **state)
expect_cons_show("Usage: some usage");
expect_cons_show("");
gboolean result = cmd_connect(args, *help);
gboolean result = cmd_connect(NULL, args, *help);
assert_true(result);
free(help);
@ -268,7 +268,7 @@ void cmd_connect_when_no_account(void **state)
expect_value(jabber_connect_with_details, port, 0);
will_return(jabber_connect_with_details, JABBER_CONNECTING);
gboolean result = cmd_connect(args, *help);
gboolean result = cmd_connect(NULL, args, *help);
assert_true(result);
free(help);
@ -294,7 +294,7 @@ void cmd_connect_with_server_when_provided(void **state)
expect_value(jabber_connect_with_details, port, 0);
will_return(jabber_connect_with_details, JABBER_CONNECTING);
gboolean result = cmd_connect(args, *help);
gboolean result = cmd_connect(NULL, args, *help);
assert_true(result);
free(help);
@ -320,7 +320,7 @@ void cmd_connect_with_port_when_provided(void **state)
expect_value(jabber_connect_with_details, port, 5432);
will_return(jabber_connect_with_details, JABBER_CONNECTING);
gboolean result = cmd_connect(args, *help);
gboolean result = cmd_connect(NULL, args, *help);
assert_true(result);
free(help);
@ -346,7 +346,7 @@ void cmd_connect_with_server_and_port_when_provided(void **state)
expect_value(jabber_connect_with_details, port, 5432);
will_return(jabber_connect_with_details, JABBER_CONNECTING);
gboolean result = cmd_connect(args, *help);
gboolean result = cmd_connect(NULL, args, *help);
assert_true(result);
free(help);
@ -374,7 +374,7 @@ void cmd_connect_fail_message(void **state)
expect_cons_show_error("Connection attempt for user@server.org failed.");
gboolean result = cmd_connect(args, *help);
gboolean result = cmd_connect(NULL, args, *help);
assert_true(result);
free(help);
@ -400,7 +400,7 @@ void cmd_connect_lowercases_argument(void **state)
expect_any(jabber_connect_with_details, port);
will_return(jabber_connect_with_details, JABBER_CONNECTING);
gboolean result = cmd_connect(args, *help);
gboolean result = cmd_connect(NULL, args, *help);
assert_true(result);
free(help);
@ -425,7 +425,7 @@ void cmd_connect_asks_password_when_not_in_account(void **state)
expect_any(jabber_connect_with_account, account);
will_return(jabber_connect_with_account, JABBER_CONNECTING);
gboolean result = cmd_connect(args, *help);
gboolean result = cmd_connect(NULL, args, *help);
assert_true(result);
free(help);
@ -448,7 +448,7 @@ void cmd_connect_shows_message_when_connecting_with_account(void **state)
expect_any(jabber_connect_with_account, account);
will_return(jabber_connect_with_account, JABBER_CONNECTING);
gboolean result = cmd_connect(args, *help);
gboolean result = cmd_connect(NULL, args, *help);
assert_true(result);
free(help);
@ -471,7 +471,7 @@ void cmd_connect_connects_with_account(void **state)
expect_memory(jabber_connect_with_account, account, account, sizeof(account));
will_return(jabber_connect_with_account, JABBER_CONNECTING);
gboolean result = cmd_connect(args, *help);
gboolean result = cmd_connect(NULL, args, *help);
assert_true(result);
free(help);

4
tests/unittests/test_cmd_disconnect.c
View File

@ -25,7 +25,7 @@ void clears_chat_sessions(void **state)
will_return(jabber_get_fulljid, "myjid@myserver.com");
expect_any_cons_show();
gboolean result = cmd_disconnect(NULL, *help);
gboolean result = cmd_disconnect(NULL, NULL, *help);
assert_true(result);
@ -34,4 +34,4 @@ void clears_chat_sessions(void **state)
assert_null(session1);
assert_null(session2);
free(help);
}
}

12
tests/unittests/test_cmd_join.c
View File

@ -24,7 +24,7 @@ static void test_with_connection_status(jabber_conn_status_t status)
expect_cons_show("You are not currently connected.");
gboolean result = cmd_join(NULL, *help);
gboolean result = cmd_join(NULL, NULL, *help);
assert_true(result);
free(help);
@ -60,7 +60,7 @@ void cmd_join_shows_error_message_when_invalid_room_jid(void **state)
expect_cons_show_error("Specified room has incorrect format.");
expect_cons_show("");
gboolean result = cmd_join(args, *help);
gboolean result = cmd_join(NULL, args, *help);
assert_true(result);
free(help);
@ -90,7 +90,7 @@ void cmd_join_uses_account_mucservice_when_no_service_specified(void **state)
expect_string(presence_join_room, nick, nick);
expect_value(presence_join_room, passwd, NULL);
gboolean result = cmd_join(args, *help);
gboolean result = cmd_join(NULL, args, *help);
assert_true(result);
free(help);
@ -118,7 +118,7 @@ void cmd_join_uses_supplied_nick(void **state)
expect_string(presence_join_room, nick, nick);
expect_value(presence_join_room, passwd, NULL);
gboolean result = cmd_join(args, *help);
gboolean result = cmd_join(NULL, args, *help);
assert_true(result);
free(help);
@ -146,7 +146,7 @@ void cmd_join_uses_account_nick_when_not_supplied(void **state)
expect_string(presence_join_room, nick, account_nick);
expect_value(presence_join_room, passwd, NULL);
gboolean result = cmd_join(args, *help);
gboolean result = cmd_join(NULL, args, *help);
assert_true(result);
free(help);
@ -177,7 +177,7 @@ void cmd_join_uses_password_when_supplied(void **state)
expect_string(presence_join_room, nick, account_nick);
expect_value(presence_join_room, passwd, password);
gboolean result = cmd_join(args, *help);
gboolean result = cmd_join(NULL, args, *help);
assert_true(result);
free(help);

75
tests/unittests/test_cmd_otr.c
View File

@ -31,7 +31,7 @@ void cmd_otr_shows_usage_when_no_args(void **state)
expect_cons_show("Usage: Some usage");
gboolean result = cmd_otr(args, *help);
gboolean result = cmd_otr(NULL, args, *help);
assert_true(result);
free(help);
@ -47,7 +47,7 @@ void cmd_otr_shows_usage_when_invalid_subcommand(void **state)
expect_cons_show("Usage: Some usage");
gboolean result = cmd_otr(args, *help);
gboolean result = cmd_otr(NULL, args, *help);
assert_true(result);
free(help);
@ -61,7 +61,7 @@ void cmd_otr_log_shows_usage_when_no_args(void **state)
expect_cons_show("Usage: Some usage");
gboolean result = cmd_otr(args, *help);
gboolean result = cmd_otr(NULL, args, *help);
assert_true(result);
free(help);
@ -75,7 +75,7 @@ void cmd_otr_log_shows_usage_when_invalid_subcommand(void **state)
expect_cons_show("Usage: Some usage");
gboolean result = cmd_otr(args, *help);
gboolean result = cmd_otr(NULL, args, *help);
assert_true(result);
free(help);
@ -90,7 +90,7 @@ void cmd_otr_log_on_enables_logging(void **state)
expect_cons_show("OTR messages will be logged as plaintext.");
gboolean result = cmd_otr(args, *help);
gboolean result = cmd_otr(NULL, args, *help);
char *pref_otr_log = prefs_get_string(PREF_OTR_LOG);
assert_true(result);
@ -109,7 +109,7 @@ void cmd_otr_log_on_shows_warning_when_chlog_disabled(void **state)
expect_cons_show("OTR messages will be logged as plaintext.");
expect_cons_show("Chat logging is currently disabled, use '/chlog on' to enable.");
gboolean result = cmd_otr(args, *help);
gboolean result = cmd_otr(NULL, args, *help);
assert_true(result);
free(help);
@ -124,7 +124,7 @@ void cmd_otr_log_off_disables_logging(void **state)
expect_cons_show("OTR message logging disabled.");
gboolean result = cmd_otr(args, *help);
gboolean result = cmd_otr(NULL, args, *help);
char *pref_otr_log = prefs_get_string(PREF_OTR_LOG);
assert_true(result);
@ -142,7 +142,7 @@ void cmd_otr_redact_redacts_logging(void **state)
expect_cons_show("OTR messages will be logged as '[redacted]'.");
gboolean result = cmd_otr(args, *help);
gboolean result = cmd_otr(NULL, args, *help);
char *pref_otr_log = prefs_get_string(PREF_OTR_LOG);
assert_true(result);
@ -161,7 +161,7 @@ void cmd_otr_log_redact_shows_warning_when_chlog_disabled(void **state)
expect_cons_show("OTR messages will be logged as '[redacted]'.");
expect_cons_show("Chat logging is currently disabled, use '/chlog on' to enable.");
gboolean result = cmd_otr(args, *help);
gboolean result = cmd_otr(NULL, args, *help);
assert_true(result);
free(help);
@ -175,7 +175,7 @@ void cmd_otr_warn_shows_usage_when_no_args(void **state)
expect_cons_show("Usage: Some usage");
gboolean result = cmd_otr(args, *help);
gboolean result = cmd_otr(NULL, args, *help);
assert_true(result);
free(help);
@ -189,7 +189,7 @@ void cmd_otr_warn_shows_usage_when_invalid_arg(void **state)
expect_cons_show("Usage: Some usage");
gboolean result = cmd_otr(args, *help);
gboolean result = cmd_otr(NULL, args, *help);
assert_true(result);
free(help);
@ -203,7 +203,7 @@ void cmd_otr_warn_on_enables_unencrypted_warning(void **state)
expect_cons_show("OTR warning message enabled.");
gboolean result = cmd_otr(args, *help);
gboolean result = cmd_otr(NULL, args, *help);
gboolean otr_warn_enabled = prefs_get_boolean(PREF_OTR_WARN);
assert_true(result);
@ -220,7 +220,7 @@ void cmd_otr_warn_off_disables_unencrypted_warning(void **state)
expect_cons_show("OTR warning message disabled.");
gboolean result = cmd_otr(args, *help);
gboolean result = cmd_otr(NULL, args, *help);
gboolean otr_warn_enabled = prefs_get_boolean(PREF_OTR_WARN);
assert_true(result);
@ -241,7 +241,7 @@ void cmd_otr_libver_shows_libotr_version(void **state)
expect_cons_show(message->str);
gboolean result = cmd_otr(args, *help);
gboolean result = cmd_otr(NULL, args, *help);
assert_true(result);
g_string_free(message, TRUE);
@ -257,7 +257,7 @@ void cmd_otr_gen_shows_message_when_not_connected(void **state)
expect_cons_show("You must be connected with an account to load OTR information.");
gboolean result = cmd_otr(args, *help);
gboolean result = cmd_otr(NULL, args, *help);
assert_true(result);
free(help);
@ -272,7 +272,7 @@ static void test_with_command_and_connection_status(char *command, jabber_conn_s
expect_cons_show("You must be connected with an account to load OTR information.");
gboolean result = cmd_otr(args, *help);
gboolean result = cmd_otr(NULL, args, *help);
assert_true(result);
free(help);
@ -320,7 +320,7 @@ void cmd_otr_gen_generates_key_for_connected_account(void **state)
expect_memory(otr_keygen, account, account, sizeof(ProfAccount));
gboolean result = cmd_otr(args, *help);
gboolean result = cmd_otr(NULL, args, *help);
assert_true(result);
free(help);
@ -361,7 +361,7 @@ void cmd_otr_myfp_shows_message_when_no_key(void **state)
expect_ui_current_print_formatted_line('!', 0, "You have not generated or loaded a private key, use '/otr gen'");
gboolean result = cmd_otr(args, *help);
gboolean result = cmd_otr(NULL, args, *help);
assert_true(result);
free(help);
@ -381,7 +381,7 @@ void cmd_otr_myfp_shows_my_fingerprint(void **state)
expect_ui_current_print_formatted_line('!', 0, message->str);
gboolean result = cmd_otr(args, *help);
gboolean result = cmd_otr(NULL, args, *help);
assert_true(result);
g_string_free(message, TRUE);
@ -393,13 +393,14 @@ test_cmd_otr_theirfp_from_wintype(win_type_t wintype)
{
CommandHelp *help = malloc(sizeof(CommandHelp));
gchar *args[] = { "theirfp", NULL };
ProfWin window;
window.type = wintype;
will_return(jabber_get_connection_status, JABBER_CONNECTED);
will_return(ui_current_win_type, wintype);
expect_ui_current_print_line("You must be in a regular chat window to view a recipient's fingerprint.");
gboolean result = cmd_otr(args, *help);
gboolean result = cmd_otr(&window, args, *help);
assert_true(result);
free(help);
@ -425,9 +426,10 @@ void cmd_otr_theirfp_shows_message_when_non_otr_chat_window(void **state)
char *recipient = "someuser@someserver.com";
CommandHelp *help = malloc(sizeof(CommandHelp));
gchar *args[] = { "theirfp", NULL };
ProfWin window;
window.type = WIN_CHAT;
will_return(jabber_get_connection_status, JABBER_CONNECTED);
will_return(ui_current_win_type, WIN_CHAT);
ProfChatWin *chatwin = malloc(sizeof(ProfChatWin));
chatwin->barejid = strdup(recipient);
@ -440,7 +442,7 @@ void cmd_otr_theirfp_shows_message_when_non_otr_chat_window(void **state)
expect_ui_current_print_formatted_line('!', 0, "You are not currently in an OTR session.");
gboolean result = cmd_otr(args, *help);
gboolean result = cmd_otr(&window, args, *help);
assert_true(result);
free(help);
@ -456,6 +458,8 @@ void cmd_otr_theirfp_shows_fingerprint(void **state)
GString *message = g_string_new(recipient);
g_string_append(message, "'s OTR fingerprint: ");
g_string_append(message, fingerprint);
ProfWin window;
window.type = WIN_CHAT;
ProfChatWin *chatwin = malloc(sizeof(ProfChatWin));
chatwin->barejid = strdup(recipient);
@ -468,14 +472,13 @@ void cmd_otr_theirfp_shows_fingerprint(void **state)
wins_set_current_by_num(2);
will_return(jabber_get_connection_status, JABBER_CONNECTED);
will_return(ui_current_win_type, WIN_CHAT);
expect_string(otr_get_their_fingerprint, recipient, chatwin->barejid);
will_return(otr_get_their_fingerprint, strdup(fingerprint));
expect_ui_current_print_formatted_line('!', 0, message->str);
gboolean result = cmd_otr(args, *help);
gboolean result = cmd_otr(&window, args, *help);
assert_true(result);
g_string_free(message, TRUE);
@ -488,13 +491,14 @@ test_cmd_otr_start_from_wintype(win_type_t wintype)
{
CommandHelp *help = malloc(sizeof(CommandHelp));
gchar *args[] = { "start", NULL };
ProfWin window;
window.type = wintype;
will_return(jabber_get_connection_status, JABBER_CONNECTED);
will_return(ui_current_win_type, wintype);
expect_ui_current_print_line("You must be in a regular chat window to start an OTR session.");
gboolean result = cmd_otr(args, *help);
gboolean result = cmd_otr(&window, args, *help);
assert_true(result);
free(help);
@ -520,9 +524,10 @@ void cmd_otr_start_shows_message_when_already_started(void **state)
char *recipient = "someone@server.org";
CommandHelp *help = malloc(sizeof(CommandHelp));
gchar *args[] = { "start", NULL };
ProfWin window;
window.type = WIN_CHAT;
will_return(jabber_get_connection_status, JABBER_CONNECTED);
will_return(ui_current_win_type, WIN_CHAT);
ProfChatWin *chatwin = malloc(sizeof(ProfChatWin));
chatwin->barejid = strdup(recipient);
@ -536,7 +541,7 @@ void cmd_otr_start_shows_message_when_already_started(void **state)
expect_ui_current_print_formatted_line('!', 0, "You are already in an OTR session.");
gboolean result = cmd_otr(args, *help);
gboolean result = cmd_otr(&window, args, *help);
assert_true(result);
free(help);
@ -548,9 +553,10 @@ void cmd_otr_start_shows_message_when_no_key(void **state)
char *recipient = "someone@server.org";
CommandHelp *help = malloc(sizeof(CommandHelp));
gchar *args[] = { "start", NULL };
ProfWin window;
window.type = WIN_CHAT;
will_return(jabber_get_connection_status, JABBER_CONNECTED);
will_return(ui_current_win_type, WIN_CHAT);
will_return(otr_key_loaded, FALSE);
ProfChatWin *chatwin = malloc(sizeof(ProfChatWin));
@ -565,7 +571,7 @@ void cmd_otr_start_shows_message_when_no_key(void **state)
expect_ui_current_print_formatted_line('!', 0, "You have not generated or loaded a private key, use '/otr gen'");
gboolean result = cmd_otr(args, *help);
gboolean result = cmd_otr(&window, args, *help);
assert_true(result);
free(help);
@ -579,6 +585,8 @@ cmd_otr_start_sends_otr_query_message_to_current_recipeint(void **state)
char *query_message = "?OTR?";
CommandHelp *help = malloc(sizeof(CommandHelp));
gchar *args[] = { "start", NULL };
ProfWin window;
window.type = WIN_CHAT;
ProfChatWin *chatwin = malloc(sizeof(ProfChatWin));
chatwin->barejid = strdup(recipient);
@ -590,14 +598,13 @@ cmd_otr_start_sends_otr_query_message_to_current_recipeint(void **state)
wins_set_current_by_num(2);
will_return(jabber_get_connection_status, JABBER_CONNECTED);
will_return(ui_current_win_type, WIN_CHAT);
will_return(otr_key_loaded, TRUE);
will_return(otr_start_query, query_message);
expect_string(message_send_chat_encrypted, barejid, chatwin->barejid);
expect_string(message_send_chat_encrypted, msg, query_message);
gboolean result = cmd_otr(args, *help);
gboolean result = cmd_otr(&window, args, *help);
assert_true(result);
free(help);
@ -612,7 +619,7 @@ void cmd_otr_shows_message_when_otr_unsupported(void **state)
expect_cons_show("This version of Profanity has not been built with OTR support enabled");
gboolean result = cmd_otr(args, *help);
gboolean result = cmd_otr(NULL, args, *help);
assert_true(result);
free(help);

6
tests/unittests/test_cmd_rooms.c
View File

@ -22,7 +22,7 @@ static void test_with_connection_status(jabber_conn_status_t status)
expect_cons_show("You are not currently connected.");
gboolean result = cmd_rooms(NULL, *help);
gboolean result = cmd_rooms(NULL, NULL, *help);
assert_true(result);
free(help);
@ -80,7 +80,7 @@ void cmd_rooms_uses_account_default_when_no_arg(void **state)
expect_string(iq_room_list_request, conferencejid, "default_conf_server");
gboolean result = cmd_rooms(args, *help);
gboolean result = cmd_rooms(NULL, args, *help);
assert_true(result);
@ -96,7 +96,7 @@ void cmd_rooms_arg_used_when_passed(void **state)
expect_string(iq_room_list_request, conferencejid, "conf_server_arg");
gboolean result = cmd_rooms(args, *help);
gboolean result = cmd_rooms(NULL, args, *help);
assert_true(result);

26
tests/unittests/test_cmd_roster.c
View File

@ -22,7 +22,7 @@ static void test_with_connection_status(jabber_conn_status_t status)
expect_cons_show("You are not currently connected.");
gboolean result = cmd_roster(args, *help);
gboolean result = cmd_roster(NULL, args, *help);
assert_true(result);
free(help);
@ -61,7 +61,7 @@ void cmd_roster_shows_roster_when_no_args(void **state)
expect_memory(cons_show_roster, list, roster, sizeof(roster));
gboolean result = cmd_roster(args, *help);
gboolean result = cmd_roster(NULL, args, *help);
assert_true(result);
free(help);
@ -78,7 +78,7 @@ void cmd_roster_add_shows_message_when_no_jid(void **state)
expect_cons_show("Usage: some usage");
gboolean result = cmd_roster(args, *help);
gboolean result = cmd_roster(NULL, args, *help);
assert_true(result);
free(help);
@ -96,7 +96,7 @@ void cmd_roster_add_sends_roster_add_request(void **state)
expect_string(roster_send_add_new, barejid, jid);
expect_string(roster_send_add_new, name, nick);
gboolean result = cmd_roster(args, *help);
gboolean result = cmd_roster(NULL, args, *help);
assert_true(result);
free(help);
@ -112,7 +112,7 @@ void cmd_roster_remove_shows_message_when_no_jid(void **state)
expect_cons_show("Usage: some usage");
gboolean result = cmd_roster(args, *help);
gboolean result = cmd_roster(NULL, args, *help);
assert_true(result);
free(help);
@ -128,7 +128,7 @@ void cmd_roster_remove_sends_roster_remove_request(void **state)
expect_string(roster_send_remove, barejid, jid);
gboolean result = cmd_roster(args, *help);
gboolean result = cmd_roster(NULL, args, *help);
assert_true(result);
free(help);
@ -144,7 +144,7 @@ void cmd_roster_nick_shows_message_when_no_jid(void **state)
expect_cons_show("Usage: some usage");
gboolean result = cmd_roster(args, *help);
gboolean result = cmd_roster(NULL, args, *help);
assert_true(result);
free(help);
@ -160,7 +160,7 @@ void cmd_roster_nick_shows_message_when_no_nick(void **state)
expect_cons_show("Usage: some usage");
gboolean result = cmd_roster(args, *help);
gboolean result = cmd_roster(NULL, args, *help);
assert_true(result);
free(help);
@ -178,7 +178,7 @@ void cmd_roster_nick_shows_message_when_no_contact_exists(void **state)
expect_cons_show("Contact not found in roster: bob@server.org");
gboolean result = cmd_roster(args, *help);
gboolean result = cmd_roster(NULL, args, *help);
assert_true(result);
free(help);
@ -205,7 +205,7 @@ void cmd_roster_nick_sends_name_change_request(void **state)
expect_cons_show("Nickname for bob@server.org set to: bobster.");
gboolean result = cmd_roster(args, *help);
gboolean result = cmd_roster(NULL, args, *help);
assert_true(result);
PContact contact = roster_get_contact(jid);
@ -225,7 +225,7 @@ void cmd_roster_clearnick_shows_message_when_no_jid(void **state)
expect_cons_show("Usage: some usage");
gboolean result = cmd_roster(args, *help);
gboolean result = cmd_roster(NULL, args, *help);
assert_true(result);
free(help);
@ -243,7 +243,7 @@ void cmd_roster_clearnick_shows_message_when_no_contact_exists(void **state)
expect_cons_show("Contact not found in roster: bob@server.org");
gboolean result = cmd_roster(args, *help);
gboolean result = cmd_roster(NULL, args, *help);
assert_true(result);
free(help);
@ -269,7 +269,7 @@ void cmd_roster_clearnick_sends_name_change_request_with_empty_nick(void **state
expect_cons_show("Nickname for bob@server.org removed.");
gboolean result = cmd_roster(args, *help);
gboolean result = cmd_roster(NULL, args, *help);
assert_true(result);
PContact contact = roster_get_contact(jid);

26
tests/unittests/test_cmd_statuses.c
View File

@ -21,7 +21,7 @@ void cmd_statuses_shows_usage_when_bad_subcmd(void **state)
expect_cons_show("Usage: some usage");
gboolean result = cmd_statuses(args, *help);
gboolean result = cmd_statuses(NULL, args, *help);
assert_true(result);
free(help);
@ -35,7 +35,7 @@ void cmd_statuses_shows_usage_when_bad_console_setting(void **state)
expect_cons_show("Usage: some usage");
gboolean result = cmd_statuses(args, *help);
gboolean result = cmd_statuses(NULL, args, *help);
assert_true(result);
free(help);
@ -49,7 +49,7 @@ void cmd_statuses_shows_usage_when_bad_chat_setting(void **state)
expect_cons_show("Usage: some usage");
gboolean result = cmd_statuses(args, *help);
gboolean result = cmd_statuses(NULL, args, *help);
assert_true(result);
free(help);
@ -63,7 +63,7 @@ void cmd_statuses_shows_usage_when_bad_muc_setting(void **state)
expect_cons_show("Usage: some usage");
gboolean result = cmd_statuses(args, *help);
gboolean result = cmd_statuses(NULL, args, *help);
assert_true(result);
free(help);
@ -76,7 +76,7 @@ void cmd_statuses_console_sets_all(void **state)
expect_cons_show("All presence updates will appear in the console.");
gboolean result = cmd_statuses(args, *help);
gboolean result = cmd_statuses(NULL, args, *help);
char *setting = prefs_get_string(PREF_STATUSES_CONSOLE);
assert_non_null(setting);
@ -93,7 +93,7 @@ void cmd_statuses_console_sets_online(void **state)
expect_cons_show("Only online/offline presence updates will appear in the console.");
gboolean result = cmd_statuses(args, *help);
gboolean result = cmd_statuses(NULL, args, *help);
char *setting = prefs_get_string(PREF_STATUSES_CONSOLE);
assert_non_null(setting);
@ -110,7 +110,7 @@ void cmd_statuses_console_sets_none(void **state)
expect_cons_show("Presence updates will not appear in the console.");
gboolean result = cmd_statuses(args, *help);
gboolean result = cmd_statuses(NULL, args, *help);
char *setting = prefs_get_string(PREF_STATUSES_CONSOLE);
assert_non_null(setting);
@ -127,7 +127,7 @@ void cmd_statuses_chat_sets_all(void **state)
expect_cons_show("All presence updates will appear in chat windows.");
gboolean result = cmd_statuses(args, *help);
gboolean result = cmd_statuses(NULL, args, *help);
char *setting = prefs_get_string(PREF_STATUSES_CHAT);
assert_non_null(setting);
@ -144,7 +144,7 @@ void cmd_statuses_chat_sets_online(void **state)
expect_cons_show("Only online/offline presence updates will appear in chat windows.");
gboolean result = cmd_statuses(args, *help);
gboolean result = cmd_statuses(NULL, args, *help);
char *setting = prefs_get_string(PREF_STATUSES_CHAT);
assert_non_null(setting);
@ -161,7 +161,7 @@ void cmd_statuses_chat_sets_none(void **state)
expect_cons_show("Presence updates will not appear in chat windows.");
gboolean result = cmd_statuses(args, *help);
gboolean result = cmd_statuses(NULL, args, *help);
char *setting = prefs_get_string(PREF_STATUSES_CHAT);
assert_non_null(setting);
@ -178,7 +178,7 @@ void cmd_statuses_muc_sets_all(void **state)
expect_cons_show("All presence updates will appear in chat room windows.");
gboolean result = cmd_statuses(args, *help);
gboolean result = cmd_statuses(NULL, args, *help);
char *setting = prefs_get_string(PREF_STATUSES_MUC);
assert_non_null(setting);
@ -195,7 +195,7 @@ void cmd_statuses_muc_sets_online(void **state)
expect_cons_show("Only join/leave presence updates will appear in chat room windows.");
gboolean result = cmd_statuses(args, *help);
gboolean result = cmd_statuses(NULL, args, *help);
char *setting = prefs_get_string(PREF_STATUSES_MUC);
assert_non_null(setting);
@ -212,7 +212,7 @@ void cmd_statuses_muc_sets_none(void **state)
expect_cons_show("Presence updates will not appear in chat room windows.");
gboolean result = cmd_statuses(args, *help);
gboolean result = cmd_statuses(NULL, args, *help);
char *setting = prefs_get_string(PREF_STATUSES_MUC);
assert_non_null(setting);

4
tests/unittests/test_cmd_sub.c
View File

@ -22,7 +22,7 @@ void cmd_sub_shows_message_when_not_connected(void **state)
expect_cons_show("You are currently not connected.");
gboolean result = cmd_sub(args, *help);
gboolean result = cmd_sub(NULL, args, *help);
assert_true(result);
free(help);
@ -38,7 +38,7 @@ void cmd_sub_shows_usage_when_no_arg(void **state)
expect_cons_show("Usage: Some usage");
gboolean result = cmd_sub(args, *help);
gboolean result = cmd_sub(NULL, args, *help);
assert_true(result);
free(help);

5
tests/unittests/ui/stub_ui.c
View File

@ -121,11 +121,6 @@ int ui_close_read_wins(void)
// current window actions
void ui_clear_current(void) {}
win_type_t ui_current_win_type(void)
{
return (win_type_t)mock();
}
void ui_current_print_line(const char * const msg, ...)
{
va_list args;