devs/profanity
2
0
Fork 0
mirror of https://git.jabber.space/devs/cproof.git synced 2026-07-26 17:06:20 +00:00
Code Issues Packages Projects Releases Wiki Activity

titlebar: allow displaying MUC name and MUC jid

Browse Source 
`/titlebar use name|jid` -> `/titlebar show|hide name|jid`

Fix https://github.com/profanity-im/profanity/issues/1284
This commit is contained in:
Michael Vetter
2020-03-24 22:13:14 +01:00
parent fd090d384d
commit f131680055
9 changed files with 65 additions and 63 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
src/config/preferences.c
View File

@@ -149,6 +149,16 @@ static void _prefs_load(void)
g_key_file_remove_key(prefs, PREF_GROUP_UI, "titlebar.goodbye", NULL);
}
// after 0.8.1: titlebar use jid|name -> titlebar show|hide jid|name
if (g_key_file_has_key(prefs, PREF_GROUP_UI, "titlebar.muc.title", NULL)) {
char *value = g_key_file_get_string(prefs, PREF_GROUP_UI, "titlebar.muc.title", NULL);
if (g_strcmp0(value, "name") == 0) {
g_key_file_set_boolean(prefs, PREF_GROUP_UI, "titlebar.muc.title.name", TRUE);
} else if (g_strcmp0(value, "jid") == 0) {
g_key_file_set_boolean(prefs, PREF_GROUP_UI, "titlebar.muc.title.jid", TRUE);
}
}
_save_prefs();
boolean_choice_ac = autocomplete_new();
@@ -1742,7 +1752,8 @@ _get_group(preference_t pref)
case PREF_STATUSBAR_SELF:
case PREF_STATUSBAR_CHAT:
case PREF_STATUSBAR_ROOM:
case PREF_TITLEBAR_MUC_TITLE:
case PREF_TITLEBAR_MUC_TITLE_JID:
case PREF_TITLEBAR_MUC_TITLE_NAME:
case PREF_HISTORY_COLOR_MUC:
case PREF_SLASH_GUARD:
return PREF_GROUP_UI;
@@ -2000,8 +2011,10 @@ _get_key(preference_t pref)
return "inpblock.dynamic";
case PREF_ENC_WARN:
return "enc.warn";
case PREF_TITLEBAR_MUC_TITLE:
return "titlebar.muc.title";
case PREF_TITLEBAR_MUC_TITLE_JID:
return "titlebar.muc.title.jid";
case PREF_TITLEBAR_MUC_TITLE_NAME:
return "titlebar.muc.title.name";
case PREF_PGP_LOG:
return "log";
case PREF_PGP_SENDFILE:
@@ -2109,6 +2122,7 @@ _get_default_boolean(preference_t pref)
case PREF_CARBONS:
case PREF_STATES:
case PREF_OUTTYPE:
case PREF_TITLEBAR_MUC_TITLE_NAME:
return TRUE;
default:
return FALSE;
@@ -2146,8 +2160,6 @@ _get_default_string(preference_t pref)
return "none";
case PREF_ROSTER_ROOMS_USE_AS_NAME:
return "name";
case PREF_TITLEBAR_MUC_TITLE:
return "name";
case PREF_ROSTER_ROOMS_ORDER:
return "name";
case PREF_ROSTER_ROOMS_UNREAD:

3
src/config/preferences.h
View File

@@ -140,7 +140,8 @@ typedef enum {
PREF_RESOURCE_MESSAGE,
PREF_INPBLOCK_DYNAMIC,
PREF_ENC_WARN,
PREF_TITLEBAR_MUC_TITLE,
PREF_TITLEBAR_MUC_TITLE_JID,
PREF_TITLEBAR_MUC_TITLE_NAME,
PREF_PGP_LOG,
PREF_PGP_SENDFILE,
PREF_TLS_CERTPATH,

3
src/config/theme.c
View File

@@ -315,7 +315,8 @@ _load_preferences(void)
_set_boolean_preference("presence", PREF_PRESENCE);
_set_boolean_preference("intype", PREF_INTYPE);
_set_boolean_preference("enc.warn", PREF_ENC_WARN);
_set_boolean_preference("titlebar.muc.title", PREF_TITLEBAR_MUC_TITLE);
_set_boolean_preference("titlebar.muc.title.name", PREF_TITLEBAR_MUC_TITLE_NAME);
_set_boolean_preference("titlebar.muc.title.jid", PREF_TITLEBAR_MUC_TITLE_JID);
_set_boolean_preference("tls.show", PREF_TLS_SHOW);
_set_boolean_preference("statusbar.show.name", PREF_STATUSBAR_SHOW_NAME);
_set_boolean_preference("statusbar.show.number", PREF_STATUSBAR_SHOW_NUMBER);