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

Rename mucconf wins into conf wins

Browse Source 
Configuration windows are now being used by both muc and cmd.
This commit is contained in:
Paul Fariello
2018-04-11 22:17:50 +05:20
parent 7123e94e82
commit a952776b89
29 changed files with 150 additions and 150 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
tests/functionaltests/proftest.c
View File

@@ -183,8 +183,8 @@ init_prof_test(void **state)
assert_true(prof_output_exact("Chat time display disabled."));
prof_input("/time muc off");
assert_true(prof_output_exact("MUC time display disabled."));
prof_input("/time mucconfig off");
assert_true(prof_output_exact("MUC config time display disabled."));
prof_input("/time config off");
assert_true(prof_output_exact("config time display disabled."));
prof_input("/time private off");
assert_true(prof_output_exact("Private chat time display disabled."));
prof_input("/time xml off");

4
tests/unittests/test_cmd_pgp.c
View File

@@ -79,9 +79,9 @@ void cmd_pgp_start_shows_message_when_no_arg_in_muc(void **state)
cmd_pgp_start_shows_message_when_no_arg_in_wintype(WIN_MUC);
}
void cmd_pgp_start_shows_message_when_no_arg_in_mucconf(void **state)
void cmd_pgp_start_shows_message_when_no_arg_in_conf(void **state)
{
cmd_pgp_start_shows_message_when_no_arg_in_wintype(WIN_MUC_CONFIG);
cmd_pgp_start_shows_message_when_no_arg_in_wintype(WIN_CONFIG);
}
void cmd_pgp_start_shows_message_when_no_arg_in_private(void **state)

2
tests/unittests/test_cmd_pgp.h
View File

@@ -8,7 +8,7 @@ void cmd_pgp_start_shows_message_when_connecting(void **state);
void cmd_pgp_start_shows_message_when_undefined(void **state);
void cmd_pgp_start_shows_message_when_no_arg_in_console(void **state);
void cmd_pgp_start_shows_message_when_no_arg_in_muc(void **state);
void cmd_pgp_start_shows_message_when_no_arg_in_mucconf(void **state);
void cmd_pgp_start_shows_message_when_no_arg_in_conf(void **state);
void cmd_pgp_start_shows_message_when_no_arg_in_private(void **state);
void cmd_pgp_start_shows_message_when_no_arg_in_xmlconsole(void **state);
#else

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

@@ -250,7 +250,7 @@ void ui_handle_error(const char * const err_msg)
void ui_clear_win_title(void) {}
void ui_goodbye_title(void) {}
void mucconfwin_handle_configuration(ProfMucConfWin *confwin, DataForm *form) {}
void confwin_handle_configuration(ProfConfWin *confwin, DataForm *form) {}
void ui_handle_room_configuration_form_error(const char * const roomjid, const char * const message) {}
void ui_handle_room_config_submit_result(const char * const roomjid) {}
void ui_handle_room_config_submit_result_error(const char * const roomjid, const char * const message) {}
@@ -263,10 +263,10 @@ void mucwin_role_set_error(ProfMucWin *mucwin, const char * const nick, const ch
void mucwin_role_list_error(ProfMucWin *mucwin, const char * const role, const char * const error) {}
void mucwin_handle_role_list(ProfMucWin *mucwin, const char * const role, GSList *nicks) {}
void mucwin_kick_error(ProfMucWin *mucwin, const char * const nick, const char * const error) {}
void mucconfwin_show_form(ProfMucConfWin *confwin) {}
void mucconfwin_show_form_field(ProfMucConfWin *confwin, DataForm *form, char *tag) {}
void mucconfwin_form_help(ProfMucConfWin *confwin) {}
void mucconfwin_field_help(ProfMucConfWin *confwin, char *tag) {}
void confwin_show_form(ProfConfWin *confwin) {}
void confwin_show_form_field(ProfConfWin *confwin, DataForm *form, char *tag) {}
void confwin_form_help(ProfConfWin *confwin) {}
void confwin_field_help(ProfConfWin *confwin, char *tag) {}
void ui_show_lines(ProfWin *window, gchar** lines) {}
void ui_redraw_all_room_rosters(void) {}
void ui_show_all_room_rosters(void) {}
@@ -494,7 +494,7 @@ ProfWin* win_create_muc(const char * const roomjid)
{
return NULL;
}
ProfWin* win_create_muc_config(const char * const title, DataForm *form)
ProfWin* win_create_config(const char * const title, DataForm *form)
{
return NULL;
}

2
tests/unittests/unittests.c
View File

@@ -557,7 +557,7 @@ int main(int argc, char* argv[]) {
unit_test(cmd_pgp_start_shows_message_when_connecting),
unit_test(cmd_pgp_start_shows_message_when_no_arg_in_console),
unit_test(cmd_pgp_start_shows_message_when_no_arg_in_muc),
unit_test(cmd_pgp_start_shows_message_when_no_arg_in_mucconf),
unit_test(cmd_pgp_start_shows_message_when_no_arg_in_conf),
unit_test(cmd_pgp_start_shows_message_when_no_arg_in_private),
unit_test(cmd_pgp_start_shows_message_when_no_arg_in_xmlconsole),
#else