/*
* Sylpheed -- a GTK+ based, lightweight, and fast e-mail client
- * Copyright (C) 1999-2001 Hiroyuki Yamamoto
+ * Copyright (C) 1999-2003 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
#include "intl.h"
#include "main.h"
-#include "prefs.h"
+#include "prefs_gtk.h"
#include "prefs_customheader.h"
#include "prefs_common.h"
#include "prefs_account.h"
gint dest_row,
gpointer data);
-static void prefs_custom_header_key_pressed (GtkWidget *widget,
+static gboolean prefs_custom_header_key_pressed (GtkWidget *widget,
GdkEventKey *event,
gpointer data);
static void prefs_custom_header_ok (void);
GtkWidget *up_btn;
GtkWidget *down_btn;
- gchar *title[] = {_("Custom headers")};
+ gchar *title[1];
- debug_print(_("Creating custom header setting window...\n"));
+ debug_print("Creating custom header setting window...\n");
- window = gtk_window_new (GTK_WINDOW_DIALOG);
+ window = gtk_window_new (GTK_WINDOW_TOPLEVEL);
gtk_container_set_border_width (GTK_CONTAINER (window), 8);
- gtk_window_position (GTK_WINDOW (window), GTK_WIN_POS_CENTER);
+ gtk_window_set_position (GTK_WINDOW (window), GTK_WIN_POS_CENTER);
gtk_window_set_modal (GTK_WINDOW (window), TRUE);
- gtk_window_set_policy (GTK_WINDOW (window), FALSE, TRUE, FALSE);
+ gtk_window_set_resizable(GTK_WINDOW (window), TRUE);
vbox = gtk_vbox_new (FALSE, 6);
gtk_widget_show (vbox);
gtk_box_pack_end (GTK_BOX(vbox), confirm_area, FALSE, FALSE, 0);
gtk_widget_grab_default (ok_btn);
- gtk_window_set_title (GTK_WINDOW(window), _("Custom 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);
- gtk_signal_connect (GTK_OBJECT(window), "delete_event",
- GTK_SIGNAL_FUNC(prefs_custom_header_deleted),
- NULL);
- gtk_signal_connect (GTK_OBJECT(window), "key_press_event",
- GTK_SIGNAL_FUNC(prefs_custom_header_key_pressed),
- NULL);
- gtk_signal_connect (GTK_OBJECT(ok_btn), "clicked",
- GTK_SIGNAL_FUNC(prefs_custom_header_ok), NULL);
- gtk_signal_connect (GTK_OBJECT(cancel_btn), "clicked",
- GTK_SIGNAL_FUNC(prefs_custom_header_cancel), NULL);
+ gtk_window_set_title (GTK_WINDOW(window), _("Custom header configuration"));
+ MANAGE_WINDOW_SIGNALS_CONNECT (window);
+ g_signal_connect (G_OBJECT(window), "delete_event",
+ G_CALLBACK(prefs_custom_header_deleted),
+ NULL);
+ g_signal_connect (G_OBJECT(window), "key_press_event",
+ G_CALLBACK(prefs_custom_header_key_pressed),
+ NULL);
+ g_signal_connect (G_OBJECT(ok_btn), "clicked",
+ G_CALLBACK(prefs_custom_header_ok), NULL);
+ g_signal_connect (G_OBJECT(cancel_btn), "clicked",
+ G_CALLBACK(prefs_custom_header_cancel), NULL);
vbox1 = gtk_vbox_new (FALSE, VSPACING);
gtk_widget_show (vbox1);
gtk_table_attach (GTK_TABLE (table1), hdr_combo, 0, 1, 1, 2,
GTK_EXPAND | GTK_SHRINK | GTK_FILL,
0, 0, 0);
- gtk_widget_set_usize (hdr_combo, 150, -1);
+ gtk_widget_set_size_request (hdr_combo, 150, -1);
gtkut_combo_set_items (GTK_COMBO (hdr_combo),
"User-Agent", "X-Face", "X-Operating-System",
NULL);
gtk_table_attach (GTK_TABLE (table1), val_entry, 1, 2, 1, 2,
GTK_EXPAND | GTK_SHRINK | GTK_FILL,
0, 0, 0);
- gtk_widget_set_usize (val_entry, 200, -1);
+ gtk_widget_set_size_request (val_entry, 200, -1);
/* add / delete */
arrow = gtk_arrow_new (GTK_ARROW_DOWN, GTK_SHADOW_OUT);
gtk_widget_show (arrow);
gtk_box_pack_start (GTK_BOX (reg_hbox), arrow, FALSE, FALSE, 0);
- gtk_widget_set_usize (arrow, -1, 16);
+ gtk_widget_set_size_request (arrow, -1, 16);
btn_hbox = gtk_hbox_new (TRUE, 4);
gtk_widget_show (btn_hbox);
add_btn = gtk_button_new_with_label (_("Add"));
gtk_widget_show (add_btn);
gtk_box_pack_start (GTK_BOX (btn_hbox), add_btn, FALSE, TRUE, 0);
- gtk_signal_connect (GTK_OBJECT (add_btn), "clicked",
- GTK_SIGNAL_FUNC (prefs_custom_header_add_cb),
- NULL);
+ g_signal_connect (G_OBJECT (add_btn), "clicked",
+ G_CALLBACK (prefs_custom_header_add_cb),
+ NULL);
del_btn = gtk_button_new_with_label (_(" Delete "));
gtk_widget_show (del_btn);
gtk_box_pack_start (GTK_BOX (btn_hbox), del_btn, FALSE, TRUE, 0);
- gtk_signal_connect (GTK_OBJECT (del_btn), "clicked",
- GTK_SIGNAL_FUNC (prefs_custom_header_delete_cb),
- NULL);
+ g_signal_connect (G_OBJECT (del_btn), "clicked",
+ G_CALLBACK (prefs_custom_header_delete_cb),
+ NULL);
ch_hbox = gtk_hbox_new (FALSE, 8);
gtk_box_pack_start (GTK_BOX (vbox1), ch_hbox, TRUE, TRUE, 0);
ch_scrolledwin = gtk_scrolled_window_new (NULL, NULL);
- gtk_widget_set_usize (ch_scrolledwin, -1, 200);
+ gtk_widget_set_size_request (ch_scrolledwin, -1, 200);
gtk_widget_show (ch_scrolledwin);
gtk_box_pack_start (GTK_BOX (ch_hbox), ch_scrolledwin, TRUE, TRUE, 0);
gtk_scrolled_window_set_policy (GTK_SCROLLED_WINDOW (ch_scrolledwin),
GTK_POLICY_AUTOMATIC,
GTK_POLICY_AUTOMATIC);
+ title[0] = _("Current custom headers");
customhdr_clist = gtk_clist_new_with_titles(1, title);
gtk_widget_show (customhdr_clist);
gtk_container_add (GTK_CONTAINER (ch_scrolledwin), customhdr_clist);
gtk_clist_set_use_drag_icons (GTK_CLIST (customhdr_clist), FALSE);
GTK_WIDGET_UNSET_FLAGS (GTK_CLIST (customhdr_clist)->column[0].button,
GTK_CAN_FOCUS);
- gtk_signal_connect (GTK_OBJECT (customhdr_clist), "select_row",
- GTK_SIGNAL_FUNC (prefs_custom_header_select),
- NULL);
- gtk_signal_connect_after
- (GTK_OBJECT (customhdr_clist), "row_move",
- GTK_SIGNAL_FUNC (prefs_custom_header_row_moved), NULL);
+ g_signal_connect (G_OBJECT (customhdr_clist), "select_row",
+ G_CALLBACK (prefs_custom_header_select),
+ NULL);
+ g_signal_connect_after
+ (G_OBJECT (customhdr_clist), "row_move",
+ G_CALLBACK (prefs_custom_header_row_moved), NULL);
btn_vbox = gtk_vbox_new (FALSE, 8);
gtk_widget_show (btn_vbox);
up_btn = gtk_button_new_with_label (_("Up"));
gtk_widget_show (up_btn);
gtk_box_pack_start (GTK_BOX (btn_vbox), up_btn, FALSE, FALSE, 0);
- gtk_signal_connect (GTK_OBJECT (up_btn), "clicked",
- GTK_SIGNAL_FUNC (prefs_custom_header_up), NULL);
+ g_signal_connect (G_OBJECT (up_btn), "clicked",
+ G_CALLBACK (prefs_custom_header_up), NULL);
down_btn = gtk_button_new_with_label (_("Down"));
gtk_widget_show (down_btn);
gtk_box_pack_start (GTK_BOX (btn_vbox), down_btn, FALSE, FALSE, 0);
- gtk_signal_connect (GTK_OBJECT (down_btn), "clicked",
- GTK_SIGNAL_FUNC (prefs_custom_header_down), NULL);
+ g_signal_connect (G_OBJECT (down_btn), "clicked",
+ G_CALLBACK (prefs_custom_header_down), NULL);
gtk_widget_show_all(window);
gchar buf[PREFSBUFSIZE];
CustomHeader *ch;
- debug_print(_("Reading custom header configuration...\n"));
+ debug_print("Reading custom header configuration...\n");
rcpath = g_strconcat(get_rc_dir(), G_DIR_SEPARATOR_S,
CUSTOM_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);
ac->customhdr_list = NULL;
}
while (fgets(buf, sizeof(buf), fp) != NULL) {
- g_strchomp(buf);
ch = custom_header_read_str(buf);
if (ch) {
if (ch->account_id == ac->account_id) {
GSList *all_hdrs = NULL;
- debug_print(_("Writing custom header configuration...\n"));
+ debug_print("Writing custom header configuration...\n");
rcpath = g_strconcat(get_rc_dir(), G_DIR_SEPARATOR_S,
CUSTOM_HEADER_RC, NULL);
- if ((fp = fopen(rcpath, "r")) == NULL) {
+ if ((fp = fopen(rcpath, "rb")) == NULL) {
if (ENOENT != errno) FILE_OP_ERROR(rcpath, "fopen");
} else {
all_hdrs = NULL;
while (fgets(buf, sizeof(buf), fp) != NULL) {
- g_strchomp(buf);
ch = custom_header_read_str(buf);
if (ch) {
if (ch->account_id != ac->account_id)
}
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;
}
if (fputs(chstr, 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(chstr);
return;
if (fputs(chstr, 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(chstr);
return;
all_hdrs = g_slist_remove(all_hdrs, ch);
}
- 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;
}
}
{
GtkCList *clist = GTK_CLIST(customhdr.customhdr_clist);
CustomHeader *ch;
- gchar *entry_text;
+ const gchar *entry_text;
gchar *ch_str[1];
entry_text = gtk_entry_get_text(GTK_ENTRY(customhdr.hdr_entry));
alertpanel_error(_("Header name is not set."));
return -1;
}
+ if (!custom_header_is_allowed(entry_text)) {
+ alertpanel_error(_("This Header name is not allowed as a custom header."));
+ return -1;
+ }
ch = g_new0(CustomHeader, 1);
ch->name = g_strdup(entry_text);
unfold_line(ch->name);
+ g_strstrip(ch->name);
+ gtk_entry_set_text(GTK_ENTRY(customhdr.hdr_entry), ch->name);
entry_text = gtk_entry_get_text(GTK_ENTRY(customhdr.val_entry));
if (entry_text[0] != '\0') {
ch->value = g_strdup(entry_text);
unfold_line(ch->value);
+ g_strstrip(ch->value);
+ gtk_entry_set_text(GTK_ENTRY(customhdr.val_entry), ch->value);
}
ch_str[0] = g_strdup_printf("%s: %s", ch->name,
prefs_custom_header_set_list(cur_ac);
}
-static void prefs_custom_header_key_pressed(GtkWidget *widget,
- GdkEventKey *event,
- gpointer data)
+static gboolean prefs_custom_header_key_pressed(GtkWidget *widget,
+ GdkEventKey *event,
+ gpointer data)
{
if (event && event->keyval == GDK_Escape)
prefs_custom_header_cancel();
+ return FALSE;
}
static void prefs_custom_header_ok(void)