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

Merge branch 'master' into openpgp

Browse Source
This commit is contained in:
James Booth 2015-05-17 22:28:12 +01:00
commit 34d9b2b272
1 changed files with 12 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
src/command/commands.c
View File

@ -3991,23 +3991,21 @@ cmd_history(gchar **args, struct cmd_help_t help)
gboolean gboolean
cmd_carbons(gchar **args, struct cmd_help_t help) cmd_carbons(gchar **args, struct cmd_help_t help)
{ {
jabber_conn_status_t conn_status = jabber_get_connection_status();
if (conn_status != JABBER_CONNECTED) {
cons_show("You are not currently connected.");
return TRUE;
}
gboolean result = _cmd_set_boolean_preference(args[0], help, gboolean result = _cmd_set_boolean_preference(args[0], help,
"Message carbons preference", PREF_CARBONS); "Message carbons preference", PREF_CARBONS);
// enable carbons jabber_conn_status_t conn_status = jabber_get_connection_status();
if (strcmp(args[0], "on") == 0) {
iq_enable_carbons(); if (conn_status == JABBER_CONNECTED) {
} // enable carbons
else if (strcmp(args[0], "off") == 0){ if (strcmp(args[0], "on") == 0) {
iq_disable_carbons(); iq_enable_carbons();
}
else if (strcmp(args[0], "off") == 0){
iq_disable_carbons();
}
} }
return result; return result;
} }
@ -4477,4 +4475,4 @@ gint _compare_commands(Command *a, Command *b)
g_free(key_b); g_free(key_b);
return result; return result;
} }