aniani/profanity
1
1
Fork 0
mirror of https://github.com/profanity-im/profanity.git synced 2025-02-02 15:08:15 -05:00
Code

Revert "Added ui_already_connected"

Browse Source 
This reverts commit e97ec56fce641554ff7aa2ff9f0583e1fb9fc364.
This commit is contained in:
James Booth 2014-04-12 15:20:19 +01:00
parent 6dabbbd541
commit 2fafcf0013
6 changed files with 5 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/command/commands.c
View File

@ -65,7 +65,7 @@ cmd_connect(gchar **args, struct cmd_help_t help)
jabber_conn_status_t conn_status = jabber_get_connection_status();
if ((conn_status != JABBER_DISCONNECTED) && (conn_status != JABBER_STARTED)) {
ui_already_connected();
cons_show("You are either connected already, or a login is in process.");
result = TRUE;
} else {
char *user = args[0];

7
src/ui/core.c
View File

@ -544,12 +544,6 @@ _ui_unknown_command(const char * const input)
cons_show("Unknown command: %s", input);
}
static void
_ui_already_connected(void)
{
cons_show("You are either connected already, or a login is in process.");
}
static void
_ui_disconnected(void)
{
@ -1928,5 +1922,4 @@ ui_init_module(void)
ui_replace_input = _ui_replace_input;
ui_invalid_command_usage = _ui_invalid_command_usage;
ui_unknown_command = _ui_unknown_command;
ui_already_connected = _ui_already_connected;
}

1
src/ui/ui.h
View File

@ -161,7 +161,6 @@ void (*ui_replace_input)(char *input, const char * const new_input, int *size);
void (*ui_invalid_command_usage)(const char * const usage, void (**setting_func)(void));
void (*ui_unknown_command)(const char * const input);
void (*ui_already_connected)(void);
// console window actions
void (*cons_show)(const char * const msg, ...);

4
tests/test_cmd_connect.c
View File

@ -19,11 +19,13 @@
static void test_with_connection_status(jabber_conn_status_t status)
{
stub_ui_already_connected();
mock_cons_show();
CommandHelp *help = malloc(sizeof(CommandHelp));
mock_connection_status(status);
expect_cons_show("You are either connected already, or a login is in process.");
gboolean result = cmd_connect(NULL, *help);
assert_true(result);

11
tests/ui/mock_ui.c
View File

@ -82,11 +82,6 @@ char * _stub_ui_ask_password(void)
return NULL;
}
static
void _stub_ui_already_connected(void)
{
}
static
win_type_t _mock_ui_current_win_type(void)
{
@ -263,12 +258,6 @@ stub_cons_show(void)
cons_show = _stub_cons_show;
}
void
stub_ui_already_connected(void)
{
ui_already_connected = _stub_ui_already_connected;
}
void
stub_ui_handle_recipient_not_found(void)
{

4
tests/ui/mock_ui.h
View File

@ -66,6 +66,4 @@ void cons_show_roster_expect(GSList *list);
void ui_switch_win_expect_and_return(int given_i, gboolean result);
void stub_ui_already_connected(void);
#endif
#endif