2006-04-05 [colin] 2.1.0cvs4

[claws.git] / src / prefs_gtk.c

diff --git a/src/prefs_gtk.c b/src/prefs_gtk.c
index ff0f208ba4d2238487e794266b0b741c700da1fd..24fa2cfa7378469e2a43cc2bdcd8c2e2f95b44fc 100644 (file)
--- a/src/prefs_gtk.c
+++ b/src/prefs_gtk.c
@@ -1,6 +1,6 @@
 /*
  * Sylpheed -- a GTK+ based, lightweight, and fast e-mail client
- * Copyright (C) 1999-2005 Hiroyuki Yamamoto
+ * Copyright (C) 1999-2006 Hiroyuki Yamamoto and the Sylpheed-Claws team
  *
  * 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
@@ -14,13 +14,15 @@
  *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
  */
 
 #ifdef HAVE_CONFIG_H
 #  include "config.h"
 #endif
 
+#include <glib.h>
+#include <glib/gi18n.h>
 #include <gtk/gtk.h>
 #include <stdio.h>
 #include <stdlib.h>
@@ -28,10 +30,10 @@
 #include <unistd.h>
 #include <errno.h>
 
-#include "intl.h"
 #include "main.h"
 #include "prefs.h"
 #include "prefs_gtk.h"
+#include "prefs_common.h"
 #include "utils.h"
 #include "gtkutils.h"
 #include "passcrypt.h"
@@ -50,11 +52,10 @@ typedef enum
 } DummyEnum;
 
 void prefs_read_config(PrefParam *param, const gchar *label,
-                      const gchar *rcfile)
+                      const gchar *rcfile, const gchar *encoding)
 {
        FILE *fp;
        gchar buf[PREFSBUFSIZE];
-       gchar *rcpath;
        gchar *block_label;
 
        g_return_if_fail(param != NULL);
@@ -65,13 +66,10 @@ void prefs_read_config(PrefParam *param, const gchar *label,
 
        prefs_set_default(param);
 
-       rcpath = g_strconcat(get_rc_dir(), G_DIR_SEPARATOR_S, rcfile, NULL);
-       if ((fp = fopen(rcpath, "rb")) == NULL) {
-               if (ENOENT != errno) FILE_OP_ERROR(rcpath, "fopen");
-               g_free(rcpath);
+       if ((fp = g_fopen(rcfile, "rb")) == NULL) {
+               if (ENOENT != errno) FILE_OP_ERROR(rcfile, "fopen");
                return;
        }
-       g_free(rcpath);
 
        block_label = g_strdup_printf("[%s]", label);
 
@@ -79,7 +77,18 @@ void prefs_read_config(PrefParam *param, const gchar *label,
        while (fgets(buf, sizeof(buf), fp) != NULL) {
                gint val;
 
-               val = strncmp(buf, block_label, strlen(block_label));
+               if (encoding) {
+                       gchar *conv_str;
+
+                       conv_str = conv_codeset_strdup
+                               (buf, encoding, CS_INTERNAL);
+                       if (!conv_str)
+                               conv_str = g_strdup(buf);
+                       val = strncmp
+                               (conv_str, block_label, strlen(block_label));
+                       g_free(conv_str);
+               } else
+                       val = strncmp(buf, block_label, strlen(block_label));
                if (val == 0) {
                        debug_print("Found %s\n", block_label);
                        break;
@@ -91,8 +100,19 @@ void prefs_read_config(PrefParam *param, const gchar *label,
                strretchomp(buf);
                /* reached next block */
                if (buf[0] == '[') break;
+               if (buf[0] == '#') continue;
 
-               prefs_config_parse_one_line(param, buf);
+               if (encoding) {
+                       gchar *conv_str;
+
+                       conv_str = conv_codeset_strdup
+                               (buf, encoding, CS_INTERNAL);
+                       if (!conv_str)
+                               conv_str = g_strdup(buf);
+                       prefs_config_parse_one_line(param, conv_str);
+                       g_free(conv_str);
+               } else
+                       prefs_config_parse_one_line(param, buf);
        }
 
        debug_print("Finished reading configuration.\n");
@@ -122,7 +142,7 @@ void prefs_config_parse_one_line(PrefParam *param, const gchar *buf)
 
                        tmp = *value ?
                                conv_codeset_strdup(value,
-                                                   conv_get_current_charset_str(),
+                                                   conv_get_locale_charset_str(),
                                                    CS_UTF_8)
                                : g_strdup("");
                        if (!tmp) {
@@ -205,7 +225,7 @@ void prefs_write_config(PrefParam *param, const gchar *label,
        g_return_if_fail(rcfile != NULL);
 
        rcpath = g_strconcat(get_rc_dir(), G_DIR_SEPARATOR_S, rcfile, NULL);
-       if ((orig_fp = fopen(rcpath, "rb")) == NULL) {
+       if ((orig_fp = g_fopen(rcpath, "rb")) == NULL) {
                if (ENOENT != errno) FILE_OP_ERROR(rcpath, "fopen");
        }
 
@@ -275,7 +295,7 @@ gint prefs_write_param(PrefParam *param, FILE *fp)
                        if (*((gchar **)param[i].data)) {
                                tmp = conv_codeset_strdup(*((gchar **)param[i].data),
                                                          CS_UTF_8,
-                                                         conv_get_current_charset_str());
+                                                         conv_get_locale_charset_str());
                                if (!tmp)
                                        tmp = g_strdup(*((gchar **)param[i].data));
                        }
@@ -365,7 +385,7 @@ void prefs_set_default(PrefParam *param)
                                        envstr = g_getenv(param[i].defval + 4);
                                        tmp = envstr && *envstr ?
                                                conv_codeset_strdup(envstr,
-                                                                   conv_get_current_charset_str(),
+                                                                   conv_get_locale_charset_str(),
                                                                    CS_UTF_8)
                                                : g_strdup("");
                                        if (!tmp) {
@@ -518,6 +538,14 @@ void prefs_button_toggled(GtkToggleButton *toggle_btn, GtkWidget *widget)
        gtk_widget_set_sensitive(widget, is_active);
 }
 
+void prefs_button_toggled_reverse(GtkToggleButton *toggle_btn, GtkWidget *widget)
+{
+       gboolean is_active;
+
+       is_active = gtk_toggle_button_get_active(toggle_btn);
+       gtk_widget_set_sensitive(widget, !is_active);
+}
+
 void prefs_set_dialog(PrefParam *param)
 {
        gint i;
@@ -827,7 +855,8 @@ static GSList *prefs_pages = NULL;
 
 void prefs_gtk_open(void)
 {
-       prefswindow_open(_("Preferences"), prefs_pages, NULL);
+       prefswindow_open(_("Preferences"), prefs_pages, NULL,
+                       &prefs_common.prefswin_width, &prefs_common.prefswin_height);
 }
 
 void prefs_gtk_register_page(PrefsPage *page)