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

Merge branch 'master' into readline

This commit is contained in:
James Booth 2015-02-24 22:58:19 +00:00
commit 7ae71391de
2 changed files with 16 additions and 4 deletions

View File

@ -358,7 +358,7 @@ prefs_get_occupants_size(void)
gint result = g_key_file_get_integer(prefs, PREF_GROUP_UI, "occupants.size", NULL); gint result = g_key_file_get_integer(prefs, PREF_GROUP_UI, "occupants.size", NULL);
if (result > 99 || result < 1) { if (result > 99 || result < 1) {
return 20; return 15;
} else { } else {
return result; return result;
} }
@ -377,7 +377,7 @@ prefs_get_roster_size(void)
gint result = g_key_file_get_integer(prefs, PREF_GROUP_UI, "roster.size", NULL); gint result = g_key_file_get_integer(prefs, PREF_GROUP_UI, "roster.size", NULL);
if (result > 99 || result < 1) { if (result > 99 || result < 1) {
return 20; return 25;
} else { } else {
return result; return result;
} }
@ -691,15 +691,24 @@ _get_default_boolean(preference_t pref)
case PREF_AUTOAWAY_CHECK: case PREF_AUTOAWAY_CHECK:
case PREF_LOG_ROTATE: case PREF_LOG_ROTATE:
case PREF_LOG_SHARED: case PREF_LOG_SHARED:
case PREF_NOTIFY_MESSAGE:
case PREF_NOTIFY_MESSAGE_CURRENT: case PREF_NOTIFY_MESSAGE_CURRENT:
case PREF_NOTIFY_ROOM_CURRENT: case PREF_NOTIFY_ROOM_CURRENT:
case PREF_NOTIFY_TYPING:
case PREF_NOTIFY_TYPING_CURRENT: case PREF_NOTIFY_TYPING_CURRENT:
case PREF_NOTIFY_SUB:
case PREF_NOTIFY_INVITE:
case PREF_SPLASH: case PREF_SPLASH:
case PREF_OCCUPANTS: case PREF_OCCUPANTS:
case PREF_MUC_PRIVILEGES: case PREF_MUC_PRIVILEGES:
case PREF_PRESENCE: case PREF_PRESENCE:
case PREF_WRAP: case PREF_WRAP:
case PREF_INPBLOCK_DYNAMIC: case PREF_INPBLOCK_DYNAMIC:
case PREF_RESOURCE_TITLE:
case PREF_RESOURCE_MESSAGE:
case PREF_ROSTER:
case PREF_ROSTER_OFFLINE:
case PREF_ROSTER_RESOURCE:
return TRUE; return TRUE;
default: default:
return FALSE; return FALSE;
@ -715,7 +724,7 @@ _get_default_string(preference_t pref)
{ {
case PREF_AUTOAWAY_MODE: case PREF_AUTOAWAY_MODE:
case PREF_NOTIFY_ROOM: case PREF_NOTIFY_ROOM:
return "off"; return "on";
case PREF_OTR_LOG: case PREF_OTR_LOG:
return "redact"; return "redact";
case PREF_OTR_POLICY: case PREF_OTR_POLICY:
@ -725,7 +734,7 @@ _get_default_string(preference_t pref)
case PREF_STATUSES_MUC: case PREF_STATUSES_MUC:
return "all"; return "all";
case PREF_ROSTER_BY: case PREF_ROSTER_BY:
return "none"; return "presence";
case PREF_TIME: case PREF_TIME:
return "seconds"; return "seconds";
default: default:

View File

@ -1003,6 +1003,9 @@ cons_roster_setting(void)
else else
cons_show("Roster resource (/roster) : hide"); cons_show("Roster resource (/roster) : hide");
char *by = prefs_get_string(PREF_ROSTER_BY);
cons_show("Roster by (/roster) : %s", by);
int size = prefs_get_roster_size(); int size = prefs_get_roster_size();
cons_show("Roster size (/roster) : %d", size); cons_show("Roster size (/roster) : %d", size);
} }