Allow utf8 symbols as omemo/pgp/otr indicator char

Fix https://github.com/profanity-im/profanity/issues/1264

1 files changed, 91 insertions, 84 deletions

diff --git a/src/ui/mucwin.c b/src/ui/mucwin.c
index 2005ce28..ce542b5f 100644
--- a/src/ui/mucwin.c
+++ b/src/ui/mucwin.c
@@ -76,7 +76,7 @@ mucwin_role_change(ProfMucWin *mucwin, const char *const role, const char *const
     assert(mucwin != NULL);
 
     ProfWin *window = (ProfWin*)mucwin;
-    win_print(window, THEME_ROOMINFO, '!', "Your role has been changed to: %s", role);
+    win_print(window, THEME_ROOMINFO, "!", "Your role has been changed to: %s", role);
     if (actor) {
         win_append(window, THEME_ROOMINFO, ", by: %s", actor);
     }
@@ -93,7 +93,7 @@ mucwin_affiliation_change(ProfMucWin *mucwin, const char *const affiliation, con
     assert(mucwin != NULL);
 
     ProfWin *window = (ProfWin*)mucwin;
-    win_print(window, THEME_ROOMINFO, '!', "Your affiliation has been changed to: %s", affiliation);
+    win_print(window, THEME_ROOMINFO, "!", "Your affiliation has been changed to: %s", affiliation);
     if (actor) {
         win_append(window, THEME_ROOMINFO, ", by: %s", actor);
     }
@@ -110,7 +110,7 @@ mucwin_role_and_affiliation_change(ProfMucWin *mucwin, const char *const role, c
     assert(mucwin != NULL);
 
     ProfWin *window = (ProfWin*)mucwin;
-    win_print(window, THEME_ROOMINFO, '!', "Your role and affiliation have been changed, role: %s, affiliation: %s", role, affiliation);
+    win_print(window, THEME_ROOMINFO, "!", "Your role and affiliation have been changed, role: %s, affiliation: %s", role, affiliation);
     if (actor) {
         win_append(window, THEME_ROOMINFO, ", by: %s", actor);
     }
@@ -128,7 +128,7 @@ mucwin_occupant_role_change(ProfMucWin *mucwin, const char *const nick, const ch
     assert(mucwin != NULL);
 
     ProfWin *window = (ProfWin*)mucwin;
-    win_print(window, THEME_ROOMINFO, '!', "%s's role has been changed to: %s", nick, role);
+    win_print(window, THEME_ROOMINFO, "!", "%s's role has been changed to: %s", nick, role);
     if (actor) {
         win_append(window, THEME_ROOMINFO, ", by: %s", actor);
     }
@@ -145,7 +145,7 @@ mucwin_occupant_affiliation_change(ProfMucWin *mucwin, const char *const nick, c
     assert(mucwin != NULL);
 
     ProfWin *window = (ProfWin*)mucwin;
-    win_print(window, THEME_ROOMINFO, '!', "%s's affiliation has been changed to: %s", nick, affiliation);
+    win_print(window, THEME_ROOMINFO, "!", "%s's affiliation has been changed to: %s", nick, affiliation);
     if (actor) {
         win_append(window, THEME_ROOMINFO, ", by: %s", actor);
     }
@@ -162,7 +162,7 @@ mucwin_occupant_role_and_affiliation_change(ProfMucWin *mucwin, const char *cons
     assert(mucwin != NULL);
 
     ProfWin *window = (ProfWin*)mucwin;
-    win_print(window, THEME_ROOMINFO, '!', "%s's role and affiliation have been changed, role: %s, affiliation: %s", nick, role, affiliation);
+    win_print(window, THEME_ROOMINFO, "!", "%s's role and affiliation have been changed, role: %s, affiliation: %s", nick, role, affiliation);
     if (actor) {
         win_append(window, THEME_ROOMINFO, ", by: %s", actor);
     }
@@ -178,8 +178,8 @@ mucwin_room_info_error(ProfMucWin *mucwin, const char *const error)
     assert(mucwin != NULL);
 
     ProfWin *window = (ProfWin*)mucwin;
-    win_println(window, THEME_DEFAULT, '!', "Room info request failed: %s", error);
-    win_println(window, THEME_DEFAULT, '-', "");
+    win_println(window, THEME_DEFAULT, "!", "Room info request failed: %s", error);
+    win_println(window, THEME_DEFAULT, "-", "");
 }
 
 void
@@ -191,7 +191,7 @@ mucwin_room_disco_info(ProfMucWin *mucwin, GSList *identities, GSList *features)
     if ((identities && (g_slist_length(identities) > 0)) ||
         (features && (g_slist_length(features) > 0))) {
         if (identities) {
-            win_println(window, THEME_DEFAULT, '!', "Identities:");
+            win_println(window, THEME_DEFAULT, "!", "Identities:");
         }
         while (identities) {
             DiscoIdentity *identity = identities->data;  // anme trpe, cat
@@ -207,19 +207,19 @@ mucwin_room_disco_info(ProfMucWin *mucwin, GSList *identities, GSList *features)
             if (identity->category) {
                 identity_str = g_string_append(identity_str, identity->category);
             }
-            win_println(window, THEME_DEFAULT, '!', "%s", identity_str->str);
+            win_println(window, THEME_DEFAULT, "!", "%s", identity_str->str);
             g_string_free(identity_str, TRUE);
             identities = g_slist_next(identities);
         }
 
         if (features) {
-            win_println(window, THEME_DEFAULT, '!', "Features:");
+            win_println(window, THEME_DEFAULT, "!", "Features:");
         }
         while (features) {
-            win_println(window, THEME_DEFAULT, '!', "  %s", features->data);
+            win_println(window, THEME_DEFAULT, "!", "  %s", features->data);
             features = g_slist_next(features);
         }
-        win_println(window, THEME_DEFAULT, '-', "");
+        win_println(window, THEME_DEFAULT, "-", "");
     }
 }
 
@@ -231,16 +231,16 @@ mucwin_roster(ProfMucWin *mucwin, GList *roster, const char *const presence)
     ProfWin *window = (ProfWin*)mucwin;
     if ((roster == NULL) || (g_list_length(roster) == 0)) {
         if (presence == NULL) {
-            win_println(window, THEME_ROOMINFO, '!', "Room is empty.");
+            win_println(window, THEME_ROOMINFO, "!", "Room is empty.");
         } else {
-            win_println(window, THEME_ROOMINFO, '!', "No occupants %s.", presence);
+            win_println(window, THEME_ROOMINFO, "!", "No occupants %s.", presence);
         }
     } else {
         int length = g_list_length(roster);
         if (presence == NULL) {
-            win_print(window, THEME_ROOMINFO, '!', "%d occupants: ", length);
+            win_print(window, THEME_ROOMINFO, "!", "%d occupants: ", length);
         } else {
-            win_print(window, THEME_ROOMINFO, '!', "%d %s: ", length, presence);
+            win_print(window, THEME_ROOMINFO, "!", "%d %s: ", length, presence);
         }
 
         while (roster) {
@@ -266,7 +266,7 @@ mucwin_occupant_offline(ProfMucWin *mucwin, const char *const nick)
     assert(mucwin != NULL);
 
     ProfWin *window = (ProfWin*)mucwin;
-    win_println(window, THEME_OFFLINE, '!', "<- %s has left the room.", nick);
+    win_println(window, THEME_OFFLINE, "!", "<- %s has left the room.", nick);
 }
 
 void
@@ -287,7 +287,7 @@ mucwin_occupant_kicked(ProfMucWin *mucwin, const char *const nick, const char *c
         g_string_append(message, reason);
     }
 
-    win_println(window, THEME_OFFLINE, '!', "<- %s", message->str);
+    win_println(window, THEME_OFFLINE, "!", "<- %s", message->str);
     g_string_free(message, TRUE);
 }
 
@@ -309,7 +309,7 @@ mucwin_occupant_banned(ProfMucWin *mucwin, const char *const nick, const char *c
         g_string_append(message, reason);
     }
 
-    win_println(window, THEME_OFFLINE, '!', "<- %s", message->str);
+    win_println(window, THEME_OFFLINE, "!", "<- %s", message->str);
     g_string_free(message, TRUE);
 }
 
@@ -320,7 +320,7 @@ mucwin_occupant_online(ProfMucWin *mucwin, const char *const nick, const char *c
     assert(mucwin != NULL);
 
     ProfWin *window = (ProfWin*)mucwin;
-    win_print(window, THEME_ONLINE, '!', "-> %s has joined the room", nick);
+    win_print(window, THEME_ONLINE, "!", "-> %s has joined the room", nick);
     if (prefs_get_boolean(PREF_MUC_PRIVILEGES)) {
         if (role) {
             win_append(window, THEME_ONLINE, ", role: %s", role);
@@ -348,7 +348,7 @@ mucwin_occupant_nick_change(ProfMucWin *mucwin, const char *const old_nick, cons
     assert(mucwin != NULL);
 
     ProfWin *window = (ProfWin*)mucwin;
-    win_println(window, THEME_THEM, '!', "** %s is now known as %s", old_nick, nick);
+    win_println(window, THEME_THEM, "!", "** %s is now known as %s", old_nick, nick);
 }
 
 void
@@ -357,7 +357,7 @@ mucwin_nick_change(ProfMucWin *mucwin, const char *const nick)
     assert(mucwin != NULL);
 
     ProfWin *window = (ProfWin*)mucwin;
-    win_println(window, THEME_ME, '!', "** You are now known as %s", nick);
+    win_println(window, THEME_ME, "!", "** You are now known as %s", nick);
 }
 
 void
@@ -415,11 +415,11 @@ _mucwin_print_mention(ProfWin *window, const char *const message, const char *co
 
         char *before_str = g_strndup(message + last_pos, pos - last_pos);
         if (strncmp(before_str, "/me ", 4) == 0) {
-            win_print_them(window, THEME_ROOMMENTION, *ch, flags, "");
+            win_print_them(window, THEME_ROOMMENTION, ch, flags, "");
             win_append_highlight(window, THEME_ROOMMENTION, "*%s ", from);
             win_append_highlight(window, THEME_ROOMMENTION, "%s", before_str + 4);
         } else {
-            win_print_them(window, THEME_ROOMMENTION, *ch, flags, from);
+            win_print_them(window, THEME_ROOMMENTION, ch, flags, from);
             win_append_highlight(window, THEME_ROOMMENTION, "%s", before_str);
         }
         g_free(before_str);
@@ -529,18 +529,21 @@ mucwin_outgoing_msg(ProfMucWin *mucwin, const char *const message, const char *c
     ProfWin *window = (ProfWin*)mucwin;
     char *mynick = muc_nick(mucwin->roomjid);
 
-    char ch = '-';
+    char *ch;
     if (mucwin->message_char) {
-        ch = mucwin->message_char[0];
+        ch = strdup(mucwin->message_char);
     } else if (enc_mode == PROF_MSG_ENC_OTR) {
         ch = prefs_get_otr_char();
     } else if (enc_mode == PROF_MSG_ENC_PGP) {
         ch = prefs_get_pgp_char();
     } else if (enc_mode == PROF_MSG_ENC_OMEMO) {
         ch = prefs_get_omemo_char();
+    } else {
+        ch = strdup("-");
     }
 
     win_print_outgoing_muc_msg(window, ch, mynick, id, replace_id, message);
+    free(ch);
 
     // save last id and message for LMC
     if (id) {
@@ -566,27 +569,31 @@ mucwin_incoming_msg(ProfMucWin *mucwin, const ProfMessage *const message, GSList
     ProfWin *window = (ProfWin*)mucwin;
     char *mynick = muc_nick(mucwin->roomjid);
 
-    char ch = '-';
+    char *ch;
     if (mucwin->message_char) {
-        ch = mucwin->message_char[0];
+        ch = strdup(mucwin->message_char);
     } else if (message->enc == PROF_MSG_ENC_OTR) {
         ch = prefs_get_otr_char();
     } else if (message->enc == PROF_MSG_ENC_PGP) {
         ch = prefs_get_pgp_char();
     } else if (message->enc == PROF_MSG_ENC_OMEMO) {
         ch = prefs_get_omemo_char();
+    } else {
+        ch = strdup("-");
     }
 
     win_insert_last_read_position_marker((ProfWin*)mucwin, mucwin->roomjid);
 
     if (g_slist_length(mentions) > 0) {
-        _mucwin_print_mention(window, message->plain, message->jid->resourcepart, mynick, mentions, &ch, flags);
+        _mucwin_print_mention(window, message->plain, message->jid->resourcepart, mynick, mentions, ch, flags);
     } else if (triggers) {
         win_print_them(window, THEME_ROOMTRIGGER, ch, flags, message->jid->resourcepart);
         _mucwin_print_triggers(window, message->plain, triggers);
     } else {
         win_println_incoming_muc_msg(window, ch, flags, message->jid->resourcepart, message->id, message->replace_id, message->plain);
     }
+
+    free(ch);
 }
 
 void
@@ -597,12 +604,12 @@ mucwin_requires_config(ProfMucWin *mucwin)
     ProfWin *window = (ProfWin*)mucwin;
     int num = wins_get_num(window);
 
-    win_println(window, THEME_DEFAULT, '-', "");
-    win_println(window, THEME_ROOMINFO, '!', "Room locked, requires configuration.");
-    win_println(window, THEME_ROOMINFO, '!', "Use '/room accept' to accept the defaults");
-    win_println(window, THEME_ROOMINFO, '!', "Use '/room destroy' to cancel and destroy the room");
-    win_println(window, THEME_ROOMINFO, '!', "Use '/room config' to edit the room configuration");
-    win_println(window, THEME_DEFAULT, '-', "");
+    win_println(window, THEME_DEFAULT, "-", "");
+    win_println(window, THEME_ROOMINFO, "!", "Room locked, requires configuration.");
+    win_println(window, THEME_ROOMINFO, "!", "Use '/room accept' to accept the defaults");
+    win_println(window, THEME_ROOMINFO, "!", "Use '/room destroy' to cancel and destroy the room");
+    win_println(window, THEME_ROOMINFO, "!", "Use '/room config' to edit the room configuration");
+    win_println(window, THEME_DEFAULT, "-", "");
 
     // currently in groupchat window
     if (wins_is_current(window)) {
@@ -622,17 +629,17 @@ mucwin_subject(ProfMucWin *mucwin, const char *const nick, const char *const sub
     ProfWin *window = (ProfWin*)mucwin;
     if (subject) {
         if (nick) {
-            win_print(window, THEME_ROOMINFO, '!', "*%s has set the room subject: ", nick);
+            win_print(window, THEME_ROOMINFO, "!", "*%s has set the room subject: ", nick);
             win_appendln(window, THEME_DEFAULT, "%s", subject);
         } else {
-            win_print(window, THEME_ROOMINFO, '!', "Room subject: ");
+            win_print(window, THEME_ROOMINFO, "!", "Room subject: ");
             win_appendln(window, THEME_DEFAULT, "%s", subject);
         }
     } else {
         if (nick) {
-            win_println(window, THEME_ROOMINFO, '!', "*%s has cleared the room subject.", nick);
+            win_println(window, THEME_ROOMINFO, "!", "*%s has cleared the room subject.", nick);
         } else {
-            win_println(window, THEME_ROOMINFO, '!', "Room subject cleared");
+            win_println(window, THEME_ROOMINFO, "!", "Room subject cleared");
         }
     }
 }
@@ -643,7 +650,7 @@ mucwin_kick_error(ProfMucWin *mucwin, const char *const nick, const char *const
     assert(mucwin != NULL);
 
     ProfWin *window = (ProfWin*)mucwin;
-    win_println(window, THEME_ERROR, '!', "Error kicking %s: %s", nick, error);
+    win_println(window, THEME_ERROR, "!", "Error kicking %s: %s", nick, error);
 }
 
 void
@@ -654,7 +661,7 @@ mucwin_broadcast(ProfMucWin *mucwin, const char *const message)
     ProfWin *window = (ProfWin*)mucwin;
     int num = wins_get_num(window);
 
-    win_print(window, THEME_ROOMINFO, '!', "Room message: ");
+    win_print(window, THEME_ROOMINFO, "!", "Room message: ");
     win_appendln(window, THEME_DEFAULT, "%s", message);
 
     // currently in groupchat window
@@ -674,7 +681,7 @@ mucwin_affiliation_list_error(ProfMucWin *mucwin, const char *const affiliation,
     assert(mucwin != NULL);
 
     ProfWin *window = (ProfWin*)mucwin;
-    win_println(window, THEME_ERROR, '!', "Error retrieving %s list: %s", affiliation, error);
+    win_println(window, THEME_ERROR, "!", "Error retrieving %s list: %s", affiliation, error);
 }
 
 void
@@ -684,17 +691,17 @@ mucwin_handle_affiliation_list(ProfMucWin *mucwin, const char *const affiliation
 
     ProfWin *window = (ProfWin*)mucwin;
     if (jids) {
-        win_println(window, THEME_DEFAULT, '!', "Affiliation: %s", affiliation);
+        win_println(window, THEME_DEFAULT, "!", "Affiliation: %s", affiliation);
         GSList *curr_jid = jids;
         while (curr_jid) {
             const char *jid = curr_jid->data;
-            win_println(window, THEME_DEFAULT, '!', "  %s", jid);
+            win_println(window, THEME_DEFAULT, "!", "  %s", jid);
             curr_jid = g_slist_next(curr_jid);
         }
-        win_println(window, THEME_DEFAULT, '!', "");
+        win_println(window, THEME_DEFAULT, "!", "");
     } else {
-        win_println(window, THEME_DEFAULT, '!', "No users found with affiliation: %s", affiliation);
-        win_println(window, THEME_DEFAULT, '!', "");
+        win_println(window, THEME_DEFAULT, "!", "No users found with affiliation: %s", affiliation);
+        win_println(window, THEME_DEFAULT, "!", "");
     }
 }
 
@@ -709,34 +716,34 @@ mucwin_show_affiliation_list(ProfMucWin *mucwin, muc_affiliation_t affiliation)
     if (!occupants) {
         switch (affiliation) {
             case MUC_AFFILIATION_OWNER:
-                win_println(window, THEME_DEFAULT, '!', "No owners found.");
+                win_println(window, THEME_DEFAULT, "!", "No owners found.");
                 break;
             case MUC_AFFILIATION_ADMIN:
-                win_println(window, THEME_DEFAULT, '!', "No admins found.");
+                win_println(window, THEME_DEFAULT, "!", "No admins found.");
                 break;
             case MUC_AFFILIATION_MEMBER:
-                win_println(window, THEME_DEFAULT, '!', "No members found.");
+                win_println(window, THEME_DEFAULT, "!", "No members found.");
                 break;
             case MUC_AFFILIATION_OUTCAST:
-                win_println(window, THEME_DEFAULT, '!', "No outcasts found.");
+                win_println(window, THEME_DEFAULT, "!", "No outcasts found.");
                 break;
             default:
                 break;
         }
-        win_println(window, THEME_DEFAULT, '-', "");
+        win_println(window, THEME_DEFAULT, "-", "");
     } else {
         switch (affiliation) {
             case MUC_AFFILIATION_OWNER:
-                win_println(window, THEME_DEFAULT, '!', "Owners:");
+                win_println(window, THEME_DEFAULT, "!", "Owners:");
                 break;
             case MUC_AFFILIATION_ADMIN:
-                win_println(window, THEME_DEFAULT, '!', "Admins:");
+                win_println(window, THEME_DEFAULT, "!", "Admins:");
                 break;
             case MUC_AFFILIATION_MEMBER:
-                win_println(window, THEME_DEFAULT, '!', "Members:");
+                win_println(window, THEME_DEFAULT, "!", "Members:");
                 break;
             case MUC_AFFILIATION_OUTCAST:
-                win_println(window, THEME_DEFAULT, '!', "Outcasts:");
+                win_println(window, THEME_DEFAULT, "!", "Outcasts:");
                 break;
             default:
                 break;
@@ -747,16 +754,16 @@ mucwin_show_affiliation_list(ProfMucWin *mucwin, muc_affiliation_t affiliation)
             Occupant *occupant = curr_occupant->data;
             if (occupant->affiliation == affiliation) {
                 if (occupant->jid) {
-                    win_println(window, THEME_DEFAULT, '!', "  %s (%s)", occupant->nick, occupant->jid);
+                    win_println(window, THEME_DEFAULT, "!", "  %s (%s)", occupant->nick, occupant->jid);
                 } else {
-                    win_println(window, THEME_DEFAULT, '!', "  %s", occupant->nick);
+                    win_println(window, THEME_DEFAULT, "!", "  %s", occupant->nick);
                 }
             }
 
             curr_occupant = g_slist_next(curr_occupant);
         }
 
-        win_println(window, THEME_DEFAULT, '-', "");
+        win_println(window, THEME_DEFAULT, "-", "");
     }
 }
 
@@ -766,7 +773,7 @@ mucwin_role_list_error(ProfMucWin *mucwin, const char *const role, const char *c
     assert(mucwin != NULL);
 
     ProfWin *window = (ProfWin*)mucwin;
-    win_println(window, THEME_ERROR, '!', "Error retrieving %s list: %s", role, error);
+    win_println(window, THEME_ERROR, "!", "Error retrieving %s list: %s", role, error);
 }
 
 void
@@ -776,26 +783,26 @@ mucwin_handle_role_list(ProfMucWin *mucwin, const char *const role, GSList *nick
 
     ProfWin *window = (ProfWin*)mucwin;
     if (nicks) {
-        win_println(window, THEME_DEFAULT, '!', "Role: %s", role);
+        win_println(window, THEME_DEFAULT, "!", "Role: %s", role);
         GSList *curr_nick = nicks;
         while (curr_nick) {
             const char *nick = curr_nick->data;
             Occupant *occupant = muc_roster_item(mucwin->roomjid, nick);
             if (occupant) {
                 if (occupant->jid) {
-                    win_println(window, THEME_DEFAULT, '!', "  %s (%s)", nick, occupant->jid);
+                    win_println(window, THEME_DEFAULT, "!", "  %s (%s)", nick, occupant->jid);
                 } else {
-                    win_println(window, THEME_DEFAULT, '!', "  %s", nick);
+                    win_println(window, THEME_DEFAULT, "!", "  %s", nick);
                 }
             } else {
-                win_println(window, THEME_DEFAULT, '!', "  %s", nick);
+                win_println(window, THEME_DEFAULT, "!", "  %s", nick);
             }
             curr_nick = g_slist_next(curr_nick);
         }
-        win_println(window, THEME_DEFAULT, '!', "");
+        win_println(window, THEME_DEFAULT, "!", "");
     } else {
-        win_println(window, THEME_DEFAULT, '!', "No occupants found with role: %s", role);
-        win_println(window, THEME_DEFAULT, '!', "");
+        win_println(window, THEME_DEFAULT, "!", "No occupants found with role: %s", role);
+        win_println(window, THEME_DEFAULT, "!", "");
     }
 }
 
@@ -810,28 +817,28 @@ mucwin_show_role_list(ProfMucWin *mucwin, muc_role_t role)
     if (!occupants) {
         switch (role) {
             case MUC_ROLE_MODERATOR:
-                win_println(window, THEME_DEFAULT, '!', "No moderators found.");
+                win_println(window, THEME_DEFAULT, "!", "No moderators found.");
                 break;
             case MUC_ROLE_PARTICIPANT:
-                win_println(window, THEME_DEFAULT, '!', "No participants found.");
+                win_println(window, THEME_DEFAULT, "!", "No participants found.");
                 break;
             case MUC_ROLE_VISITOR:
-                win_println(window, THEME_DEFAULT, '!', "No visitors found.");
+                win_println(window, THEME_DEFAULT, "!", "No visitors found.");
                 break;
             default:
                 break;
         }
-        win_println(window, THEME_DEFAULT, '-', "");
+        win_println(window, THEME_DEFAULT, "-", "");
     } else {
         switch (role) {
             case MUC_ROLE_MODERATOR:
-                win_println(window, THEME_DEFAULT, '!', "Moderators:");
+                win_println(window, THEME_DEFAULT, "!", "Moderators:");
                 break;
             case MUC_ROLE_PARTICIPANT:
-                win_println(window, THEME_DEFAULT, '!', "Participants:");
+                win_println(window, THEME_DEFAULT, "!", "Participants:");
                 break;
             case MUC_ROLE_VISITOR:
-                win_println(window, THEME_DEFAULT, '!', "Visitors:");
+                win_println(window, THEME_DEFAULT, "!", "Visitors:");
                 break;
             default:
                 break;
@@ -842,16 +849,16 @@ mucwin_show_role_list(ProfMucWin *mucwin, muc_role_t role)
             Occupant *occupant = curr_occupant->data;
             if (occupant->role == role) {
                 if (occupant->jid) {
-                    win_println(window, THEME_DEFAULT, '!', "  %s (%s)", occupant->nick, occupant->jid);
+                    win_println(window, THEME_DEFAULT, "!", "  %s (%s)", occupant->nick, occupant->jid);
                 } else {
-                    win_println(window, THEME_DEFAULT, '!', "  %s", occupant->nick);
+                    win_println(window, THEME_DEFAULT, "!", "  %s", occupant->nick);
                 }
             }
 
             curr_occupant = g_slist_next(curr_occupant);
         }
 
-        win_println(window, THEME_DEFAULT, '-', "");
+        win_println(window, THEME_DEFAULT, "-", "");
     }
 }
 
@@ -862,7 +869,7 @@ mucwin_affiliation_set_error(ProfMucWin *mucwin, const char *const jid, const ch
     assert(mucwin != NULL);
 
     ProfWin *window = (ProfWin*)mucwin;
-    win_println(window, THEME_ERROR, '!', "Error setting %s affiliation for %s: %s", affiliation, jid, error);
+    win_println(window, THEME_ERROR, "!", "Error setting %s affiliation for %s: %s", affiliation, jid, error);
 }
 
 void
@@ -872,7 +879,7 @@ mucwin_role_set_error(ProfMucWin *mucwin, const char *const nick, const char *co
     assert(mucwin != NULL);
 
     ProfWin *window = (ProfWin*)mucwin;
-    win_println(window, THEME_ERROR, '!', "Error setting %s role for %s: %s", role, nick, error);
+    win_println(window, THEME_ERROR, "!", "Error setting %s role for %s: %s", role, nick, error);
 }
 
 void
@@ -884,10 +891,10 @@ mucwin_info(ProfMucWin *mucwin)
     char *affiliation = muc_affiliation_str(mucwin->roomjid);
 
     ProfWin *window = (ProfWin*) mucwin;
-    win_println(window, THEME_DEFAULT, '!', "Room: %s", mucwin->roomjid);
-    win_println(window, THEME_DEFAULT, '!', "Affiliation: %s", affiliation);
-    win_println(window, THEME_DEFAULT, '!', "Role: %s", role);
-    win_println(window, THEME_DEFAULT, '-', "");
+    win_println(window, THEME_DEFAULT, "!", "Room: %s", mucwin->roomjid);
+    win_println(window, THEME_DEFAULT, "!", "Affiliation: %s", affiliation);
+    win_println(window, THEME_DEFAULT, "!", "Role: %s", role);
+    win_println(window, THEME_DEFAULT, "-", "");
 }
 
 void