2004-08-24 [colin] 0.9.12cvs80.3

	* src/wizard.c
		Fix full name, ports, and imap

diff --git a/ChangeLog-gtk2.claws b/ChangeLog-gtk2.claws
index d3d6271038ba9600d7df9f1b15ebf5cf29590c09..0c19d12480aa7921b258ab477b6dbcbcd65ad707 100644 (file)
--- a/ChangeLog-gtk2.claws
+++ b/ChangeLog-gtk2.claws
@@ -1,3 +1,8 @@
+2004-08-24 [colin]     0.9.12cvs80.3
+
+       * src/wizard.c
+               Fix full name, ports, and imap
+
 2004-08-24 [colin]     0.9.12cvs80.2
 
        * src/Makefile.am

diff --git a/PATCHSETS b/PATCHSETS
index 2b7e8727a2176b4a9f2b8ce552ce874a03f7710c..6bef76d7cc6e60633808d90ef2b55b2d7260a0b9 100644 (file)
--- a/PATCHSETS
+++ b/PATCHSETS
@@ -138,3 +138,4 @@
 ( cvs diff -u -r 1.16.2.1 -r 1.16.2.2 src/matcher_parser_lex.l; ) > 0.9.12cvs79.3.patchset
 ( cvs diff -u -r 1.213.2.13 -r 1.213.2.14 src/folder.c; ) > 0.9.12cvs80.1.patchset
 ( cvs diff -u -r 1.155.2.10 -r 1.155.2.11 src/Makefile.am; cvs diff -u -r 1.115.2.15 -r 1.115.2.16 src/main.c; cvs diff -u -r 1.5.2.1 -r 1.5.2.2 src/setup.c; cvs diff -u -r 1.1.1.1 -r 1.1.1.2 src/setup.h; cvs diff -u -r 1.25.2.5 -r 1.25.2.6 src/stock_pixmap.c; cvs diff -u -r 1.18.2.3 -r 1.18.2.4 src/stock_pixmap.h; cvs diff -u -r 0 -r 1 src/wizard.c; cvs diff -u -r 0 -r 1 src/wizard.h; cvs diff -u -r 0 -r 1 src/pixmaps/sylpheed_icon.xpm; ) > 0.9.12cvs80.2.patchset
+( cvs diff -u -r 1.1.2.1 -r 1.1.2.2 src/wizard.c; ) > 0.9.12cvs80.3.patchset

diff --git a/configure.ac b/configure.ac
index 5628053ea32cf9a11e8f1a8eda553905009e28a0..f4e38fae6869859e5e689dc593c28cd4874cdbf6 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -13,7 +13,7 @@ INTERFACE_AGE=0
 BINARY_AGE=0
 EXTRA_VERSION=80
 EXTRA_RELEASE=
-EXTRA_GTK2_VERSION=.2
+EXTRA_GTK2_VERSION=.3
 
 if test \( $EXTRA_VERSION -eq 0 \) -o \( "x$EXTRA_RELEASE" != "x" \); then
     VERSION=${MAJOR_VERSION}.${MINOR_VERSION}.${MICRO_VERSION}${EXTRA_RELEASE}${EXTRA_GTK2_VERSION}

diff --git a/src/wizard.c b/src/wizard.c
index 943eff18803de52ac81b3926c53aa8c377859b15..4083471f29d31030b9b31d7121abf619cf51cfa9 100644 (file)
--- a/src/wizard.c
+++ b/src/wizard.c
@@ -46,6 +46,7 @@
 #include "mainwindow.h"
 #include "stock_pixmap.h"
 #include "setup.h"
+#include "folder.h"
 
 typedef enum
 {
@@ -87,6 +88,8 @@ static void wizard_write_config(WizardWindow *wizard)
        gboolean mailbox_ok = FALSE;
        PrefsAccount *prefs_account = prefs_account_new();
        GList *account_list = NULL;
+       GtkWidget *menu, *menuitem;
+       int tmp;
        
        if (wizard->create_mailbox) {
                mailbox_ok = setup_write_mailbox_path(wizard->mainwin, 
@@ -109,10 +112,27 @@ static void wizard_write_config(WizardWindow *wizard)
                                gtk_entry_get_text(GTK_ENTRY(wizard->recv_username)));
        prefs_account->passwd = g_strdup(
                                gtk_entry_get_text(GTK_ENTRY(wizard->recv_password)));
+
+       menu = gtk_option_menu_get_menu(GTK_OPTION_MENU(wizard->recv_type));
+       menuitem = gtk_menu_get_active(GTK_MENU(menu));
        prefs_account->protocol = GPOINTER_TO_INT
-                       (g_object_get_data(G_OBJECT(wizard->recv_type), 
-                                          MENU_VAL_ID));
-       
+                       (g_object_get_data(G_OBJECT(menuitem), MENU_VAL_ID));
+
+       tmp = atoi(gtk_entry_get_text(GTK_ENTRY(wizard->smtp_port)));
+       if (tmp != 25) {
+               prefs_account->smtpport = tmp;
+               prefs_account->set_smtpport = TRUE;
+       }
+
+       tmp = atoi(gtk_entry_get_text(GTK_ENTRY(wizard->recv_port)));
+       if (prefs_account->protocol == A_POP3 && tmp != 110) {
+               prefs_account->popport = tmp;
+               prefs_account->set_popport = TRUE;
+       } else if (prefs_account->protocol == A_IMAP4 && tmp != 143) {
+               prefs_account->imapport = tmp;
+               prefs_account->set_imapport = TRUE;
+       }
+
        account_list = g_list_append(account_list, prefs_account);
        prefs_account_write_config_all(account_list);
        prefs_account_free(prefs_account);
@@ -231,7 +251,6 @@ static GtkWidget* mailbox_page (WizardWindow * wizard)
        gtk_table_set_row_spacings(GTK_TABLE(table), 4);
        gtk_table_set_col_spacings(GTK_TABLE(table), 8);
 
-       wizard->full_name = gtk_entry_new();
        wizard->mailbox_name = gtk_entry_new();
        gtk_entry_set_text(GTK_ENTRY(wizard->mailbox_name), "Mail");
        GTK_TABLE_ADD_ROW_AT(table, _("Mailbox name:"), 
@@ -265,7 +284,6 @@ static GtkWidget* smtp_page (WizardWindow * wizard)
        gtk_table_set_row_spacings(GTK_TABLE(table), 4);
        gtk_table_set_col_spacings(GTK_TABLE(table), 8);
 
-       wizard->full_name = gtk_entry_new();
        wizard->smtp_server = gtk_entry_new();
        text = get_default_server("smtp");
        gtk_entry_set_text(GTK_ENTRY(wizard->smtp_server), text);
@@ -281,6 +299,27 @@ static GtkWidget* smtp_page (WizardWindow * wizard)
        return table;
 }
 
+static void wizard_protocol_changed(GtkMenuItem *menuitem, gpointer data)
+{
+       WizardWindow *wizard = (WizardWindow *)data;
+       RecvProtocol protocol;
+       gchar *text;
+       protocol = GPOINTER_TO_INT
+               (g_object_get_data(G_OBJECT(menuitem), MENU_VAL_ID));
+       
+       if (protocol == A_POP3) {
+               text = get_default_server("pop");
+               gtk_entry_set_text(GTK_ENTRY(wizard->recv_server), text);
+               g_free(text);
+               gtk_entry_set_text(GTK_ENTRY(wizard->recv_port), "110");
+       } else {
+               text = get_default_server("imap");
+               gtk_entry_set_text(GTK_ENTRY(wizard->recv_server), text);
+               g_free(text);
+               gtk_entry_set_text(GTK_ENTRY(wizard->recv_port), "143");                
+       }
+}
+
 static GtkWidget* recv_page (WizardWindow * wizard)
 {
        GtkWidget *table = gtk_table_new(5,2, FALSE);
@@ -292,11 +331,16 @@ static GtkWidget* recv_page (WizardWindow * wizard)
        gtk_table_set_row_spacings(GTK_TABLE(table), 4);
        gtk_table_set_col_spacings(GTK_TABLE(table), 8);
 
-       wizard->full_name = gtk_entry_new();
        wizard->recv_type = gtk_option_menu_new();
        
        MENUITEM_ADD (menu, menuitem, _("POP3"), A_POP3);
+       g_signal_connect(G_OBJECT(menuitem), "activate",
+                        G_CALLBACK(wizard_protocol_changed),
+                        wizard);
        MENUITEM_ADD (menu, menuitem, _("IMAP"), A_IMAP4);
+       g_signal_connect(G_OBJECT(menuitem), "activate",
+                        G_CALLBACK(wizard_protocol_changed),
+                        wizard);
        gtk_option_menu_set_menu (GTK_OPTION_MENU (wizard->recv_type), menu);
        GTK_TABLE_ADD_ROW_AT(table, _("Server type:"), 
                             wizard->recv_type, i); i++;