2005-07-01 [colin] 1.9.12cvs8

[claws.git] / src / common / template.c

diff --git a/src/common/template.c b/src/common/template.c
index fdafcf8fb052762a8ce62b02820c3670ce9a493c..031ddb3df959f9e4decbcd608126c61e7d017b7c 100644 (file)
--- a/src/common/template.c
+++ b/src/common/template.c
@@ -21,12 +21,12 @@
 #include "defs.h"
 
 #include <glib.h>
+#include <glib/gi18n.h>
 #include <stdio.h>
 #include <dirent.h>
 #include <sys/stat.h>
 #include <ctype.h>
 
-#include "intl.h"
 #include "utils.h"
 #include "template.h"
 #include "../codeconv.h"
@@ -39,9 +39,6 @@ static Template *template_load(gchar *filename)
        FILE *fp;
        gchar buf[BUFFSIZE];
        gint bytes_read;
-#warning FIXME_GTK2
-       const gchar *src_codeset = conv_get_current_charset_str();
-       const gchar *dest_codeset = CS_UTF_8;
 
        if ((fp = fopen(filename, "rb")) == NULL) {
                FILE_OP_ERROR(filename, "fopen");
@@ -57,36 +54,18 @@ static Template *template_load(gchar *filename)
        tmpl->value = NULL;
 
        while (fgets(buf, sizeof(buf), fp) != NULL) {
-               gchar *tmp = NULL;
-
                if (buf[0] == '\n')
                        break;
-               else if (!g_strncasecmp(buf, "Name:", 5)) {
-                       tmp = conv_codeset_strdup(buf + 5,
-                                                 src_codeset,
-                                                 dest_codeset);
-                       tmpl->name = tmp ? g_strstrip(tmp) : g_strdup(buf + 5);
-               } else if (!g_strncasecmp(buf, "Subject:", 8)) {
-                       tmp = conv_codeset_strdup(buf + 8,
-                                                 src_codeset,
-                                                 dest_codeset);
-                       tmpl->subject = tmp ? g_strstrip(tmp) : g_strdup(buf + 8);
-               } else if (!g_strncasecmp(buf, "To:", 3)) {
-                       tmp = conv_codeset_strdup(buf + 3,
-                                                 src_codeset,
-                                                 dest_codeset);
-                       tmpl->to = tmp ? g_strstrip(tmp) : g_strdup(buf + 3);
-               } else if (!g_strncasecmp(buf, "Cc:", 3)) {
-                       tmp = conv_codeset_strdup(buf + 3,
-                                                 src_codeset,
-                                                 dest_codeset);
-                       tmpl->cc = tmp ? g_strstrip(tmp) : g_strdup(buf + 3);
-               } else if (!g_strncasecmp(buf, "Bcc:", 4)) {
-                       tmp = conv_codeset_strdup(buf + 4,
-                                                 src_codeset,
-                                                 dest_codeset);
-                       tmpl->bcc = tmp ? g_strstrip(tmp) : g_strdup(buf + 4);
-               }
+               else if (!g_ascii_strncasecmp(buf, "Name:", 5))
+                       tmpl->name = g_strdup(g_strstrip(buf + 5));
+               else if (!g_ascii_strncasecmp(buf, "To:", 3))
+                       tmpl->to = g_strdup(g_strstrip(buf + 3));
+               else if (!g_ascii_strncasecmp(buf, "Cc:", 3))
+                       tmpl->cc = g_strdup(g_strstrip(buf + 3));
+               else if (!g_ascii_strncasecmp(buf, "Bcc:", 4))
+                       tmpl->bcc = g_strdup(g_strstrip(buf + 4));                                              
+               else if (!g_ascii_strncasecmp(buf, "Subject:", 8))
+                       tmpl->subject = g_strdup(g_strstrip(buf + 8));
        }
 
        if (!tmpl->name) {
@@ -103,10 +82,7 @@ static Template *template_load(gchar *filename)
                }
        }
        fclose(fp);
-       buf[bytes_read] = '\0';
-       tmpl->value = conv_codeset_strdup(buf, src_codeset, dest_codeset);
-       if (!tmpl->value)
-               tmpl->value = g_strdup(buf);
+       tmpl->value = g_strndup(buf, bytes_read);
 
        return tmpl;
 }
@@ -161,7 +137,8 @@ GSList *template_read_config(void)
        while ((de = readdir(dp)) != NULL) {
                if (*de->d_name == '.') continue;
 
-               filename = g_strconcat(path, G_DIR_SEPARATOR_S, de->d_name, NULL);
+               filename = g_strconcat(path, G_DIR_SEPARATOR_S,
+                                      de->d_name, NULL);
 
                if (stat(filename, &s) != 0 || !S_ISREG(s.st_mode) ) {
                        debug_print("%s:%d %s is not an ordinary file\n",
@@ -172,6 +149,7 @@ GSList *template_read_config(void)
                tmpl = template_load(filename);
                if (tmpl)
                        tmpl_list = g_slist_append(tmpl_list, tmpl);
+
                g_free(filename);
        }
 
@@ -205,10 +183,6 @@ void template_write_config(GSList *tmpl_list)
 
        for (cur = tmpl_list, tmpl_num = 1; cur != NULL;
             cur = cur->next, tmpl_num++) {
-#warning FIXME_GTK2
-               const gchar *src_codeset = CS_UTF_8;
-               const gchar *dest_codeset = conv_get_current_charset_str();
-               gchar *tmp = NULL;
                gchar *filename;
 
                tmpl = cur->data;
@@ -222,56 +196,23 @@ void template_write_config(GSList *tmpl_list)
                        return;
                }
 
-               tmp = conv_codeset_strdup(tmpl->name, src_codeset, dest_codeset);
-               if (!tmp)
-                       tmp = g_strdup(tmpl->name);
-               fprintf(fp, "Name: %s\n", tmp ? tmp : "");
-               g_free(tmp);
-
-               if (tmpl->subject && *tmpl->subject != '\0') {
-                       tmp = conv_codeset_strdup(tmpl->subject,
-                                                 src_codeset, dest_codeset);
-                       if (!tmp)
-                               tmp = g_strdup(tmpl->subject);
-                       fprintf(fp, "Subject: %s\n", tmp);
-                       g_free(tmp);
-               }
-
-               if (tmpl->to && *tmpl->to != '\0') {
-                       tmp = conv_codeset_strdup(tmpl->to,
-                                                 src_codeset, dest_codeset);
-                       if (!tmp)
-                               tmp = g_strdup(tmpl->to);
-                       fprintf(fp, "To: %s\n", tmp);
-                       g_free(tmp);
-               }
-
-               if (tmpl->cc && *tmpl->cc != '\0') {
-                       tmp = conv_codeset_strdup(tmpl->cc,
-                                                 src_codeset, dest_codeset);
-                       if (!tmp)
-                               tmp = g_strdup(tmpl->cc);
-                       fprintf(fp, "Cc: %s\n", tmp);
-                       g_free(tmp);
-               }
-
-               if (tmpl->bcc && *tmpl->bcc != '\0') {
-                       tmp = conv_codeset_strdup(tmpl->bcc,
-                                                 src_codeset, dest_codeset);
-                       if (!tmp)
-                               tmp = g_strdup(tmpl->bcc);
-                       fprintf(fp, "Bcc: %s\n", tmp);
-                       g_free(tmp);
-               }
-
+               fprintf(fp, "Name: %s\n", tmpl->name);
+               if (tmpl->subject && *tmpl->subject != '\0')
+                       fprintf(fp, "Subject: %s\n", tmpl->subject);
+               if (tmpl->to && *tmpl->to != '\0')
+                       fprintf(fp, "To: %s\n", tmpl->to);
+               if (tmpl->cc && *tmpl->cc != '\0')
+                       fprintf(fp, "Cc: %s\n", tmpl->cc);
+               if (tmpl->bcc && *tmpl->bcc != '\0')
+                       fprintf(fp, "Bcc: %s\n", tmpl->bcc);                                            
                fputs("\n", fp);
-               tmp = conv_codeset_strdup(tmpl->value,
-                                         src_codeset, dest_codeset);
-               if (!tmp)
-                       tmp = g_strdup(tmpl->value);
-               fwrite(tmp, sizeof(gchar) * strlen(tmp), 1, fp);
-               g_free(tmp);
+               if (tmpl->value && *tmpl->value != '\0')
+                       fwrite(tmpl->value, sizeof(gchar), strlen(tmpl->value), fp);
+               else
+                       fwrite("", sizeof(gchar), 1, fp);
+
                fclose(fp);
+               g_free(filename);
        }
 }