utf8 conversion for theme info

diff --git a/ChangeLog-gtk2 b/ChangeLog-gtk2
index 8a16c36fc8c91b0f6f80f483fda75157fbb6f14b..b70b351cebd01e3e283e59b5ab14ca800db8960e 100644 (file)
--- a/ChangeLog-gtk2
+++ b/ChangeLog-gtk2
@@ -1,3 +1,10 @@
+2004-02-22 Thorsten Maerz <torte@netztorte.de>
+       * src/prefs_themes.c
+               utf8 conversion for theme info
+
+2004-02-21 Thorsten Maerz <torte@netztorte.de>
+       * sync 0.9.9claws
+

 2004-02-14 Thorsten Maerz <torte@netztorte.de>
        * src/grouplistdialog.c
                allow multiple selections without ctrl key
 2004-02-14 Thorsten Maerz <torte@netztorte.de>
        * src/grouplistdialog.c
                allow multiple selections without ctrl key

diff --git a/src/prefs_themes.c b/src/prefs_themes.c
index 12f3c131b51b27a33b6c235f25dfc2a2c28708f6..e46369f0d61e5ddc5e18c8d60568beca3305ce1a 100644 (file)
--- a/src/prefs_themes.c
+++ b/src/prefs_themes.c
@@ -33,6 +33,7 @@
 
 #include "intl.h"
 #include "utils.h"
 
 #include "intl.h"
 #include "utils.h"

+#include "codeconv.h"

 #include "prefs_common.h"
 #include "prefs_gtk.h"
 
 #include "prefs_common.h"
 #include "prefs_gtk.h"
 


@@ -557,16 +558,30 @@ static void prefs_themes_update_buttons(const ThemesData *tdata)
                gtk_widget_set_sensitive(theme->btn_remove, can_rem);
 }
 
                gtk_widget_set_sensitive(theme->btn_remove, can_rem);
 }
 

+/* placeholders may already be utf8 (i18n) */
+#define SET_LABEL_TEXT_UTF8(label, text)                               \
+{                                                                      \
+       gchar *tmpstr;                                                  \
+                                                                       \
+       if (!g_utf8_validate(text, -1, NULL))                           \
+               tmpstr = conv_codeset_strdup(text,                      \
+                       conv_get_current_charset_str(), CS_UTF_8);      \
+       else                                                            \
+               tmpstr = g_strdup(text);                                \
+                                                                       \
+       gtk_label_set_text(GTK_LABEL(label), tmpstr);                   \
+       g_free(tmpstr);                                                 \
+}

 static void prefs_themes_display_theme_info(ThemesData *tdata, const ThemeInfo *info)
 {
        ThemesPage *theme = tdata->page;
        gchar *save_prefs_path;
        gint   i;
 static void prefs_themes_display_theme_info(ThemesData *tdata, const ThemeInfo *info)
 {
        ThemesPage *theme = tdata->page;
        gchar *save_prefs_path;
        gint   i;

-       
-       gtk_label_set_text(GTK_LABEL(theme->name), info->name);
-       gtk_label_set_text(GTK_LABEL(theme->author), info->author);
-       gtk_label_set_text(GTK_LABEL(theme->url), info->url);   
-       gtk_label_set_text(GTK_LABEL(theme->status), info->status);
+
+       SET_LABEL_TEXT_UTF8(theme->name,        info->name);
+       SET_LABEL_TEXT_UTF8(theme->author,      info->author);
+       SET_LABEL_TEXT_UTF8(theme->url,         info->url);
+       SET_LABEL_TEXT_UTF8(theme->status,      info->status);

 
        save_prefs_path = prefs_common.pixmap_theme_path;
        prefs_common.pixmap_theme_path = tdata->displayed;
 
        save_prefs_path = prefs_common.pixmap_theme_path;
        prefs_common.pixmap_theme_path = tdata->displayed;


@@ -580,6 +595,7 @@ static void prefs_themes_display_theme_info(ThemesData *tdata, const ThemeInfo *
 
        prefs_themes_update_buttons(tdata);
 }
 
        prefs_themes_update_buttons(tdata);
 }

+#undef SET_LABEL_TEXT_UTF8

 
 static void prefs_themes_display_global_stats(const ThemesData *tdata)
 {
 
 static void prefs_themes_display_global_stats(const ThemesData *tdata)
 {