mirror of
https://github.com/profanity-im/profanity.git
synced 2024-09-22 19:45:54 -04:00
Allow utf8 in roster contact char
This commit is contained in:
parent
91898597dd
commit
a668ca45b7
@ -2407,8 +2407,8 @@ cmd_roster(ProfWin* window, const char* const command, gchar** args)
|
|||||||
cons_show("Roster contact char removed.");
|
cons_show("Roster contact char removed.");
|
||||||
rosterwin_roster();
|
rosterwin_roster();
|
||||||
} else {
|
} else {
|
||||||
prefs_set_roster_contact_char(args[2][0]);
|
prefs_set_roster_contact_char(args[2]);
|
||||||
cons_show("Roster contact char set to %c.", args[2][0]);
|
cons_show("Roster contact char set to %s.", args[2]);
|
||||||
rosterwin_roster();
|
rosterwin_roster();
|
||||||
}
|
}
|
||||||
} else if (g_strcmp0(args[1], "indent") == 0) {
|
} else if (g_strcmp0(args[1], "indent") == 0) {
|
||||||
|
@ -1110,30 +1110,22 @@ prefs_clear_roster_header_char(void)
|
|||||||
g_key_file_remove_key(prefs, PREF_GROUP_UI, "roster.header.char", NULL);
|
g_key_file_remove_key(prefs, PREF_GROUP_UI, "roster.header.char", NULL);
|
||||||
}
|
}
|
||||||
|
|
||||||
char
|
char*
|
||||||
prefs_get_roster_contact_char(void)
|
prefs_get_roster_contact_char(void)
|
||||||
{
|
{
|
||||||
char result = 0;
|
char* result = g_key_file_get_string(prefs, PREF_GROUP_UI, "roster.contact.char", NULL);
|
||||||
|
|
||||||
char* resultstr = g_key_file_get_string(prefs, PREF_GROUP_UI, "roster.contact.char", NULL);
|
|
||||||
if (!resultstr) {
|
|
||||||
result = 0;
|
|
||||||
} else {
|
|
||||||
result = resultstr[0];
|
|
||||||
}
|
|
||||||
free(resultstr);
|
|
||||||
|
|
||||||
return result;
|
return result;
|
||||||
}
|
}
|
||||||
|
|
||||||
void
|
void
|
||||||
prefs_set_roster_contact_char(char ch)
|
prefs_set_roster_contact_char(char* ch)
|
||||||
{
|
{
|
||||||
char str[2];
|
if (g_utf8_strlen(ch, 4) == 1) {
|
||||||
str[0] = ch;
|
g_key_file_set_string(prefs, PREF_GROUP_UI, "roster.contact.char", ch);
|
||||||
str[1] = '\0';
|
} else {
|
||||||
|
log_error("Could not set roster contact char: %s", ch);
|
||||||
g_key_file_set_string(prefs, PREF_GROUP_UI, "roster.contact.char", str);
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
void
|
void
|
||||||
|
@ -257,8 +257,8 @@ gboolean prefs_set_ox_char(char* ch);
|
|||||||
char* prefs_get_roster_header_char(void);
|
char* prefs_get_roster_header_char(void);
|
||||||
void prefs_set_roster_header_char(char* ch);
|
void prefs_set_roster_header_char(char* ch);
|
||||||
void prefs_clear_roster_header_char(void);
|
void prefs_clear_roster_header_char(void);
|
||||||
char prefs_get_roster_contact_char(void);
|
char* prefs_get_roster_contact_char(void);
|
||||||
void prefs_set_roster_contact_char(char ch);
|
void prefs_set_roster_contact_char(char* ch);
|
||||||
void prefs_clear_roster_contact_char(void);
|
void prefs_clear_roster_contact_char(void);
|
||||||
char prefs_get_roster_resource_char(void);
|
char prefs_get_roster_resource_char(void);
|
||||||
void prefs_set_roster_resource_char(char ch);
|
void prefs_set_roster_resource_char(char ch);
|
||||||
|
@ -430,8 +430,8 @@ _load_preferences(void)
|
|||||||
|
|
||||||
if (g_key_file_has_key(theme, "ui", "roster.contact.char", NULL)) {
|
if (g_key_file_has_key(theme, "ui", "roster.contact.char", NULL)) {
|
||||||
gchar* ch = g_key_file_get_string(theme, "ui", "roster.contact.char", NULL);
|
gchar* ch = g_key_file_get_string(theme, "ui", "roster.contact.char", NULL);
|
||||||
if (ch && strlen(ch) > 0) {
|
if (ch && g_utf8_strlen(ch, 4) == 1) {
|
||||||
prefs_set_roster_contact_char(ch[0]);
|
prefs_set_roster_contact_char(ch);
|
||||||
g_free(ch);
|
g_free(ch);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@ -1476,17 +1476,20 @@ cons_roster_setting(void)
|
|||||||
cons_show("Roster offline (/roster) : hide");
|
cons_show("Roster offline (/roster) : hide");
|
||||||
|
|
||||||
char* header_ch = prefs_get_roster_header_char();
|
char* header_ch = prefs_get_roster_header_char();
|
||||||
if (header_ch)
|
if (header_ch) {
|
||||||
cons_show("Roster header char (/roster) : %s", header_ch);
|
cons_show("Roster header char (/roster) : %s", header_ch);
|
||||||
else
|
|
||||||
cons_show("Roster header char (/roster) : none");
|
|
||||||
free(header_ch);
|
free(header_ch);
|
||||||
|
} else {
|
||||||
|
cons_show("Roster header char (/roster) : none");
|
||||||
|
}
|
||||||
|
|
||||||
char contact_ch = prefs_get_roster_contact_char();
|
char* contact_ch = prefs_get_roster_contact_char();
|
||||||
if (contact_ch)
|
if (contact_ch) {
|
||||||
cons_show("Roster contact char (/roster) : %c", contact_ch);
|
cons_show("Roster contact char (/roster) : %s", contact_ch);
|
||||||
else
|
free(contact_ch);
|
||||||
|
} else {
|
||||||
cons_show("Roster contact char (/roster) : none");
|
cons_show("Roster contact char (/roster) : none");
|
||||||
|
}
|
||||||
|
|
||||||
char resource_ch = prefs_get_roster_resource_char();
|
char resource_ch = prefs_get_roster_resource_char();
|
||||||
if (resource_ch)
|
if (resource_ch)
|
||||||
|
@ -314,9 +314,9 @@ _rosterwin_unsubscribed_item(ProfLayoutSplit* layout, ProfChatWin* chatwin)
|
|||||||
indent--;
|
indent--;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
char ch = prefs_get_roster_contact_char();
|
char *ch = prefs_get_roster_contact_char();
|
||||||
if (ch) {
|
if (ch) {
|
||||||
g_string_append_printf(msg, "%c", ch);
|
g_string_append_printf(msg, "%s", ch);
|
||||||
}
|
}
|
||||||
|
|
||||||
char* unreadpos = prefs_get_string(PREF_ROSTER_UNREAD);
|
char* unreadpos = prefs_get_string(PREF_ROSTER_UNREAD);
|
||||||
@ -376,9 +376,9 @@ _rosterwin_contact(ProfLayoutSplit* layout, PContact contact)
|
|||||||
indent--;
|
indent--;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
char ch = prefs_get_roster_contact_char();
|
char *ch = prefs_get_roster_contact_char();
|
||||||
if (ch) {
|
if (ch) {
|
||||||
g_string_append_printf(msg, "%c", ch);
|
g_string_append_printf(msg, "%s", ch);
|
||||||
}
|
}
|
||||||
|
|
||||||
char* unreadpos = prefs_get_string(PREF_ROSTER_UNREAD);
|
char* unreadpos = prefs_get_string(PREF_ROSTER_UNREAD);
|
||||||
|
Loading…
Reference in New Issue
Block a user