2007-07-30 [colin] 2.10.0cvs78

[claws.git] / src / prefs_account.c

diff --git a/src/prefs_account.c b/src/prefs_account.c
index 2698b9f7b22b08cf125758180a51abfe9b6b2471..aa9a6126a6be6e63f9a4071790ad35d0d896d493 100644 (file)
--- a/src/prefs_account.c
+++ b/src/prefs_account.c
@@ -4,7 +4,7 @@
  *
  * 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
- * the Free Software Foundation; either version 2 of the License, or
+ * the Free Software Foundation; either version 3 of the License, or
  * (at your option) any later version.
  *
  * This program is distributed in the hope that it will be useful,
@@ -13,8 +13,8 @@
  * GNU General Public License for more details.
  *
  * 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., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ * 
  */
 
 #ifdef HAVE_CONFIG_H
@@ -179,10 +179,12 @@ typedef struct ComposePage
        GtkWidget *autobcc_entry;
        GtkWidget *autoreplyto_checkbtn;
        GtkWidget *autoreplyto_entry;
+#if USE_ASPELL
        GtkWidget *checkbtn_enable_default_dictionary;
        GtkWidget *optmenu_default_dictionary;
        GtkWidget *checkbtn_enable_default_alt_dictionary;
        GtkWidget *optmenu_default_alt_dictionary;
+#endif
 } ComposePage;
 
 typedef struct TemplatesPage
@@ -1289,8 +1291,8 @@ static void receive_create_widget_func(PrefsPage * _page,
        GtkWidget *local_inbox_btn;
 
        GtkWidget *optmenu;
-       GtkWidget *optmenu_menu;
-       GtkWidget *menuitem;
+       GtkListStore *menu;
+       GtkTreeIter iter;
        GtkWidget *recvatgetall_checkbtn;
 
        GtkWidget *hbox2;
@@ -1457,19 +1459,17 @@ static void receive_create_widget_func(PrefsPage * _page,
        gtk_widget_show (label);
        gtk_box_pack_start (GTK_BOX (hbox1), label, FALSE, FALSE, 0);
 
-       optmenu = gtk_option_menu_new ();
+
+       optmenu = gtkut_sc_combobox_create(NULL, FALSE);
+       menu = GTK_LIST_STORE(gtk_combo_box_get_model(GTK_COMBO_BOX(optmenu)));
        gtk_widget_show (optmenu);
        gtk_box_pack_start (GTK_BOX (hbox1), optmenu, FALSE, FALSE, 0);
 
-       optmenu_menu = gtk_menu_new ();
-
-       MENUITEM_ADD (optmenu_menu, menuitem, _("Automatic"), 0);
-       MENUITEM_ADD (optmenu_menu, menuitem, "LOGIN", IMAP_AUTH_LOGIN);
-       MENUITEM_ADD (optmenu_menu, menuitem, "CRAM-MD5", IMAP_AUTH_CRAM_MD5);
-       MENUITEM_ADD (optmenu_menu, menuitem, "ANONYMOUS", IMAP_AUTH_ANON);
-       MENUITEM_ADD (optmenu_menu, menuitem, "GSSAPI", IMAP_AUTH_GSSAPI);
-
-       gtk_option_menu_set_menu (GTK_OPTION_MENU (optmenu), optmenu_menu);
+       COMBOBOX_ADD (menu, _("Automatic"), 0);
+       COMBOBOX_ADD (menu, "LOGIN", IMAP_AUTH_LOGIN);
+       COMBOBOX_ADD (menu, "CRAM-MD5", IMAP_AUTH_CRAM_MD5);
+       COMBOBOX_ADD (menu, "ANONYMOUS", IMAP_AUTH_ANON);
+       COMBOBOX_ADD (menu, "GSSAPI", IMAP_AUTH_GSSAPI);
 
        hbox1 = gtk_hbox_new (FALSE, 8);
        gtk_widget_show (hbox1);
@@ -2855,8 +2855,10 @@ static void templates_save_func(PrefsPage *_page)
                                                                        tmp_ac_prefs.compose_subject_format,
                                                                        tmp_ac_prefs.compose_body_format);
        quotefmt_check_reply_formats(tmp_ac_prefs.reply_with_format,
+                                                                       tmp_ac_prefs.reply_quotemark,
                                                                        tmp_ac_prefs.reply_body_format);
        quotefmt_check_forward_formats(tmp_ac_prefs.forward_with_format,
+                                                                       tmp_ac_prefs.forward_quotemark,
                                                                        tmp_ac_prefs.forward_body_format);
        if (prefs_templates_apply() >= 0)
                cancelled = FALSE;
@@ -3323,7 +3325,7 @@ PrefsAccount *prefs_account_open(PrefsAccount *ac_prefs, gboolean *dirty)
 
        prefswindow_open_full(title, prefs_pages, ac_prefs, destroy_dialog,
                        &prefs_common.editaccountwin_width, &prefs_common.editaccountwin_height,
-                       TRUE);
+                       TRUE, TRUE);
        g_free(title);
        gtk_main();
 
@@ -3528,43 +3530,16 @@ static void prefs_account_protocol_set_optmenu(PrefParam *pparam)
 
 static void prefs_account_imap_auth_type_set_data_from_optmenu(PrefParam *pparam)
 {
-       GtkWidget *menu;
-       GtkWidget *menuitem;
-
-       menu = gtk_option_menu_get_menu(GTK_OPTION_MENU(*pparam->widget));
-       menuitem = gtk_menu_get_active(GTK_MENU(menu));
-       *((RecvProtocol *)pparam->data) = GPOINTER_TO_INT
-               (g_object_get_data(G_OBJECT(menuitem), MENU_VAL_ID));
+       *((RecvProtocol *)pparam->data) =
+                       combobox_get_active_data(GTK_COMBO_BOX(*pparam->widget));
 }
 
 static void prefs_account_imap_auth_type_set_optmenu(PrefParam *pparam)
 {
        IMAPAuthType type = *((IMAPAuthType *)pparam->data);
-       GtkOptionMenu *optmenu = GTK_OPTION_MENU(*pparam->widget);
-       GtkWidget *menu;
-       GtkWidget *menuitem;
+       GtkComboBox *optmenu = GTK_COMBO_BOX(*pparam->widget);
 
-       switch (type) {
-       case IMAP_AUTH_LOGIN:
-               gtk_option_menu_set_history(optmenu, 1);
-               break;
-       case IMAP_AUTH_CRAM_MD5:
-               gtk_option_menu_set_history(optmenu, 2);
-               break;
-       case IMAP_AUTH_ANON:
-               gtk_option_menu_set_history(optmenu, 3);
-               break;
-       case IMAP_AUTH_GSSAPI:
-               gtk_option_menu_set_history(optmenu, 4);
-               break;
-       case 0:
-       default:
-               gtk_option_menu_set_history(optmenu, 0);
-       }
-
-       menu = gtk_option_menu_get_menu(optmenu);
-       menuitem = gtk_menu_get_active(GTK_MENU(menu));
-       gtk_menu_item_activate(GTK_MENU_ITEM(menuitem));
+       combobox_select_by_data(optmenu, type);
 }
 
 static void prefs_account_smtp_auth_type_set_data_from_optmenu(PrefParam *pparam)