changeset 2952:cb15e12b6352 trunk

Preserve capitalization for xfont users.
author William Pitcock <nenolod@atheme-project.org>
date Sun, 01 Jul 2007 08:35:12 -0500
parents 4586c0951eab
children 80b6fc3f4d29
files src/audacious/ui_skinned_textbox.c
diffstat 1 files changed, 4 insertions(+), 2 deletions(-) [+]
line wrap: on
line diff
--- a/src/audacious/ui_skinned_textbox.c	Sun Jul 01 08:21:26 2007 -0500
+++ b/src/audacious/ui_skinned_textbox.c	Sun Jul 01 08:35:12 2007 -0500
@@ -517,7 +517,7 @@
     if (textbox->text)
         g_free(textbox->text);
 
-    textbox->text = g_utf8_strup(text, -1);
+    textbox->text = str_to_utf8(text);
     priv->scroll_back = FALSE;
     ui_skinned_textbox_redraw(textbox);
 }
@@ -678,7 +678,8 @@
                                      gdk_rgb_get_visual()->depth);
     gc = priv->gc;
 
-    for (tmp = pixmaptext, i = 0; tmp != NULL && i < length; i++, tmp = g_utf8_next_char(tmp)) {
+    for (tmp = g_utf8_strup(pixmaptext, -1), i = 0;
+         tmp != NULL && i < length; i++, tmp = g_utf8_next_char(tmp)) {
         gchar c = *tmp;
         x = y = -1;
         if (c >= 'A' && c <= 'Z') {
@@ -698,6 +699,7 @@
                          bmp_active_skin->properties.textbox_bitmap_font_width, 
                          bmp_active_skin->properties.textbox_bitmap_font_height);
     }
+    g_free(tmp);
     g_free(pixmaptext);
 }