2007-02-09 [paul] 2.7.2cvs34

[claws.git] / src / prefs_send.c

diff --git a/src/prefs_send.c b/src/prefs_send.c
index 4ab83f8e62a2c377b877898242df30256a63b6df..04f79dfdb0a0de13f9495cfeffd066a7a68bccab 100644 (file)
--- a/src/prefs_send.c
+++ b/src/prefs_send.c
@@ -1,6 +1,6 @@
 /*
  * Sylpheed -- a GTK+ based, lightweight, and fast e-mail client
- * Copyright (C) 2005 Colin Leroy <colin@colino.net> & The Sylpheed-Claws Team
+ * Copyright (C) 2005-2007 Colin Leroy <colin@colino.net> & The Claws Mail 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
@@ -48,6 +48,7 @@ typedef struct _SendPage
 
        GtkWidget *checkbtn_savemsg;
        GtkWidget *checkbtn_confirm_send_queued_messages;
+       GtkWidget *checkbtn_never_send_retrcpt;
        GtkWidget *optmenu_senddialog;
        GtkWidget *optmenu_charset;
        GtkWidget *optmenu_encoding_method;
@@ -108,7 +109,7 @@ static void prefs_common_encoding_set_optmenu(GtkWidget *widget, TransferEncodin
 }
 
 
-void prefs_send_create_widget(PrefsPage *_page, GtkWindow *window, 
+static void prefs_send_create_widget(PrefsPage *_page, GtkWindow *window, 
                                  gpointer data)
 {
        SendPage *prefs_send = (SendPage *) _page;
@@ -128,6 +129,7 @@ void prefs_send_create_widget(PrefsPage *_page, GtkWindow *window,
        GtkWidget *menu;
        GtkWidget *optmenu_senddialog;
        GtkWidget *checkbtn_confirm_send_queued_messages;
+       GtkWidget *checkbtn_never_send_retrcpt;
        GtkWidget *table;
 
        vbox1 = gtk_vbox_new (FALSE, VSPACING);
@@ -144,6 +146,9 @@ void prefs_send_create_widget(PrefsPage *_page, GtkWindow *window,
        PACK_CHECK_BUTTON (vbox2, checkbtn_confirm_send_queued_messages,
                        _("Confirm before sending queued messages"));
 
+       PACK_CHECK_BUTTON(vbox2, checkbtn_never_send_retrcpt,
+                         _("Never send Return Receipts"));
+
        table = gtk_table_new(3, 2, FALSE);
        gtk_widget_show(table);
        gtk_container_add (GTK_CONTAINER (vbox1), table);
@@ -216,6 +221,9 @@ void prefs_send_create_widget(PrefsPage *_page, GtkWindow *window,
        SET_MENUITEM(_("Hebrew (ISO-8859-8)"),           CS_ISO_8859_8);
        SET_MENUITEM(_("Hebrew (Windows-1255)"),         CS_WINDOWS_1255);
        SET_MENUITEM(NULL, NULL);
+       SET_MENUITEM(_("Arabic (ISO-8859-6)"),           CS_ISO_8859_6);
+       SET_MENUITEM(_("Arabic (Windows-1256)"),         CS_WINDOWS_1256);
+       SET_MENUITEM(NULL, NULL);
        SET_MENUITEM(_("Turkish (ISO-8859-9)"),          CS_ISO_8859_9);
        SET_MENUITEM(NULL, NULL);
        SET_MENUITEM(_("Cyrillic (ISO-8859-5)"),         CS_ISO_8859_5);
@@ -279,6 +287,8 @@ void prefs_send_create_widget(PrefsPage *_page, GtkWindow *window,
                prefs_common.savemsg);
        gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(checkbtn_confirm_send_queued_messages),
                prefs_common.confirm_send_queued_messages);
+       gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(checkbtn_never_send_retrcpt),
+               prefs_common.never_send_retrcpt);
        gtk_option_menu_set_history(GTK_OPTION_MENU(optmenu_senddialog),
                prefs_common.send_dialog_mode);
        prefs_common_charset_set_optmenu(optmenu_charset, 
@@ -290,6 +300,7 @@ void prefs_send_create_widget(PrefsPage *_page, GtkWindow *window,
        
        prefs_send->checkbtn_savemsg = checkbtn_savemsg;
        prefs_send->checkbtn_confirm_send_queued_messages = checkbtn_confirm_send_queued_messages;
+       prefs_send->checkbtn_never_send_retrcpt = checkbtn_never_send_retrcpt;
        prefs_send->optmenu_senddialog = optmenu_senddialog;
        prefs_send->optmenu_charset = optmenu_charset;
        prefs_send->optmenu_encoding_method = optmenu_encoding;
@@ -297,7 +308,7 @@ void prefs_send_create_widget(PrefsPage *_page, GtkWindow *window,
        prefs_send->page.widget = vbox1;
 }
 
-void prefs_send_save(PrefsPage *_page)
+static void prefs_send_save(PrefsPage *_page)
 {
        SendPage *page = (SendPage *) _page;
        GtkWidget *menu;
@@ -307,6 +318,8 @@ void prefs_send_save(PrefsPage *_page)
                GTK_TOGGLE_BUTTON(page->checkbtn_savemsg));
        prefs_common.confirm_send_queued_messages = gtk_toggle_button_get_active(
                GTK_TOGGLE_BUTTON(page->checkbtn_confirm_send_queued_messages));
+       prefs_common.never_send_retrcpt = gtk_toggle_button_get_active(
+               GTK_TOGGLE_BUTTON(page->checkbtn_never_send_retrcpt));
 
        menu = gtk_option_menu_get_menu(GTK_OPTION_MENU(page->optmenu_senddialog));
        menuitem = gtk_menu_get_active(GTK_MENU(menu));
@@ -332,7 +345,7 @@ void prefs_send_init(void)
        static gchar *path[3];
 
        path[0] = _("Mail Handling");
-       path[1] = _("Send");
+       path[1] = _("Sending");
        path[2] = NULL;
 
        page = g_new0(SendPage, 1);