WIP: feat/upstream-sync #104

Closed
jabber.developer2 wants to merge 54 commits from feat/upstream-sync into master
16 changed files with 311 additions and 123 deletions
Showing only changes of commit 1ffff8de33 - Show all commits

View File

@@ -6322,6 +6322,10 @@ cmd_reconnect(ProfWin* window, const char* const command, gchar** args)
int intval = 0;
auto_char char* err_msg = NULL;
if (g_strcmp0(value, "now") == 0) {
if (connection_get_status() != JABBER_CONNECTED) {
cons_show("You can't reconnect now, a connection has not been established yet.");
return TRUE;
}
cl_ev_reconnect();
} else if (strtoi_range(value, &intval, 0, INT_MAX, &err_msg)) {
prefs_set_reconnect(intval);
@@ -9614,6 +9618,12 @@ cmd_register(ProfWin* window, const char* const command, gchar** args)
gchar* opt_keys[] = { "port", "tls", "auth", NULL };
gboolean parsed;
if (connection_get_status() != JABBER_DISCONNECTED) {
cons_show_error("Can't register unless disconnected, please wait.");
log_info("Can't register unless disconnected, please wait.");
return TRUE;
}
GHashTable* options = parse_options(&args[2], opt_keys, &parsed);
if (!parsed) {
cons_bad_cmd_usage(command);