2005-02-17 [paul] 1.0.1cvs11.4

[claws.git] / src / sourcewindow.c

diff --git a/src/sourcewindow.c b/src/sourcewindow.c
index 28c0f4bc46767eba1a1e376e347a75c2f65c5c39..d1328c8830faa1208699f064c1b3bd23d1f998e5 100644 (file)
--- a/src/sourcewindow.c
+++ b/src/sourcewindow.c
@@ -1,6 +1,6 @@
 /*
  * Sylpheed -- a GTK+ based, lightweight, and fast e-mail client
- * Copyright (C) 1999-2003 Hiroyuki Yamamoto
+ * Copyright (C) 1999-2005 Hiroyuki Yamamoto
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -20,6 +20,7 @@
 #include "defs.h"
 
 #include <glib.h>
+#include <glib/gi18n.h>
 #include <gdk/gdkkeysyms.h>
 #include <gtk/gtkwidget.h>
 #include <gtk/gtkwindow.h>
@@ -30,7 +31,6 @@
 #include <stdio.h>
 #include <stdlib.h>
 
-#include "intl.h"
 #include "sourcewindow.h"
 #include "utils.h"
 #include "gtkutils.h"
@@ -86,7 +86,10 @@ SourceWindow *source_window_create(void)
 
        scrolledwin = gtk_scrolled_window_new(NULL, NULL);
        gtk_scrolled_window_set_policy(GTK_SCROLLED_WINDOW(scrolledwin),
-                                      GTK_POLICY_NEVER, GTK_POLICY_AUTOMATIC);
+                                      GTK_POLICY_AUTOMATIC,
+                                      GTK_POLICY_AUTOMATIC);
+       gtk_scrolled_window_set_shadow_type(GTK_SCROLLED_WINDOW(scrolledwin),
+                                           GTK_SHADOW_IN);
        gtk_container_add(GTK_CONTAINER(window), scrolledwin);
        gtk_widget_show(scrolledwin);
 
@@ -161,22 +164,10 @@ void source_window_append(SourceWindow *sourcewin, const gchar *str)
 
        len = strlen(str) + 1;
        Xalloca(out, len, return);
-       
-       conv_localetodisp(out, len, str);
-       if (!g_utf8_validate(out, -1, NULL)) {
-               gchar *buf;
-               gint buflen;
-               const gchar *src_codeset, *dest_codeset;
-               src_codeset = conv_get_current_charset_str();
-               dest_codeset = CS_UTF_8;
-               buf = conv_codeset_strdup(out, src_codeset, dest_codeset);
-               gtk_text_buffer_get_iter_at_offset(buffer, &iter, -1);
-               gtk_text_buffer_insert(buffer, &iter, buf, -1);
-               g_free(buf);
-       } else {
-               gtk_text_buffer_get_iter_at_offset(buffer, &iter, -1);
-               gtk_text_buffer_insert(buffer, &iter, out, -1);
-       }
+       conv_utf8todisp(out, len, str);
+
+       gtk_text_buffer_get_iter_at_offset(buffer, &iter, -1);
+       gtk_text_buffer_insert(buffer, &iter, out, -1);
 }
 
 static void source_window_size_alloc_cb(GtkWidget *widget,