Merge branch 'master' into pgp

This commit is contained in:
James Booth
2015-04-21 23:35:37 +01:00
9 changed files with 105 additions and 70 deletions

View File

@@ -15,8 +15,8 @@ void cmd_win_shows_message_when_win_doesnt_exist(void **state)
CommandHelp *help = malloc(sizeof(CommandHelp));
gchar *args[] = { "3", NULL };
expect_value(ui_switch_win, i, 3);
will_return(ui_switch_win, FALSE);
expect_value(ui_switch_win_num, i, 3);
will_return(ui_switch_win_num, FALSE);
expect_cons_show("Window 3 does not exist.");
@@ -31,8 +31,8 @@ void cmd_win_switches_to_given_win_when_exists(void **state)
CommandHelp *help = malloc(sizeof(CommandHelp));
gchar *args[] = { "12", NULL };
expect_value(ui_switch_win, i, 12);
will_return(ui_switch_win, TRUE);
expect_value(ui_switch_win_num, i, 12);
will_return(ui_switch_win_num, TRUE);
gboolean result = cmd_win(args, *help);
assert_true(result);

View File

@@ -64,7 +64,12 @@ GSList* ui_get_chat_recipients(void)
return NULL;
}
gboolean ui_switch_win(const int i)
gboolean ui_switch_win(ProfWin *win)
{
return FALSE;
}
gboolean ui_switch_win_num(const int i)
{
check_expected(i);
return (gboolean)mock();
@@ -99,8 +104,12 @@ unsigned long ui_get_idle_time(void)
}
void ui_reset_idle_time(void) {}
void ui_new_chat_win(const char * const barejid) {}
void ui_new_private_win(const char * const fulljid) {}
ProfWin* ui_new_chat_win(const char * const barejid)
{
return NULL;
}
void ui_print_system_msg_from_recipient(const char * const barejid, const char *message) {}
gint ui_unread(void)
{