aniani/profanity
1
0
Fork 0
mirror of https://github.com/profanity-im/profanity.git synced 2024-12-04 14:46:46 -05:00
Code

Remove redundant window->type checks

Browse Source
This commit is contained in:
James Booth 2018-03-04 21:15:24 +00:00
parent 7c5ece24c5
commit ecd0736a09
1 changed files with 12 additions and 36 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
src/command/cmd_funcs.c
View File

@ -4500,9 +4500,7 @@ cmd_bookmark(ProfWin *window, const char *const command, gchar **args)
if (conn_status != JABBER_CONNECTED) { if (conn_status != JABBER_CONNECTED) {
cons_show("You are not currently connected."); cons_show("You are not currently connected.");
if (window->type != WIN_CONSOLE) {
cons_alert(); cons_alert();
}
return TRUE; return TRUE;
} }
@ -4541,9 +4539,7 @@ cmd_bookmark(ProfWin *window, const char *const command, gchar **args)
if (cmd == NULL) { if (cmd == NULL) {
cons_bad_cmd_usage(command); cons_bad_cmd_usage(command);
if (window->type != WIN_CONSOLE) {
cons_alert(); cons_alert();
}
return TRUE; return TRUE;
} }
@ -4558,9 +4554,7 @@ cmd_bookmark(ProfWin *window, const char *const command, gchar **args)
cons_bad_cmd_usage(command); cons_bad_cmd_usage(command);
cons_show(""); cons_show("");
} }
if (window->type != WIN_CONSOLE) {
cons_alert(); cons_alert();
}
return TRUE; return TRUE;
} }
@ -4575,17 +4569,13 @@ cmd_bookmark(ProfWin *window, const char *const command, gchar **args)
if (jid == NULL) { if (jid == NULL) {
cons_bad_cmd_usage(command); cons_bad_cmd_usage(command);
cons_show(""); cons_show("");
if (window->type != WIN_CONSOLE) {
cons_alert(); cons_alert();
}
return TRUE; return TRUE;
} }
if (strchr(jid, '@') == NULL) { if (strchr(jid, '@') == NULL) {
cons_show("Invalid room, must be of the form room@domain.tld"); cons_show("Invalid room, must be of the form room@domain.tld");
cons_show(""); cons_show("");
if (window->type != WIN_CONSOLE) {
cons_alert(); cons_alert();
}
return TRUE; return TRUE;
} }
@ -4596,9 +4586,7 @@ cmd_bookmark(ProfWin *window, const char *const command, gchar **args)
} else { } else {
cons_show("No bookmark exists for %s.", jid); cons_show("No bookmark exists for %s.", jid);
} }
if (window->type != WIN_CONSOLE) {
cons_alert(); cons_alert();
}
return TRUE; return TRUE;
} }
@ -4607,9 +4595,7 @@ cmd_bookmark(ProfWin *window, const char *const command, gchar **args)
if (!joined) { if (!joined) {
cons_show("No bookmark exists for %s.", jid); cons_show("No bookmark exists for %s.", jid);
} }
if (window->type != WIN_CONSOLE) {
cons_alert(); cons_alert();
}
return TRUE; return TRUE;
} }
@ -4620,9 +4606,7 @@ cmd_bookmark(ProfWin *window, const char *const command, gchar **args)
if (!parsed) { if (!parsed) {
cons_bad_cmd_usage(command); cons_bad_cmd_usage(command);
cons_show(""); cons_show("");
if (window->type != WIN_CONSOLE) {
cons_alert(); cons_alert();
}
return TRUE; return TRUE;
} }
@ -4632,9 +4616,7 @@ cmd_bookmark(ProfWin *window, const char *const command, gchar **args)
cons_bad_cmd_usage(command); cons_bad_cmd_usage(command);
cons_show(""); cons_show("");
options_destroy(options); options_destroy(options);
if (window->type != WIN_CONSOLE) {
cons_alert(); cons_alert();
}
return TRUE; return TRUE;
} }
@ -4649,9 +4631,7 @@ cmd_bookmark(ProfWin *window, const char *const command, gchar **args)
cons_show("Bookmark already exists, use /bookmark update to edit."); cons_show("Bookmark already exists, use /bookmark update to edit.");
} }
options_destroy(options); options_destroy(options);
if (window->type != WIN_CONSOLE) {
cons_alert(); cons_alert();
}
return TRUE; return TRUE;
} }
@ -4663,17 +4643,13 @@ cmd_bookmark(ProfWin *window, const char *const command, gchar **args)
cons_show("No bookmark exists for %s.", jid); cons_show("No bookmark exists for %s.", jid);
} }
options_destroy(options); options_destroy(options);
if (window->type != WIN_CONSOLE) {
cons_alert(); cons_alert();
}
return TRUE; return TRUE;
} }
cons_bad_cmd_usage(command); cons_bad_cmd_usage(command);
options_destroy(options); options_destroy(options);
if (window->type != WIN_CONSOLE) {
cons_alert(); cons_alert();
}
return TRUE; return TRUE;
} }