diff options
Diffstat (limited to 'src/command/cmd_funcs.c')
| -rw-r--r-- | src/command/cmd_funcs.c | 2306 |
1 files changed, 1130 insertions, 1176 deletions
diff --git a/src/command/cmd_funcs.c b/src/command/cmd_funcs.c index 1020db96..1eb47f84 100644 --- a/src/command/cmd_funcs.c +++ b/src/command/cmd_funcs.c @@ -38,50 +38,50 @@ #include "config.h" -#include <string.h> -#include <stdlib.h> -#include <stdio.h> -#include <errno.h> #include <assert.h> +#include <ctype.h> +#include <errno.h> +#include <fcntl.h> +#include <gio/gio.h> #include <glib.h> #include <glib/gstdio.h> -#include <gio/gio.h> +#include <langinfo.h> +#include <stdio.h> +#include <stdlib.h> +#include <string.h> #include <sys/stat.h> #include <sys/types.h> -#include <fcntl.h> #include <unistd.h> -#include <langinfo.h> -#include <ctype.h> -#include "profanity.h" -#include "log.h" -#include "common.h" -#include "command/cmd_funcs.h" -#include "command/cmd_defs.h" #include "command/cmd_ac.h" -#include "config/accounts.h" +#include "command/cmd_defs.h" +#include "command/cmd_funcs.h" +#include "common.h" #include "config/account.h" +#include "config/accounts.h" #include "config/preferences.h" +#include "config/scripts.h" #include "config/theme.h" #include "config/tlscerts.h" -#include "config/scripts.h" #include "event/client_events.h" -#include "tools/http_upload.h" +#include "log.h" +#include "plugins/plugins.h" +#include "profanity.h" #include "tools/autocomplete.h" +#include "tools/bookmark_ignore.h" +#include "tools/http_upload.h" #include "tools/parser.h" #include "tools/tinyurl.h" -#include "tools/bookmark_ignore.h" -#include "plugins/plugins.h" #include "ui/ui.h" #include "ui/window_list.h" -#include "xmpp/xmpp.h" +#include "xmpp/avatar.h" +#include "xmpp/chat_session.h" #include "xmpp/connection.h" #include "xmpp/contact.h" -#include "xmpp/roster_list.h" #include "xmpp/jid.h" #include "xmpp/muc.h" -#include "xmpp/chat_session.h" -#include "xmpp/avatar.h" +#include "xmpp/roster_list.h" +#include "xmpp/xmpp.h" #ifdef HAVE_LIBOTR #include "otr/otr.h" @@ -98,8 +98,8 @@ #endif #ifdef HAVE_GTK -#include "ui/tray.h" #include "tools/clipboard.h" +#include "ui/tray.h" #endif #ifdef HAVE_PYTHON @@ -107,21 +107,21 @@ #endif static void _update_presence(const resource_presence_t presence, - const char *const show, gchar **args); -static void _cmd_set_boolean_preference(gchar *arg, const char *const command, - const char *const display, preference_t pref); -static void _who_room(ProfWin *window, const char *const command, gchar **args); -static void _who_roster(ProfWin *window, const char *const command, gchar **args); -static gboolean _cmd_execute(ProfWin *window, const char *const command, const char *const inp); -static gboolean _cmd_execute_default(ProfWin *window, const char *inp); -static gboolean _cmd_execute_alias(ProfWin *window, const char *const inp, gboolean *ran); + const char* const show, gchar** args); +static void _cmd_set_boolean_preference(gchar* arg, const char* const command, + const char* const display, preference_t pref); +static void _who_room(ProfWin* window, const char* const command, gchar** args); +static void _who_roster(ProfWin* window, const char* const command, gchar** args); +static gboolean _cmd_execute(ProfWin* window, const char* const command, const char* const inp); +static gboolean _cmd_execute_default(ProfWin* window, const char* inp); +static gboolean _cmd_execute_alias(ProfWin* window, const char* const inp, gboolean* ran); /* * Take a line of input and process it, return TRUE if profanity is to * continue, FALSE otherwise */ gboolean -cmd_process_input(ProfWin *window, char *inp) +cmd_process_input(ProfWin* window, char* inp) { log_debug("Input received: %s", inp); gboolean result = FALSE; @@ -131,15 +131,15 @@ cmd_process_input(ProfWin *window, char *inp) if (strlen(inp) == 0) { result = TRUE; - // handle command if input starts with a '/' + // handle command if input starts with a '/' } else if (inp[0] == '/') { - char *inp_cpy = strdup(inp); - char *command = strtok(inp_cpy, " "); - char *question_mark = strchr(command, '?'); + char* inp_cpy = strdup(inp); + char* command = strtok(inp_cpy, " "); + char* question_mark = strchr(command, '?'); if (question_mark) { *question_mark = '\0'; - char *fakeinp; - if (asprintf(&fakeinp, "/help %s", command+1)) { + char* fakeinp; + if (asprintf(&fakeinp, "/help %s", command + 1)) { result = _cmd_execute(window, "/help", fakeinp); free(fakeinp); } @@ -148,7 +148,7 @@ cmd_process_input(ProfWin *window, char *inp) } free(inp_cpy); - // call a default handler if input didn't start with '/' + // call a default handler if input didn't start with '/' } else { result = _cmd_execute_default(window, inp); } @@ -159,16 +159,16 @@ cmd_process_input(ProfWin *window, char *inp) // Command execution void -cmd_execute_connect(ProfWin *window, const char *const account) +cmd_execute_connect(ProfWin* window, const char* const account) { - GString *command = g_string_new("/connect "); + GString* command = g_string_new("/connect "); g_string_append(command, account); cmd_process_input(window, command->str); g_string_free(command, TRUE); } gboolean -cmd_tls_certpath(ProfWin *window, const char *const command, gchar **args) +cmd_tls_certpath(ProfWin* window, const char* const command, gchar** args) { #ifdef HAVE_LIBMESODE if (g_strcmp0(args[1], "set") == 0) { @@ -193,7 +193,7 @@ cmd_tls_certpath(ProfWin *window, const char *const command, gchar **args) cons_show("Certificate path defaulted to finding system certpath."); return TRUE; } else if (args[1] == NULL) { - char *path = prefs_get_tls_certpath(); + char* path = prefs_get_tls_certpath(); if (path) { cons_show("Trusted certificate path: %s", path); free(path); @@ -209,11 +209,10 @@ cmd_tls_certpath(ProfWin *window, const char *const command, gchar **args) cons_show("Certificate path setting only supported when built with libmesode."); return TRUE; #endif - } gboolean -cmd_tls_trust(ProfWin *window, const char *const command, gchar **args) +cmd_tls_trust(ProfWin* window, const char* const command, gchar** args) { #ifdef HAVE_LIBMESODE jabber_conn_status_t conn_status = connection_get_status(); @@ -225,7 +224,7 @@ cmd_tls_trust(ProfWin *window, const char *const command, gchar **args) cons_show("No TLS connection established"); return TRUE; } - TLSCertificate *cert = connection_get_tls_peer_cert(); + TLSCertificate* cert = connection_get_tls_peer_cert(); if (!cert) { cons_show("Error getting TLS certificate."); return TRUE; @@ -246,11 +245,11 @@ cmd_tls_trust(ProfWin *window, const char *const command, gchar **args) } gboolean -cmd_tls_trusted(ProfWin *window, const char *const command, gchar **args) +cmd_tls_trusted(ProfWin* window, const char* const command, gchar** args) { #ifdef HAVE_LIBMESODE - GList *certs = tlscerts_list(); - GList *curr = certs; + GList* certs = tlscerts_list(); + GList* curr = certs; if (curr) { cons_show("Trusted certificates:"); @@ -259,7 +258,7 @@ cmd_tls_trusted(ProfWin *window, const char *const command, gchar **args) cons_show("No trusted certificates found."); } while (curr) { - TLSCertificate *cert = curr->data; + TLSCertificate* cert = curr->data; cons_show_tlscert_summary(cert); cons_show(""); curr = g_list_next(curr); @@ -273,7 +272,7 @@ cmd_tls_trusted(ProfWin *window, const char *const command, gchar **args) } gboolean -cmd_tls_revoke(ProfWin *window, const char *const command, gchar **args) +cmd_tls_revoke(ProfWin* window, const char* const command, gchar** args) { #ifdef HAVE_LIBMESODE if (args[1] == NULL) { @@ -294,11 +293,11 @@ cmd_tls_revoke(ProfWin *window, const char *const command, gchar **args) } gboolean -cmd_tls_cert(ProfWin *window, const char *const command, gchar **args) +cmd_tls_cert(ProfWin* window, const char* const command, gchar** args) { #ifdef HAVE_LIBMESODE if (args[1]) { - TLSCertificate *cert = tlscerts_get_trusted(args[1]); + TLSCertificate* cert = tlscerts_get_trusted(args[1]); if (!cert) { cons_show("No such certificate."); } else { @@ -316,7 +315,7 @@ cmd_tls_cert(ProfWin *window, const char *const command, gchar **args) cons_show("No TLS connection established"); return TRUE; } - TLSCertificate *cert = connection_get_tls_peer_cert(); + TLSCertificate* cert = connection_get_tls_peer_cert(); if (!cert) { cons_show("Error getting TLS certificate."); return TRUE; @@ -333,7 +332,7 @@ cmd_tls_cert(ProfWin *window, const char *const command, gchar **args) } gboolean -cmd_connect(ProfWin *window, const char *const command, gchar **args) +cmd_connect(ProfWin* window, const char* const command, gchar** args) { jabber_conn_status_t conn_status = connection_get_status(); if (conn_status != JABBER_DISCONNECTED) { @@ -341,10 +340,10 @@ cmd_connect(ProfWin *window, const char *const command, gchar **args) return TRUE; } - gchar *opt_keys[] = { "server", "port", "tls", "auth", NULL }; + gchar* opt_keys[] = { "server", "port", "tls", "auth", NULL }; gboolean parsed; - GHashTable *options = parse_options(&args[args[0] ? 1 : 0], opt_keys, &parsed); + GHashTable* options = parse_options(&args[args[0] ? 1 : 0], opt_keys, &parsed); if (!parsed) { cons_bad_cmd_usage(command); cons_show(""); @@ -352,25 +351,18 @@ cmd_connect(ProfWin *window, const char *const command, gchar **args) return TRUE; } - char *altdomain = g_hash_table_lookup(options, "server"); + char* altdomain = g_hash_table_lookup(options, "server"); - char *tls_policy = g_hash_table_lookup(options, "tls"); - if (tls_policy && - (g_strcmp0(tls_policy, "force") != 0) && - (g_strcmp0(tls_policy, "allow") != 0) && - (g_strcmp0(tls_policy, "trust") != 0) && - (g_strcmp0(tls_policy, "disable") != 0) && - (g_strcmp0(tls_policy, "legacy") != 0)) { + char* tls_policy = g_hash_table_lookup(options, "tls"); + if (tls_policy && (g_strcmp0(tls_policy, "force") != 0) && (g_strcmp0(tls_policy, "allow") != 0) && (g_strcmp0(tls_policy, "trust") != 0) && (g_strcmp0(tls_policy, "disable") != 0) && (g_strcmp0(tls_policy, "legacy") != 0)) { cons_bad_cmd_usage(command); cons_show(""); options_destroy(options); return TRUE; } - char *auth_policy = g_hash_table_lookup(options, "auth"); - if (auth_policy && - (g_strcmp0(auth_policy, "default") != 0) && - (g_strcmp0(auth_policy, "legacy") != 0)) { + char* auth_policy = g_hash_table_lookup(options, "auth"); + if (auth_policy && (g_strcmp0(auth_policy, "default") != 0) && (g_strcmp0(auth_policy, "legacy") != 0)) { cons_bad_cmd_usage(command); cons_show(""); options_destroy(options); @@ -379,8 +371,8 @@ cmd_connect(ProfWin *window, const char *const command, gchar **args) int port = 0; if (g_hash_table_contains(options, "port")) { - char *port_str = g_hash_table_lookup(options, "port"); - char *err_msg = NULL; + char* port_str = g_hash_table_lookup(options, "port"); + char* err_msg = NULL; gboolean res = strtoi_range(port_str, &port, 1, 65535, &err_msg); if (!res) { cons_show(err_msg); @@ -392,8 +384,8 @@ cmd_connect(ProfWin *window, const char *const command, gchar **args) } } - char *user = args[0]; - char *def = prefs_get_string(PREF_DEFAULT_ACCOUNT); + char* user = args[0]; + char* def = prefs_get_string(PREF_DEFAULT_ACCOUNT); if (!user) { if (def) { user = def; @@ -405,12 +397,12 @@ cmd_connect(ProfWin *window, const char *const command, gchar **args) } } - char *jid; + char* jid; user = strdup(user); g_free(def); // connect with account - ProfAccount *account = accounts_get_account(user); + ProfAccount* account = accounts_get_account(user); if (account) { // override account options with connect options if (altdomain != NULL) @@ -426,7 +418,7 @@ cmd_connect(ProfWin *window, const char *const command, gchar **args) if (account->password) { conn_status = cl_ev_connect_account(account); - // use eval_password if set + // use eval_password if set } else if (account->eval_password) { gboolean res = account_eval_password(account); if (res) { @@ -441,7 +433,7 @@ cmd_connect(ProfWin *window, const char *const command, gchar **args) return TRUE; } - // no account password setting, prompt + // no account password setting, prompt } else { account->password = ui_ask_password(); conn_status = cl_ev_connect_account(account); @@ -452,10 +444,10 @@ cmd_connect(ProfWin *window, const char *const command, gchar **args) jid = account_create_connect_jid(account); account_free(account); - // connect with JID + // connect with JID } else { jid = g_utf8_strdown(user, -1); - char *passwd = ui_ask_password(); + char* passwd = ui_ask_password(); conn_status = cl_ev_connect_jid(jid, passwd, altdomain, port, tls_policy, auth_policy); free(passwd); } @@ -473,9 +465,9 @@ cmd_connect(ProfWin *window, const char *const command, gchar **args) } gboolean -cmd_account_list(ProfWin *window, const char *const command, gchar **args) +cmd_account_list(ProfWin* window, const char* const command, gchar** args) { - gchar **accounts = accounts_get_list(); + gchar** accounts = accounts_get_list(); cons_show_account_list(accounts); g_strfreev(accounts); @@ -483,15 +475,15 @@ cmd_account_list(ProfWin *window, const char *const command, gchar **args) } gboolean -cmd_account_show(ProfWin *window, const char *const command, gchar **args) +cmd_account_show(ProfWin* window, const char* const command, gchar** args) { - char *account_name = args[1]; + char* account_name = args[1]; if (account_name == NULL) { cons_bad_cmd_usage(command); return TRUE; } - ProfAccount *account = accounts_get_account(account_name); + ProfAccount* account = accounts_get_account(account_name); if (account == NULL) { cons_show("No such account."); cons_show(""); @@ -504,9 +496,9 @@ cmd_account_show(ProfWin *window, const char *const command, gchar **args) } gboolean -cmd_account_add(ProfWin *window, const char *const command, gchar **args) +cmd_account_add(ProfWin* window, const char* const command, gchar** args) { - char *account_name = args[1]; + char* account_name = args[1]; if (account_name == NULL) { cons_bad_cmd_usage(command); return TRUE; @@ -520,18 +512,18 @@ cmd_account_add(ProfWin *window, const char *const command, gchar **args) } gboolean -cmd_account_remove(ProfWin *window, const char *const command, gchar **args) +cmd_account_remove(ProfWin* window, const char* const command, gchar** args) { - char *account_name = args[1]; - if(!account_name) { + char* account_name = args[1]; + if (!account_name) { cons_bad_cmd_usage(command); return TRUE; } - char *def = prefs_get_string(PREF_DEFAULT_ACCOUNT); - if(accounts_remove(account_name)){ + char* def = prefs_get_string(PREF_DEFAULT_ACCOUNT); + if (accounts_remove(account_name)) { cons_show("Account %s removed.", account_name); - if(def && strcmp(def, account_name) == 0){ + if (def && strcmp(def, account_name) == 0) { prefs_set_string(PREF_DEFAULT_ACCOUNT, NULL); cons_show("Default account removed because the corresponding account was removed."); } @@ -546,9 +538,9 @@ cmd_account_remove(ProfWin *window, const char *const command, gchar **args) } gboolean -cmd_account_enable(ProfWin *window, const char *const command, gchar **args) +cmd_account_enable(ProfWin* window, const char* const command, gchar** args) { - char *account_name = args[1]; + char* account_name = args[1]; if (account_name == NULL) { cons_bad_cmd_usage(command); return TRUE; @@ -565,9 +557,9 @@ cmd_account_enable(ProfWin *window, const char *const command, gchar **args) return TRUE; } gboolean -cmd_account_disable(ProfWin *window, const char *const command, gchar **args) +cmd_account_disable(ProfWin* window, const char* const command, gchar** args) { - char *account_name = args[1]; + char* account_name = args[1]; if (account_name == NULL) { cons_bad_cmd_usage(command); return TRUE; @@ -585,15 +577,15 @@ cmd_account_disable(ProfWin *window, const char *const command, gchar **args) } gboolean -cmd_account_rename(ProfWin *window, const char *const command, gchar **args) +cmd_account_rename(ProfWin* window, const char* const command, gchar** args) { if (g_strv_length(args) != 3) { cons_bad_cmd_usage(command); return TRUE; } - char *account_name = args[1]; - char *new_name = args[2]; + char* account_name = args[1]; + char* new_name = args[2]; if (accounts_rename(account_name, new_name)) { cons_show("Account renamed."); @@ -607,10 +599,10 @@ cmd_account_rename(ProfWin *window, const char *const command, gchar **args) } gboolean -cmd_account_default(ProfWin *window, const char *const command, gchar **args) +cmd_account_default(ProfWin* window, const char* const command, gchar** args) { if (g_strv_length(args) == 1) { - char *def = prefs_get_string(PREF_DEFAULT_ACCOUNT); + char* def = prefs_get_string(PREF_DEFAULT_ACCOUNT); if (def) { cons_show("The default account is %s.", def); free(def); @@ -626,7 +618,7 @@ cmd_account_default(ProfWin *window, const char *const command, gchar **args) } } else if (g_strv_length(args) == 3) { if (strcmp(args[1], "set") == 0) { - ProfAccount *account_p = accounts_get_account(args[2]); + ProfAccount* account_p = accounts_get_account(args[2]); if (account_p) { prefs_set_string(PREF_DEFAULT_ACCOUNT, args[2]); cons_show("Default account set to %s.", args[2]); @@ -645,9 +637,9 @@ cmd_account_default(ProfWin *window, const char *const command, gchar **args) } gboolean -_account_set_jid(char *account_name, char *jid) +_account_set_jid(char* account_name, char* jid) { - Jid *jidp = jid_create(jid); + Jid* jidp = jid_create(jid); if (jidp == NULL) { cons_show("Malformed jid: %s", jid); } else { @@ -665,7 +657,7 @@ _account_set_jid(char *account_name, char *jid) } gboolean -_account_set_server(char *account_name, char *server) +_account_set_server(char* account_name, char* server) { accounts_set_server(account_name, server); cons_show("Updated server for account %s: %s", account_name, server); @@ -674,10 +666,10 @@ _account_set_server(char *account_name, char *server) } gboolean -_account_set_port(char *account_name, char *port) +_account_set_port(char* account_name, char* port) { int porti; - char *err_msg = NULL; + char* err_msg = NULL; gboolean res = strtoi_range(port, &porti, 1, 65535, &err_msg); if (!res) { cons_show(err_msg); @@ -692,7 +684,7 @@ _account_set_port(char *account_name, char *port) } gboolean -_account_set_resource(char *account_name, char *resource) +_account_set_resource(char* account_name, char* resource) { accounts_set_resource(account_name, resource); if (connection_get_status() == JABBER_CONNECTED) { @@ -705,9 +697,9 @@ _account_set_resource(char *account_name, char *resource) } gboolean -_account_set_password(char *account_name, char *password) +_account_set_password(char* account_name, char* password) { - ProfAccount *account = accounts_get_account(account_name); + ProfAccount* account = accounts_get_account(account_name); if (account->eval_password) { cons_show("Cannot set password when eval_password is set."); } else { @@ -720,10 +712,10 @@ _account_set_password(char *account_name, char *password) } gboolean -_account_set_eval_password(char *account_name, char *eval_password) +_account_set_eval_password(char* account_name, char* eval_password) { - ProfAccount *account = accounts_get_account(account_name); - if(account->password) { + ProfAccount* account = accounts_get_account(account_name); + if (account->password) { cons_show("Cannot set eval_password when password is set."); } else { accounts_set_eval_password(account_name, eval_password); @@ -735,7 +727,7 @@ _account_set_eval_password(char *account_name, char *eval_password) } gboolean -_account_set_muc(char *account_name, char *muc) +_account_set_muc(char* account_name, char* muc) { accounts_set_muc_service(account_name, muc); cons_show("Updated muc service for account %s: %s", account_name, muc); @@ -744,7 +736,7 @@ _account_set_muc(char *account_name, char *muc) } gboolean -_account_set_nick(char *account_name, char *nick) +_account_set_nick(char* account_name, char* nick) { accounts_set_muc_nick(account_name, nick); cons_show("Updated muc nick for account %s: %s", account_name, nick); @@ -753,11 +745,11 @@ _account_set_nick(char *account_name, char *nick) } gboolean -_account_set_otr(char *account_name, char *policy) +_account_set_otr(char* account_name, char* policy) { if ((g_strcmp0(policy, "manual") != 0) - && (g_strcmp0(policy, "opportunistic") != 0) - && (g_strcmp0(policy, "always") != 0)) { + && (g_strcmp0(policy, "opportunistic") != 0) + && (g_strcmp0(policy, "always") != 0)) { cons_show("OTR policy must be one of: manual, opportunistic or always."); } else { accounts_set_otr_policy(account_name, policy); @@ -768,7 +760,7 @@ _account_set_otr(char *account_name, char *policy) } gboolean -_account_set_status(char *account_name, char *status) +_account_set_status(char* account_name, char* status) { if (!valid_resource_presence_string(status) && (strcmp(status, "last") != 0)) { cons_show("Invalid status: %s", status); @@ -781,10 +773,10 @@ _account_set_status(char *account_name, char *status) } gboolean -_account_set_pgpkeyid(char *account_name, char *pgpkeyid) +_account_set_pgpkeyid(char* account_name, char* pgpkeyid) { #ifdef HAVE_LIBGPGME - char *err_str = NULL; + char* err_str = NULL; if (!p_gpg_valid_key(pgpkeyid, &err_str)) { cons_show("Invalid PGP key ID specified: %s, see /pgp keys", err_str); } else { @@ -800,7 +792,7 @@ _account_set_pgpkeyid(char *account_name, char *pgpkeyid) } gboolean -_account_set_startscript(char *account_name, char *script) +_account_set_startscript(char* account_name, char* script) { accounts_set_script_start(account_name, script); cons_show("Updated start script for account %s: %s", account_name, script); @@ -808,7 +800,7 @@ _account_set_startscript(char *account_name, char *script) } gboolean -_account_set_theme(char *account_name, char *theme) +_account_set_theme(char* account_name, char* theme) { if (!theme_exists(theme)) { cons_show("Theme does not exist: %s", theme); @@ -817,7 +809,7 @@ _account_set_theme(char *account_name, char *theme) accounts_set_theme(account_name, theme); if (connection_get_status() == JABBER_CONNECTED) { - ProfAccount *account = accounts_get_account(session_get_account_name()); + ProfAccount* account = accounts_get_account(session_get_account_name()); if (account) { if (g_strcmp0(account->name, account_name) == 0) { theme_load(theme, false); @@ -842,13 +834,13 @@ _account_set_theme(char *account_name, char *theme) } gboolean -_account_set_tls(char *account_name, char *policy) +_account_set_tls(char* account_name, char* policy) { if ((g_strcmp0(policy, "force") != 0) - && (g_strcmp0(policy, "allow") != 0) - && (g_strcmp0(policy, "trust") != 0) - && (g_strcmp0(policy, "disable") != 0) - && (g_strcmp0(policy, "legacy") != 0)) { + && (g_strcmp0(policy, "allow") != 0) + && (g_strcmp0(policy, "trust") != 0) + && (g_strcmp0(policy, "disable") != 0) + && (g_strcmp0(policy, "legacy") != 0)) { cons_show("TLS policy must be one of: force, allow, legacy or disable."); } else { accounts_set_tls_policy(account_name, policy); @@ -859,10 +851,10 @@ _account_set_tls(char *account_name, char *policy) } gboolean -_account_set_auth(char *account_name, char *policy) +_account_set_auth(char* account_name, char* policy) { if ((g_strcmp0(policy, "default") != 0) - && (g_strcmp0(policy, "legacy") != 0)) { + && (g_strcmp0(policy, "legacy") != 0)) { cons_show("Auth policy must be either default or legacy."); } else { accounts_set_auth_policy(account_name, policy); @@ -873,10 +865,10 @@ _account_set_auth(char *account_name, char *policy) } gboolean -_account_set_presence_priority(char *account_name, char *presence, char *priority) +_account_set_presence_priority(char* account_name, char* presence, char* priority) { int intval; - char *err_msg = NULL; + char* err_msg = NULL; gboolean res = strtoi_range(priority, &intval, -128, 127, &err_msg); if (!res) { cons_show(err_msg); @@ -885,8 +877,7 @@ _account_set_presence_priority(char *account_name, char *presence, char *priorit } resource_presence_t presence_type = resource_presence_from_string(presence); - switch (presence_type) - { + switch (presence_type) { case (RESOURCE_ONLINE): accounts_set_priority_online(account_name, intval); break; @@ -906,7 +897,7 @@ _account_set_presence_priority(char *account_name, char *presence, char *priorit jabber_conn_status_t conn_status = connection_get_status(); if (conn_status == JABBER_CONNECTED) { - char *connected_account = session_get_account_name(); + char* connected_account = session_get_account_name(); resource_presence_t last_presence = accounts_get_last_presence(connected_account); if (presence_type == last_presence) { cl_ev_presence_send(last_presence, 0); @@ -918,37 +909,52 @@ _account_set_presence_priority(char *account_name, char *presence, char *priorit } gboolean -cmd_account_set(ProfWin *window, const char *const command, gchar **args) +cmd_account_set(ProfWin* window, const char* const command, gchar** args) { if (g_strv_length(args) != 4) { cons_bad_cmd_usage(command); return TRUE; } - char *account_name = args[1]; + char* account_name = args[1]; if (!accounts_account_exists(account_name)) { cons_show("Account %s doesn't exist", account_name); cons_show(""); return TRUE; } - char *property = args[2]; - char *value = args[3]; - if (strcmp(property, "jid") == 0) return _account_set_jid(account_name, value); - if (strcmp(property, "server") == 0) return _account_set_server(account_name, value); - if (strcmp(property, "port") == 0) return _account_set_port(account_name, value); - if (strcmp(property, "resource") == 0) return _account_set_resource(account_name, value); - if (strcmp(property, "password") == 0) return _account_set_password(account_name, value); - if (strcmp(property, "eval_password") == 0) return _account_set_eval_password(account_name, value); - if (strcmp(property, "muc") == 0) return _account_set_muc(account_name, value); - if (strcmp(property, "nick") == 0) return _account_set_nick(account_name, value); - if (strcmp(property, "otr") == 0) return _account_set_otr(account_name, value); - if (strcmp(property, "status") == 0) return _account_set_status(account_name, value); - if (strcmp(property, "pgpkeyid") == 0) return _account_set_pgpkeyid(account_name, value); - if (strcmp(property, "startscript") == 0) return _account_set_startscript(account_name, value); - if (strcmp(property, "theme") == 0) return _account_set_theme(account_name, value); - if (strcmp(property, "tls") == 0) return _account_set_tls(account_name, value); - if (strcmp(property, "auth") == 0) return _account_set_auth(account_name, value); + char* property = args[2]; + char* value = args[3]; + if (strcmp(property, "jid") == 0) + return _account_set_jid(account_name, value); + if (strcmp(property, "server") == 0) + return _account_set_server(account_name, value); + if (strcmp(property, "port") == 0) + return _account_set_port(account_name, value); + if (strcmp(property, "resource") == 0) + return _account_set_resource(account_name, value); + if (strcmp(property, "password") == 0) + return _account_set_password(account_name, value); + if (strcmp(property, "eval_password") == 0) + return _account_set_eval_password(account_name, value); + if (strcmp(property, "muc") == 0) + return _account_set_muc(account_name, value); + if (strcmp(property, "nick") == 0) + return _account_set_nick(account_name, value); + if (strcmp(property, "otr") == 0) + return _account_set_otr(account_name, value); + if (strcmp(property, "status") == 0) + return _account_set_status(account_name, value); + if (strcmp(property, "pgpkeyid") == 0) + return _account_set_pgpkeyid(account_name, value); + if (strcmp(property, "startscript") == 0) + return _account_set_startscript(account_name, value); + if (strcmp(property, "theme") == 0) + return _account_set_theme(account_name, value); + if (strcmp(property, "tls") == 0) + return _account_set_tls(account_name, value); + if (strcmp(property, "auth") == 0) + return _account_set_auth(account_name, value); if (valid_resource_presence_string(property)) { return _account_set_presence_priority(account_name, property, value); @@ -961,21 +967,21 @@ cmd_account_set(ProfWin *window, const char *const command, gchar **args) } gboolean -cmd_account_clear(ProfWin *window, const char *const command, gchar **args) +cmd_account_clear(ProfWin* window, const char* const command, gchar** args) { if (g_strv_length(args) != 3) { cons_bad_cmd_usage(command); return TRUE; } - char *account_name = args[1]; + char* account_name = args[1]; if (!accounts_account_exists(account_name)) { cons_show("Account %s doesn't exist", account_name); cons_show(""); return TRUE; } - char *property = args[2]; + char* property = args[2]; if (strcmp(property, "password") == 0) { accounts_clear_password(account_name); cons_show("Removed password for account %s", account_name); @@ -1025,7 +1031,7 @@ cmd_account_clear(ProfWin *window, const char *const command, gchar **args) } gboolean -cmd_account(ProfWin *window, const char *const command, gchar **args) +cmd_account(ProfWin* window, const char* const command, gchar** args) { if (args[0] != NULL) { cons_bad_cmd_usage(command); @@ -1038,7 +1044,7 @@ cmd_account(ProfWin *window, const char *const command, gchar **args) return TRUE; } - ProfAccount *account = accounts_get_account(session_get_account_name()); + ProfAccount* account = accounts_get_account(session_get_account_name()); if (account) { cons_show_account(account); account_free(account); @@ -1050,7 +1056,7 @@ cmd_account(ProfWin *window, const char *const command, gchar **args) } gboolean -cmd_script(ProfWin *window, const char *const command, gchar **args) +cmd_script(ProfWin* window, const char* const command, gchar** args) { if ((g_strcmp0(args[0], "run") == 0) && args[1]) { gboolean res = scripts_exec(args[1]); @@ -1058,11 +1064,11 @@ cmd_script(ProfWin *window, const char *const command, gchar **args) cons_show("Could not find script %s", args[1]); } } else if (g_strcmp0(args[0], "list") == 0) { - GSList *scripts = scripts_list(); + GSList* scripts = scripts_list(); cons_show_scripts(scripts); g_slist_free_full(scripts, g_free); } else if ((g_strcmp0(args[0], "show") == 0) && args[1]) { - GSList *commands = scripts_read(args[1]); + GSList* commands = scripts_read(args[1]); cons_show_script(args[1], commands); g_slist_free_full(commands, g_free); } else { @@ -1074,16 +1080,22 @@ cmd_script(ProfWin *window, const char *const command, gchar **args) /* escape a string into csv and write it to the file descriptor */ static int -_writecsv(int fd, const char *const str) +_writecsv(int fd, const char* const str) { - if (!str) return 0; + if (!str) + return 0; size_t len = strlen(str); - char *s = malloc(2 * len * sizeof(char)); - char *c = s; + char* s = malloc(2 * len * sizeof(char)); + char* c = s; int i = 0; for (; i < strlen(str); i++) { - if (str[i] != '"') *c++ = str[i]; - else { *c++ = '"'; *c++ = '"'; len++; } + if (str[i] != '"') + *c++ = str[i]; + else { + *c++ = '"'; + *c++ = '"'; + len++; + } } if (-1 == write(fd, s, len)) { cons_show("error: failed to write '%s' to the requested file: %s", s, strerror(errno)); @@ -1094,7 +1106,7 @@ _writecsv(int fd, const char *const str) } gboolean -cmd_export(ProfWin *window, const char *const command, gchar **args) +cmd_export(ProfWin* window, const char* const command, gchar** args) { jabber_conn_status_t conn_status = connection_get_status(); @@ -1103,8 +1115,8 @@ cmd_export(ProfWin *window, const char *const command, gchar **args) cons_show(""); return TRUE; } else { - GString *fname = g_string_new(""); - GSList *list = NULL; + GString* fname = g_string_new(""); + GSList* list = NULL; int fd; /* deal with the ~ convention for $HOME */ @@ -1124,22 +1136,28 @@ cmd_export(ProfWin *window, const char *const command, gchar **args) return TRUE; } - if (-1 == write(fd, "jid,name\n", strlen("jid,name\n"))) goto write_error; + if (-1 == write(fd, "jid,name\n", strlen("jid,name\n"))) + goto write_error; list = roster_get_contacts(ROSTER_ORD_NAME); if (list) { - GSList *curr = list; - while (curr){ + GSList* curr = list; + while (curr) { PContact contact = curr->data; - const char *jid = p_contact_barejid(contact); - const char *name = p_contact_name(contact); + const char* jid = p_contact_barejid(contact); + const char* name = p_contact_name(contact); /* write the data to the file */ - if (-1 == write(fd, "\"", 1)) goto write_error; - if (-1 == _writecsv(fd, jid)) goto write_error; - if (-1 == write(fd, "\",\"", 3)) goto write_error; - if (-1 == _writecsv(fd, name)) goto write_error; - if (-1 == write(fd, "\"\n", 2)) goto write_error; + if (-1 == write(fd, "\"", 1)) + goto write_error; + if (-1 == _writecsv(fd, jid)) + goto write_error; + if (-1 == write(fd, "\",\"", 3)) + goto write_error; + if (-1 == _writecsv(fd, name)) + goto write_error; + if (-1 == write(fd, "\"\n", 2)) + goto write_error; /* loop */ curr = g_slist_next(curr); @@ -1154,7 +1172,7 @@ cmd_export(ProfWin *window, const char *const command, gchar **args) g_slist_free(list); close(fd); return TRUE; -write_error: + write_error: cons_show("error: write failed: %s", strerror(errno)); cons_show(""); g_slist_free(list); @@ -1164,7 +1182,7 @@ write_error: } gboolean -cmd_sub(ProfWin *window, const char *const command, gchar **args) +cmd_sub(ProfWin* window, const char* const command, gchar** args) { jabber_conn_status_t conn_status = connection_get_status(); @@ -1198,12 +1216,12 @@ cmd_sub(ProfWin *window, const char *const command, gchar **args) } if (jid == NULL) { - ProfChatWin *chatwin = (ProfChatWin*)window; + ProfChatWin* chatwin = (ProfChatWin*)window; assert(chatwin->memcheck == PROFCHATWIN_MEMCHECK); jid = chatwin->barejid; } - Jid *jidp = jid_create(jid); + Jid* jidp = jid_create(jid); if (strcmp(subcmd, "allow") == 0) { presence_subscription(jidp->barejid, PRESENCE_SUBSCRIBED); @@ -1229,18 +1247,18 @@ cmd_sub(ProfWin *window, const char *const command, gchar **args) if (window->type == WIN_CHAT) { if (p_contact_pending_out(contact)) { win_println(window, THEME_DEFAULT, "-", "%s subscription status: %s, request pending.", - jidp->barejid, p_contact_subscription(contact)); + jidp->barejid, p_contact_subscription(contact)); } else { win_println(window, THEME_DEFAULT, "-", "%s subscription status: %s.", jidp->barejid, - p_contact_subscription(contact)); + p_contact_subscription(contact)); } } else { if (p_contact_pending_out(contact)) { cons_show("%s subscription status: %s, request pending.", - jidp->barejid, p_contact_subscription(contact)); + jidp->barejid, p_contact_subscription(contact)); } else { cons_show("%s subscription status: %s.", jidp->barejid, - p_contact_subscription(contact)); + p_contact_subscription(contact)); } } } @@ -1254,7 +1272,7 @@ cmd_sub(ProfWin *window, const char *const command, gchar **args) } gboolean -cmd_disconnect(ProfWin *window, const char *const command, gchar **args) +cmd_disconnect(ProfWin* window, const char* const command, gchar** args) { if (connection_get_status() != JABBER_CONNECTED) { cons_show("You are not currently connected."); @@ -1263,7 +1281,7 @@ cmd_disconnect(ProfWin *window, const char *const command, gchar **args) cl_ev_disconnect(); - char *theme = prefs_get_string(PREF_THEME); + char* theme = prefs_get_string(PREF_THEME); if (theme) { gboolean res = theme_load(theme, false); g_free(theme); @@ -1290,7 +1308,7 @@ cmd_disconnect(ProfWin *window, const char *const command, gchar **args) } gboolean -cmd_quit(ProfWin *window, const char *const command, gchar **args) +cmd_quit(ProfWin* window, const char* const command, gchar** args) { log_info("Profanity is shutting down..."); exit(0); @@ -1298,21 +1316,21 @@ cmd_quit(ProfWin *window, const char *const command, gchar **args) } gboolean -cmd_wins_unread(ProfWin *window, const char *const command, gchar **args) +cmd_wins_unread(ProfWin* window, const char* const command, gchar** args) { cons_show_wins(TRUE); return TRUE; } gboolean -cmd_wins_prune(ProfWin *window, const char *const command, gchar **args) +cmd_wins_prune(ProfWin* window, const char* const command, gchar** args) { ui_prune_wins(); return TRUE; } gboolean -cmd_wins_swap(ProfWin *window, const char *const command, gchar **args) +cmd_wins_swap(ProfWin* window, const char* const command, gchar** args) { if ((args[1] == NULL) || (args[2] == NULL)) { cons_bad_cmd_usage(command); @@ -1353,7 +1371,7 @@ cmd_wins_swap(ProfWin *window, const char *const command, gchar **args) } gboolean -cmd_wins(ProfWin *window, const char *const command, gchar **args) +cmd_wins(ProfWin* window, const char* const command, gchar** args) { if (args[0] != NULL) { cons_bad_cmd_usage(command); @@ -1365,7 +1383,7 @@ cmd_wins(ProfWin *window, const char *const command, gchar **args) } gboolean -cmd_close(ProfWin *window, const char *const command, gchar **args) +cmd_close(ProfWin* window, const char* const command, gchar** args) { jabber_conn_status_t conn_status = connection_get_status(); @@ -1424,7 +1442,7 @@ cmd_close(ProfWin *window, const char *const command, gchar **args) return TRUE; } - ProfWin *toclose = wins_get_by_num(index); + ProfWin* toclose = wins_get_by_num(index); if (!toclose) { cons_show("Window is not open."); return TRUE; @@ -1454,7 +1472,7 @@ cmd_close(ProfWin *window, const char *const command, gchar **args) return TRUE; } - ProfWin *toclose = wins_get_by_string(args[0]); + ProfWin* toclose = wins_get_by_string(args[0]); if (!toclose) { cons_show("Window \"%s\" does not exist.", args[0]); return TRUE; @@ -1483,7 +1501,7 @@ cmd_close(ProfWin *window, const char *const command, gchar **args) } gboolean -cmd_win(ProfWin *window, const char *const command, gchar **args) +cmd_win(ProfWin* window, const char* const command, gchar** args) { gboolean is_num = TRUE; int i = 0; @@ -1497,14 +1515,14 @@ cmd_win(ProfWin *window, const char *const command, gchar **args) if (is_num) { int num = atoi(args[0]); - ProfWin *focuswin = wins_get_by_num(num); + ProfWin* focuswin = wins_get_by_num(num); if (!focuswin) { cons_show("Window %d does not exist.", num); } else { ui_focus_win(focuswin); } } else { - ProfWin *focuswin = wins_get_by_string(args[0]); + ProfWin* focuswin = wins_get_by_string(args[0]); if (!focuswin) { cons_show("Window \"%s\" does not exist.", args[0]); } else { @@ -1516,21 +1534,23 @@ cmd_win(ProfWin *window, const char *const command, gchar **args) } static void -_cmd_list_commands(GList *commands) { +_cmd_list_commands(GList* commands) +{ int maxlen = 0; - GList *curr = commands; + GList* curr = commands; while (curr) { - gchar *cmd = curr->data; + gchar* cmd = curr->data; int len = strlen(cmd); - if (len > maxlen) maxlen = len; + if (len > maxlen) + maxlen = len; curr = g_list_next(curr); } - GString *cmds = g_string_new(""); + GString* cmds = g_string_new(""); curr = commands; int count = 0; while (curr) { - gchar *cmd = curr->data; + gchar* cmd = curr->data; if (count == 5) { cons_show(cmds->str); g_string_free(cmds, TRUE); @@ -1551,21 +1571,21 @@ _cmd_list_commands(GList *commands) { } static void -_cmd_help_cmd_list(const char *const tag) +_cmd_help_cmd_list(const char* const tag) { cons_show(""); - ProfWin *console = wins_get_console(); + ProfWin* console = wins_get_console(); if (tag) { win_println(console, THEME_HELP_HEADER, "-", "%s commands", tag); } else { win_println(console, THEME_HELP_HEADER, "-", "All commands"); } - GList *ordered_commands = NULL; + GList* ordered_commands = NULL; if (g_strcmp0(tag, "plugins") == 0) { - GList *plugins_cmds = plugins_get_command_names(); - GList *curr = plugins_cmds; + GList* plugins_cmds = plugins_get_command_names(); + GList* curr = plugins_cmds; while (curr) { ordered_commands = g_list_insert_sorted(ordered_commands, curr->data, (GCompareFunc)g_strcmp0); curr = g_list_next(curr); @@ -1576,8 +1596,8 @@ _cmd_help_cmd_list(const char *const tag) // add plugins if showing all commands if (!tag) { - GList *plugins_cmds = plugins_get_command_names(); - GList *curr = plugins_cmds; + GList* plugins_cmds = plugins_get_command_names(); + GList* curr = plugins_cmds; while (curr) { ordered_commands = g_list_insert_sorted(ordered_commands, curr->data, (GCompareFunc)g_strcmp0); curr = g_list_next(curr); @@ -1591,7 +1611,7 @@ _cmd_help_cmd_list(const char *const tag) } gboolean -cmd_help(ProfWin *window, const char *const command, gchar **args) +cmd_help(ProfWin* window, const char* const command, gchar** args) { int num_args = g_strv_length(args); if (num_args == 0) { @@ -1600,12 +1620,12 @@ cmd_help(ProfWin *window, const char *const command, gchar **args) if (args[1] == NULL) { cons_bad_cmd_usage(command); } else { - GList *cmds = cmd_search_index_all(args[1]); + GList* cmds = cmd_search_index_all(args[1]); if (cmds == NULL) { cons_show("No commands found."); } else { - GList *curr = cmds; - GList *results = NULL; + GList* curr = cmds; + GList* results = NULL; while (curr) { results = g_list_insert_sorted(results, curr->data, (GCompareFunc)g_strcmp0); curr = g_list_next(curr); @@ -1620,12 +1640,12 @@ cmd_help(ProfWin *window, const char *const command, gchar **args) if (args[1] == NULL) { cons_bad_cmd_usage(command); } else { - GList *cmds = cmd_search_index_any(args[1]); + GList* cmds = cmd_search_index_any(args[1]); if (cmds == NULL) { cons_show("No commands found."); } else { - GList *curr = cmds; - GList *results = NULL; + GList* curr = cmds; + GList* results = NULL; while (curr) { results = g_list_insert_sorted(results, curr->data, (GCompareFunc)g_strcmp0); curr = g_list_next(curr); @@ -1649,15 +1669,15 @@ cmd_help(ProfWin *window, const char *const command, gchar **args) } else if (strcmp(args[0], "navigation") == 0) { cons_navigation_help(); } else { - char *cmd = args[0]; + char* cmd = args[0]; char cmd_with_slash[1 + strlen(cmd) + 1]; sprintf(cmd_with_slash, "/%s", cmd); - Command *command = cmd_get(cmd_with_slash); + Command* command = cmd_get(cmd_with_slash); if (command) { cons_show_help(cmd_with_slash, &command->help); } else { - CommandHelp *commandHelp = plugins_get_help(cmd_with_slash); + CommandHelp* commandHelp = plugins_get_help(cmd_with_slash); if (commandHelp) { cons_show_help(cmd_with_slash, commandHelp); } else { @@ -1671,7 +1691,7 @@ cmd_help(ProfWin *window, const char *const command, gchar **args) } gboolean -cmd_about(ProfWin *window, const char *const command, gchar **args) +cmd_about(ProfWin* window, const char* const command, gchar** args) { cons_show(""); cons_about(); @@ -1679,7 +1699,7 @@ cmd_about(ProfWin *window, const char *const command, gchar **args) } gboolean -cmd_prefs(ProfWin *window, const char *const command, gchar **args) +cmd_prefs(ProfWin* window, const char* const command, gchar** args) { if (args[0] == NULL) { cons_prefs(); @@ -1728,18 +1748,18 @@ cmd_prefs(ProfWin *window, const char *const command, gchar **args) } gboolean -cmd_theme(ProfWin *window, const char *const command, gchar **args) +cmd_theme(ProfWin* window, const char* const command, gchar** args) { // 'full-load' means to load the theme including the settings (not just [colours]) gboolean fullload = (g_strcmp0(args[0], "full-load") == 0); // list themes if (g_strcmp0(args[0], "list") == 0) { - GSList *themes = theme_list(); + GSList* themes = theme_list(); cons_show_themes(themes); g_slist_free_full(themes, g_free); - // load a theme + // load a theme } else if (g_strcmp0(args[0], "load") == 0 || fullload) { if (args[1] == NULL) { cons_bad_cmd_usage(command); @@ -1762,7 +1782,7 @@ cmd_theme(ProfWin *window, const char *const command, gchar **args) cons_show("Couldn't find theme: %s", args[1]); } - // show colours + // show colours } else if (g_strcmp0(args[0], "colours") == 0) { cons_theme_colours(); } else if (g_strcmp0(args[0], "properties") == 0) { @@ -1775,7 +1795,7 @@ cmd_theme(ProfWin *window, const char *const command, gchar **args) } static void -_who_room(ProfWin *window, const char *const command, gchar **args) +_who_room(ProfWin* window, const char* const command, gchar** args) { if ((g_strv_length(args) == 2) && args[1]) { cons_show("Argument group is not applicable to chat rooms."); @@ -1783,53 +1803,30 @@ _who_room(ProfWin *window, const char *const command, gchar **args) } // bad arg - if (args[0] && - (g_strcmp0(args[0], "online") != 0) && - (g_strcmp0(args[0], "available") != 0) && - (g_strcmp0(args[0], "unavailable") != 0) && - (g_strcmp0(args[0], "away") != 0) && - (g_strcmp0(args[0], "chat") != 0) && - (g_strcmp0(args[0], "xa") != 0) && - (g_strcmp0(args[0], "dnd") != 0) && - (g_strcmp0(args[0], "any") != 0) && - (g_strcmp0(args[0], "moderator") != 0) && - (g_strcmp0(args[0], "participant") != 0) && - (g_strcmp0(args[0], "visitor") != 0) && - (g_strcmp0(args[0], "owner") != 0) && - (g_strcmp0(args[0], "admin") != 0) && - (g_strcmp0(args[0], "member") != 0) && - (g_strcmp0(args[0], "outcast") != 0)) { + if (args[0] && (g_strcmp0(args[0], "online") != 0) && (g_strcmp0(args[0], "available") != 0) && (g_strcmp0(args[0], "unavailable") != 0) && (g_strcmp0(args[0], "away") != 0) && (g_strcmp0(args[0], "chat") != 0) && (g_strcmp0(args[0], "xa") != 0) && (g_strcmp0(args[0], "dnd") != 0) && (g_strcmp0(args[0], "any") != 0) && (g_strcmp0(args[0], "moderator") != 0) && (g_strcmp0(args[0], "participant") != 0) && (g_strcmp0(args[0], "visitor") != 0) && (g_strcmp0(args[0], "owner") != 0) && (g_strcmp0(args[0], "admin") != 0) && (g_strcmp0(args[0], "member") != 0) && (g_strcmp0(args[0], "outcast") != 0)) { cons_bad_cmd_usage(command); return; } - ProfMucWin *mucwin = (ProfMucWin*)window; + ProfMucWin* mucwin = (ProfMucWin*)window; assert(mucwin->memcheck == PROFMUCWIN_MEMCHECK); // presence filter - if (args[0] == NULL || - (g_strcmp0(args[0], "online") == 0) || - (g_strcmp0(args[0], "available") == 0) || - (g_strcmp0(args[0], "unavailable") == 0) || - (g_strcmp0(args[0], "away") == 0) || - (g_strcmp0(args[0], "chat") == 0) || - (g_strcmp0(args[0], "xa") == 0) || - (g_strcmp0(args[0], "dnd") == 0) || - (g_strcmp0(args[0], "any") == 0)) { - - char *presence = args[0]; - GList *occupants = muc_roster(mucwin->roomjid); + if (args[0] == NULL || (g_strcmp0(args[0], "online") == 0) || (g_strcmp0(args[0], "available") == 0) || (g_strcmp0(args[0], "unavailable") == 0) || (g_strcmp0(args[0], "away") == 0) || (g_strcmp0(args[0], "chat") == 0) || (g_strcmp0(args[0], "xa") == 0) || (g_strcmp0(args[0], "dnd") == 0) || (g_strcmp0(args[0], "any") == 0)) { + + char* presence = args[0]; + GList* occupants = muc_roster(mucwin->roomjid); // no arg, show all contacts if ((presence == NULL) || (g_strcmp0(presence, "any") == 0)) { mucwin_roster(mucwin, occupants, NULL); - // available + // available } else if (strcmp("available", presence) == 0) { - GList *filtered = NULL; + GList* filtered = NULL; while (occupants) { - Occupant *occupant = occupants->data; + Occupant* occupant = occupants->data; if (muc_occupant_available(occupant)) { filtered = g_list_append(filtered, occupant); } @@ -1838,12 +1835,12 @@ _who_room(ProfWin *window, const char *const command, gchar **args) mucwin_roster(mucwin, filtered, "available"); - // unavailable + // unavailable } else if (strcmp("unavailable", presence) == 0) { - GList *filtered = NULL; + GList* filtered = NULL; while (occupants) { - Occupant *occupant = occupants->data; + Occupant* occupant = occupants->data; if (!muc_occupant_available(occupant)) { filtered = g_list_append(filtered, occupant); } @@ -1852,13 +1849,13 @@ _who_room(ProfWin *window, const char *const command, gchar **args) mucwin_roster(mucwin, filtered, "unavailable"); - // show specific status + // show specific status } else { - GList *filtered = NULL; + GList* filtered = NULL; while (occupants) { - Occupant *occupant = occupants->data; - const char *presence_str = string_from_resource_presence(occupant->presence); + Occupant* occupant = occupants->data; + const char* presence_str = string_from_resource_presence(occupant->presence); if (strcmp(presence_str, presence) == 0) { filtered = g_list_append(filtered, occupant); } @@ -1870,7 +1867,7 @@ _who_room(ProfWin *window, const char *const command, gchar **args) g_list_free(occupants); - // role or affiliation filter + // role or affiliation filter } else { if (g_strcmp0(args[0], "moderator") == 0) { mucwin_show_role_list(mucwin, MUC_ROLE_MODERATOR); @@ -1905,32 +1902,32 @@ _who_room(ProfWin *window, const char *const command, gchar **args) } static void -_who_roster(ProfWin *window, const char *const command, gchar **args) +_who_roster(ProfWin* window, const char* const command, gchar** args) { - char *presence = args[0]; + char* presence = args[0]; // bad arg if (presence - && (strcmp(presence, "online") != 0) - && (strcmp(presence, "available") != 0) - && (strcmp(presence, "unavailable") != 0) - && (strcmp(presence, "offline") != 0) - && (strcmp(presence, "away") != 0) - && (strcmp(presence, "chat") != 0) - && (strcmp(presence, "xa") != 0) - && (strcmp(presence, "dnd") != 0) - && (strcmp(presence, "any") != 0)) { + && (strcmp(presence, "online") != 0) + && (strcmp(presence, "available") != 0) + && (strcmp(presence, "unavailable") != 0) + && (strcmp(presence, "offline") != 0) + && (strcmp(presence, "away") != 0) + && (strcmp(presence, "chat") != 0) + && (strcmp(presence, "xa") != 0) + && (strcmp(presence, "dnd") != 0) + && (strcmp(presence, "any") != 0)) { cons_bad_cmd_usage(command); return; } - char *group = NULL; + char* group = NULL; if ((g_strv_length(args) == 2) && args[1]) { group = args[1]; } cons_show(""); - GSList *list = NULL; + GSList* list = NULL; if (group) { list = roster_get_group(group, ROSTER_ORD_NAME); if (list == NULL) { @@ -1963,11 +1960,11 @@ _who_roster(ProfWin *window, const char *const command, gchar **args) } } - // available + // available } else if (strcmp("available", presence) == 0) { - GSList *filtered = NULL; + GSList* filtered = NULL; - GSList *curr = list; + GSList* curr = list; while (curr) { PContact contact = curr->data; if (p_contact_is_available(contact)) { @@ -1993,11 +1990,11 @@ _who_roster(ProfWin *window, const char *const command, gchar **args) } g_slist_free(filtered); - // unavailable + // unavailable } else if (strcmp("unavailable", presence) == 0) { - GSList *filtered = NULL; + GSList* filtered = NULL; - GSList *curr = list; + GSList* curr = list; while (curr) { PContact contact = curr->data; if (!p_contact_is_available(contact)) { @@ -2023,11 +2020,11 @@ _who_roster(ProfWin *window, const char *const command, gchar **args) } g_slist_free(filtered); - // online, available resources + // online, available resources } else if (strcmp("online", presence) == 0) { - GSList *filtered = NULL; + GSList* filtered = NULL; - GSList *curr = list; + GSList* curr = list; while (curr) { PContact contact = curr->data; if (p_contact_has_available_resource(contact)) { @@ -2053,11 +2050,11 @@ _who_roster(ProfWin *window, const char *const command, gchar **args) } g_slist_free(filtered); - // offline, no available resources + // offline, no available resources } else if (strcmp("offline", presence) == 0) { - GSList *filtered = NULL; + GSList* filtered = NULL; - GSList *curr = list; + GSList* curr = list; while (curr) { PContact contact = curr->data; if (!p_contact_has_available_resource(contact)) { @@ -2083,11 +2080,11 @@ _who_roster(ProfWin *window, const char *const command, gchar **args) } g_slist_free(filtered); - // show specific status + // show specific status } else { - GSList *filtered = NULL; + GSList* filtered = NULL; - GSList *curr = list; + GSList* curr = list; while (curr) { PContact contact = curr->data; if (strcmp(p_contact_presence(contact), presence) == 0) { @@ -2118,7 +2115,7 @@ _who_roster(ProfWin *window, const char *const command, gchar **args) } gboolean -cmd_who(ProfWin *window, const char *const command, gchar **args) +cmd_who(ProfWin* window, const char* const command, gchar** args) { jabber_conn_status_t conn_status = connection_get_status(); @@ -2138,10 +2135,10 @@ cmd_who(ProfWin *window, const char *const command, gchar **args) } gboolean -cmd_msg(ProfWin *window, const char *const command, gchar **args) +cmd_msg(ProfWin* window, const char* const command, gchar** args) { - char *usr = args[0]; - char *msg = args[1]; + char* usr = args[0]; + char* msg = args[1]; jabber_conn_status_t conn_status = connection_get_status(); @@ -2152,14 +2149,14 @@ cmd_msg(ProfWin *window, const char *const command, gchar **args) // send private message when in MUC room if (window->type == WIN_MUC) { - ProfMucWin *mucwin = (ProfMucWin*)window; + ProfMucWin* mucwin = (ProfMucWin*)window; assert(mucwin->memcheck == PROFMUCWIN_MEMCHECK); if (muc_roster_contains_nick(mucwin->roomjid, usr)) { - GString *full_jid = g_string_new(mucwin->roomjid); + GString* full_jid = g_string_new(mucwin->roomjid); g_string_append(full_jid, "/"); g_string_append(full_jid, usr); - ProfPrivateWin *privwin = wins_get_private(full_jid->str); + ProfPrivateWin* privwin = wins_get_private(full_jid->str); if (!privwin) { privwin = (ProfPrivateWin*)wins_new_private(full_jid->str); } @@ -2177,14 +2174,14 @@ cmd_msg(ProfWin *window, const char *const command, gchar **args) return TRUE; - // send chat message + // send chat message } else { - char *barejid = roster_barejid_from_name(usr); + char* barejid = roster_barejid_from_name(usr); if (barejid == NULL) { barejid = usr; } - ProfChatWin *chatwin = wins_get_chat(barejid); + ProfChatWin* chatwin = wins_get_chat(barejid); if (!chatwin) { chatwin = chatwin_new(barejid); } @@ -2221,7 +2218,7 @@ cmd_msg(ProfWin *window, const char *const command, gchar **args) } gboolean -cmd_group(ProfWin *window, const char *const command, gchar **args) +cmd_group(ProfWin* window, const char* const command, gchar** args) { jabber_conn_status_t conn_status = connection_get_status(); @@ -2232,8 +2229,8 @@ cmd_group(ProfWin *window, const char *const command, gchar **args) // list all groups if (args[1] == NULL) { - GList *groups = roster_get_groups(); - GList *curr = groups; + GList* groups = roster_get_groups(); + GList* curr = groups; if (curr) { cons_show("Groups:"); while (curr) { @@ -2250,28 +2247,28 @@ cmd_group(ProfWin *window, const char *const command, gchar **args) // show contacts in group if (strcmp(args[1], "show") == 0) { - char *group = args[2]; + char* group = args[2]; if (group == NULL) { cons_bad_cmd_usage(command); return TRUE; } - GSList *list = roster_get_group(group, ROSTER_ORD_NAME); + GSList* list = roster_get_group(group, ROSTER_ORD_NAME); cons_show_roster_group(group, list); return TRUE; } // add contact to group if (strcmp(args[1], "add") == 0) { - char *group = args[2]; - char *contact = args[3]; + char* group = args[2]; + char* contact = args[3]; if ((group == NULL) || (contact == NULL)) { cons_bad_cmd_usage(command); return TRUE; } - char *barejid = roster_barejid_from_name(contact); + char* barejid = roster_barejid_from_name(contact); if (barejid == NULL) { barejid = contact; } @@ -2283,7 +2280,7 @@ cmd_group(ProfWin *window, const char *const command, gchar **args) } if (p_contact_in_group(pcontact, group)) { - const char *display_name = p_contact_name_or_jid(pcontact); + const char* display_name = p_contact_name_or_jid(pcontact); ui_contact_already_in_group(display_name, group); } else { roster_send_add_to_group(group, pcontact); @@ -2294,15 +2291,15 @@ cmd_group(ProfWin *window, const char *const command, gchar **args) // remove contact from group if (strcmp(args[1], "remove") == 0) { - char *group = args[2]; - char *contact = args[3]; + char* group = args[2]; + char* contact = args[3]; if ((group == NULL) || (contact == NULL)) { cons_bad_cmd_usage(command); return TRUE; } - char *barejid = roster_barejid_from_name(contact); + char* barejid = roster_barejid_from_name(contact); if (barejid == NULL) { barejid = contact; } @@ -2314,7 +2311,7 @@ cmd_group(ProfWin *window, const char *const command, gchar **args) } if (!p_contact_in_group(pcontact, group)) { - const char *display_name = p_contact_name_or_jid(pcontact); + const char* display_name = p_contact_name_or_jid(pcontact); ui_contact_not_in_group(display_name, group); } else { roster_send_remove_from_group(group, pcontact); @@ -2328,7 +2325,7 @@ cmd_group(ProfWin *window, const char *const command, gchar **args) } gboolean -cmd_roster(ProfWin *window, const char *const command, gchar **args) +cmd_roster(ProfWin* window, const char* const command, gchar** args) { jabber_conn_status_t conn_status = connection_get_status(); @@ -2339,31 +2336,31 @@ cmd_roster(ProfWin *window, const char *const command, gchar **args) return TRUE; } - GSList *list = roster_get_contacts(ROSTER_ORD_NAME); + GSList* list = roster_get_contacts(ROSTER_ORD_NAME); cons_show_roster(list); g_slist_free(list); return TRUE; - // show roster, only online contacts - } else if(g_strcmp0(args[0], "online") == 0){ + // show roster, only online contacts + } else if (g_strcmp0(args[0], "online") == 0) { if (conn_status != JABBER_CONNECTED) { cons_show("You are not currently connected."); return TRUE; } - GSList *list = roster_get_contacts_online(); + GSList* list = roster_get_contacts_online(); cons_show_roster(list); g_slist_free(list); return TRUE; - // set roster size + // set roster size } else if (g_strcmp0(args[0], "size") == 0) { if (!args[1]) { cons_bad_cmd_usage(command); return TRUE; } int intval = 0; - char *err_msg = NULL; + char* err_msg = NULL; gboolean res = strtoi_range(args[1], &intval, 1, 99, &err_msg); if (res) { prefs_set_roster_size(intval); @@ -2378,7 +2375,7 @@ cmd_roster(ProfWin *window, const char *const command, gchar **args) return TRUE; } - // set line wrapping + // set line wrapping } else if (g_strcmp0(args[0], "wrap") == 0) { if (!args[1]) { cons_bad_cmd_usage(command); @@ -2389,7 +2386,7 @@ cmd_roster(ProfWin *window, const char *const command, gchar **args) return TRUE; } - // header settings + // header settings } else if (g_strcmp0(args[0], "header") == 0) { if (g_strcmp0(args[1], "char") == 0) { if (!args[2]) { @@ -2408,7 +2405,7 @@ cmd_roster(ProfWin *window, const char *const command, gchar **args) } return TRUE; - // contact settings + // contact settings } else if (g_strcmp0(args[0], "contact") == 0) { if (g_strcmp0(args[1], "char") == 0) { if (!args[2]) { @@ -2427,7 +2424,7 @@ cmd_roster(ProfWin *window, const char *const command, gchar **args) cons_bad_cmd_usage(command); } else { int intval = 0; - char *err_msg = NULL; + char* err_msg = NULL; gboolean res = strtoi_range(args[2], &intval, 0, 10, &err_msg); if (res) { prefs_set_roster_contact_indent(intval); @@ -2443,7 +2440,7 @@ cmd_roster(ProfWin *window, const char *const command, gchar **args) } return TRUE; - // resource settings + // resource settings } else if (g_strcmp0(args[0], "resource") == 0) { if (g_strcmp0(args[1], "char") == 0) { if (!args[2]) { @@ -2462,7 +2459,7 @@ cmd_roster(ProfWin *window, const char *const command, gchar **args) cons_bad_cmd_usage(command); } else { int intval = 0; - char *err_msg = NULL; + char* err_msg = NULL; gboolean res = strtoi_range(args[2], &intval, 0, 10, &err_msg); if (res) { prefs_set_roster_resource_indent(intval); @@ -2482,14 +2479,14 @@ cmd_roster(ProfWin *window, const char *const command, gchar **args) } return TRUE; - // presence settings + // presence settings } else if (g_strcmp0(args[0], "presence") == 0) { if (g_strcmp0(args[1], "indent") == 0) { if (!args[2]) { cons_bad_cmd_usage(command); } else { int intval = 0; - char *err_msg = NULL; + char* err_msg = NULL; gboolean res = strtoi_range(args[2], &intval, -1, 10, &err_msg); if (res) { prefs_set_roster_presence_indent(intval); @@ -2505,10 +2502,10 @@ cmd_roster(ProfWin *window, const char *const command, gchar **args) } return TRUE; - // show/hide roster + // show/hide roster } else if ((g_strcmp0(args[0], "show") == 0) || (g_strcmp0(args[0], "hide") == 0)) { preference_t pref; - const char *pref_str; + const char* pref_str; if (args[1] == NULL) { pref = PREF_ROSTER; pref_str = ""; @@ -2568,7 +2565,7 @@ cmd_roster(ProfWin *window, const char *const command, gchar **args) } return TRUE; - // roster grouping + // roster grouping } else if (g_strcmp0(args[0], "by") == 0) { if (g_strcmp0(args[1], "group") == 0) { cons_show("Grouping roster by roster group"); @@ -2596,7 +2593,7 @@ cmd_roster(ProfWin *window, const char *const command, gchar **args) return TRUE; } - // roster item order + // roster item order } else if (g_strcmp0(args[0], "order") == 0) { if (g_strcmp0(args[1], "name") == 0) { cons_show("Ordering roster by name"); @@ -2885,28 +2882,28 @@ cmd_roster(ProfWin *window, const char *const command, gchar **args) return TRUE; } - // add contact + // add contact } else if (strcmp(args[0], "add") == 0) { if (conn_status != JABBER_CONNECTED) { cons_show("You are not currently connected."); return TRUE; } - char *jid = args[1]; + char* jid = args[1]; if (jid == NULL) { cons_bad_cmd_usage(command); } else { - char *name = args[2]; + char* name = args[2]; roster_send_add_new(jid, name); } return TRUE; - // remove contact + // remove contact } else if (strcmp(args[0], "remove") == 0) { if (conn_status != JABBER_CONNECTED) { cons_show("You are not currently connected."); return TRUE; } - char *jid = args[1]; + char* jid = args[1]; if (jid == NULL) { cons_bad_cmd_usage(command); } else { @@ -2924,8 +2921,8 @@ cmd_roster(ProfWin *window, const char *const command, gchar **args) return TRUE; } - GSList *all = roster_get_contacts(ROSTER_ORD_NAME); - GSList *curr = all; + GSList* all = roster_get_contacts(ROSTER_ORD_NAME); + GSList* curr = all; while (curr) { PContact contact = curr->data; roster_send_remove(p_contact_barejid(contact)); @@ -2935,19 +2932,19 @@ cmd_roster(ProfWin *window, const char *const command, gchar **args) g_slist_free(all); return TRUE; - // change nickname + // change nickname } else if (strcmp(args[0], "nick") == 0) { if (conn_status != JABBER_CONNECTED) { cons_show("You are not currently connected."); return TRUE; } - char *jid = args[1]; + char* jid = args[1]; if (jid == NULL) { cons_bad_cmd_usage(command); return TRUE; } - char *name = args[2]; + char* name = args[2]; if (name == NULL) { cons_bad_cmd_usage(command); return TRUE; @@ -2960,27 +2957,26 @@ cmd_roster(ProfWin *window, const char *const command, gchar **args) return TRUE; } - const char *barejid = p_contact_barejid(contact); + const char* barejid = p_contact_barejid(contact); // TODO wait for result stanza before updating - const char *oldnick = p_contact_name(contact); + const char* oldnick = p_contact_name(contact); wins_change_nick(barejid, oldnick, name); roster_change_name(contact, name); - GSList *groups = p_contact_groups(contact); + GSList* groups = p_contact_groups(contact); roster_send_name_change(barejid, name, groups); - cons_show("Nickname for %s set to: %s.", jid, name); return TRUE; - // remove nickname + // remove nickname } else if (strcmp(args[0], "clearnick") == 0) { if (conn_status != JABBER_CONNECTED) { cons_show("You are not currently connected."); return TRUE; } - char *jid = args[1]; + char* jid = args[1]; if (jid == NULL) { cons_bad_cmd_usage(command); return TRUE; @@ -2993,13 +2989,13 @@ cmd_roster(ProfWin *window, const char *const command, gchar **args) return TRUE; } - const char *barejid = p_contact_barejid(contact); + const char* barejid = p_contact_barejid(contact); // TODO wait for result stanza before updating - const char *oldnick = p_contact_name(contact); + const char* oldnick = p_contact_name(contact); wins_remove_nick(barejid, oldnick); roster_change_name(contact, NULL); - GSList *groups = p_contact_groups(contact); + GSList* groups = p_contact_groups(contact); roster_send_name_change(barejid, NULL, groups); cons_show("Nickname for %s removed.", jid); @@ -3012,7 +3008,7 @@ cmd_roster(ProfWin *window, const char *const command, gchar **args) } gboolean -cmd_blocked(ProfWin *window, const char *const command, gchar **args) +cmd_blocked(ProfWin* window, const char* const command, gchar** args) { if (connection_get_status() != JABBER_CONNECTED) { cons_show("You are not currently connected."); @@ -3025,9 +3021,9 @@ cmd_blocked(ProfWin *window, const char *const command, gchar **args) } if (g_strcmp0(args[0], "add") == 0) { - char *jid = args[1]; + char* jid = args[1]; if (jid == NULL && (window->type == WIN_CHAT)) { - ProfChatWin *chatwin = (ProfChatWin*)window; + ProfChatWin* chatwin = (ProfChatWin*)window; jid = chatwin->barejid; } @@ -3058,8 +3054,8 @@ cmd_blocked(ProfWin *window, const char *const command, gchar **args) return TRUE; } - GList *blocked = blocked_list(); - GList *curr = blocked; + GList* blocked = blocked_list(); + GList* curr = blocked; if (curr) { cons_show("Blocked users:"); while (curr) { @@ -3074,10 +3070,10 @@ cmd_blocked(ProfWin *window, const char *const command, gchar **args) } gboolean -cmd_resource(ProfWin *window, const char *const command, gchar **args) +cmd_resource(ProfWin* window, const char* const command, gchar** args) { - char *cmd = args[0]; - char *setting = NULL; + char* cmd = args[0]; + char* setting = NULL; if (g_strcmp0(cmd, "message") == 0) { setting = args[1]; if (!setting) { @@ -3109,10 +3105,10 @@ cmd_resource(ProfWin *window, const char *const command, gchar **args) return TRUE; } - ProfChatWin *chatwin = (ProfChatWin*)window; + ProfChatWin* chatwin = (ProfChatWin*)window; if (g_strcmp0(cmd, "set") == 0) { - char *resource = args[1]; + char* resource = args[1]; if (!resource) { cons_bad_cmd_usage(command); return TRUE; @@ -3157,7 +3153,7 @@ cmd_resource(ProfWin *window, const char *const command, gchar **args) static void _cmd_status_show_status(char* usr) { - char *usr_jid = roster_barejid_from_name(usr); + char* usr_jid = roster_barejid_from_name(usr); if (usr_jid == NULL) { usr_jid = usr; } @@ -3165,9 +3161,9 @@ _cmd_status_show_status(char* usr) } gboolean -cmd_status_set(ProfWin *window, const char *const command, gchar **args) +cmd_status_set(ProfWin* window, const char* const command, gchar** args) { - char *state = args[1]; + char* state = args[1]; if (g_strcmp0(state, "online") == 0) { _update_presence(RESOURCE_ONLINE, "online", args); @@ -3187,9 +3183,9 @@ cmd_status_set(ProfWin *window, const char *const command, gchar **args) } gboolean -cmd_status_get(ProfWin *window, const char *const command, gchar **args) +cmd_status_get(ProfWin* window, const char* const command, gchar** args) { - char *usr = args[1]; + char* usr = args[1]; jabber_conn_status_t conn_status = connection_get_status(); @@ -3198,70 +3194,69 @@ cmd_status_get(ProfWin *window, const char *const command, gchar **args) return TRUE; } - switch (window->type) - { - case WIN_MUC: - if (usr) { - ProfMucWin *mucwin = (ProfMucWin*)window; - assert(mucwin->memcheck == PROFMUCWIN_MEMCHECK); - Occupant *occupant = muc_roster_item(mucwin->roomjid, usr); - if (occupant) { - win_show_occupant(window, occupant); - } else { - win_println(window, THEME_DEFAULT, "-", "No such participant \"%s\" in room.", usr); - } - } else { - win_println(window, THEME_DEFAULT, "-", "You must specify a nickname."); - } - break; - case WIN_CHAT: - if (usr) { - _cmd_status_show_status(usr); + switch (window->type) { + case WIN_MUC: + if (usr) { + ProfMucWin* mucwin = (ProfMucWin*)window; + assert(mucwin->memcheck == PROFMUCWIN_MEMCHECK); + Occupant* occupant = muc_roster_item(mucwin->roomjid, usr); + if (occupant) { + win_show_occupant(window, occupant); } else { - ProfChatWin *chatwin = (ProfChatWin*)window; - assert(chatwin->memcheck == PROFCHATWIN_MEMCHECK); - PContact pcontact = roster_get_contact(chatwin->barejid); - if (pcontact) { - win_show_contact(window, pcontact); - } else { - win_println(window, THEME_DEFAULT, "-", "Error getting contact info."); - } + win_println(window, THEME_DEFAULT, "-", "No such participant \"%s\" in room.", usr); } - break; - case WIN_PRIVATE: - if (usr) { - _cmd_status_show_status(usr); + } else { + win_println(window, THEME_DEFAULT, "-", "You must specify a nickname."); + } + break; + case WIN_CHAT: + if (usr) { + _cmd_status_show_status(usr); + } else { + ProfChatWin* chatwin = (ProfChatWin*)window; + assert(chatwin->memcheck == PROFCHATWIN_MEMCHECK); + PContact pcontact = roster_get_contact(chatwin->barejid); + if (pcontact) { + win_show_contact(window, pcontact); } else { - ProfPrivateWin *privatewin = (ProfPrivateWin*)window; - assert(privatewin->memcheck == PROFPRIVATEWIN_MEMCHECK); - Jid *jid = jid_create(privatewin->fulljid); - Occupant *occupant = muc_roster_item(jid->barejid, jid->resourcepart); - if (occupant) { - win_show_occupant(window, occupant); - } else { - win_println(window, THEME_DEFAULT, "-", "Error getting contact info."); - } - jid_destroy(jid); + win_println(window, THEME_DEFAULT, "-", "Error getting contact info."); } - break; - case WIN_CONSOLE: - if (usr) { - _cmd_status_show_status(usr); + } + break; + case WIN_PRIVATE: + if (usr) { + _cmd_status_show_status(usr); + } else { + ProfPrivateWin* privatewin = (ProfPrivateWin*)window; + assert(privatewin->memcheck == PROFPRIVATEWIN_MEMCHECK); + Jid* jid = jid_create(privatewin->fulljid); + Occupant* occupant = muc_roster_item(jid->barejid, jid->resourcepart); + if (occupant) { + win_show_occupant(window, occupant); } else { - cons_bad_cmd_usage(command); + win_println(window, THEME_DEFAULT, "-", "Error getting contact info."); } - break; - default: - break; + jid_destroy(jid); + } + break; + case WIN_CONSOLE: + if (usr) { + _cmd_status_show_status(usr); + } else { + cons_bad_cmd_usage(command); + } + break; + default: + break; } return TRUE; } static void -_cmd_info_show_contact(char *usr) +_cmd_info_show_contact(char* usr) { - char *usr_jid = roster_barejid_from_name(usr); + char* usr_jid = roster_barejid_from_name(usr); if (usr_jid == NULL) { usr_jid = usr; } @@ -3274,9 +3269,9 @@ _cmd_info_show_contact(char *usr) } gboolean -cmd_info(ProfWin *window, const char *const command, gchar **args) +cmd_info(ProfWin* window, const char* const command, gchar** args) { - char *usr = args[0]; + char* usr = args[0]; jabber_conn_status_t conn_status = connection_get_status(); @@ -3285,150 +3280,148 @@ cmd_info(ProfWin *window, const char *const command, gchar **args) return TRUE; } - switch (window->type) - { - case WIN_MUC: - if (usr) { - ProfMucWin *mucwin = (ProfMucWin*)window; - assert(mucwin->memcheck == PROFMUCWIN_MEMCHECK); - Occupant *occupant = muc_roster_item(mucwin->roomjid, usr); - if (occupant) { - win_show_occupant_info(window, mucwin->roomjid, occupant); - } else { - win_println(window, THEME_DEFAULT, "-", "No such occupant \"%s\" in room.", usr); - } - } else { - ProfMucWin *mucwin = (ProfMucWin*)window; - assert(mucwin->memcheck == PROFMUCWIN_MEMCHECK); - iq_room_info_request(mucwin->roomjid, TRUE); - mucwin_info(mucwin); - return TRUE; - } - break; - case WIN_CHAT: - if (usr) { - _cmd_info_show_contact(usr); + switch (window->type) { + case WIN_MUC: + if (usr) { + ProfMucWin* mucwin = (ProfMucWin*)window; + assert(mucwin->memcheck == PROFMUCWIN_MEMCHECK); + Occupant* occupant = muc_roster_item(mucwin->roomjid, usr); + if (occupant) { + win_show_occupant_info(window, mucwin->roomjid, occupant); } else { - ProfChatWin *chatwin = (ProfChatWin*)window; - assert(chatwin->memcheck == PROFCHATWIN_MEMCHECK); - PContact pcontact = roster_get_contact(chatwin->barejid); - if (pcontact) { - win_show_info(window, pcontact); - } else { - win_println(window, THEME_DEFAULT, "-", "Error getting contact info."); - } + win_println(window, THEME_DEFAULT, "-", "No such occupant \"%s\" in room.", usr); } - break; - case WIN_PRIVATE: - if (usr) { - _cmd_info_show_contact(usr); + } else { + ProfMucWin* mucwin = (ProfMucWin*)window; + assert(mucwin->memcheck == PROFMUCWIN_MEMCHECK); + iq_room_info_request(mucwin->roomjid, TRUE); + mucwin_info(mucwin); + return TRUE; + } + break; + case WIN_CHAT: + if (usr) { + _cmd_info_show_contact(usr); + } else { + ProfChatWin* chatwin = (ProfChatWin*)window; + assert(chatwin->memcheck == PROFCHATWIN_MEMCHECK); + PContact pcontact = roster_get_contact(chatwin->barejid); + if (pcontact) { + win_show_info(window, pcontact); } else { - ProfPrivateWin *privatewin = (ProfPrivateWin*)window; - assert(privatewin->memcheck == PROFPRIVATEWIN_MEMCHECK); - Jid *jid = jid_create(privatewin->fulljid); - Occupant *occupant = muc_roster_item(jid->barejid, jid->resourcepart); - if (occupant) { - win_show_occupant_info(window, jid->barejid, occupant); - } else { - win_println(window, THEME_DEFAULT, "-", "Error getting contact info."); - } - jid_destroy(jid); + win_println(window, THEME_DEFAULT, "-", "Error getting contact info."); } - break; - case WIN_CONSOLE: - if (usr) { - _cmd_info_show_contact(usr); + } + break; + case WIN_PRIVATE: + if (usr) { + _cmd_info_show_contact(usr); + } else { + ProfPrivateWin* privatewin = (ProfPrivateWin*)window; + assert(privatewin->memcheck == PROFPRIVATEWIN_MEMCHECK); + Jid* jid = jid_create(privatewin->fulljid); + Occupant* occupant = muc_roster_item(jid->barejid, jid->resourcepart); + if (occupant) { + win_show_occupant_info(window, jid->barejid, occupant); } else { - cons_bad_cmd_usage(command); + win_println(window, THEME_DEFAULT, "-", "Error getting contact info."); } - break; - default: - break; + jid_destroy(jid); + } + break; + case WIN_CONSOLE: + if (usr) { + _cmd_info_show_contact(usr); + } else { + cons_bad_cmd_usage(command); + } + break; + default: + break; } return TRUE; } gboolean -cmd_caps(ProfWin *window, const char *const command, gchar **args) +cmd_caps(ProfWin* window, const char* const command, gchar** args) { jabber_conn_status_t conn_status = connection_get_status(); - Occupant *occupant = NULL; + Occupant* occupant = NULL; if (conn_status != JABBER_CONNECTED) { cons_show("You are not currently connected."); return TRUE; } - switch (window->type) - { - case WIN_MUC: - if (args[0]) { - ProfMucWin *mucwin = (ProfMucWin*)window; - assert(mucwin->memcheck == PROFMUCWIN_MEMCHECK); - occupant = muc_roster_item(mucwin->roomjid, args[0]); - if (occupant) { - Jid *jidp = jid_create_from_bare_and_resource(mucwin->roomjid, args[0]); - cons_show_caps(jidp->fulljid, occupant->presence); - jid_destroy(jidp); - } else { - cons_show("No such participant \"%s\" in room.", args[0]); - } + switch (window->type) { + case WIN_MUC: + if (args[0]) { + ProfMucWin* mucwin = (ProfMucWin*)window; + assert(mucwin->memcheck == PROFMUCWIN_MEMCHECK); + occupant = muc_roster_item(mucwin->roomjid, args[0]); + if (occupant) { + Jid* jidp = jid_create_from_bare_and_resource(mucwin->roomjid, args[0]); + cons_show_caps(jidp->fulljid, occupant->presence); + jid_destroy(jidp); } else { - cons_show("No nickname supplied to /caps in chat room."); + cons_show("No such participant \"%s\" in room.", args[0]); } - break; - case WIN_CHAT: - case WIN_CONSOLE: - if (args[0]) { - Jid *jid = jid_create(args[0]); + } else { + cons_show("No nickname supplied to /caps in chat room."); + } + break; + case WIN_CHAT: + case WIN_CONSOLE: + if (args[0]) { + Jid* jid = jid_create(args[0]); - if (jid->fulljid == NULL) { - cons_show("You must provide a full jid to the /caps command."); + if (jid->fulljid == NULL) { + cons_show("You must provide a full jid to the /caps command."); + } else { + PContact pcontact = roster_get_contact(jid->barejid); + if (pcontact == NULL) { + cons_show("Contact not found in roster: %s", jid->barejid); } else { - PContact pcontact = roster_get_contact(jid->barejid); - if (pcontact == NULL) { - cons_show("Contact not found in roster: %s", jid->barejid); + Resource* resource = p_contact_get_resource(pcontact, jid->resourcepart); + if (resource == NULL) { + cons_show("Could not find resource %s, for contact %s", jid->barejid, jid->resourcepart); } else { - Resource *resource = p_contact_get_resource(pcontact, jid->resourcepart); - if (resource == NULL) { - cons_show("Could not find resource %s, for contact %s", jid->barejid, jid->resourcepart); - } else { - cons_show_caps(jid->fulljid, resource->presence); - } + cons_show_caps(jid->fulljid, resource->presence); } } - jid_destroy(jid); - } else { - cons_show("You must provide a jid to the /caps command."); } - break; - case WIN_PRIVATE: - if (args[0]) { - cons_show("No parameter needed to /caps when in private chat."); - } else { - ProfPrivateWin *privatewin = (ProfPrivateWin*)window; - assert(privatewin->memcheck == PROFPRIVATEWIN_MEMCHECK); - Jid *jid = jid_create(privatewin->fulljid); - if (jid) { - occupant = muc_roster_item(jid->barejid, jid->resourcepart); - cons_show_caps(jid->resourcepart, occupant->presence); - jid_destroy(jid); - } + jid_destroy(jid); + } else { + cons_show("You must provide a jid to the /caps command."); + } + break; + case WIN_PRIVATE: + if (args[0]) { + cons_show("No parameter needed to /caps when in private chat."); + } else { + ProfPrivateWin* privatewin = (ProfPrivateWin*)window; + assert(privatewin->memcheck == PROFPRIVATEWIN_MEMCHECK); + Jid* jid = jid_create(privatewin->fulljid); + if (jid) { + occupant = muc_roster_item(jid->barejid, jid->resourcepart); + cons_show_caps(jid->resourcepart, occupant->presence); + jid_destroy(jid); } - break; - default: - break; + } + break; + default: + break; } return TRUE; } static void -_send_software_version_iq_to_fulljid(char *request) +_send_software_version_iq_to_fulljid(char* request) { - char *mybarejid = connection_get_barejid(); - Jid *jid = jid_create(request); + char* mybarejid = connection_get_barejid(); + Jid* jid = jid_create(request); if (jid == NULL || jid->fulljid == NULL) { cons_show("You must provide a full jid to the /software command."); @@ -3442,7 +3435,7 @@ _send_software_version_iq_to_fulljid(char *request) } gboolean -cmd_software(ProfWin *window, const char *const command, gchar **args) +cmd_software(ProfWin* window, const char* const command, gchar** args) { jabber_conn_status_t conn_status = connection_get_status(); @@ -3451,75 +3444,74 @@ cmd_software(ProfWin *window, const char *const command, gchar **args) return TRUE; } - switch (window->type) - { - case WIN_MUC: - if (args[0]) { - ProfMucWin *mucwin = (ProfMucWin*)window; - assert(mucwin->memcheck == PROFMUCWIN_MEMCHECK); - Occupant *occupant = muc_roster_item(mucwin->roomjid, args[0]); - if (occupant) { - Jid *jid = jid_create_from_bare_and_resource(mucwin->roomjid, args[0]); - iq_send_software_version(jid->fulljid); - jid_destroy(jid); - } else { - cons_show("No such participant \"%s\" in room.", args[0]); - } + switch (window->type) { + case WIN_MUC: + if (args[0]) { + ProfMucWin* mucwin = (ProfMucWin*)window; + assert(mucwin->memcheck == PROFMUCWIN_MEMCHECK); + Occupant* occupant = muc_roster_item(mucwin->roomjid, args[0]); + if (occupant) { + Jid* jid = jid_create_from_bare_and_resource(mucwin->roomjid, args[0]); + iq_send_software_version(jid->fulljid); + jid_destroy(jid); } else { - cons_show("No nickname supplied to /software in chat room."); + cons_show("No such participant \"%s\" in room.", args[0]); } + } else { + cons_show("No nickname supplied to /software in chat room."); + } + break; + case WIN_CHAT: + if (args[0]) { + _send_software_version_iq_to_fulljid(args[0]); break; - case WIN_CHAT: - if (args[0]) { - _send_software_version_iq_to_fulljid(args[0]); - break; - } else { - ProfChatWin *chatwin = (ProfChatWin*)window; - assert(chatwin->memcheck == PROFCHATWIN_MEMCHECK); - - char *resource = NULL; - ChatSession *session = chat_session_get(chatwin->barejid); - if (chatwin->resource_override) { - resource = chatwin->resource_override; - } else if (session && session->resource) { - resource = session->resource; - } + } else { + ProfChatWin* chatwin = (ProfChatWin*)window; + assert(chatwin->memcheck == PROFCHATWIN_MEMCHECK); - if (resource) { - GString *fulljid = g_string_new(chatwin->barejid); - g_string_append_printf(fulljid, "/%s", resource); - iq_send_software_version(fulljid->str); - g_string_free(fulljid, TRUE); - } else { - win_println(window, THEME_DEFAULT, "-", "Unknown resource for /software command. See /help resource."); - } - break; + char* resource = NULL; + ChatSession* session = chat_session_get(chatwin->barejid); + if (chatwin->resource_override) { + resource = chatwin->resource_override; + } else if (session && session->resource) { + resource = session->resource; } - case WIN_CONSOLE: - if (args[0]) { - _send_software_version_iq_to_fulljid(args[0]); - } else { - cons_show("You must provide a jid to the /software command."); - } - break; - case WIN_PRIVATE: - if (args[0]) { - cons_show("No parameter needed to /software when in private chat."); + + if (resource) { + GString* fulljid = g_string_new(chatwin->barejid); + g_string_append_printf(fulljid, "/%s", resource); + iq_send_software_version(fulljid->str); + g_string_free(fulljid, TRUE); } else { - ProfPrivateWin *privatewin = (ProfPrivateWin*)window; - assert(privatewin->memcheck == PROFPRIVATEWIN_MEMCHECK); - iq_send_software_version(privatewin->fulljid); + win_println(window, THEME_DEFAULT, "-", "Unknown resource for /software command. See /help resource."); } break; - default: - break; + } + case WIN_CONSOLE: + if (args[0]) { + _send_software_version_iq_to_fulljid(args[0]); + } else { + cons_show("You must provide a jid to the /software command."); + } + break; + case WIN_PRIVATE: + if (args[0]) { + cons_show("No parameter needed to /software when in private chat."); + } else { + ProfPrivateWin* privatewin = (ProfPrivateWin*)window; + assert(privatewin->memcheck == PROFPRIVATEWIN_MEMCHECK); + iq_send_software_version(privatewin->fulljid); + } + break; + default: + break; } return TRUE; } gboolean -cmd_serversoftware(ProfWin *window, const char *const command, gchar **args) +cmd_serversoftware(ProfWin* window, const char* const command, gchar** args) { jabber_conn_status_t conn_status = connection_get_status(); @@ -3538,7 +3530,7 @@ cmd_serversoftware(ProfWin *window, const char *const command, gchar **args) } gboolean -cmd_join(ProfWin *window, const char *const command, gchar **args) +cmd_join(ProfWin* window, const char* const command, gchar** args) { jabber_conn_status_t conn_status = connection_get_status(); if (conn_status != JABBER_CONNECTED) { @@ -3547,11 +3539,11 @@ cmd_join(ProfWin *window, const char *const command, gchar **args) } if (args[0] == NULL) { - char *account_name = session_get_account_name(); - ProfAccount *account = accounts_get_account(account_name); + char* account_name = session_get_account_name(); + ProfAccount* account = accounts_get_account(account_name); if (account->muc_service) { - GString *room_str = g_string_new(""); - char *uuid = connection_create_uuid(); + GString* room_str = g_string_new(""); + char* uuid = connection_create_uuid(); g_string_append_printf(room_str, "private-chat-%s@%s", uuid, account->muc_service); connection_free_uuid(uuid); @@ -3567,43 +3559,43 @@ cmd_join(ProfWin *window, const char *const command, gchar **args) return TRUE; } - Jid *room_arg = jid_create(args[0]); + Jid* room_arg = jid_create(args[0]); if (room_arg == NULL) { cons_show_error("Specified room has incorrect format."); cons_show(""); return TRUE; } - char *room = NULL; - char *nick = NULL; - char *passwd = NULL; - char *account_name = session_get_account_name(); - ProfAccount *account = accounts_get_account(account_name); + char* room = NULL; + char* nick = NULL; + char* passwd = NULL; + char* account_name = session_get_account_name(); + ProfAccount* account = accounts_get_account(account_name); // full room jid supplied (room@server) if (room_arg->localpart) { room = g_strdup(args[0]); - // server not supplied (room), use account preference + // server not supplied (room), use account preference } else if (account->muc_service) { - GString *room_str = g_string_new(""); + GString* room_str = g_string_new(""); g_string_append(room_str, args[0]); g_string_append(room_str, "@"); g_string_append(room_str, account->muc_service); room = room_str->str; g_string_free(room_str, FALSE); - // no account preference + // no account preference } else { cons_show("Account MUC service property not found."); return TRUE; } // Additional args supplied - gchar *opt_keys[] = { "nick", "password", NULL }; + gchar* opt_keys[] = { "nick", "password", NULL }; gboolean parsed; - GHashTable *options = parse_options(&args[1], opt_keys, &parsed); + GHashTable* options = parse_options(&args[1], opt_keys, &parsed); if (!parsed) { cons_bad_cmd_usage(command); cons_show(""); @@ -3645,7 +3637,7 @@ cmd_join(ProfWin *window, const char *const command, gchar **args) } gboolean -cmd_invite(ProfWin *window, const char *const command, gchar **args) +cmd_invite(ProfWin* window, const char* const command, gchar** args) { jabber_conn_status_t conn_status = connection_get_status(); @@ -3655,31 +3647,31 @@ cmd_invite(ProfWin *window, const char *const command, gchar **args) } if (g_strcmp0(args[0], "send") == 0) { - char *contact = args[1]; - char *reason = args[2]; + char* contact = args[1]; + char* reason = args[2]; if (window->type != WIN_MUC) { cons_show("You must be in a chat room to send an invite."); return TRUE; } - char *usr_jid = roster_barejid_from_name(contact); + char* usr_jid = roster_barejid_from_name(contact); if (usr_jid == NULL) { usr_jid = contact; } - ProfMucWin *mucwin = (ProfMucWin*)window; + ProfMucWin* mucwin = (ProfMucWin*)window; assert(mucwin->memcheck == PROFMUCWIN_MEMCHECK); message_send_invite(mucwin->roomjid, usr_jid, reason); if (reason) { cons_show("Room invite sent, contact: %s, room: %s, reason: \"%s\".", - contact, mucwin->roomjid, reason); + contact, mucwin->roomjid, reason); } else { cons_show("Room invite sent, contact: %s, room: %s.", - contact, mucwin->roomjid); + contact, mucwin->roomjid); } } else if (g_strcmp0(args[0], "list") == 0) { - GList *invites = muc_invites(); + GList* invites = muc_invites(); cons_show_room_invites(invites); g_list_free_full(invites, g_free); } else if (g_strcmp0(args[0], "decline") == 0) { @@ -3695,14 +3687,14 @@ cmd_invite(ProfWin *window, const char *const command, gchar **args) } gboolean -cmd_form_field(ProfWin *window, char *tag, gchar **args) +cmd_form_field(ProfWin* window, char* tag, gchar** args) { if (window->type != WIN_CONFIG) { return TRUE; } - ProfConfWin *confwin = (ProfConfWin*)window; - DataForm *form = confwin->form; + ProfConfWin* confwin = (ProfConfWin*)window; + DataForm* form = confwin->form; if (form) { if (!form_tag_exists(form, tag)) { win_println(window, THEME_DEFAULT, "-", "Form does not contain a field with tag %s", tag); @@ -3710,8 +3702,8 @@ cmd_form_field(ProfWin *window, char *tag, gchar **args) } form_field_type_t field_type = form_get_field_type(form, tag); - char *cmd = NULL; - char *value = NULL; + char* cmd = NULL; + char* value = NULL; gboolean valid = FALSE; gboolean added = FALSE; gboolean removed = FALSE; @@ -3913,7 +3905,7 @@ cmd_form_field(ProfWin *window, char *tag, gchar **args) } gboolean -cmd_form(ProfWin *window, const char *const command, gchar **args) +cmd_form(ProfWin* window, const char* const command, gchar** args) { jabber_conn_status_t conn_status = connection_get_status(); @@ -3927,15 +3919,12 @@ cmd_form(ProfWin *window, const char *const command, gchar **args) return TRUE; } - if ((g_strcmp0(args[0], "submit") != 0) && - (g_strcmp0(args[0], "cancel") != 0) && - (g_strcmp0(args[0], "show") != 0) && - (g_strcmp0(args[0], "help") != 0)) { + if ((g_strcmp0(args[0], "submit") != 0) && (g_strcmp0(args[0], "cancel") != 0) && (g_strcmp0(args[0], "show") != 0) && (g_strcmp0(args[0], "help") != 0)) { cons_bad_cmd_usage(command); return TRUE; } - ProfConfWin *confwin = (ProfConfWin*)window; + ProfConfWin* confwin = (ProfConfWin*)window; assert(confwin->memcheck == PROFCONFWIN_MEMCHECK); if (g_strcmp0(args[0], "show") == 0) { @@ -3944,20 +3933,20 @@ cmd_form(ProfWin *window, const char *const command, gchar **args) } if (g_strcmp0(args[0], "help") == 0) { - char *tag = args[1]; + char* tag = args[1]; if (tag) { confwin_field_help(confwin, tag); } else { confwin_form_help(confwin); - gchar **help_text = NULL; - Command *command = cmd_get("/form"); + gchar** help_text = NULL; + Command* command = cmd_get("/form"); if (command) { help_text = command->help.synopsis; } - ui_show_lines((ProfWin*) confwin, help_text); + ui_show_lines((ProfWin*)confwin, help_text); } win_println(window, THEME_DEFAULT, "-", ""); return TRUE; @@ -3978,7 +3967,7 @@ cmd_form(ProfWin *window, const char *const command, gchar **args) int num = wins_get_num(window); - ProfWin *new_current = (ProfWin*)wins_get_muc(confwin->roomjid); + ProfWin* new_current = (ProfWin*)wins_get_muc(confwin->roomjid); if (!new_current) { new_current = wins_get_console(); } @@ -3991,7 +3980,7 @@ cmd_form(ProfWin *window, const char *const command, gchar **args) } gboolean -cmd_kick(ProfWin *window, const char *const command, gchar **args) +cmd_kick(ProfWin* window, const char* const command, gchar** args) { jabber_conn_status_t conn_status = connection_get_status(); @@ -4005,13 +3994,13 @@ cmd_kick(ProfWin *window, const char *const command, gchar **args) return TRUE; } - ProfMucWin *mucwin = (ProfMucWin*)window; + ProfMucWin* mucwin = (ProfMucWin*)window; assert(mucwin->memcheck == PROFMUCWIN_MEMCHECK); - char *nick = args[0]; + char* nick = args[0]; if (nick) { if (muc_roster_contains_nick(mucwin->roomjid, nick)) { - char *reason = args[1]; + char* reason = args[1]; iq_room_kick_occupant(mucwin->roomjid, nick, reason); } else { win_println(window, THEME_DEFAULT, "!", "Occupant does not exist: %s", nick); @@ -4024,7 +4013,7 @@ cmd_kick(ProfWin *window, const char *const command, gchar **args) } gboolean -cmd_ban(ProfWin *window, const char *const command, gchar **args) +cmd_ban(ProfWin* window, const char* const command, gchar** args) { jabber_conn_status_t conn_status = connection_get_status(); @@ -4038,12 +4027,12 @@ cmd_ban(ProfWin *window, const char *const command, gchar **args) return TRUE; } - ProfMucWin *mucwin = (ProfMucWin*)window; + ProfMucWin* mucwin = (ProfMucWin*)window; assert(mucwin->memcheck == PROFMUCWIN_MEMCHECK); - char *jid = args[0]; + char* jid = args[0]; if (jid) { - char *reason = args[1]; + char* reason = args[1]; iq_room_affiliation_set(mucwin->roomjid, jid, "outcast", reason); } else { cons_bad_cmd_usage(command); @@ -4052,7 +4041,7 @@ cmd_ban(ProfWin *window, const char *const command, gchar **args) } gboolean -cmd_subject(ProfWin *window, const char *const command, gchar **args) +cmd_subject(ProfWin* window, const char* const command, gchar** args) { jabber_conn_status_t conn_status = connection_get_status(); @@ -4066,11 +4055,11 @@ cmd_subject(ProfWin *window, const char *const command, gchar **args) return TRUE; } - ProfMucWin *mucwin = (ProfMucWin*)window; + ProfMucWin* mucwin = (ProfMucWin*)window; assert(mucwin->memcheck == PROFMUCWIN_MEMCHECK); if (args[0] == NULL) { - char *subject = muc_subject(mucwin->roomjid); + char* subject = muc_subject(mucwin->roomjid); if (subject) { win_print(window, THEME_ROOMINFO, "!", "Room subject: "); win_appendln(window, THEME_DEFAULT, "%s", subject); @@ -4100,9 +4089,9 @@ cmd_subject(ProfWin *window, const char *const command, gchar **args) if (g_strcmp0(args[0], "prepend") == 0) { if (args[1]) { - char *old_subject = muc_subject(mucwin->roomjid); + char* old_subject = muc_subject(mucwin->roomjid); if (old_subject) { - GString *new_subject = g_string_new(args[1]); + GString* new_subject = g_string_new(args[1]); g_string_append(new_subject, old_subject); message_send_groupchat_subject(mucwin->roomjid, new_subject->str); g_string_free(new_subject, TRUE); @@ -4117,9 +4106,9 @@ cmd_subject(ProfWin *window, const char *const command, gchar **args) if (g_strcmp0(args[0], "append") == 0) { if (args[1]) { - char *old_subject = muc_subject(mucwin->roomjid); + char* old_subject = muc_subject(mucwin->roomjid); if (old_subject) { - GString *new_subject = g_string_new(old_subject); + GString* new_subject = g_string_new(old_subject); g_string_append(new_subject, args[1]); message_send_groupchat_subject(mucwin->roomjid, new_subject->str); g_string_free(new_subject, TRUE); @@ -4142,7 +4131,7 @@ cmd_subject(ProfWin *window, const char *const command, gchar **args) } gboolean -cmd_affiliation(ProfWin *window, const char *const command, gchar **args) +cmd_affiliation(ProfWin* window, const char* const command, gchar** args) { jabber_conn_status_t conn_status = connection_get_status(); @@ -4156,24 +4145,19 @@ cmd_affiliation(ProfWin *window, const char *const command, gchar **args) return TRUE; } - char *cmd = args[0]; + char* cmd = args[0]; if (cmd == NULL) { cons_bad_cmd_usage(command); return TRUE; } - char *affiliation = args[1]; - if (affiliation && - (g_strcmp0(affiliation, "owner") != 0) && - (g_strcmp0(affiliation, "admin") != 0) && - (g_strcmp0(affiliation, "member") != 0) && - (g_strcmp0(affiliation, "none") != 0) && - (g_strcmp0(affiliation, "outcast") != 0)) { + char* affiliation = args[1]; + if (affiliation && (g_strcmp0(affiliation, "owner") != 0) && (g_strcmp0(affiliation, "admin") != 0) && (g_strcmp0(affiliation, "member") != 0) && (g_strcmp0(affiliation, "none") != 0) && (g_strcmp0(affiliation, "outcast") != 0)) { cons_bad_cmd_usage(command); return TRUE; } - ProfMucWin *mucwin = (ProfMucWin*)window; + ProfMucWin* mucwin = (ProfMucWin*)window; assert(mucwin->memcheck == PROFMUCWIN_MEMCHECK); if (g_strcmp0(cmd, "list") == 0) { @@ -4196,12 +4180,12 @@ cmd_affiliation(ProfWin *window, const char *const command, gchar **args) return TRUE; } - char *jid = args[2]; + char* jid = args[2]; if (jid == NULL) { cons_bad_cmd_usage(command); return TRUE; } else { - char *reason = args[3]; + char* reason = args[3]; iq_room_affiliation_set(mucwin->roomjid, jid, affiliation, reason); return TRUE; } @@ -4212,7 +4196,7 @@ cmd_affiliation(ProfWin *window, const char *const command, gchar **args) } gboolean -cmd_role(ProfWin *window, const char *const command, gchar **args) +cmd_role(ProfWin* window, const char* const command, gchar** args) { jabber_conn_status_t conn_status = connection_get_status(); @@ -4226,23 +4210,19 @@ cmd_role(ProfWin *window, const char *const command, gchar **args) return TRUE; } - char *cmd = args[0]; + char* cmd = args[0]; if (cmd == NULL) { cons_bad_cmd_usage(command); return TRUE; } - char *role = args[1]; - if (role && - (g_strcmp0(role, "visitor") != 0) && - (g_strcmp0(role, "participant") != 0) && - (g_strcmp0(role, "moderator") != 0) && - (g_strcmp0(role, "none") != 0)) { + char* role = args[1]; + if (role && (g_strcmp0(role, "visitor") != 0) && (g_strcmp0(role, "participant") != 0) && (g_strcmp0(role, "moderator") != 0) && (g_strcmp0(role, "none") != 0)) { cons_bad_cmd_usage(command); return TRUE; } - ProfMucWin *mucwin = (ProfMucWin*)window; + ProfMucWin* mucwin = (ProfMucWin*)window; assert(mucwin->memcheck == PROFMUCWIN_MEMCHECK); if (g_strcmp0(cmd, "list") == 0) { @@ -4264,12 +4244,12 @@ cmd_role(ProfWin *window, const char *const command, gchar **args) return TRUE; } - char *nick = args[2]; + char* nick = args[2]; if (nick == NULL) { cons_bad_cmd_usage(command); return TRUE; } else { - char *reason = args[3]; + char* reason = args[3]; iq_room_role_set(mucwin->roomjid, nick, role, reason); return TRUE; } @@ -4280,7 +4260,7 @@ cmd_role(ProfWin *window, const char *const command, gchar **args) } gboolean -cmd_room(ProfWin *window, const char *const command, gchar **args) +cmd_room(ProfWin* window, const char* const command, gchar** args) { jabber_conn_status_t conn_status = connection_get_status(); @@ -4294,7 +4274,7 @@ cmd_room(ProfWin *window, const char *const command, gchar **args) return TRUE; } - ProfMucWin *mucwin = (ProfMucWin*)window; + ProfMucWin* mucwin = (ProfMucWin*)window; assert(mucwin->memcheck == PROFMUCWIN_MEMCHECK); if (g_strcmp0(args[0], "accept") == 0) { @@ -4312,7 +4292,7 @@ cmd_room(ProfWin *window, const char *const command, gchar **args) iq_destroy_room(mucwin->roomjid); return TRUE; } else if (g_strcmp0(args[0], "config") == 0) { - ProfConfWin *confwin = wins_get_conf(mucwin->roomjid); + ProfConfWin* confwin = wins_get_conf(mucwin->roomjid); if (confwin) { ui_focus_win((ProfWin*)confwin); @@ -4328,7 +4308,7 @@ cmd_room(ProfWin *window, const char *const command, gchar **args) } gboolean -cmd_occupants(ProfWin *window, const char *const command, gchar **args) +cmd_occupants(ProfWin* window, const char* const command, gchar** args) { if (g_strcmp0(args[0], "size") == 0) { if (!args[1]) { @@ -4336,7 +4316,7 @@ cmd_occupants(ProfWin *window, const char *const command, gchar **args) return TRUE; } else { int intval = 0; - char *err_msg = NULL; + char* err_msg = NULL; gboolean res = strtoi_range(args[1], &intval, 1, 99, &err_msg); if (res) { prefs_set_occupants_size(intval); @@ -4357,7 +4337,7 @@ cmd_occupants(ProfWin *window, const char *const command, gchar **args) return TRUE; } else { int intval = 0; - char *err_msg = NULL; + char* err_msg = NULL; gboolean res = strtoi_range(args[1], &intval, 0, 10, &err_msg); if (res) { prefs_set_occupants_indent(intval); @@ -4378,7 +4358,7 @@ cmd_occupants(ProfWin *window, const char *const command, gchar **args) return TRUE; } else { _cmd_set_boolean_preference(args[1], command, "Occupants panel line wrap", PREF_OCCUPANTS_WRAP); - occupantswin_occupants_all(); + occupantswin_occupants_all(); return TRUE; } } @@ -4464,7 +4444,7 @@ cmd_occupants(ProfWin *window, const char *const command, gchar **args) return TRUE; } - ProfMucWin *mucwin = (ProfMucWin*)window; + ProfMucWin* mucwin = (ProfMucWin*)window; assert(mucwin->memcheck == PROFMUCWIN_MEMCHECK); if (g_strcmp0(args[0], "show") == 0) { @@ -4489,7 +4469,7 @@ cmd_occupants(ProfWin *window, const char *const command, gchar **args) } gboolean -cmd_rooms(ProfWin *window, const char *const command, gchar **args) +cmd_rooms(ProfWin* window, const char* const command, gchar** args) { jabber_conn_status_t conn_status = connection_get_status(); @@ -4498,8 +4478,8 @@ cmd_rooms(ProfWin *window, const char *const command, gchar **args) return TRUE; } - gchar *service = NULL; - gchar *filter = NULL; + gchar* service = NULL; + gchar* filter = NULL; if (args[0] != NULL) { if (g_strcmp0(args[0], "service") == 0) { if (args[1] == NULL) { @@ -4543,7 +4523,7 @@ cmd_rooms(ProfWin *window, const char *const command, gchar **args) return TRUE; } } - if (g_strv_length(args) >=3 ) { + if (g_strv_length(args) >= 3) { if (g_strcmp0(args[2], "service") == 0) { if (args[3] == NULL) { cons_bad_cmd_usage(command); @@ -4574,7 +4554,7 @@ cmd_rooms(ProfWin *window, const char *const command, gchar **args) } if (service == NULL) { - ProfAccount *account = accounts_get_account(session_get_account_name()); + ProfAccount* account = accounts_get_account(session_get_account_name()); if (account->muc_service) { service = g_strdup(account->muc_service); account_free(account); @@ -4602,7 +4582,7 @@ cmd_rooms(ProfWin *window, const char *const command, gchar **args) } gboolean -cmd_bookmark(ProfWin *window, const char *const command, gchar **args) +cmd_bookmark(ProfWin* window, const char* const command, gchar** args) { jabber_conn_status_t conn_status = connection_get_status(); @@ -4613,15 +4593,15 @@ cmd_bookmark(ProfWin *window, const char *const command, gchar **args) } int num_args = g_strv_length(args); - gchar *cmd = args[0]; + gchar* cmd = args[0]; if (window->type == WIN_MUC - && num_args < 2 - && (cmd == NULL || g_strcmp0(cmd, "add") == 0)) { + && num_args < 2 + && (cmd == NULL || g_strcmp0(cmd, "add") == 0)) { // default to current nickname, password, and autojoin "on" - ProfMucWin *mucwin = (ProfMucWin*)window; + ProfMucWin* mucwin = (ProfMucWin*)window; assert(mucwin->memcheck == PROFMUCWIN_MEMCHECK); - char *nick = muc_nick(mucwin->roomjid); - char *password = muc_password(mucwin->roomjid); + char* nick = muc_nick(mucwin->roomjid); + char* password = muc_password(mucwin->roomjid); gboolean added = bookmark_add(mucwin->roomjid, nick, password, "on", NULL); if (added) { win_println(window, THEME_DEFAULT, "!", "Bookmark added for %s.", mucwin->roomjid); @@ -4632,9 +4612,9 @@ cmd_bookmark(ProfWin *window, const char *const command, gchar **args) } if (window->type == WIN_MUC - && num_args < 2 - && g_strcmp0(cmd, "remove") == 0) { - ProfMucWin *mucwin = (ProfMucWin*)window; + && num_args < 2 + && g_strcmp0(cmd, "remove") == 0) { + ProfMucWin* mucwin = (ProfMucWin*)window; assert(mucwin->memcheck == PROFMUCWIN_MEMCHECK); gboolean removed = bookmark_remove(mucwin->roomjid); if (removed) { @@ -4667,13 +4647,13 @@ cmd_bookmark(ProfWin *window, const char *const command, gchar **args) } if (strcmp(cmd, "list") == 0) { - GList *bookmarks = bookmark_get_list(); + GList* bookmarks = bookmark_get_list(); cons_show_bookmarks(bookmarks); g_list_free(bookmarks); return TRUE; } - char *jid = args[1]; + char* jid = args[1]; if (jid == NULL) { cons_bad_cmd_usage(command); cons_show(""); @@ -4707,10 +4687,10 @@ cmd_bookmark(ProfWin *window, const char *const command, gchar **args) return TRUE; } - gchar *opt_keys[] = { "autojoin", "nick", "password", "name", NULL }; + gchar* opt_keys[] = { "autojoin", "nick", "password", "name", NULL }; gboolean parsed; - GHashTable *options = parse_options(&args[2], opt_keys, &parsed); + GHashTable* options = parse_options(&args[2], opt_keys, &parsed); if (!parsed) { cons_bad_cmd_usage(command); cons_show(""); @@ -4718,7 +4698,7 @@ cmd_bookmark(ProfWin *window, const char *const command, gchar **args) return TRUE; } - char *autojoin = g_hash_table_lookup(options, "autojoin"); + char* autojoin = g_hash_table_lookup(options, "autojoin"); if (autojoin && ((strcmp(autojoin, "on") != 0) && (strcmp(autojoin, "off") != 0))) { cons_bad_cmd_usage(command); @@ -4728,9 +4708,9 @@ cmd_bookmark(ProfWin *window, const char *const command, gchar **args) return TRUE; } - char *nick = g_hash_table_lookup(options, "nick"); - char *password = g_hash_table_lookup(options, "password"); - char *name = g_hash_table_lookup(options, "name"); + char* nick = g_hash_table_lookup(options, "nick"); + char* password = g_hash_table_lookup(options, "password"); + char* name = g_hash_table_lookup(options, "name"); if (strcmp(cmd, "add") == 0) { gboolean added = bookmark_add(jid, nick, password, autojoin, name); @@ -4764,7 +4744,7 @@ cmd_bookmark(ProfWin *window, const char *const command, gchar **args) } gboolean -cmd_bookmark_ignore(ProfWin *window, const char *const command, gchar **args) +cmd_bookmark_ignore(ProfWin* window, const char* const command, gchar** args) { jabber_conn_status_t conn_status = connection_get_status(); @@ -4777,7 +4757,7 @@ cmd_bookmark_ignore(ProfWin *window, const char *const command, gchar **args) // `/bookmark ignore` lists them if (args[1] == NULL) { gsize len = 0; - gchar **list = bookmark_ignore_list(&len); + gchar** list = bookmark_ignore_list(&len); cons_show_bookmarks_ignore(list, len); g_strfreev(list); return TRUE; @@ -4800,7 +4780,7 @@ cmd_bookmark_ignore(ProfWin *window, const char *const command, gchar **args) } gboolean -cmd_disco(ProfWin *window, const char *const command, gchar **args) +cmd_disco(ProfWin* window, const char* const command, gchar** args) { jabber_conn_status_t conn_status = connection_get_status(); @@ -4809,11 +4789,11 @@ cmd_disco(ProfWin *window, const char *const command, gchar **args) return TRUE; } - GString *jid = g_string_new(""); + GString* jid = g_string_new(""); if (args[1]) { jid = g_string_append(jid, args[1]); } else { - Jid *jidp = jid_create(connection_get_fulljid()); + Jid* jidp = jid_create(connection_get_fulljid()); jid = g_string_append(jid, jidp->domainpart); jid_destroy(jidp); } @@ -4830,14 +4810,14 @@ cmd_disco(ProfWin *window, const char *const command, gchar **args) } gboolean -cmd_sendfile(ProfWin *window, const char *const command, gchar **args) +cmd_sendfile(ProfWin* window, const char* const command, gchar** args) { jabber_conn_status_t conn_status = connection_get_status(); - char *filename = args[0]; + char* filename = args[0]; // expand ~ to $HOME if (filename[0] == '~' && filename[1] == '/') { - if (asprintf(&filename, "%s/%s", getenv("HOME"), filename+2) == -1) { + if (asprintf(&filename, "%s/%s", getenv("HOME"), filename + 2) == -1) { return TRUE; } } else { @@ -4857,45 +4837,45 @@ cmd_sendfile(ProfWin *window, const char *const command, gchar **args) } switch (window->type) { - case WIN_MUC: - { - ProfMucWin *mucwin = (ProfMucWin*)window; - assert(mucwin->memcheck == PROFMUCWIN_MEMCHECK); + case WIN_MUC: + { + ProfMucWin* mucwin = (ProfMucWin*)window; + assert(mucwin->memcheck == PROFMUCWIN_MEMCHECK); - // only omemo, no pgp/otr available in MUCs - if (mucwin->is_omemo && !prefs_get_boolean(PREF_OMEMO_SENDFILE)) { - cons_show_error("Uploading unencrypted files disabled. See /omemo sendfile, /otr sendfile, /pgp sendfile."); - win_println(window, THEME_ERROR, "-", "Sending encrypted files via http_upload is not possible yet."); - free(filename); - return TRUE; - } - break; + // only omemo, no pgp/otr available in MUCs + if (mucwin->is_omemo && !prefs_get_boolean(PREF_OMEMO_SENDFILE)) { + cons_show_error("Uploading unencrypted files disabled. See /omemo sendfile, /otr sendfile, /pgp sendfile."); + win_println(window, THEME_ERROR, "-", "Sending encrypted files via http_upload is not possible yet."); + free(filename); + return TRUE; } - case WIN_CHAT: - { - ProfChatWin *chatwin = (ProfChatWin*)window; - assert(chatwin->memcheck == PROFCHATWIN_MEMCHECK); + break; + } + case WIN_CHAT: + { + ProfChatWin* chatwin = (ProfChatWin*)window; + assert(chatwin->memcheck == PROFCHATWIN_MEMCHECK); - if ((chatwin->is_omemo && !prefs_get_boolean(PREF_OMEMO_SENDFILE)) - || (chatwin->pgp_send && !prefs_get_boolean(PREF_PGP_SENDFILE)) - || (chatwin->is_otr && !prefs_get_boolean(PREF_OTR_SENDFILE))) { - cons_show_error("Uploading unencrypted files disabled. See /omemo sendfile, /otr sendfile, /pgp sendfile."); - win_println(window, THEME_ERROR, "-", "Sending encrypted files via http_upload is not possible yet."); - free(filename); - return TRUE; - } - break; - } - case WIN_PRIVATE: - { - //we don't support encryption in private muc windows - break; - } - default: - cons_show_error("Unsupported window for file transmission."); - free(filename); - return TRUE; + if ((chatwin->is_omemo && !prefs_get_boolean(PREF_OMEMO_SENDFILE)) + || (chatwin->pgp_send && !prefs_get_boolean(PREF_PGP_SENDFILE)) + || (chatwin->is_otr && !prefs_get_boolean(PREF_OTR_SENDFILE))) { + cons_show_error("Uploading unencrypted files disabled. See /omemo sendfile, /otr sendfile, /pgp sendfile."); + win_println(window, THEME_ERROR, "-", "Sending encrypted files via http_upload is not possible yet."); + free(filename); + return TRUE; } + break; + } + case WIN_PRIVATE: + { + //we don't support encryption in private muc windows + break; + } + default: + cons_show_error("Unsupported window for file transmission."); + free(filename); + return TRUE; + } if (access(filename, R_OK) != 0) { cons_show_error("Uploading '%s' failed: File not found!", filename); @@ -4909,7 +4889,7 @@ cmd_sendfile(ProfWin *window, const char *const command, gchar **args) return TRUE; } - HTTPUpload *upload = malloc(sizeof(HTTPUpload)); + HTTPUpload* upload = malloc(sizeof(HTTPUpload)); upload->window = window; upload->filename = filename; @@ -4922,7 +4902,7 @@ cmd_sendfile(ProfWin *window, const char *const command, gchar **args) } gboolean -cmd_lastactivity(ProfWin *window, const char *const command, gchar **args) +cmd_lastactivity(ProfWin* window, const char* const command, gchar** args) { if ((g_strcmp0(args[0], "on") == 0) || (g_strcmp0(args[0], "off") == 0)) { _cmd_set_boolean_preference(args[0], command, "Last activity", PREF_LASTACTIVITY); @@ -4943,8 +4923,8 @@ cmd_lastactivity(ProfWin *window, const char *const command, gchar **args) } if (args[0] == NULL) { - Jid *jidp = jid_create(connection_get_fulljid()); - GString *jid = g_string_new(jidp->domainpart); + Jid* jidp = jid_create(connection_get_fulljid()); + GString* jid = g_string_new(jidp->domainpart); iq_last_activity_request(jid->str); @@ -4959,7 +4939,7 @@ cmd_lastactivity(ProfWin *window, const char *const command, gchar **args) } gboolean -cmd_nick(ProfWin *window, const char *const command, gchar **args) +cmd_nick(ProfWin* window, const char* const command, gchar** args) { jabber_conn_status_t conn_status = connection_get_status(); @@ -4972,27 +4952,27 @@ cmd_nick(ProfWin *window, const char *const command, gchar **args) return TRUE; } - ProfMucWin *mucwin = (ProfMucWin*)window; + ProfMucWin* mucwin = (ProfMucWin*)window; assert(mucwin->memcheck == PROFMUCWIN_MEMCHECK); - char *nick = args[0]; + char* nick = args[0]; presence_change_room_nick(mucwin->roomjid, nick); return TRUE; } gboolean -cmd_alias(ProfWin *window, const char *const command, gchar **args) +cmd_alias(ProfWin* window, const char* const command, gchar** args) { - char *subcmd = args[0]; + char* subcmd = args[0]; if (strcmp(subcmd, "add") == 0) { - char *alias = args[1]; + char* alias = args[1]; if (alias == NULL) { cons_bad_cmd_usage(command); return TRUE; } else { - char *alias_p = alias; - GString *ac_value = g_string_new(""); + char* alias_p = alias; + GString* ac_value = g_string_new(""); if (alias[0] == '/') { g_string_append(ac_value, alias); alias_p = &alias[1]; @@ -5001,7 +4981,7 @@ cmd_alias(ProfWin *window, const char *const command, gchar **args) g_string_append(ac_value, alias); } - char *value = args[2]; + char* value = args[2]; if (value == NULL) { cons_bad_cmd_usage(command); g_string_free(ac_value, TRUE); @@ -5020,7 +5000,7 @@ cmd_alias(ProfWin *window, const char *const command, gchar **args) } } } else if (strcmp(subcmd, "remove") == 0) { - char *alias = args[1]; + char* alias = args[1]; if (alias == NULL) { cons_bad_cmd_usage(command); return TRUE; @@ -5032,7 +5012,7 @@ cmd_alias(ProfWin *window, const char *const command, gchar **args) if (!removed) { cons_show("No such command alias /%s", alias); } else { - GString *ac_value = g_string_new("/"); + GString* ac_value = g_string_new("/"); g_string_append(ac_value, alias); cmd_ac_remove(ac_value->str); cmd_ac_remove_alias_value(alias); @@ -5042,7 +5022,7 @@ cmd_alias(ProfWin *window, const char *const command, gchar **args) return TRUE; } } else if (strcmp(subcmd, "list") == 0) { - GList *aliases = prefs_get_aliases(); + GList* aliases = prefs_get_aliases(); cons_show_aliases(aliases); prefs_free_aliases(aliases); return TRUE; @@ -5053,9 +5033,9 @@ cmd_alias(ProfWin *window, const char *const command, gchar **args) } gboolean -cmd_tiny(ProfWin *window, const char *const command, gchar **args) +cmd_tiny(ProfWin* window, const char* const command, gchar** args) { - char *url = args[0]; + char* url = args[0]; if (window->type != WIN_CHAT && window->type != WIN_MUC && window->type != WIN_PRIVATE) { cons_show("/tiny can only be used in chat windows"); @@ -5067,30 +5047,30 @@ cmd_tiny(ProfWin *window, const char *const command, gchar **args) return TRUE; } - char *tiny = tinyurl_get(url); + char* tiny = tinyurl_get(url); if (!tiny) { win_println(window, THEME_ERROR, "-", "Couldn't create tinyurl."); return TRUE; } - switch (window->type){ + switch (window->type) { case WIN_CHAT: { - ProfChatWin *chatwin = (ProfChatWin*)window; + ProfChatWin* chatwin = (ProfChatWin*)window; assert(chatwin->memcheck == PROFCHATWIN_MEMCHECK); cl_ev_send_msg(chatwin, tiny, NULL); break; } case WIN_PRIVATE: { - ProfPrivateWin *privatewin = (ProfPrivateWin*)window; + ProfPrivateWin* privatewin = (ProfPrivateWin*)window; assert(privatewin->memcheck == PROFPRIVATEWIN_MEMCHECK); cl_ev_send_priv_msg(privatewin, tiny, NULL); break; } case WIN_MUC: { - ProfMucWin *mucwin = (ProfMucWin*)window; + ProfMucWin* mucwin = (ProfMucWin*)window; assert(mucwin->memcheck == PROFMUCWIN_MEMCHECK); cl_ev_send_muc_msg(mucwin, tiny, NULL); break; @@ -5105,13 +5085,13 @@ cmd_tiny(ProfWin *window, const char *const command, gchar **args) } gboolean -cmd_clear(ProfWin *window, const char *const command, gchar **args) +cmd_clear(ProfWin* window, const char* const command, gchar** args) { if (args[0] == NULL) { win_clear(window); return TRUE; } else { - if ((g_strcmp0(args[0], "persist_history") == 0) ) { + if ((g_strcmp0(args[0], "persist_history") == 0)) { if (args[1] != NULL) { if ((g_strcmp0(args[1], "on") == 0) || (g_strcmp0(args[1], "off") == 0)) { @@ -5134,7 +5114,7 @@ cmd_clear(ProfWin *window, const char *const command, gchar **args) } gboolean -cmd_privileges(ProfWin *window, const char *const command, gchar **args) +cmd_privileges(ProfWin* window, const char* const command, gchar** args) { _cmd_set_boolean_preference(args[0], command, "MUC privileges", PREF_MUC_PRIVILEGES); @@ -5144,10 +5124,10 @@ cmd_privileges(ProfWin *window, const char *const command, gchar **args) } gboolean -cmd_charset(ProfWin *window, const char *const command, gchar **args) +cmd_charset(ProfWin* window, const char* const command, gchar** args) { - char *codeset = nl_langinfo(CODESET); - char *lang = getenv("LANG"); + char* codeset = nl_langinfo(CODESET); + char* lang = getenv("LANG"); cons_show("Charset information:"); @@ -5157,28 +5137,28 @@ cmd_charset(ProfWin *window, const char *const command, gchar **args) if (codeset) { cons_show(" CODESET: %s", codeset); } - cons_show(" MB_CUR_MAX: %d", MB_CUR_MAX); - cons_show(" MB_LEN_MAX: %d", MB_LEN_MAX); + cons_show(" MB_CUR_MAX: %d", MB_CUR_MAX); + cons_show(" MB_LEN_MAX: %d", MB_LEN_MAX); return TRUE; } gboolean -cmd_beep(ProfWin *window, const char *const command, gchar **args) +cmd_beep(ProfWin* window, const char* const command, gchar** args) { _cmd_set_boolean_preference(args[0], command, "Sound", PREF_BEEP); return TRUE; } gboolean -cmd_console(ProfWin *window, const char *const command, gchar **args) +cmd_console(ProfWin* window, const char* const command, gchar** args) { if ((g_strcmp0(args[0], "chat") != 0) && (g_strcmp0(args[0], "muc") != 0) && (g_strcmp0(args[0], "private") != 0)) { cons_bad_cmd_usage(command); return TRUE; } - char *setting = args[1]; + char* setting = args[1]; if ((g_strcmp0(setting, "all") != 0) && (g_strcmp0(setting, "first") != 0) && (g_strcmp0(setting, "none") != 0)) { cons_bad_cmd_usage(command); return TRUE; @@ -5206,12 +5186,9 @@ cmd_console(ProfWin *window, const char *const command, gchar **args) } gboolean -cmd_presence(ProfWin *window, const char *const command, gchar **args) +cmd_presence(ProfWin* window, const char* const command, gchar** args) { - if (strcmp(args[0], "console") != 0 && - strcmp(args[0], "chat") != 0 && - strcmp(args[0], "room") != 0 && - strcmp(args[0], "titlebar") != 0) { + if (strcmp(args[0], "console") != 0 && strcmp(args[0], "chat") != 0 && strcmp(args[0], "room") != 0 && strcmp(args[0], "titlebar") != 0) { cons_bad_cmd_usage(command); return TRUE; } @@ -5221,9 +5198,7 @@ cmd_presence(ProfWin *window, const char *const command, gchar **args) return TRUE; } - if (strcmp(args[1], "all") != 0 && - strcmp(args[1], "online") != 0 && - strcmp(args[1], "none") != 0) { + if (strcmp(args[1], "all") != 0 && strcmp(args[1], "online") != 0 && strcmp(args[1], "none") != 0) { cons_bad_cmd_usage(command); return TRUE; } @@ -5265,7 +5240,7 @@ cmd_presence(ProfWin *window, const char *const command, gchar **args) } gboolean -cmd_wrap(ProfWin *window, const char *const command, gchar **args) +cmd_wrap(ProfWin* window, const char* const command, gchar** args) { _cmd_set_boolean_preference(args[0], command, "Word wrap", PREF_WRAP); @@ -5275,11 +5250,11 @@ cmd_wrap(ProfWin *window, const char *const command, gchar **args) } gboolean -cmd_time(ProfWin *window, const char *const command, gchar **args) +cmd_time(ProfWin* window, const char* const command, gchar** args) { if (g_strcmp0(args[0], "lastactivity") == 0) { if (args[1] == NULL) { - char *format = prefs_get_string(PREF_TIME_LASTACTIVITY); + char* format = prefs_get_string(PREF_TIME_LASTACTIVITY); cons_show("Last activity time format: '%s'.", format); g_free(format); return TRUE; @@ -5298,7 +5273,7 @@ cmd_time(ProfWin *window, const char *const command, gchar **args) } } else if (g_strcmp0(args[0], "statusbar") == 0) { if (args[1] == NULL) { - char *format = prefs_get_string(PREF_TIME_STATUSBAR); + char* format = prefs_get_string(PREF_TIME_STATUSBAR); cons_show("Status bar time format: '%s'.", format); g_free(format); return TRUE; @@ -5318,7 +5293,7 @@ cmd_time(ProfWin *window, const char *const command, gchar **args) } } else if (g_strcmp0(args[0], "console") == 0) { if (args[1] == NULL) { - char *format = prefs_get_string(PREF_TIME_CONSOLE); + char* format = prefs_get_string(PREF_TIME_CONSOLE); cons_show("Console time format: '%s'.", format); g_free(format); return TRUE; @@ -5338,7 +5313,7 @@ cmd_time(ProfWin *window, const char *const command, gchar **args) } } else if (g_strcmp0(args[0], "chat") == 0) { if (args[1] == NULL) { - char *format = prefs_get_string(PREF_TIME_CHAT); + char* format = prefs_get_string(PREF_TIME_CHAT); cons_show("Chat time format: '%s'.", format); g_free(format); return TRUE; @@ -5358,7 +5333,7 @@ cmd_time(ProfWin *window, const char *const command, gchar **args) } } else if (g_strcmp0(args[0], "muc") == 0) { if (args[1] == NULL) { - char *format = prefs_get_string(PREF_TIME_MUC); + char* format = prefs_get_string(PREF_TIME_MUC); cons_show("MUC time format: '%s'.", format); g_free(format); return TRUE; @@ -5378,7 +5353,7 @@ cmd_time(ProfWin *window, const char *const command, gchar **args) } } else if (g_strcmp0(args[0], "config") == 0) { if (args[1] == NULL) { - char *format = prefs_get_string(PREF_TIME_CONFIG); + char* format = prefs_get_string(PREF_TIME_CONFIG); cons_show("config time format: '%s'.", format); g_free(format); return TRUE; @@ -5398,7 +5373,7 @@ cmd_time(ProfWin *window, const char *const command, gchar **args) } } else if (g_strcmp0(args[0], "private") == 0) { if (args[1] == NULL) { - char *format = prefs_get_string(PREF_TIME_PRIVATE); + char* format = prefs_get_string(PREF_TIME_PRIVATE); cons_show("Private chat time format: '%s'.", format); g_free(format); return TRUE; @@ -5418,7 +5393,7 @@ cmd_time(ProfWin *window, const char *const command, gchar **args) } } else if (g_strcmp0(args[0], "xml") == 0) { if (args[1] == NULL) { - char *format = prefs_get_string(PREF_TIME_XMLCONSOLE); + char* format = prefs_get_string(PREF_TIME_XMLCONSOLE); cons_show("XML Console time format: '%s'.", format); g_free(format); return TRUE; @@ -5481,7 +5456,7 @@ cmd_time(ProfWin *window, const char *const command, gchar **args) } gboolean -cmd_states(ProfWin *window, const char *const command, gchar **args) +cmd_states(ProfWin* window, const char* const command, gchar** args) { if (args[0] == NULL) { return FALSE; @@ -5499,7 +5474,7 @@ cmd_states(ProfWin *window, const char *const command, gchar **args) } gboolean -cmd_wintitle(ProfWin *window, const char *const command, gchar **args) +cmd_wintitle(ProfWin* window, const char* const command, gchar** args) { if (g_strcmp0(args[0], "show") != 0 && g_strcmp0(args[0], "goodbye") != 0) { cons_bad_cmd_usage(command); @@ -5518,7 +5493,7 @@ cmd_wintitle(ProfWin *window, const char *const command, gchar **args) } gboolean -cmd_outtype(ProfWin *window, const char *const command, gchar **args) +cmd_outtype(ProfWin* window, const char* const command, gchar** args) { if (args[0] == NULL) { return FALSE; @@ -5535,9 +5510,9 @@ cmd_outtype(ProfWin *window, const char *const command, gchar **args) } gboolean -cmd_gone(ProfWin *window, const char *const command, gchar **args) +cmd_gone(ProfWin* window, const char* const command, gchar** args) { - char *value = args[0]; + char* value = args[0]; gint period = atoi(value); prefs_set_gone(period); @@ -5557,15 +5532,14 @@ cmd_gone(ProfWin *window, const char *const command, gchar **args) return TRUE; } - gboolean -cmd_notify(ProfWin *window, const char *const command, gchar **args) +cmd_notify(ProfWin* window, const char* const command, gchar** args) { if (!args[0]) { - ProfWin *current = wins_get_current(); + ProfWin* current = wins_get_current(); if (current->type == WIN_MUC) { win_println(current, THEME_DEFAULT, "-", ""); - ProfMucWin *mucwin = (ProfMucWin *)current; + ProfMucWin* mucwin = (ProfMucWin*)current; win_println(window, THEME_DEFAULT, "!", "Notification settings for %s:", mucwin->roomjid); if (prefs_has_room_notify(mucwin->roomjid)) { @@ -5612,7 +5586,6 @@ cmd_notify(ProfWin *window, const char *const command, gchar **args) cons_show(""); cons_notify_setting(); cons_bad_cmd_usage(command); - } return TRUE; } @@ -5647,7 +5620,7 @@ cmd_notify(ProfWin *window, const char *const command, gchar **args) } } - // chat room settings + // chat room settings } else if (g_strcmp0(args[0], "room") == 0) { if (g_strcmp0(args[1], "on") == 0) { cons_show("Room notifications enabled."); @@ -5721,8 +5694,8 @@ cmd_notify(ProfWin *window, const char *const command, gchar **args) } } } else if (g_strcmp0(args[2], "list") == 0) { - GList *triggers = prefs_get_room_notify_triggers(); - GList *curr = triggers; + GList* triggers = prefs_get_room_notify_triggers(); + GList* curr = triggers; if (curr) { cons_show("Room notification triggers:"); } else { @@ -5746,7 +5719,7 @@ cmd_notify(ProfWin *window, const char *const command, gchar **args) cons_show("Usage: /notify room on|off|mention"); } - // typing settings + // typing settings } else if (g_strcmp0(args[0], "typing") == 0) { if (g_strcmp0(args[1], "on") == 0) { cons_show("Typing notifications enabled."); @@ -5768,7 +5741,7 @@ cmd_notify(ProfWin *window, const char *const command, gchar **args) cons_show("Usage: /notify typing on|off"); } - // invite settings + // invite settings } else if (g_strcmp0(args[0], "invite") == 0) { if (g_strcmp0(args[1], "on") == 0) { cons_show("Chat room invite notifications enabled."); @@ -5780,7 +5753,7 @@ cmd_notify(ProfWin *window, const char *const command, gchar **args) cons_show("Usage: /notify invite on|off"); } - // subscription settings + // subscription settings } else if (g_strcmp0(args[0], "sub") == 0) { if (g_strcmp0(args[1], "on") == 0) { cons_show("Subscription notifications enabled."); @@ -5792,7 +5765,7 @@ cmd_notify(ProfWin *window, const char *const command, gchar **args) cons_show("Usage: /notify sub on|off"); } - // remind settings + // remind settings } else if (g_strcmp0(args[0], "remind") == 0) { if (!args[1]) { cons_bad_cmd_usage(command); @@ -5808,18 +5781,18 @@ cmd_notify(ProfWin *window, const char *const command, gchar **args) } } - // current chat room settings + // current chat room settings } else if (g_strcmp0(args[0], "on") == 0) { jabber_conn_status_t conn_status = connection_get_status(); if (conn_status != JABBER_CONNECTED) { cons_show("You are not currently connected."); } else { - ProfWin *window = wins_get_current(); + ProfWin* window = wins_get_current(); if (window->type != WIN_MUC) { cons_show("You must be in a chat room."); } else { - ProfMucWin *mucwin = (ProfMucWin*)window; + ProfMucWin* mucwin = (ProfMucWin*)window; prefs_set_room_notify(mucwin->roomjid, TRUE); win_println(window, THEME_DEFAULT, "!", "Notifications enabled for %s", mucwin->roomjid); } @@ -5830,11 +5803,11 @@ cmd_notify(ProfWin *window, const char *const command, gchar **args) if (conn_status != JABBER_CONNECTED) { cons_show("You are not currently connected."); } else { - ProfWin *window = wins_get_current(); + ProfWin* window = wins_get_current(); if (window->type != WIN_MUC) { cons_show("You must be in a chat room."); } else { - ProfMucWin *mucwin = (ProfMucWin*)window; + ProfMucWin* mucwin = (ProfMucWin*)window; prefs_set_room_notify(mucwin->roomjid, FALSE); win_println(window, THEME_DEFAULT, "!", "Notifications disabled for %s", mucwin->roomjid); } @@ -5846,20 +5819,20 @@ cmd_notify(ProfWin *window, const char *const command, gchar **args) cons_show("You are not currently connected."); } else { if (g_strcmp0(args[1], "on") == 0) { - ProfWin *window = wins_get_current(); + ProfWin* window = wins_get_current(); if (window->type != WIN_MUC) { cons_show("You must be in a chat room."); } else { - ProfMucWin *mucwin = (ProfMucWin*)window; + ProfMucWin* mucwin = (ProfMucWin*)window; prefs_set_room_notify_mention(mucwin->roomjid, TRUE); win_println(window, THEME_DEFAULT, "!", "Mention notifications enabled for %s", mucwin->roomjid); } } else if (g_strcmp0(args[1], "off") == 0) { - ProfWin *window = wins_get_current(); + ProfWin* window = wins_get_current(); if (window->type != WIN_MUC) { cons_show("You must be in a chat rooms."); } else { - ProfMucWin *mucwin = (ProfMucWin*)window; + ProfMucWin* mucwin = (ProfMucWin*)window; prefs_set_room_notify_mention(mucwin->roomjid, FALSE); win_println(window, THEME_DEFAULT, "!", "Mention notifications disabled for %s", mucwin->roomjid); } @@ -5874,20 +5847,20 @@ cmd_notify(ProfWin *window, const char *const command, gchar **args) cons_show("You are not currently connected."); } else { if (g_strcmp0(args[1], "on") == 0) { - ProfWin *window = wins_get_current(); + ProfWin* window = wins_get_current(); if (window->type != WIN_MUC) { cons_show("You must be in a chat room."); } else { - ProfMucWin *mucwin = (ProfMucWin*)window; + ProfMucWin* mucwin = (ProfMucWin*)window; prefs_set_room_notify_trigger(mucwin->roomjid, TRUE); win_println(window, THEME_DEFAULT, "!", "Custom trigger notifications enabled for %s", mucwin->roomjid); } } else if (g_strcmp0(args[1], "off") == 0) { - ProfWin *window = wins_get_current(); + ProfWin* window = wins_get_current(); if (window->type != WIN_MUC) { cons_show("You must be in a chat rooms."); } else { - ProfMucWin *mucwin = (ProfMucWin*)window; + ProfMucWin* mucwin = (ProfMucWin*)window; prefs_set_room_notify_trigger(mucwin->roomjid, FALSE); win_println(window, THEME_DEFAULT, "!", "Custom trigger notifications disabled for %s", mucwin->roomjid); } @@ -5901,11 +5874,11 @@ cmd_notify(ProfWin *window, const char *const command, gchar **args) if (conn_status != JABBER_CONNECTED) { cons_show("You are not currently connected."); } else { - ProfWin *window = wins_get_current(); + ProfWin* window = wins_get_current(); if (window->type != WIN_MUC) { cons_show("You must be in a chat room."); } else { - ProfMucWin *mucwin = (ProfMucWin*)window; + ProfMucWin* mucwin = (ProfMucWin*)window; gboolean res = prefs_reset_room_notify(mucwin->roomjid); if (res) { win_println(window, THEME_DEFAULT, "!", "Notification settings set to global defaults for %s", mucwin->roomjid); @@ -5922,10 +5895,10 @@ cmd_notify(ProfWin *window, const char *const command, gchar **args) } gboolean -cmd_inpblock(ProfWin *window, const char *const command, gchar **args) +cmd_inpblock(ProfWin* window, const char* const command, gchar** args) { - char *subcmd = args[0]; - char *value = args[1]; + char* subcmd = args[0]; + char* value = args[1]; if (g_strcmp0(subcmd, "timeout") == 0) { if (value == NULL) { @@ -5934,7 +5907,7 @@ cmd_inpblock(ProfWin *window, const char *const command, gchar **args) } int intval = 0; - char *err_msg = NULL; + char* err_msg = NULL; gboolean res = strtoi_range(value, &intval, 1, 1000, &err_msg); if (res) { cons_show("Input blocking set to %d milliseconds.", intval); @@ -5969,7 +5942,7 @@ cmd_inpblock(ProfWin *window, const char *const command, gchar **args) } gboolean -cmd_titlebar(ProfWin *window, const char *const command, gchar **args) +cmd_titlebar(ProfWin* window, const char* const command, gchar** args) { if (g_strcmp0(args[0], "up") == 0) { gboolean result = prefs_titlebar_pos_up(); @@ -6000,7 +5973,7 @@ cmd_titlebar(ProfWin *window, const char *const command, gchar **args) } gboolean -cmd_titlebar_show_hide(ProfWin *window, const char *const command, gchar **args) +cmd_titlebar_show_hide(ProfWin* window, const char* const command, gchar** args) { if (args[1] != NULL) { if (g_strcmp0(args[0], "show") == 0) { @@ -6013,10 +5986,10 @@ cmd_titlebar_show_hide(ProfWin *window, const char *const command, gchar **args) prefs_set_boolean(PREF_ENC_WARN, TRUE); } else if (g_strcmp0(args[1], "resource") == 0) { cons_show("Showing resource in titlebar enabled."); - prefs_set_boolean(PREF_RESOURCE_TITLE , TRUE); + prefs_set_boolean(PREF_RESOURCE_TITLE, TRUE); } else if (g_strcmp0(args[1], "presence") == 0) { cons_show("Showing contact presence in titlebar enabled."); - prefs_set_boolean(PREF_PRESENCE , TRUE); + prefs_set_boolean(PREF_PRESENCE, TRUE); } else if (g_strcmp0(args[1], "jid") == 0) { cons_show("Showing MUC JID in titlebar as title enabled."); prefs_set_boolean(PREF_TITLEBAR_MUC_TITLE_JID, TRUE); @@ -6036,10 +6009,10 @@ cmd_titlebar_show_hide(ProfWin *window, const char *const command, gchar **args) prefs_set_boolean(PREF_ENC_WARN, FALSE); } else if (g_strcmp0(args[1], "resource") == 0) { cons_show("Showing resource in titlebar disabled."); - prefs_set_boolean(PREF_RESOURCE_TITLE , FALSE); + prefs_set_boolean(PREF_RESOURCE_TITLE, FALSE); } else if (g_strcmp0(args[1], "presence") == 0) { cons_show("Showing contact presence in titlebar disabled."); - prefs_set_boolean(PREF_PRESENCE , FALSE); + prefs_set_boolean(PREF_PRESENCE, FALSE); } else if (g_strcmp0(args[1], "jid") == 0) { cons_show("Showing MUC JID in titlebar as title disabled."); prefs_set_boolean(PREF_TITLEBAR_MUC_TITLE_JID, FALSE); @@ -6058,7 +6031,7 @@ cmd_titlebar_show_hide(ProfWin *window, const char *const command, gchar **args) } gboolean -cmd_mainwin(ProfWin *window, const char *const command, gchar **args) +cmd_mainwin(ProfWin* window, const char* const command, gchar** args) { if (g_strcmp0(args[0], "up") == 0) { gboolean result = prefs_mainwin_pos_up(); @@ -6089,7 +6062,7 @@ cmd_mainwin(ProfWin *window, const char *const command, gchar **args) } gboolean -cmd_statusbar(ProfWin *window, const char *const command, gchar **args) +cmd_statusbar(ProfWin* window, const char* const command, gchar** args) { if (g_strcmp0(args[0], "show") == 0) { if (g_strcmp0(args[1], "name") == 0) { @@ -6153,9 +6126,9 @@ cmd_statusbar(ProfWin *window, const char *const command, gchar **args) return TRUE; } - char *value = args[1]; + char* value = args[1]; int intval = 0; - char *err_msg = NULL; + char* err_msg = NULL; gboolean res = strtoi_range(value, &intval, 0, INT_MAX, &err_msg); if (res) { if (intval < 0 || intval > 10) { @@ -6185,9 +6158,9 @@ cmd_statusbar(ProfWin *window, const char *const command, gchar **args) return TRUE; } - char *value = args[1]; + char* value = args[1]; int intval = 0; - char *err_msg = NULL; + char* err_msg = NULL; gboolean res = strtoi_range(value, &intval, 0, INT_MAX, &err_msg); if (res) { if (intval < 0) { @@ -6303,7 +6276,7 @@ cmd_statusbar(ProfWin *window, const char *const command, gchar **args) } gboolean -cmd_inputwin(ProfWin *window, const char *const command, gchar **args) +cmd_inputwin(ProfWin* window, const char* const command, gchar** args) { if (g_strcmp0(args[0], "up") == 0) { gboolean result = prefs_inputwin_pos_up(); @@ -6334,10 +6307,10 @@ cmd_inputwin(ProfWin *window, const char *const command, gchar **args) } gboolean -cmd_log(ProfWin *window, const char *const command, gchar **args) +cmd_log(ProfWin* window, const char* const command, gchar** args) { - char *subcmd = args[0]; - char *value = args[1]; + char* subcmd = args[0]; + char* value = args[1]; if (strcmp(subcmd, "maxsize") == 0) { if (value == NULL) { @@ -6346,7 +6319,7 @@ cmd_log(ProfWin *window, const char *const command, gchar **args) } int intval = 0; - char *err_msg = NULL; + char* err_msg = NULL; gboolean res = strtoi_range(value, &intval, PREFS_MIN_LOG_SIZE, INT_MAX, &err_msg); if (res) { prefs_set_max_log_size(intval); @@ -6390,12 +6363,12 @@ cmd_log(ProfWin *window, const char *const command, gchar **args) } gboolean -cmd_reconnect(ProfWin *window, const char *const command, gchar **args) +cmd_reconnect(ProfWin* window, const char* const command, gchar** args) { - char *value = args[0]; + char* value = args[0]; int intval = 0; - char *err_msg = NULL; + char* err_msg = NULL; gboolean res = strtoi_range(value, &intval, 0, INT_MAX, &err_msg); if (res) { prefs_set_reconnect(intval); @@ -6414,14 +6387,14 @@ cmd_reconnect(ProfWin *window, const char *const command, gchar **args) } gboolean -cmd_autoping(ProfWin *window, const char *const command, gchar **args) +cmd_autoping(ProfWin* window, const char* const command, gchar** args) { - char *cmd = args[0]; - char *value = args[1]; + char* cmd = args[0]; + char* value = args[1]; if (g_strcmp0(cmd, "set") == 0) { int intval = 0; - char *err_msg = NULL; + char* err_msg = NULL; gboolean res = strtoi_range(value, &intval, 0, INT_MAX, &err_msg); if (res) { prefs_set_autoping(intval); @@ -6439,7 +6412,7 @@ cmd_autoping(ProfWin *window, const char *const command, gchar **args) } else if (g_strcmp0(cmd, "timeout") == 0) { int intval = 0; - char *err_msg = NULL; + char* err_msg = NULL; gboolean res = strtoi_range(value, &intval, 0, INT_MAX, &err_msg); if (res) { prefs_set_autoping_timeout(intval); @@ -6462,7 +6435,7 @@ cmd_autoping(ProfWin *window, const char *const command, gchar **args) } gboolean -cmd_ping(ProfWin *window, const char *const command, gchar **args) +cmd_ping(ProfWin* window, const char* const command, gchar** args) { jabber_conn_status_t conn_status = connection_get_status(); @@ -6492,17 +6465,15 @@ cmd_ping(ProfWin *window, const char *const command, gchar **args) } gboolean -cmd_autoaway(ProfWin *window, const char *const command, gchar **args) +cmd_autoaway(ProfWin* window, const char* const command, gchar** args) { - if ((strcmp(args[0], "mode") != 0) && (strcmp(args[0], "time") != 0) && - (strcmp(args[0], "message") != 0) && (strcmp(args[0], "check") != 0)) { + if ((strcmp(args[0], "mode") != 0) && (strcmp(args[0], "time") != 0) && (strcmp(args[0], "message") != 0) && (strcmp(args[0], "check") != 0)) { cons_show("Setting must be one of 'mode', 'time', 'message' or 'check'"); return TRUE; } if (strcmp(args[0], "mode") == 0) { - if ((strcmp(args[1], "idle") != 0) && (strcmp(args[1], "away") != 0) && - (strcmp(args[1], "off") != 0)) { + if ((strcmp(args[1], "idle") != 0) && (strcmp(args[1], "away") != 0) && (strcmp(args[1], "off") != 0)) { cons_show("Mode must be one of 'idle', 'away' or 'off'"); } else { prefs_set_string(PREF_AUTOAWAY_MODE, args[1]); @@ -6515,7 +6486,7 @@ cmd_autoaway(ProfWin *window, const char *const command, gchar **args) if (strcmp(args[0], "time") == 0) { if (g_strcmp0(args[1], "away") == 0) { int minutesval = 0; - char *err_msg = NULL; + char* err_msg = NULL; gboolean res = strtoi_range(args[2], &minutesval, 1, INT_MAX, &err_msg); if (res) { prefs_set_autoaway_time(minutesval); @@ -6532,7 +6503,7 @@ cmd_autoaway(ProfWin *window, const char *const command, gchar **args) return TRUE; } else if (g_strcmp0(args[1], "xa") == 0) { int minutesval = 0; - char *err_msg = NULL; + char* err_msg = NULL; gboolean res = strtoi_range(args[2], &minutesval, 0, INT_MAX, &err_msg); if (res) { int away_time = prefs_get_autoaway_time(); @@ -6596,7 +6567,7 @@ cmd_autoaway(ProfWin *window, const char *const command, gchar **args) } gboolean -cmd_priority(ProfWin *window, const char *const command, gchar **args) +cmd_priority(ProfWin* window, const char* const command, gchar** args) { jabber_conn_status_t conn_status = connection_get_status(); @@ -6605,10 +6576,10 @@ cmd_priority(ProfWin *window, const char *const command, gchar **args) return TRUE; } - char *value = args[0]; + char* value = args[0]; int intval = 0; - char *err_msg = NULL; + char* err_msg = NULL; gboolean res = strtoi_range(value, &intval, -128, 127, &err_msg); if (res) { accounts_set_priority_all(session_get_account_name(), intval); @@ -6624,7 +6595,7 @@ cmd_priority(ProfWin *window, const char *const command, gchar **args) } gboolean -cmd_vercheck(ProfWin *window, const char *const command, gchar **args) +cmd_vercheck(ProfWin* window, const char* const command, gchar** args) { int num_args = g_strv_length(args); @@ -6638,13 +6609,13 @@ cmd_vercheck(ProfWin *window, const char *const command, gchar **args) } gboolean -cmd_xmlconsole(ProfWin *window, const char *const command, gchar **args) +cmd_xmlconsole(ProfWin* window, const char* const command, gchar** args) { - ProfXMLWin *xmlwin = wins_get_xmlconsole(); + ProfXMLWin* xmlwin = wins_get_xmlconsole(); if (xmlwin) { ui_focus_win((ProfWin*)xmlwin); } else { - ProfWin *window = wins_new_xmlconsole(); + ProfWin* window = wins_new_xmlconsole(); ui_focus_win(window); } @@ -6652,14 +6623,14 @@ cmd_xmlconsole(ProfWin *window, const char *const command, gchar **args) } gboolean -cmd_flash(ProfWin *window, const char *const command, gchar **args) +cmd_flash(ProfWin* window, const char* const command, gchar** args) { _cmd_set_boolean_preference(args[0], command, "Screen flash", PREF_FLASH); return TRUE; } gboolean -cmd_tray(ProfWin *window, const char *const command, gchar **args) +cmd_tray(ProfWin* window, const char* const command, gchar** args) { #ifdef HAVE_GTK if (g_strcmp0(args[0], "timer") == 0) { @@ -6674,7 +6645,7 @@ cmd_tray(ProfWin *window, const char *const command, gchar **args) } int intval = 0; - char *err_msg = NULL; + char* err_msg = NULL; gboolean res = strtoi_range(args[1], &intval, 1, 10, &err_msg); if (res) { if (intval == 1) { @@ -6727,21 +6698,21 @@ cmd_tray(ProfWin *window, const char *const command, gchar **args) } gboolean -cmd_intype(ProfWin *window, const char *const command, gchar **args) +cmd_intype(ProfWin* window, const char* const command, gchar** args) { _cmd_set_boolean_preference(args[0], command, "Show contact typing", PREF_INTYPE); return TRUE; } gboolean -cmd_splash(ProfWin *window, const char *const command, gchar **args) +cmd_splash(ProfWin* window, const char* const command, gchar** args) { _cmd_set_boolean_preference(args[0], command, "Splash screen", PREF_SPLASH); return TRUE; } gboolean -cmd_autoconnect(ProfWin *window, const char *const command, gchar **args) +cmd_autoconnect(ProfWin* window, const char* const command, gchar** args) { if (strcmp(args[0], "off") == 0) { prefs_set_string(PREF_CONNECT_ACCOUNT, NULL); @@ -6764,14 +6735,13 @@ cmd_autoconnect(ProfWin *window, const char *const command, gchar **args) } gboolean -cmd_logging(ProfWin *window, const char *const command, gchar **args) +cmd_logging(ProfWin* window, const char* const command, gchar** args) { if (args[0] == NULL) { cons_logging_setting(); return TRUE; } - if (strcmp(args[0], "chat") == 0 && args[1] != NULL) { _cmd_set_boolean_preference(args[1], command, "Chat logging", PREF_CHLOG); @@ -6793,7 +6763,7 @@ cmd_logging(ProfWin *window, const char *const command, gchar **args) } gboolean -cmd_history(ProfWin *window, const char *const command, gchar **args) +cmd_history(ProfWin* window, const char* const command, gchar** args) { if (args[0] == NULL) { return FALSE; @@ -6810,7 +6780,7 @@ cmd_history(ProfWin *window, const char *const command, gchar **args) } gboolean -cmd_carbons(ProfWin *window, const char *const command, gchar **args) +cmd_carbons(ProfWin* window, const char* const command, gchar** args) { if (args[0] == NULL) { return FALSE; @@ -6824,8 +6794,7 @@ cmd_carbons(ProfWin *window, const char *const command, gchar **args) // enable carbons if (strcmp(args[0], "on") == 0) { iq_enable_carbons(); - } - else if (strcmp(args[0], "off") == 0){ + } else if (strcmp(args[0], "off") == 0) { iq_disable_carbons(); } } @@ -6834,7 +6803,7 @@ cmd_carbons(ProfWin *window, const char *const command, gchar **args) } gboolean -cmd_receipts(ProfWin *window, const char *const command, gchar **args) +cmd_receipts(ProfWin* window, const char* const command, gchar** args) { if (g_strcmp0(args[0], "send") == 0) { _cmd_set_boolean_preference(args[1], command, "Send delivery receipts", PREF_RECEIPTS_SEND); @@ -6854,10 +6823,10 @@ cmd_receipts(ProfWin *window, const char *const command, gchar **args) } gboolean -cmd_plugins_sourcepath(ProfWin *window, const char *const command, gchar **args) +cmd_plugins_sourcepath(ProfWin* window, const char* const command, gchar** args) { if (args[1] == NULL) { - char *sourcepath = prefs_get_string(PREF_PLUGINS_SOURCEPATH); + char* sourcepath = prefs_get_string(PREF_PLUGINS_SOURCEPATH); if (sourcepath) { cons_show("Current plugins sourcepath: %s", sourcepath); g_free(sourcepath); @@ -6874,7 +6843,7 @@ cmd_plugins_sourcepath(ProfWin *window, const char *const command, gchar **args) } if (g_strcmp0(args[1], "set") == 0) { - char *path = args[2]; + char* path = args[2]; if (path == NULL) { cons_bad_cmd_usage(command); return TRUE; @@ -6882,7 +6851,7 @@ cmd_plugins_sourcepath(ProfWin *window, const char *const command, gchar **args) // expand ~ to $HOME if (path[0] == '~' && path[1] == '/') { - if (asprintf(&path, "%s/%s", getenv("HOME"), path+2) == -1) { + if (asprintf(&path, "%s/%s", getenv("HOME"), path + 2) == -1) { return TRUE; } } else { @@ -6906,9 +6875,9 @@ cmd_plugins_sourcepath(ProfWin *window, const char *const command, gchar **args) } gboolean -cmd_plugins_install(ProfWin *window, const char *const command, gchar **args) +cmd_plugins_install(ProfWin* window, const char* const command, gchar** args) { - char *path = args[1]; + char* path = args[1]; if (path == NULL) { char* sourcepath = prefs_get_string(PREF_PLUGINS_SOURCEPATH); if (sourcepath) { @@ -6919,7 +6888,7 @@ cmd_plugins_install(ProfWin *window, const char *const command, gchar **args) return TRUE; } } else if (path[0] == '~' && path[1] == '/') { - if (asprintf(&path, "%s/%s", getenv("HOME"), path+2) == -1) { + if (asprintf(&path, "%s/%s", getenv("HOME"), path + 2) == -1) { return TRUE; } } else { @@ -6934,7 +6903,7 @@ cmd_plugins_install(ProfWin *window, const char *const command, gchar **args) } GString* error_message = g_string_new(NULL); - gchar *plugin_name = g_path_get_basename(path); + gchar* plugin_name = g_path_get_basename(path); gboolean result = plugins_install(plugin_name, path, error_message); if (result) { cons_show("Plugin installed: %s", plugin_name); @@ -6951,7 +6920,7 @@ cmd_plugins_install(ProfWin *window, const char *const command, gchar **args) if (result->installed) { cons_show(""); cons_show("Installed plugins:"); - GSList *curr = result->installed; + GSList* curr = result->installed; while (curr) { cons_show(" %s", curr->data); curr = g_slist_next(curr); @@ -6960,7 +6929,7 @@ cmd_plugins_install(ProfWin *window, const char *const command, gchar **args) if (result->failed) { cons_show(""); cons_show("Failed installs:"); - GSList *curr = result->failed; + GSList* curr = result->failed; while (curr) { cons_show(" %s", curr->data); curr = g_slist_next(curr); @@ -6981,9 +6950,9 @@ cmd_plugins_install(ProfWin *window, const char *const command, gchar **args) } gboolean -cmd_plugins_update(ProfWin *window, const char *const command, gchar **args) +cmd_plugins_update(ProfWin* window, const char* const command, gchar** args) { - char *path = args[1]; + char* path = args[1]; if (path == NULL) { char* sourcepath = prefs_get_string(PREF_PLUGINS_SOURCEPATH); if (sourcepath) { @@ -6994,7 +6963,7 @@ cmd_plugins_update(ProfWin *window, const char *const command, gchar **args) return TRUE; } } else if (path[0] == '~' && path[1] == '/') { - if (asprintf(&path, "%s/%s", getenv("HOME"), path+2) == -1) { + if (asprintf(&path, "%s/%s", getenv("HOME"), path + 2) == -1) { return TRUE; } } else { @@ -7015,7 +6984,7 @@ cmd_plugins_update(ProfWin *window, const char *const command, gchar **args) } GString* error_message = g_string_new(NULL); - gchar *plugin_name = g_path_get_basename(path); + gchar* plugin_name = g_path_get_basename(path); if (plugins_unload(plugin_name)) { if (plugins_uninstall(plugin_name)) { if (plugins_install(plugin_name, path, error_message)) { @@ -7046,7 +7015,7 @@ cmd_plugins_update(ProfWin *window, const char *const command, gchar **args) } gboolean -cmd_plugins_uninstall(ProfWin *window, const char *const command, gchar **args) +cmd_plugins_uninstall(ProfWin* window, const char* const command, gchar** args) { if (args[1] == NULL) { return FALSE; @@ -7063,13 +7032,13 @@ cmd_plugins_uninstall(ProfWin *window, const char *const command, gchar **args) } gboolean -cmd_plugins_load(ProfWin *window, const char *const command, gchar **args) +cmd_plugins_load(ProfWin* window, const char* const command, gchar** args) { if (args[1] == NULL) { - GSList *loaded = plugins_load_all(); + GSList* loaded = plugins_load_all(); if (loaded) { cons_show("Loaded plugins:"); - GSList *curr = loaded; + GSList* curr = loaded; while (curr) { cons_show(" %s", curr->data); curr = g_slist_next(curr); @@ -7094,7 +7063,7 @@ cmd_plugins_load(ProfWin *window, const char *const command, gchar **args) } gboolean -cmd_plugins_unload(ProfWin *window, const char *const command, gchar **args) +cmd_plugins_unload(ProfWin* window, const char* const command, gchar** args) { if (args[1] == NULL) { gboolean res = plugins_unload_all(); @@ -7117,7 +7086,7 @@ cmd_plugins_unload(ProfWin *window, const char *const command, gchar **args) } gboolean -cmd_plugins_reload(ProfWin *window, const char *const command, gchar **args) +cmd_plugins_reload(ProfWin* window, const char* const command, gchar** args) { if (args[1] == NULL) { plugins_reload_all(); @@ -7138,10 +7107,10 @@ cmd_plugins_reload(ProfWin *window, const char *const command, gchar **args) } gboolean -cmd_plugins_python_version(ProfWin *window, const char *const command, gchar **args) +cmd_plugins_python_version(ProfWin* window, const char* const command, gchar** args) { #ifdef HAVE_PYTHON - const char *version = python_get_version_string(); + const char* version = python_get_version_string(); cons_show("Python version:"); cons_show("%s", version); #else @@ -7151,15 +7120,15 @@ cmd_plugins_python_version(ProfWin *window, const char *const command, gchar **a } gboolean -cmd_plugins(ProfWin *window, const char *const command, gchar **args) +cmd_plugins(ProfWin* window, const char* const command, gchar** args) { - GList *plugins = plugins_loaded_list(); + GList* plugins = plugins_loaded_list(); if (plugins == NULL) { cons_show("No plugins installed."); return TRUE; } - GList *curr = plugins; + GList* curr = plugins; cons_show("Installed plugins:"); while (curr) { cons_show(" %s", curr->data); @@ -7171,7 +7140,7 @@ cmd_plugins(ProfWin *window, const char *const command, gchar **args) } gboolean -cmd_pgp(ProfWin *window, const char *const command, gchar **args) +cmd_pgp(ProfWin* window, const char* const command, gchar** args) { #ifdef HAVE_LIBGPGME if (args[0] == NULL) { @@ -7194,7 +7163,7 @@ cmd_pgp(ProfWin *window, const char *const command, gchar **args) cons_bad_cmd_usage(command); return TRUE; } else if (g_strcmp0(args[0], "log") == 0) { - char *choice = args[1]; + char* choice = args[1]; if (g_strcmp0(choice, "on") == 0) { prefs_set_string(PREF_PGP_LOG, "on"); cons_show("PGP messages will be logged as plaintext."); @@ -7217,20 +7186,20 @@ cmd_pgp(ProfWin *window, const char *const command, gchar **args) } if (g_strcmp0(args[0], "keys") == 0) { - GHashTable *keys = p_gpg_list_keys(); + GHashTable* keys = p_gpg_list_keys(); if (!keys || g_hash_table_size(keys) == 0) { cons_show("No keys found"); return TRUE; } cons_show("PGP keys:"); - GList *keylist = g_hash_table_get_keys(keys); - GList *curr = keylist; + GList* keylist = g_hash_table_get_keys(keys); + GList* curr = keylist; while (curr) { - ProfPGPKey *key = g_hash_table_lookup(keys, curr->data); + ProfPGPKey* key = g_hash_table_lookup(keys, curr->data); cons_show(" %s", key->name); cons_show(" ID : %s", key->id); - char *format_fp = p_gpg_format_fp_str(key->fp); + char* format_fp = p_gpg_format_fp_str(key->fp); cons_show(" Fingerprint : %s", format_fp); free(format_fp); if (key->secret) { @@ -7252,13 +7221,13 @@ cmd_pgp(ProfWin *window, const char *const command, gchar **args) return TRUE; } - char *jid = args[1]; + char* jid = args[1]; if (!args[1]) { cons_bad_cmd_usage(command); return TRUE; } - char *keyid = args[2]; + char* keyid = args[2]; if (!args[2]) { cons_bad_cmd_usage(command); return TRUE; @@ -7280,18 +7249,18 @@ cmd_pgp(ProfWin *window, const char *const command, gchar **args) cons_show("You are not currently connected."); return TRUE; } - GHashTable *pubkeys = p_gpg_pubkeys(); - GList *jids = g_hash_table_get_keys(pubkeys); + GHashTable* pubkeys = p_gpg_pubkeys(); + GList* jids = g_hash_table_get_keys(pubkeys); if (!jids) { cons_show("No contacts found with PGP public keys assigned."); return TRUE; } cons_show("Assigned PGP public keys:"); - GList *curr = jids; + GList* curr = jids; while (curr) { - char *jid = curr->data; - ProfPGPPubKeyId *pubkeyid = g_hash_table_lookup(pubkeys, jid); + char* jid = curr->data; + ProfPGPPubKeyId* pubkeyid = g_hash_table_lookup(pubkeys, jid); if (pubkeyid->received) { cons_show(" %s: %s (received)", jid, pubkeyid->id); } else { @@ -7304,13 +7273,13 @@ cmd_pgp(ProfWin *window, const char *const command, gchar **args) } if (g_strcmp0(args[0], "libver") == 0) { - const char *libver = p_gpg_libver(); + const char* libver = p_gpg_libver(); if (!libver) { cons_show("Could not get libgpgme version"); return TRUE; } - GString *fullstr = g_string_new("Using libgpgme version "); + GString* fullstr = g_string_new("Using libgpgme version "); g_string_append(fullstr, libver); cons_show("%s", fullstr->str); g_string_free(fullstr, TRUE); @@ -7330,11 +7299,11 @@ cmd_pgp(ProfWin *window, const char *const command, gchar **args) return TRUE; } - ProfChatWin *chatwin = NULL; + ProfChatWin* chatwin = NULL; if (args[1]) { - char *contact = args[1]; - char *barejid = roster_barejid_from_name(contact); + char* contact = args[1]; + char* barejid = roster_barejid_from_name(contact); if (barejid == NULL) { barejid = contact; } @@ -7364,8 +7333,8 @@ cmd_pgp(ProfWin *window, const char *const command, gchar **args) return TRUE; } - ProfAccount *account = accounts_get_account(session_get_account_name()); - char *err_str = NULL; + ProfAccount* account = accounts_get_account(session_get_account_name()); + char* err_str = NULL; if (!p_gpg_valid_key(account->pgp_keyid, &err_str)) { win_println(window, THEME_DEFAULT, "!", "Invalid PGP key ID %s: %s, cannot start PGP encryption.", account->pgp_keyid, err_str); free(err_str); @@ -7397,7 +7366,7 @@ cmd_pgp(ProfWin *window, const char *const command, gchar **args) return TRUE; } - ProfChatWin *chatwin = (ProfChatWin*)window; + ProfChatWin* chatwin = (ProfChatWin*)window; if (chatwin->pgp_send == FALSE) { win_println(window, THEME_DEFAULT, "!", "PGP encryption is not currently enabled."); return TRUE; @@ -7429,7 +7398,7 @@ cmd_pgp(ProfWin *window, const char *const command, gchar **args) */ gboolean -cmd_ox(ProfWin *window, const char *const command, gchar **args) +cmd_ox(ProfWin* window, const char* const command, gchar** args) { if (args[0] == NULL) { cons_bad_cmd_usage(command); @@ -7440,20 +7409,20 @@ cmd_ox(ProfWin *window, const char *const command, gchar **args) // Should we move this to a common command // e.g. '/openpgp keys'?. else if (g_strcmp0(args[0], "keys") == 0) { - GHashTable *keys = p_gpg_list_keys(); + GHashTable* keys = p_gpg_list_keys(); if (!keys || g_hash_table_size(keys) == 0) { cons_show("No keys found"); return TRUE; } cons_show("OpenPGP keys:"); - GList *keylist = g_hash_table_get_keys(keys); - GList *curr = keylist; + GList* keylist = g_hash_table_get_keys(keys); + GList* curr = keylist; while (curr) { - ProfPGPKey *key = g_hash_table_lookup(keys, curr->data); + ProfPGPKey* key = g_hash_table_lookup(keys, curr->data); cons_show(" %s", key->name); cons_show(" ID : %s", key->id); - char *format_fp = p_gpg_format_fp_str(key->fp); + char* format_fp = p_gpg_format_fp_str(key->fp); cons_show(" Fingerprint : %s", format_fp); free(format_fp); if (key->secret) { @@ -7469,13 +7438,12 @@ cmd_ox(ProfWin *window, const char *const command, gchar **args) } else if (g_strcmp0(args[0], "contacts") == 0) { - GHashTable *keys = ox_gpg_public_keys(); + GHashTable* keys = ox_gpg_public_keys(); cons_show("OpenPGP keys:"); - GList *keylist = g_hash_table_get_keys(keys); - GList *curr = keylist; - + GList* keylist = g_hash_table_get_keys(keys); + GList* curr = keylist; - GSList *roster_list = NULL; + GSList* roster_list = NULL; jabber_conn_status_t conn_status = connection_get_status(); if (conn_status != JABBER_CONNECTED) { cons_show("You are not currently connected."); @@ -7484,23 +7452,23 @@ cmd_ox(ProfWin *window, const char *const command, gchar **args) } while (curr) { - ProfPGPKey *key = g_hash_table_lookup(keys, curr->data); + ProfPGPKey* key = g_hash_table_lookup(keys, curr->data); PContact contact = NULL; if (roster_list) { - GSList *curr_c = roster_list; - while ( !contact && curr_c){ + GSList* curr_c = roster_list; + while (!contact && curr_c) { contact = curr_c->data; - const char *jid = p_contact_barejid(contact); + const char* jid = p_contact_barejid(contact); GString* xmppuri = g_string_new("xmpp:"); g_string_append(xmppuri, jid); - if( g_strcmp0(key->name, xmppuri->str)) { + if (g_strcmp0(key->name, xmppuri->str)) { contact = NULL; } curr_c = g_slist_next(curr_c); } } - if(contact) { + if (contact) { cons_show("%s - %s", key->fp, key->name); } else { cons_show("%s - %s (not in roster)", key->fp, key->name); @@ -7520,11 +7488,11 @@ cmd_ox(ProfWin *window, const char *const command, gchar **args) return TRUE; } - ProfChatWin *chatwin = NULL; + ProfChatWin* chatwin = NULL; if (args[1]) { - char *contact = args[1]; - char *barejid = roster_barejid_from_name(contact); + char* contact = args[1]; + char* barejid = roster_barejid_from_name(contact); if (barejid == NULL) { barejid = contact; } @@ -7554,9 +7522,9 @@ cmd_ox(ProfWin *window, const char *const command, gchar **args) return TRUE; } - ProfAccount *account = accounts_get_account(session_get_account_name()); + ProfAccount* account = accounts_get_account(session_get_account_name()); - if ( !ox_is_private_key_available(account->jid) ) { + if (!ox_is_private_key_available(account->jid)) { win_println(window, THEME_DEFAULT, "!", "No private OpenPGP found, cannot start OX encryption."); account_free(account); return TRUE; @@ -7572,8 +7540,8 @@ cmd_ox(ProfWin *window, const char *const command, gchar **args) win_println(window, THEME_DEFAULT, "!", "OX encryption enabled."); return TRUE; } else if (g_strcmp0(args[0], "announce") == 0) { - if( args[1] ) { - ox_announce_public_key( args[1] ); + if (args[1]) { + ox_announce_public_key(args[1]); } else { cons_show("Filename is required"); } @@ -7585,7 +7553,7 @@ cmd_ox(ProfWin *window, const char *const command, gchar **args) #endif // HAVE_LIBGPGME gboolean -cmd_otr_char(ProfWin *window, const char *const command, gchar **args) +cmd_otr_char(ProfWin* window, const char* const command, gchar** args) { #ifdef HAVE_LIBOTR if (args[1] == NULL) { @@ -7607,10 +7575,10 @@ cmd_otr_char(ProfWin *window, const char *const command, gchar **args) } gboolean -cmd_otr_log(ProfWin *window, const char *const command, gchar **args) +cmd_otr_log(ProfWin* window, const char* const command, gchar** args) { #ifdef HAVE_LIBOTR - char *choice = args[1]; + char* choice = args[1]; if (g_strcmp0(choice, "on") == 0) { prefs_set_string(PREF_OTR_LOG, "on"); cons_show("OTR messages will be logged as plaintext."); @@ -7637,10 +7605,10 @@ cmd_otr_log(ProfWin *window, const char *const command, gchar **args) } gboolean -cmd_otr_libver(ProfWin *window, const char *const command, gchar **args) +cmd_otr_libver(ProfWin* window, const char* const command, gchar** args) { #ifdef HAVE_LIBOTR - char *version = otr_libotr_version(); + char* version = otr_libotr_version(); cons_show("Using libotr version %s", version); return TRUE; #else @@ -7650,25 +7618,23 @@ cmd_otr_libver(ProfWin *window, const char *const command, gchar **args) } gboolean -cmd_otr_policy(ProfWin *window, const char *const command, gchar **args) +cmd_otr_policy(ProfWin* window, const char* const command, gchar** args) { #ifdef HAVE_LIBOTR if (args[1] == NULL) { - char *policy = prefs_get_string(PREF_OTR_POLICY); + char* policy = prefs_get_string(PREF_OTR_POLICY); cons_show("OTR policy is now set to: %s", policy); g_free(policy); return TRUE; } - char *choice = args[1]; - if ((g_strcmp0(choice, "manual") != 0) && - (g_strcmp0(choice, "opportunistic") != 0) && - (g_strcmp0(choice, "always") != 0)) { + char* choice = args[1]; + if ((g_strcmp0(choice, "manual") != 0) && (g_strcmp0(choice, "opportunistic") != 0) && (g_strcmp0(choice, "always") != 0)) { cons_show("OTR policy can be set to: manual, opportunistic or always."); return TRUE; } - char *contact = args[2]; + char* contact = args[2]; if (contact == NULL) { prefs_set_string(PREF_OTR_POLICY, choice); cons_show("OTR policy is now set to: %s", choice); @@ -7680,7 +7646,7 @@ cmd_otr_policy(ProfWin *window, const char *const command, gchar **args) return TRUE; } - char *contact_jid = roster_barejid_from_name(contact); + char* contact_jid = roster_barejid_from_name(contact); if (contact_jid == NULL) { contact_jid = contact; } @@ -7694,7 +7660,7 @@ cmd_otr_policy(ProfWin *window, const char *const command, gchar **args) } gboolean -cmd_otr_gen(ProfWin *window, const char *const command, gchar **args) +cmd_otr_gen(ProfWin* window, const char* const command, gchar** args) { #ifdef HAVE_LIBOTR if (connection_get_status() != JABBER_CONNECTED) { @@ -7702,7 +7668,7 @@ cmd_otr_gen(ProfWin *window, const char *const command, gchar **args) return TRUE; } - ProfAccount *account = accounts_get_account(session_get_account_name()); + ProfAccount* account = accounts_get_account(session_get_account_name()); otr_keygen(account); account_free(account); return TRUE; @@ -7713,7 +7679,7 @@ cmd_otr_gen(ProfWin *window, const char *const command, gchar **args) } gboolean -cmd_otr_myfp(ProfWin *window, const char *const command, gchar **args) +cmd_otr_myfp(ProfWin* window, const char* const command, gchar** args) { #ifdef HAVE_LIBOTR if (connection_get_status() != JABBER_CONNECTED) { @@ -7726,7 +7692,7 @@ cmd_otr_myfp(ProfWin *window, const char *const command, gchar **args) return TRUE; } - char *fingerprint = otr_get_my_fingerprint(); + char* fingerprint = otr_get_my_fingerprint(); win_println(window, THEME_DEFAULT, "!", "Your OTR fingerprint: %s", fingerprint); free(fingerprint); return TRUE; @@ -7737,7 +7703,7 @@ cmd_otr_myfp(ProfWin *window, const char *const command, gchar **args) } gboolean -cmd_otr_theirfp(ProfWin *window, const char *const command, gchar **args) +cmd_otr_theirfp(ProfWin* window, const char* const command, gchar** args) { #ifdef HAVE_LIBOTR if (connection_get_status() != JABBER_CONNECTED) { @@ -7750,14 +7716,14 @@ cmd_otr_theirfp(ProfWin *window, const char *const command, gchar **args) return TRUE; } - ProfChatWin *chatwin = (ProfChatWin*)window; + ProfChatWin* chatwin = (ProfChatWin*)window; assert(chatwin->memcheck == PROFCHATWIN_MEMCHECK); if (chatwin->is_otr == FALSE) { win_println(window, THEME_DEFAULT, "!", "You are not currently in an OTR session."); return TRUE; } - char *fingerprint = otr_get_their_fingerprint(chatwin->barejid); + char* fingerprint = otr_get_their_fingerprint(chatwin->barejid); win_println(window, THEME_DEFAULT, "!", "%s's OTR fingerprint: %s", chatwin->barejid, fingerprint); free(fingerprint); return TRUE; @@ -7768,7 +7734,7 @@ cmd_otr_theirfp(ProfWin *window, const char *const command, gchar **args) } gboolean -cmd_otr_start(ProfWin *window, const char *const command, gchar **args) +cmd_otr_start(ProfWin* window, const char* const command, gchar** args) { #ifdef HAVE_LIBOTR if (connection_get_status() != JABBER_CONNECTED) { @@ -7778,13 +7744,13 @@ cmd_otr_start(ProfWin *window, const char *const command, gchar **args) // recipient supplied if (args[1]) { - char *contact = args[1]; - char *barejid = roster_barejid_from_name(contact); + char* contact = args[1]; + char* barejid = roster_barejid_from_name(contact); if (barejid == NULL) { barejid = contact; } - ProfChatWin *chatwin = wins_get_chat(barejid); + ProfChatWin* chatwin = wins_get_chat(barejid); if (!chatwin) { chatwin = chatwin_new(barejid); } @@ -7811,8 +7777,8 @@ cmd_otr_start(ProfWin *window, const char *const command, gchar **args) } if (!otr_is_secure(barejid)) { - char *otr_query_message = otr_start_query(); - char *id = message_send_chat_otr(barejid, otr_query_message, FALSE, NULL); + char* otr_query_message = otr_start_query(); + char* id = message_send_chat_otr(barejid, otr_query_message, FALSE, NULL); free(id); return TRUE; } @@ -7820,14 +7786,14 @@ cmd_otr_start(ProfWin *window, const char *const command, gchar **args) chatwin_otr_secured(chatwin, otr_is_trusted(barejid)); return TRUE; - // no recipient, use current chat + // no recipient, use current chat } else { if (window->type != WIN_CHAT) { win_println(window, THEME_DEFAULT, "-", "You must be in a regular chat window to start an OTR session."); return TRUE; } - ProfChatWin *chatwin = (ProfChatWin*)window; + ProfChatWin* chatwin = (ProfChatWin*)window; assert(chatwin->memcheck == PROFCHATWIN_MEMCHECK); if (chatwin->pgp_send) { win_println(window, THEME_DEFAULT, "!", "You must disable PGP encryption before starting an OTR session."); @@ -7844,8 +7810,8 @@ cmd_otr_start(ProfWin *window, const char *const command, gchar **args) return TRUE; } - char *otr_query_message = otr_start_query(); - char *id = message_send_chat_otr(chatwin->barejid, otr_query_message, FALSE, NULL); + char* otr_query_message = otr_start_query(); + char* id = message_send_chat_otr(chatwin->barejid, otr_query_message, FALSE, NULL); free(id); return TRUE; @@ -7857,7 +7823,7 @@ cmd_otr_start(ProfWin *window, const char *const command, gchar **args) } gboolean -cmd_otr_end(ProfWin *window, const char *const command, gchar **args) +cmd_otr_end(ProfWin* window, const char* const command, gchar** args) { #ifdef HAVE_LIBOTR if (connection_get_status() != JABBER_CONNECTED) { @@ -7870,7 +7836,7 @@ cmd_otr_end(ProfWin *window, const char *const command, gchar **args) return TRUE; } - ProfChatWin *chatwin = (ProfChatWin*)window; + ProfChatWin* chatwin = (ProfChatWin*)window; assert(chatwin->memcheck == PROFCHATWIN_MEMCHECK); if (chatwin->is_otr == FALSE) { win_println(window, THEME_DEFAULT, "!", "You are not currently in an OTR session."); @@ -7887,7 +7853,7 @@ cmd_otr_end(ProfWin *window, const char *const command, gchar **args) } gboolean -cmd_otr_trust(ProfWin *window, const char *const command, gchar **args) +cmd_otr_trust(ProfWin* window, const char* const command, gchar** args) { #ifdef HAVE_LIBOTR if (connection_get_status() != JABBER_CONNECTED) { @@ -7900,7 +7866,7 @@ cmd_otr_trust(ProfWin *window, const char *const command, gchar **args) return TRUE; } - ProfChatWin *chatwin = (ProfChatWin*)window; + ProfChatWin* chatwin = (ProfChatWin*)window; assert(chatwin->memcheck == PROFCHATWIN_MEMCHECK); if (chatwin->is_otr == FALSE) { win_println(window, THEME_DEFAULT, "!", "You are not currently in an OTR session."); @@ -7917,7 +7883,7 @@ cmd_otr_trust(ProfWin *window, const char *const command, gchar **args) } gboolean -cmd_otr_untrust(ProfWin *window, const char *const command, gchar **args) +cmd_otr_untrust(ProfWin* window, const char* const command, gchar** args) { #ifdef HAVE_LIBOTR if (connection_get_status() != JABBER_CONNECTED) { @@ -7930,7 +7896,7 @@ cmd_otr_untrust(ProfWin *window, const char *const command, gchar **args) return TRUE; } - ProfChatWin *chatwin = (ProfChatWin*)window; + ProfChatWin* chatwin = (ProfChatWin*)window; assert(chatwin->memcheck == PROFCHATWIN_MEMCHECK); if (chatwin->is_otr == FALSE) { win_println(window, THEME_DEFAULT, "!", "You are not currently in an OTR session."); @@ -7947,7 +7913,7 @@ cmd_otr_untrust(ProfWin *window, const char *const command, gchar **args) } gboolean -cmd_otr_secret(ProfWin *window, const char *const command, gchar **args) +cmd_otr_secret(ProfWin* window, const char* const command, gchar** args) { #ifdef HAVE_LIBOTR if (connection_get_status() != JABBER_CONNECTED) { @@ -7960,14 +7926,14 @@ cmd_otr_secret(ProfWin *window, const char *const command, gchar **args) return TRUE; } - ProfChatWin *chatwin = (ProfChatWin*)window; + ProfChatWin* chatwin = (ProfChatWin*)window; assert(chatwin->memcheck == PROFCHATWIN_MEMCHECK); if (chatwin->is_otr == FALSE) { win_println(window, THEME_DEFAULT, "!", "You are not currently in an OTR session."); return TRUE; } - char *secret = args[1]; + char* secret = args[1]; if (secret == NULL) { cons_bad_cmd_usage(command); return TRUE; @@ -7982,7 +7948,7 @@ cmd_otr_secret(ProfWin *window, const char *const command, gchar **args) } gboolean -cmd_otr_question(ProfWin *window, const char *const command, gchar **args) +cmd_otr_question(ProfWin* window, const char* const command, gchar** args) { #ifdef HAVE_LIBOTR if (connection_get_status() != JABBER_CONNECTED) { @@ -7990,8 +7956,8 @@ cmd_otr_question(ProfWin *window, const char *const command, gchar **args) return TRUE; } - char *question = args[1]; - char *answer = args[2]; + char* question = args[1]; + char* answer = args[2]; if (question == NULL || answer == NULL) { cons_bad_cmd_usage(command); return TRUE; @@ -8002,7 +7968,7 @@ cmd_otr_question(ProfWin *window, const char *const command, gchar **args) return TRUE; } - ProfChatWin *chatwin = (ProfChatWin*)window; + ProfChatWin* chatwin = (ProfChatWin*)window; assert(chatwin->memcheck == PROFCHATWIN_MEMCHECK); if (chatwin->is_otr == FALSE) { win_println(window, THEME_DEFAULT, "!", "You are not currently in an OTR session."); @@ -8018,7 +7984,7 @@ cmd_otr_question(ProfWin *window, const char *const command, gchar **args) } gboolean -cmd_otr_answer(ProfWin *window, const char *const command, gchar **args) +cmd_otr_answer(ProfWin* window, const char* const command, gchar** args) { #ifdef HAVE_LIBOTR if (connection_get_status() != JABBER_CONNECTED) { @@ -8031,14 +7997,14 @@ cmd_otr_answer(ProfWin *window, const char *const command, gchar **args) return TRUE; } - ProfChatWin *chatwin = (ProfChatWin*)window; + ProfChatWin* chatwin = (ProfChatWin*)window; assert(chatwin->memcheck == PROFCHATWIN_MEMCHECK); if (chatwin->is_otr == FALSE) { win_println(window, THEME_DEFAULT, "!", "You are not currently in an OTR session."); return TRUE; } - char *answer = args[1]; + char* answer = args[1]; if (answer == NULL) { cons_bad_cmd_usage(command); return TRUE; @@ -8053,7 +8019,7 @@ cmd_otr_answer(ProfWin *window, const char *const command, gchar **args) } gboolean -cmd_otr_sendfile(ProfWin *window, const char *const command, gchar **args) +cmd_otr_sendfile(ProfWin* window, const char* const command, gchar** args) { #ifdef HAVE_LIBOTR _cmd_set_boolean_preference(args[1], command, "Sending unencrypted files in an OTR session via /sendfile", PREF_OTR_SENDFILE); @@ -8066,7 +8032,7 @@ cmd_otr_sendfile(ProfWin *window, const char *const command, gchar **args) } gboolean -cmd_command_list(ProfWin *window, const char *const command, gchar **args) +cmd_command_list(ProfWin* window, const char* const command, gchar** args) { jabber_conn_status_t conn_status = connection_get_status(); @@ -8080,26 +8046,26 @@ cmd_command_list(ProfWin *window, const char *const command, gchar **args) return TRUE; } - char *jid = args[1]; + char* jid = args[1]; if (jid == NULL) { switch (window->type) { case WIN_MUC: { - ProfMucWin *mucwin = (ProfMucWin*)window; + ProfMucWin* mucwin = (ProfMucWin*)window; assert(mucwin->memcheck == PROFMUCWIN_MEMCHECK); jid = mucwin->roomjid; break; } case WIN_CHAT: { - ProfChatWin *chatwin = (ProfChatWin*)window; + ProfChatWin* chatwin = (ProfChatWin*)window; assert(chatwin->memcheck == PROFCHATWIN_MEMCHECK); jid = chatwin->barejid; break; } case WIN_PRIVATE: { - ProfPrivateWin *privatewin = (ProfPrivateWin*)window; + ProfPrivateWin* privatewin = (ProfPrivateWin*)window; assert(privatewin->memcheck == PROFPRIVATEWIN_MEMCHECK); jid = privatewin->fulljid; break; @@ -8122,7 +8088,7 @@ cmd_command_list(ProfWin *window, const char *const command, gchar **args) } gboolean -cmd_command_exec(ProfWin *window, const char *const command, gchar **args) +cmd_command_exec(ProfWin* window, const char* const command, gchar** args) { jabber_conn_status_t conn_status = connection_get_status(); @@ -8141,26 +8107,26 @@ cmd_command_exec(ProfWin *window, const char *const command, gchar **args) return TRUE; } - char *jid = args[2]; + char* jid = args[2]; if (jid == NULL) { switch (window->type) { case WIN_MUC: { - ProfMucWin *mucwin = (ProfMucWin*)window; + ProfMucWin* mucwin = (ProfMucWin*)window; assert(mucwin->memcheck == PROFMUCWIN_MEMCHECK); jid = mucwin->roomjid; break; } case WIN_CHAT: { - ProfChatWin *chatwin = (ProfChatWin*)window; + ProfChatWin* chatwin = (ProfChatWin*)window; assert(chatwin->memcheck == PROFCHATWIN_MEMCHECK); jid = chatwin->barejid; break; } case WIN_PRIVATE: { - ProfPrivateWin *privatewin = (ProfPrivateWin*)window; + ProfPrivateWin* privatewin = (ProfPrivateWin*)window; assert(privatewin->memcheck == PROFPRIVATEWIN_MEMCHECK); jid = privatewin->fulljid; break; @@ -8183,17 +8149,17 @@ cmd_command_exec(ProfWin *window, const char *const command, gchar **args) } static gboolean -_cmd_execute(ProfWin *window, const char *const command, const char *const inp) +_cmd_execute(ProfWin* window, const char* const command, const char* const inp) { if (g_str_has_prefix(command, "/field") && window->type == WIN_CONFIG) { gboolean result = FALSE; - gchar **args = parse_args_with_freetext(inp, 1, 2, &result); + gchar** args = parse_args_with_freetext(inp, 1, 2, &result); if (!result) { win_println(window, THEME_DEFAULT, "!", "Invalid command, see /form help"); result = TRUE; } else { - gchar **tokens = g_strsplit(inp, " ", 2); - char *field = tokens[0] + 1; + gchar** tokens = g_strsplit(inp, " ", 2); + char* field = tokens[0] + 1; result = cmd_form_field(window, field, args); g_strfreev(tokens); } @@ -8202,11 +8168,11 @@ _cmd_execute(ProfWin *window, const char *const command, const char *const inp) return result; } - Command *cmd = cmd_get(command); + Command* cmd = cmd_get(command); gboolean result = FALSE; if (cmd) { - gchar **args = cmd->parser(inp, cmd->min_args, cmd->max_args, &result); + gchar** args = cmd->parser(inp, cmd->min_args, cmd->max_args, &result); if (result == FALSE) { ui_invalid_command_usage(cmd->cmd, cmd->setting_func); return TRUE; @@ -8215,7 +8181,7 @@ _cmd_execute(ProfWin *window, const char *const command, const char *const inp) int i = 0; while (cmd->sub_funcs[i][0]) { if (g_strcmp0(args[0], (char*)cmd->sub_funcs[i][0]) == 0) { - gboolean (*func)(ProfWin *window, const char *const command, gchar **args) = cmd->sub_funcs[i][1]; + gboolean (*func)(ProfWin * window, const char* const command, gchar** args) = cmd->sub_funcs[i][1]; gboolean result = func(window, command, args); g_strfreev(args); return result; @@ -8244,13 +8210,13 @@ _cmd_execute(ProfWin *window, const char *const command, const char *const inp) } static gboolean -_cmd_execute_default(ProfWin *window, const char *inp) +_cmd_execute_default(ProfWin* window, const char* inp) { // handle escaped commands - treat as normal message if (g_str_has_prefix(inp, "//")) { inp++; - // handle unknown commands + // handle unknown commands } else if ((inp[0] == '/') && (!g_str_has_prefix(inp, "/me "))) { cons_show("Unknown command: %s", inp); cons_alert(); @@ -8265,7 +8231,7 @@ _cmd_execute_default(ProfWin *window, const char *inp) // handle plugin window if (window->type == WIN_PLUGIN) { - ProfPluginWin *pluginwin = (ProfPluginWin*)window; + ProfPluginWin* pluginwin = (ProfPluginWin*)window; plugins_win_process_line(pluginwin->tag, inp); return TRUE; } @@ -8279,21 +8245,21 @@ _cmd_execute_default(ProfWin *window, const char *inp) switch (window->type) { case WIN_CHAT: { - ProfChatWin *chatwin = (ProfChatWin*)window; + ProfChatWin* chatwin = (ProfChatWin*)window; assert(chatwin->memcheck == PROFCHATWIN_MEMCHECK); cl_ev_send_msg(chatwin, inp, NULL); break; } case WIN_PRIVATE: { - ProfPrivateWin *privatewin = (ProfPrivateWin*)window; + ProfPrivateWin* privatewin = (ProfPrivateWin*)window; assert(privatewin->memcheck == PROFPRIVATEWIN_MEMCHECK); cl_ev_send_priv_msg(privatewin, inp, NULL); break; } case WIN_MUC: { - ProfMucWin *mucwin = (ProfMucWin*)window; + ProfMucWin* mucwin = (ProfMucWin*)window; assert(mucwin->memcheck == PROFMUCWIN_MEMCHECK); cl_ev_send_muc_msg(mucwin, inp, NULL); break; @@ -8311,15 +8277,15 @@ _cmd_execute_default(ProfWin *window, const char *inp) } static gboolean -_cmd_execute_alias(ProfWin *window, const char *const inp, gboolean *ran) +_cmd_execute_alias(ProfWin* window, const char* const inp, gboolean* ran) { if (inp[0] != '/') { *ran = FALSE; return TRUE; } - char *alias = strdup(inp+1); - char *value = prefs_get_alias(alias); + char* alias = strdup(inp + 1); + char* value = prefs_get_alias(alias); free(alias); if (value) { *ran = TRUE; @@ -8335,9 +8301,9 @@ _cmd_execute_alias(ProfWin *window, const char *const inp, gboolean *ran) // helper function for status change commands static void _update_presence(const resource_presence_t resource_presence, - const char *const show, gchar **args) + const char* const show, gchar** args) { - char *msg = NULL; + char* msg = NULL; int num_args = g_strv_length(args); // if no message, use status as message @@ -8360,13 +8326,13 @@ _update_presence(const resource_presence_t resource_presence, // helper function for boolean preference commands static void -_cmd_set_boolean_preference(gchar *arg, const char *const command, - const char *const display, preference_t pref) +_cmd_set_boolean_preference(gchar* arg, const char* const command, + const char* const display, preference_t pref) { if (arg == NULL) { cons_bad_cmd_usage(command); } else if (strcmp(arg, "on") == 0) { - GString *enabled = g_string_new(display); + GString* enabled = g_string_new(display); g_string_append(enabled, " enabled."); cons_show(enabled->str); @@ -8374,7 +8340,7 @@ _cmd_set_boolean_preference(gchar *arg, const char *const command, g_string_free(enabled, TRUE); } else if (strcmp(arg, "off") == 0) { - GString *disabled = g_string_new(display); + GString* disabled = g_string_new(display); g_string_append(disabled, " disabled."); cons_show(disabled->str); @@ -8387,7 +8353,7 @@ _cmd_set_boolean_preference(gchar *arg, const char *const command, } gboolean -cmd_omemo_gen(ProfWin *window, const char *const command, gchar **args) +cmd_omemo_gen(ProfWin* window, const char* const command, gchar** args) { #ifdef HAVE_OMEMO if (connection_get_status() != JABBER_CONNECTED) { @@ -8402,7 +8368,7 @@ cmd_omemo_gen(ProfWin *window, const char *const command, gchar **args) cons_show("Generating OMEMO crytographic materials, it may take a while..."); ui_update(); - ProfAccount *account = accounts_get_account(session_get_account_name()); + ProfAccount* account = accounts_get_account(session_get_account_name()); omemo_generate_crypto_materials(account); cons_show("OMEMO crytographic materials generated."); return TRUE; @@ -8413,7 +8379,7 @@ cmd_omemo_gen(ProfWin *window, const char *const command, gchar **args) } gboolean -cmd_omemo_start(ProfWin *window, const char *const command, gchar **args) +cmd_omemo_start(ProfWin* window, const char* const command, gchar** args) { #ifdef HAVE_OMEMO if (connection_get_status() != JABBER_CONNECTED) { @@ -8426,12 +8392,12 @@ cmd_omemo_start(ProfWin *window, const char *const command, gchar **args) return TRUE; } - ProfChatWin *chatwin = NULL; + ProfChatWin* chatwin = NULL; // recipient supplied if (args[1]) { - char *contact = args[1]; - char *barejid = roster_barejid_from_name(contact); + char* contact = args[1]; + char* barejid = roster_barejid_from_name(contact); if (barejid == NULL) { barejid = contact; } @@ -8442,10 +8408,10 @@ cmd_omemo_start(ProfWin *window, const char *const command, gchar **args) } ui_focus_win((ProfWin*)chatwin); } else { - if (window->type == WIN_CHAT) { - chatwin = (ProfChatWin*)window; - assert(chatwin->memcheck == PROFCHATWIN_MEMCHECK); - } + if (window->type == WIN_CHAT) { + chatwin = (ProfChatWin*)window; + assert(chatwin->memcheck == PROFCHATWIN_MEMCHECK); + } } if (chatwin) { @@ -8468,11 +8434,11 @@ cmd_omemo_start(ProfWin *window, const char *const command, gchar **args) omemo_start_session(chatwin->barejid); chatwin->is_omemo = TRUE; } else if (window->type == WIN_MUC) { - ProfMucWin *mucwin = (ProfMucWin*)window; + ProfMucWin* mucwin = (ProfMucWin*)window; assert(mucwin->memcheck == PROFMUCWIN_MEMCHECK); if (muc_anonymity_type(mucwin->roomjid) == MUC_ANONYMITY_TYPE_NONANONYMOUS - && muc_member_type(mucwin->roomjid) == MUC_MEMBER_TYPE_MEMBERS_ONLY) { + && muc_member_type(mucwin->roomjid) == MUC_MEMBER_TYPE_MEMBERS_ONLY) { accounts_add_omemo_state(session_get_account_name(), mucwin->roomjid, TRUE); omemo_start_muc_sessions(mucwin->roomjid); mucwin->is_omemo = TRUE; @@ -8491,7 +8457,7 @@ cmd_omemo_start(ProfWin *window, const char *const command, gchar **args) } gboolean -cmd_omemo_char(ProfWin *window, const char *const command, gchar **args) +cmd_omemo_char(ProfWin* window, const char* const command, gchar** args) { #ifdef HAVE_OMEMO if (args[1] == NULL) { @@ -8513,10 +8479,10 @@ cmd_omemo_char(ProfWin *window, const char *const command, gchar **args) } gboolean -cmd_omemo_log(ProfWin *window, const char *const command, gchar **args) +cmd_omemo_log(ProfWin* window, const char* const command, gchar** args) { #ifdef HAVE_OMEMO - char *choice = args[1]; + char* choice = args[1]; if (g_strcmp0(choice, "on") == 0) { prefs_set_string(PREF_OMEMO_LOG, "on"); cons_show("OMEMO messages will be logged as plaintext."); @@ -8543,7 +8509,7 @@ cmd_omemo_log(ProfWin *window, const char *const command, gchar **args) } gboolean -cmd_omemo_end(ProfWin *window, const char *const command, gchar **args) +cmd_omemo_end(ProfWin* window, const char* const command, gchar** args) { #ifdef HAVE_OMEMO if (connection_get_status() != JABBER_CONNECTED) { @@ -8552,7 +8518,7 @@ cmd_omemo_end(ProfWin *window, const char *const command, gchar **args) } if (window->type == WIN_CHAT) { - ProfChatWin *chatwin = (ProfChatWin*)window; + ProfChatWin* chatwin = (ProfChatWin*)window; assert(chatwin->memcheck == PROFCHATWIN_MEMCHECK); if (!chatwin->is_omemo) { @@ -8563,7 +8529,7 @@ cmd_omemo_end(ProfWin *window, const char *const command, gchar **args) chatwin->is_omemo = FALSE; accounts_add_omemo_state(session_get_account_name(), chatwin->barejid, FALSE); } else if (window->type == WIN_MUC) { - ProfMucWin *mucwin = (ProfMucWin*)window; + ProfMucWin* mucwin = (ProfMucWin*)window; assert(mucwin->memcheck == PROFMUCWIN_MEMCHECK); if (!mucwin->is_omemo) { @@ -8586,7 +8552,7 @@ cmd_omemo_end(ProfWin *window, const char *const command, gchar **args) } gboolean -cmd_omemo_fingerprint(ProfWin *window, const char *const command, gchar **args) +cmd_omemo_fingerprint(ProfWin* window, const char* const command, gchar** args) { #ifdef HAVE_OMEMO if (connection_get_status() != JABBER_CONNECTED) { @@ -8599,22 +8565,22 @@ cmd_omemo_fingerprint(ProfWin *window, const char *const command, gchar **args) return TRUE; } - Jid *jid; + Jid* jid; if (!args[1]) { if (window->type == WIN_CONSOLE) { - char *fingerprint = omemo_own_fingerprint(TRUE); + char* fingerprint = omemo_own_fingerprint(TRUE); cons_show("Your OMEMO fingerprint: %s", fingerprint); free(fingerprint); jid = jid_create(connection_get_fulljid()); } else if (window->type == WIN_CHAT) { - ProfChatWin *chatwin = (ProfChatWin*)window; + ProfChatWin* chatwin = (ProfChatWin*)window; jid = jid_create(chatwin->barejid); } else { win_println(window, THEME_DEFAULT, "-", "You must be in a regular chat window to print fingerprint without providing the contact."); return TRUE; } } else { - char *barejid = roster_barejid_from_name(args[1]); + char* barejid = roster_barejid_from_name(args[1]); if (barejid) { jid = jid_create(barejid); } else { @@ -8626,8 +8592,8 @@ cmd_omemo_fingerprint(ProfWin *window, const char *const command, gchar **args) } } - GList *fingerprints = omemo_known_device_identities(jid->barejid); - GList *fingerprint; + GList* fingerprints = omemo_known_device_identities(jid->barejid); + GList* fingerprint; if (!fingerprints) { win_println(window, THEME_DEFAULT, "-", "There is no known fingerprints for %s", jid->barejid); @@ -8635,7 +8601,7 @@ cmd_omemo_fingerprint(ProfWin *window, const char *const command, gchar **args) } for (fingerprint = fingerprints; fingerprint != NULL; fingerprint = fingerprint->next) { - char *formatted_fingerprint = omemo_format_fingerprint(fingerprint->data); + char* formatted_fingerprint = omemo_format_fingerprint(fingerprint->data); gboolean trusted = omemo_is_trusted_identity(jid->barejid, fingerprint->data); win_println(window, THEME_DEFAULT, "-", "%s's OMEMO fingerprint: %s%s", jid->barejid, formatted_fingerprint, trusted ? " (trusted)" : ""); @@ -8656,7 +8622,7 @@ cmd_omemo_fingerprint(ProfWin *window, const char *const command, gchar **args) } gboolean -cmd_omemo_trust(ProfWin *window, const char *const command, gchar **args) +cmd_omemo_trust(ProfWin* window, const char* const command, gchar** args) { #ifdef HAVE_OMEMO if (connection_get_status() != JABBER_CONNECTED) { @@ -8674,8 +8640,8 @@ cmd_omemo_trust(ProfWin *window, const char *const command, gchar **args) return TRUE; } - char *fingerprint; - char *barejid; + char* fingerprint; + char* barejid; /* Contact not provided */ if (!args[2]) { @@ -8686,12 +8652,12 @@ cmd_omemo_trust(ProfWin *window, const char *const command, gchar **args) return TRUE; } - ProfChatWin *chatwin = (ProfChatWin*)window; + ProfChatWin* chatwin = (ProfChatWin*)window; assert(chatwin->memcheck == PROFCHATWIN_MEMCHECK); barejid = chatwin->barejid; } else { fingerprint = args[2]; - char *contact = args[1]; + char* contact = args[1]; barejid = roster_barejid_from_name(contact); if (barejid == NULL) { barejid = contact; @@ -8700,7 +8666,7 @@ cmd_omemo_trust(ProfWin *window, const char *const command, gchar **args) omemo_trust(barejid, fingerprint); - char *unformatted_fingerprint = malloc(strlen(fingerprint)); + char* unformatted_fingerprint = malloc(strlen(fingerprint)); int i; int j; for (i = 0, j = 0; fingerprint[i] != '\0'; i++) { @@ -8725,7 +8691,7 @@ cmd_omemo_trust(ProfWin *window, const char *const command, gchar **args) } gboolean -cmd_omemo_untrust(ProfWin *window, const char *const command, gchar **args) +cmd_omemo_untrust(ProfWin* window, const char* const command, gchar** args) { #ifdef HAVE_OMEMO if (connection_get_status() != JABBER_CONNECTED) { @@ -8743,8 +8709,8 @@ cmd_omemo_untrust(ProfWin *window, const char *const command, gchar **args) return TRUE; } - char *fingerprint; - char *barejid; + char* fingerprint; + char* barejid; /* Contact not provided */ if (!args[2]) { @@ -8755,12 +8721,12 @@ cmd_omemo_untrust(ProfWin *window, const char *const command, gchar **args) return TRUE; } - ProfChatWin *chatwin = (ProfChatWin*)window; + ProfChatWin* chatwin = (ProfChatWin*)window; assert(chatwin->memcheck == PROFCHATWIN_MEMCHECK); barejid = chatwin->barejid; } else { fingerprint = args[2]; - char *contact = args[1]; + char* contact = args[1]; barejid = roster_barejid_from_name(contact); if (barejid == NULL) { barejid = contact; @@ -8769,7 +8735,7 @@ cmd_omemo_untrust(ProfWin *window, const char *const command, gchar **args) omemo_untrust(barejid, fingerprint); - char *unformatted_fingerprint = malloc(strlen(fingerprint)); + char* unformatted_fingerprint = malloc(strlen(fingerprint)); int i; int j; for (i = 0, j = 0; fingerprint[i] != '\0'; i++) { @@ -8794,7 +8760,7 @@ cmd_omemo_untrust(ProfWin *window, const char *const command, gchar **args) } gboolean -cmd_omemo_clear_device_list(ProfWin *window, const char *const command, gchar **args) +cmd_omemo_clear_device_list(ProfWin* window, const char* const command, gchar** args) { #ifdef HAVE_OMEMO if (connection_get_status() != JABBER_CONNECTED) { @@ -8812,20 +8778,18 @@ cmd_omemo_clear_device_list(ProfWin *window, const char *const command, gchar ** } gboolean -cmd_omemo_policy(ProfWin *window, const char *const command, gchar **args) +cmd_omemo_policy(ProfWin* window, const char* const command, gchar** args) { #ifdef HAVE_OMEMO if (args[1] == NULL) { - char *policy = prefs_get_string(PREF_OMEMO_POLICY); + char* policy = prefs_get_string(PREF_OMEMO_POLICY); cons_show("OMEMO policy is now set to: %s", policy); g_free(policy); return TRUE; } - char *choice = args[1]; - if ((g_strcmp0(choice, "manual") != 0) && - (g_strcmp0(choice, "automatic") != 0) && - (g_strcmp0(choice, "always") != 0)) { + char* choice = args[1]; + if ((g_strcmp0(choice, "manual") != 0) && (g_strcmp0(choice, "automatic") != 0) && (g_strcmp0(choice, "always") != 0)) { cons_show("OMEMO policy can be set to: manual, automatic or always."); return TRUE; } @@ -8840,7 +8804,7 @@ cmd_omemo_policy(ProfWin *window, const char *const command, gchar **args) } gboolean -cmd_omemo_sendfile(ProfWin *window, const char *const command, gchar **args) +cmd_omemo_sendfile(ProfWin* window, const char* const command, gchar** args) { #ifdef HAVE_OMEMO _cmd_set_boolean_preference(args[1], command, "Sending unencrypted files in an OMEMO session via /sendfile", PREF_OMEMO_SENDFILE); @@ -8853,7 +8817,7 @@ cmd_omemo_sendfile(ProfWin *window, const char *const command, gchar **args) } gboolean -cmd_save(ProfWin *window, const char *const command, gchar **args) +cmd_save(ProfWin* window, const char* const command, gchar** args) { log_info("Saving preferences to configuration file"); cons_show("Saving preferences."); @@ -8862,7 +8826,7 @@ cmd_save(ProfWin *window, const char *const command, gchar **args) } gboolean -cmd_reload(ProfWin *window, const char *const command, gchar **args) +cmd_reload(ProfWin* window, const char* const command, gchar** args) { log_info("Reloading preferences"); cons_show("Reloading preferences."); @@ -8871,39 +8835,39 @@ cmd_reload(ProfWin *window, const char *const command, gchar **args) } gboolean -cmd_paste(ProfWin *window, const char *const command, gchar **args) +cmd_paste(ProfWin* window, const char* const command, gchar** args) { #ifdef HAVE_GTK - char *clipboard_buffer = clipboard_get(); + char* clipboard_buffer = clipboard_get(); if (clipboard_buffer) { switch (window->type) { - case WIN_MUC: - { - ProfMucWin *mucwin = (ProfMucWin*)window; - assert(mucwin->memcheck == PROFMUCWIN_MEMCHECK); - cl_ev_send_muc_msg(mucwin, clipboard_buffer, NULL); - break; - } - case WIN_CHAT: - { - ProfChatWin *chatwin = (ProfChatWin*)window; - assert(chatwin->memcheck == PROFCHATWIN_MEMCHECK); - cl_ev_send_msg(chatwin, clipboard_buffer, NULL); - break; - } - case WIN_PRIVATE: - { - ProfPrivateWin *privatewin = (ProfPrivateWin*)window; - assert(privatewin->memcheck == PROFPRIVATEWIN_MEMCHECK); - cl_ev_send_priv_msg(privatewin, clipboard_buffer, NULL); - break; - } - case WIN_CONSOLE: - case WIN_XML: - default: - cons_bad_cmd_usage(command); - break; + case WIN_MUC: + { + ProfMucWin* mucwin = (ProfMucWin*)window; + assert(mucwin->memcheck == PROFMUCWIN_MEMCHECK); + cl_ev_send_muc_msg(mucwin, clipboard_buffer, NULL); + break; + } + case WIN_CHAT: + { + ProfChatWin* chatwin = (ProfChatWin*)window; + assert(chatwin->memcheck == PROFCHATWIN_MEMCHECK); + cl_ev_send_msg(chatwin, clipboard_buffer, NULL); + break; + } + case WIN_PRIVATE: + { + ProfPrivateWin* privatewin = (ProfPrivateWin*)window; + assert(privatewin->memcheck == PROFPRIVATEWIN_MEMCHECK); + cl_ev_send_priv_msg(privatewin, clipboard_buffer, NULL); + break; + } + case WIN_CONSOLE: + case WIN_XML: + default: + cons_bad_cmd_usage(command); + break; } free(clipboard_buffer); @@ -8916,16 +8880,16 @@ cmd_paste(ProfWin *window, const char *const command, gchar **args) } gboolean -cmd_color(ProfWin *window, const char *const command, gchar **args) +cmd_color(ProfWin* window, const char* const command, gchar** args) { if (g_strcmp0(args[0], "on") == 0) { - prefs_set_string(PREF_COLOR_NICK, "true"); + prefs_set_string(PREF_COLOR_NICK, "true"); } else if (g_strcmp0(args[0], "off") == 0) { - prefs_set_string(PREF_COLOR_NICK, "false"); + prefs_set_string(PREF_COLOR_NICK, "false"); } else if (g_strcmp0(args[0], "redgreen") == 0) { - prefs_set_string(PREF_COLOR_NICK, "redgreen"); + prefs_set_string(PREF_COLOR_NICK, "redgreen"); } else if (g_strcmp0(args[0], "blue") == 0) { - prefs_set_string(PREF_COLOR_NICK, "blue"); + prefs_set_string(PREF_COLOR_NICK, "blue"); } else if (g_strcmp0(args[0], "own") == 0) { if (g_strcmp0(args[1], "on") == 0) { _cmd_set_boolean_preference(args[1], command, "Color generation for own nick", PREF_COLOR_NICK_OWN); @@ -8937,7 +8901,7 @@ cmd_color(ProfWin *window, const char *const command, gchar **args) cons_show("Consistent color generation for nicks set to: %s", args[0]); - char *theme = prefs_get_string(PREF_THEME); + char* theme = prefs_get_string(PREF_THEME); if (theme) { gboolean res = theme_load(theme, false); @@ -8954,7 +8918,7 @@ cmd_color(ProfWin *window, const char *const command, gchar **args) } gboolean -cmd_avatar(ProfWin *window, const char *const command, gchar **args) +cmd_avatar(ProfWin* window, const char* const command, gchar** args) { if (args[1] == NULL) { cons_bad_cmd_usage(command); @@ -8974,7 +8938,7 @@ cmd_avatar(ProfWin *window, const char *const command, gchar **args) } gboolean -cmd_os(ProfWin *window, const char *const command, gchar **args) +cmd_os(ProfWin* window, const char* const command, gchar** args) { _cmd_set_boolean_preference(args[0], command, "Revealing OS name", PREF_REVEAL_OS); @@ -8982,7 +8946,7 @@ cmd_os(ProfWin *window, const char *const command, gchar **args) } gboolean -cmd_correction(ProfWin *window, const char *const command, gchar **args) +cmd_correction(ProfWin* window, const char* const command, gchar** args) { // enable/disable if (g_strcmp0(args[0], "on") == 0) { @@ -9011,7 +8975,7 @@ cmd_correction(ProfWin *window, const char *const command, gchar **args) } gboolean -cmd_correct(ProfWin *window, const char *const command, gchar **args) +cmd_correct(ProfWin* window, const char* const command, gchar** args) { jabber_conn_status_t conn_status = connection_get_status(); if (conn_status != JABBER_CONNECTED) { @@ -9025,7 +8989,7 @@ cmd_correct(ProfWin *window, const char *const command, gchar **args) } if (window->type == WIN_CHAT) { - ProfChatWin *chatwin = (ProfChatWin*)window; + ProfChatWin* chatwin = (ProfChatWin*)window; assert(chatwin->memcheck == PROFCHATWIN_MEMCHECK); if (chatwin->last_msg_id == NULL || chatwin->last_message == NULL) { @@ -9034,13 +8998,13 @@ cmd_correct(ProfWin *window, const char *const command, gchar **args) } // send message again, with replace flag - gchar *message = g_strjoinv(" ", args); + gchar* message = g_strjoinv(" ", args); cl_ev_send_msg_correct(chatwin, message, FALSE, TRUE); free(message); return TRUE; } else if (window->type == WIN_MUC) { - ProfMucWin *mucwin = (ProfMucWin*)window; + ProfMucWin* mucwin = (ProfMucWin*)window; assert(mucwin->memcheck == PROFMUCWIN_MEMCHECK); if (mucwin->last_msg_id == NULL || mucwin->last_message == NULL) { @@ -9049,7 +9013,7 @@ cmd_correct(ProfWin *window, const char *const command, gchar **args) } // send message again, with replace flag - gchar *message = g_strjoinv(" ", args); + gchar* message = g_strjoinv(" ", args); cl_ev_send_muc_msg_corrected(mucwin, message, FALSE, TRUE); free(message); @@ -9061,7 +9025,7 @@ cmd_correct(ProfWin *window, const char *const command, gchar **args) } gboolean -cmd_slashguard(ProfWin *window, const char *const command, gchar **args) +cmd_slashguard(ProfWin* window, const char* const command, gchar** args) { if (args[0] == NULL) { return FALSE; @@ -9073,11 +9037,9 @@ cmd_slashguard(ProfWin *window, const char *const command, gchar **args) } gboolean -cmd_url_open(ProfWin *window, const char *const command, gchar **args) +cmd_url_open(ProfWin* window, const char* const command, gchar** args) { - if (window->type != WIN_CHAT && - window->type != WIN_MUC && - window->type != WIN_PRIVATE) { + if (window->type != WIN_CHAT && window->type != WIN_MUC && window->type != WIN_PRIVATE) { cons_show("url open not supported in this window"); return TRUE; } @@ -9089,37 +9051,35 @@ cmd_url_open(ProfWin *window, const char *const command, gchar **args) gboolean require_save = false; - gchar *fileStart = g_strrstr(args[1], "/"); + gchar* fileStart = g_strrstr(args[1], "/"); if (fileStart == NULL) { cons_show("URL '%s' is not valid.", args[1]); return TRUE; } fileStart++; - if (((char*)(fileStart - 2))[0] == '/' && - ((char*)(fileStart - 3))[0] == ':' - ){ - // If the '/' is last character of the '://' string, there will be no suffix - // Therefore, it is considered that there is no file name in the URL and - // fileStart is set to the end of the URL. - fileStart = args[1] + strlen(args[1]); + if (((char*)(fileStart - 2))[0] == '/' && ((char*)(fileStart - 3))[0] == ':') { + // If the '/' is last character of the '://' string, there will be no suffix + // Therefore, it is considered that there is no file name in the URL and + // fileStart is set to the end of the URL. + fileStart = args[1] + strlen(args[1]); } - gchar *suffix = NULL; - gchar *suffixStart = g_strrstr(fileStart, "."); + gchar* suffix = NULL; + gchar* suffixStart = g_strrstr(fileStart, "."); if (suffixStart != NULL) { suffixStart++; - gchar *suffixEnd = g_strrstr(suffixStart, "#"); - if(suffixEnd == NULL) { + gchar* suffixEnd = g_strrstr(suffixStart, "#"); + if (suffixEnd == NULL) { suffix = g_strdup(suffixStart); } else { suffix = g_strndup(suffixStart, suffixEnd - suffixStart); } } - gchar **suffix_cmd_pref = prefs_get_string_list_with_option(PREF_URL_OPEN_CMD, NULL); + gchar** suffix_cmd_pref = prefs_get_string_list_with_option(PREF_URL_OPEN_CMD, NULL); if (suffix != NULL) { - gchar *lowercase_suffix = g_ascii_strdown(suffix, -1); + gchar* lowercase_suffix = g_ascii_strdown(suffix, -1); g_strfreev(suffix_cmd_pref); suffix_cmd_pref = prefs_get_string_list_with_option(PREF_URL_OPEN_CMD, lowercase_suffix); g_free(lowercase_suffix); @@ -9130,21 +9090,21 @@ cmd_url_open(ProfWin *window, const char *const command, gchar **args) require_save = true; } - gchar *suffix_cmd = g_strdup(suffix_cmd_pref[1]); + gchar* suffix_cmd = g_strdup(suffix_cmd_pref[1]); g_strfreev(suffix_cmd_pref); - gchar *scheme = g_uri_parse_scheme(args[1]); - if( 0 == g_strcmp0(scheme, "aesgcm")) { + gchar* scheme = g_uri_parse_scheme(args[1]); + if (0 == g_strcmp0(scheme, "aesgcm")) { require_save = true; } g_free(scheme); if (require_save) { - gchar *save_args[] = { "open", args[1], "/tmp/profanity.tmp", NULL}; + gchar* save_args[] = { "open", args[1], "/tmp/profanity.tmp", NULL }; cmd_url_save(window, command, save_args); } - gchar **argv = g_strsplit(suffix_cmd, " ", 0); + gchar** argv = g_strsplit(suffix_cmd, " ", 0); guint num_args = 0; while (argv[num_args]) { if (0 == g_strcmp0(argv[num_args], "%u")) { @@ -9174,11 +9134,9 @@ cmd_url_open(ProfWin *window, const char *const command, gchar **args) } gboolean -cmd_url_save(ProfWin *window, const char *const command, gchar **args) +cmd_url_save(ProfWin* window, const char* const command, gchar** args) { - if (window->type != WIN_CHAT && - window->type != WIN_MUC && - window->type != WIN_PRIVATE) { + if (window->type != WIN_CHAT && window->type != WIN_MUC && window->type != WIN_PRIVATE) { cons_show("url save not supported in this window"); return TRUE; } @@ -9188,27 +9146,25 @@ cmd_url_save(ProfWin *window, const char *const command, gchar **args) return TRUE; } - gchar *uri = args[1]; - gchar *target_path = g_strdup(args[2]); + gchar* uri = args[1]; + gchar* target_path = g_strdup(args[2]); - GFile *file = g_file_new_for_uri(uri); + GFile* file = g_file_new_for_uri(uri); - gchar *target_dir = NULL; - gchar *base_name = NULL; + gchar* target_dir = NULL; + gchar* base_name = NULL; if (target_path == NULL) { target_dir = g_strdup("./"); base_name = g_file_get_basename(file); if (0 == g_strcmp0(base_name, ".")) { - g_free(base_name); - base_name = g_strdup("saved_url_content.html"); + g_free(base_name); + base_name = g_strdup("saved_url_content.html"); } target_path = g_strconcat(target_dir, base_name, NULL); } - if (g_file_test(target_path, G_FILE_TEST_EXISTS) && - g_file_test(target_path, G_FILE_TEST_IS_DIR) - ) { + if (g_file_test(target_path, G_FILE_TEST_EXISTS) && g_file_test(target_path, G_FILE_TEST_IS_DIR)) { target_dir = g_strdup(target_path); base_name = g_file_get_basename(file); g_free(target_path); @@ -9223,8 +9179,7 @@ cmd_url_save(ProfWin *window, const char *const command, gchar **args) target_dir = g_path_get_dirname(target_path); } - if (!g_file_test(target_dir, G_FILE_TEST_EXISTS) || - !g_file_test(target_dir, G_FILE_TEST_IS_DIR)) { + if (!g_file_test(target_dir, G_FILE_TEST_EXISTS) || !g_file_test(target_dir, G_FILE_TEST_IS_DIR)) { cons_show("%s does not exist or is not a directory.", target_dir); g_free(target_path); g_free(target_dir); @@ -9232,7 +9187,7 @@ cmd_url_save(ProfWin *window, const char *const command, gchar **args) return TRUE; } - gchar *scheme = g_uri_parse_scheme(uri); + gchar* scheme = g_uri_parse_scheme(uri); if (scheme == NULL) { cons_show("URL '%s' is not valid.", uri); g_free(target_path); @@ -9241,18 +9196,17 @@ cmd_url_save(ProfWin *window, const char *const command, gchar **args) return TRUE; } - gchar *scheme_cmd = NULL; + gchar* scheme_cmd = NULL; if (0 == g_strcmp0(scheme, "http") || 0 == g_strcmp0(scheme, "https") - || 0 == g_strcmp0(scheme, "aesgcm") - ) { + || 0 == g_strcmp0(scheme, "aesgcm")) { scheme_cmd = prefs_get_string_with_option(PREF_URL_SAVE_CMD, scheme); } g_free(scheme); - gchar **argv = g_strsplit(scheme_cmd, " ", 0); + gchar** argv = g_strsplit(scheme_cmd, " ", 0); g_free(scheme_cmd); guint num_args = 0; @@ -9281,7 +9235,7 @@ cmd_url_save(ProfWin *window, const char *const command, gchar **args) } gboolean -cmd_executable(ProfWin *window, const char *const command, gchar **args) +cmd_executable(ProfWin* window, const char* const command, gchar** args) { if (g_strcmp0(args[0], "avatar") == 0) { prefs_set_string(PREF_AVATAR_CMD, args[1]); @@ -9292,8 +9246,8 @@ cmd_executable(ProfWin *window, const char *const command, gchar **args) return TRUE; } - gchar *str = g_strjoinv(" ", &args[3]); - const gchar* const list[] = {args[2], str, NULL}; + gchar* str = g_strjoinv(" ", &args[3]); + const gchar* const list[] = { args[2], str, NULL }; prefs_set_string_list_with_option(PREF_URL_OPEN_CMD, args[1], list); cons_show("`url open` command set to: %s for %s files", str, args[1]); g_free(str); @@ -9303,7 +9257,7 @@ cmd_executable(ProfWin *window, const char *const command, gchar **args) return TRUE; } - gchar *str = g_strjoinv(" ", &args[2]); + gchar* str = g_strjoinv(" ", &args[2]); prefs_set_string_with_option(PREF_URL_SAVE_CMD, args[1], str); cons_show("`url save` command set to: %s for scheme %s", str, args[1]); g_free(str); |