sync with 0.9.10cvs11

[claws.git] / src / prefs_display_header.c

diff --git a/src/prefs_display_header.c b/src/prefs_display_header.c
index 820a0c533e3bff1e6f40b5240ec5a5c31a3ec54c..d41e090c72deeb3428881aaac4f8a4043798fb75 100644 (file)
--- a/src/prefs_display_header.c
+++ b/src/prefs_display_header.c
@@ -1,6 +1,6 @@
 /*
  * Sylpheed -- a GTK+ based, lightweight, and fast e-mail client
- * Copyright (C) 1999-2001 Hiroyuki Yamamoto
+ * Copyright (C) 1999-2004 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
@@ -32,7 +32,7 @@
 #include <errno.h>
 
 #include "intl.h"
-#include "prefs.h"
+#include "prefs_gtk.h"
 #include "prefs_display_header.h"
 #include "prefs_common.h"
 #include "manage_window.h"
@@ -56,18 +56,6 @@ static struct DisplayHeader {
        GtkWidget *other_headers;
 } dispheader;
 
-/*
-   parameter name, default value, pointer to the prefs variable, data type,
-   pointer to the widget pointer,
-   pointer to the function for data setting,
-   pointer to the function for widget setting
- */
-
-#define VSPACING               12
-#define VSPACING_NARROW                4
-#define DEFAULT_ENTRY_WIDTH    80
-#define PREFSBUFSIZE           1024
-
 /* widget creating functions */
 static void prefs_display_header_create        (void);
 
@@ -140,6 +128,9 @@ static void prefs_display_header_set_default(void)
 
 void prefs_display_header_open(void)
 {
+       if (prefs_rc_is_readonly(DISPLAY_HEADER_RC))
+               return;
+
        if (!dispheader.window) {
                prefs_display_header_create();
        }
@@ -184,7 +175,7 @@ static void prefs_display_header_create(void)
 
        gchar *title[1];
 
-       debug_print(_("Creating display header setting window...\n"));
+       debug_print("Creating display header setting window...\n");
 
        window = gtk_window_new (GTK_WINDOW_DIALOG);
        gtk_container_set_border_width (GTK_CONTAINER (window), 8);
@@ -207,11 +198,8 @@ static void prefs_display_header_create(void)
        gtk_widget_grab_default (ok_btn);
 
        gtk_window_set_title (GTK_WINDOW(window),
-                             _("Display header setting"));
-       gtk_signal_connect (GTK_OBJECT(window), "focus_in_event",
-                           GTK_SIGNAL_FUNC(manage_window_focus_in), NULL);
-       gtk_signal_connect (GTK_OBJECT(window), "focus_out_event",
-                           GTK_SIGNAL_FUNC(manage_window_focus_out), NULL);
+                             _("Displayed header configuration"));
+       MANAGE_WINDOW_SIGNALS_CONNECT(window);
        gtk_signal_connect (GTK_OBJECT(window), "delete_event",
                            GTK_SIGNAL_FUNC(prefs_display_header_deleted),
                            NULL);
@@ -289,7 +277,7 @@ static void prefs_display_header_create(void)
        gtk_box_pack_start (GTK_BOX (btn_vbox), reg_btn, FALSE, TRUE, 0);
        gtk_signal_connect (GTK_OBJECT (reg_btn), "clicked",
                            GTK_SIGNAL_FUNC (prefs_display_header_register_cb),
-                           FALSE);
+                           GINT_TO_POINTER(FALSE));
        del_btn = gtk_button_new_with_label (_("Delete"));
        gtk_widget_show (del_btn);
        gtk_box_pack_start (GTK_BOX (btn_vbox), del_btn, FALSE, TRUE, 0);
@@ -345,13 +333,13 @@ static void prefs_display_header_create(void)
        gtk_signal_connect (GTK_OBJECT (reg_btn), "clicked",
                            GTK_SIGNAL_FUNC
                            (prefs_display_header_register_cb),
-                           (void *) TRUE);
+                           GINT_TO_POINTER(TRUE));
        del_btn = gtk_button_new_with_label (_("Delete"));
        gtk_widget_show (del_btn);
        gtk_box_pack_start (GTK_BOX (btn_vbox), del_btn, FALSE, TRUE, 0);
        gtk_signal_connect (GTK_OBJECT (del_btn), "clicked",
                            GTK_SIGNAL_FUNC (prefs_display_header_delete_cb),
-                           (void *) hidden_headers_clist);
+                           hidden_headers_clist);
 
        PACK_CHECK_BUTTON (btn_hbox, checkbtn_other_headers,
                           _("Show all unspecified headers"));
@@ -379,11 +367,11 @@ void prefs_display_header_read_config(void)
        gchar buf[PREFSBUFSIZE];
        DisplayHeaderProp *dp;
 
-       debug_print(_("Reading configuration for displaying headers...\n"));
+       debug_print("Reading configuration for displaying headers...\n");
 
        rcpath = g_strconcat(get_rc_dir(), G_DIR_SEPARATOR_S,
                             DISPLAY_HEADER_RC, NULL);
-       if ((fp = fopen(rcpath, "r")) == NULL) {
+       if ((fp = fopen(rcpath, "rb")) == NULL) {
                if (ENOENT != errno) FILE_OP_ERROR(rcpath, "fopen");
                g_free(rcpath);
                prefs_common.disphdr_list = NULL;
@@ -417,13 +405,13 @@ void prefs_display_header_write_config(void)
        PrefFile *pfile;
        GSList *cur;
 
-       debug_print(_("Writing configuration for displaying headers...\n"));
+       debug_print("Writing configuration for displaying headers...\n");
 
        rcpath = g_strconcat(get_rc_dir(), G_DIR_SEPARATOR_S,
                             DISPLAY_HEADER_RC, NULL);
 
        if ((pfile = prefs_write_open(rcpath)) == NULL) {
-               g_warning(_("failed to write configuration to file\n"));
+               g_warning("failed to write configuration to file\n");
                g_free(rcpath);
                return;
        }
@@ -437,7 +425,7 @@ void prefs_display_header_write_config(void)
                if (fputs(dpstr, pfile->fp) == EOF ||
                    fputc('\n', pfile->fp) == EOF) {
                        FILE_OP_ERROR(rcpath, "fputs || fputc");
-                       prefs_write_close_revert(pfile);
+                       prefs_file_close_revert(pfile);
                        g_free(rcpath);
                        g_free(dpstr);
                        return;
@@ -447,8 +435,8 @@ void prefs_display_header_write_config(void)
 
        g_free(rcpath);
 
-       if (prefs_write_close(pfile) < 0) {
-               g_warning(_("failed to write configuration to file\n"));
+       if (prefs_file_close(pfile) < 0) {
+               g_warning("failed to write configuration to file\n");
                return;
        }
 }
@@ -570,9 +558,7 @@ static gint prefs_display_header_clist_set_row(gboolean hidden)
 static void prefs_display_header_register_cb(GtkButton *btn,
                                             gpointer hidden_data)
 {
-       gboolean hidden = (gboolean)hidden_data;
-
-       prefs_display_header_clist_set_row(hidden);
+       prefs_display_header_clist_set_row(GPOINTER_TO_INT(hidden_data));
 }
 
 static void prefs_display_header_delete_cb(GtkButton *btn, gpointer clist_data)