aniani/profanity
1
1
Fork 0
mirror of https://github.com/profanity-im/profanity.git synced 2025-02-02 15:08:15 -05:00
Code

Merge pull request #1909 from H3rnand3zzz/fix/correction-char

Browse Source 
Add unicode support for correction char
This commit is contained in:
Michael Vetter 2023-11-03 09:38:58 +01:00 committed by GitHub
commit 0b957d6207
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 12 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/command/cmd_funcs.c
View File

@ -9329,7 +9329,6 @@ cmd_os(ProfWin* window, const char* const command, gchar** args)
gboolean gboolean
cmd_correction(ProfWin* window, const char* const command, gchar** args) cmd_correction(ProfWin* window, const char* const command, gchar** args)
{ {
// enable/disable
if (g_strcmp0(args[0], "on") == 0) { if (g_strcmp0(args[0], "on") == 0) {
_cmd_set_boolean_preference(args[0], "Last Message Correction", PREF_CORRECTION_ALLOW); _cmd_set_boolean_preference(args[0], "Last Message Correction", PREF_CORRECTION_ALLOW);
caps_add_feature(XMPP_FEATURE_LAST_MESSAGE_CORRECTION); caps_add_feature(XMPP_FEATURE_LAST_MESSAGE_CORRECTION);
@ -9340,15 +9339,12 @@ cmd_correction(ProfWin* window, const char* const command, gchar** args)
return TRUE; return TRUE;
} }
// char
if (g_strcmp0(args[0], "char") == 0) { if (g_strcmp0(args[0], "char") == 0) {
if (args[1] == NULL) { if (args[1] == NULL || g_utf8_strlen(args[1], 4) != 1) {
cons_bad_cmd_usage(command);
} else if (strlen(args[1]) != 1) {
cons_bad_cmd_usage(command); cons_bad_cmd_usage(command);
} else { } else {
prefs_set_correction_char(args[1][0]); prefs_set_correction_char(args[1]);
cons_show("LMC char set to %c.", args[1][0]); cons_show("LMC char set to %s.", args[1]);
} }
} }

12
src/config/preferences.c
View File

@ -1281,13 +1281,13 @@ prefs_get_correction_char(void)
} }
void void
prefs_set_correction_char(char ch) prefs_set_correction_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, "correction.char", ch);
str[1] = '\0'; } else {
log_error("Could not set correction char: %s", ch);
g_key_file_set_string(prefs, PREF_GROUP_UI, "correction.char", str); }
} }
gboolean gboolean

2
src/config/preferences.h
View File

@ -296,7 +296,7 @@ gint prefs_get_occupants_indent(void);
void prefs_set_occupants_indent(gint value); void prefs_set_occupants_indent(gint value);
gchar* prefs_get_correction_char(void); gchar* prefs_get_correction_char(void);
void prefs_set_correction_char(char ch); void prefs_set_correction_char(char* ch);
void prefs_add_login(const char* jid); void prefs_add_login(const char* jid);

4
src/config/theme.c
View File

@ -484,8 +484,8 @@ _load_preferences(void)
if (g_key_file_has_key(theme, "ui", "correction.char", NULL)) { if (g_key_file_has_key(theme, "ui", "correction.char", NULL)) {
auto_gchar gchar* ch = g_key_file_get_string(theme, "ui", "correction.char", NULL); auto_gchar gchar* ch = g_key_file_get_string(theme, "ui", "correction.char", NULL);
if (ch && strlen(ch) > 0) { if (ch && g_utf8_strlen(ch, 4) == 1) {
prefs_set_correction_char(ch[0]); prefs_set_correction_char(ch);
} }
} }