Merge remote-tracking branch 'oliverlemoal/xep-0280' into xep-0280

This commit is contained in:
James Booth
2015-03-08 21:51:50 +00:00
17 changed files with 167 additions and 2 deletions

View File

@@ -1177,6 +1177,15 @@ cons_history_setting(void)
cons_show("Chat history (/history) : OFF");
}
void
cons_carbons_setting(void)
{
if (prefs_get_boolean(PREF_CARBONS))
cons_show("Message carbons (/carbons) : ON");
else
cons_show("Message carbons (/carbons) : OFF");
}
void
cons_show_chat_prefs(void)
{

View File

@@ -315,6 +315,7 @@ void cons_outtype_setting(void);
void cons_intype_setting(void);
void cons_gone_setting(void);
void cons_history_setting(void);
void cons_carbons_setting(void);
void cons_log_setting(void);
void cons_chlog_setting(void);
void cons_grlog_setting(void);