2004-08-26 [colin] 0.9.12cvs82.3

	* src/main.c
	* src/wizard.c
		Fix account folders duplication

diff --git a/ChangeLog-gtk2.claws b/ChangeLog-gtk2.claws
index 79adc9498affc9dbd9f3a14010fce919caad2ef2..1d95316b97061dd983c3797b8114cd065c379260 100644 (file)
--- a/ChangeLog-gtk2.claws
+++ b/ChangeLog-gtk2.claws
@@ -1,3 +1,9 @@
+2004-08-26 [colin]     0.9.12cvs82.3
+
+       * src/main.c
+       * src/wizard.c
+               Fix account folders duplication
+
 2004-08-25 [colin]     0.9.12cvs82.2
 
        * src/wizard.c

diff --git a/PATCHSETS b/PATCHSETS
index 1854d0cd034da20fa362db4faf85b015d14bf067..3a87af8c35b878752552e9be18d47c8521056174 100644 (file)
--- a/PATCHSETS
+++ b/PATCHSETS
@@ -142,3 +142,4 @@
 ( cvs diff -u -r 1.1.2.1 -r 1.1.2.2 src/plugins/pgpmime/pgpmime.c; cvs diff -u -r 1.1.2.1 -r 1.1.2.2 src/plugins/pgpmime/sgpgme.c; cvs diff -u -r 1.1.2.1 -r 1.1.2.2 src/plugins/pgpmime/sgpgme.h; ) > 0.9.12cvs81.1.patchset
 ( cvs diff -u -r 1.1.2.2 -r 1.1.2.3 src/plugins/pgpmime/pgpmime.c; ) > 0.9.12cvs82.1.patchset
 ( cvs diff -u -r 1.1.2.2 -r 1.1.2.3 src/wizard.c; ) > 0.9.12cvs82.2.patchset
+( cvs diff -u -r 1.115.2.16 -r 1.115.2.17 src/main.c; cvs diff -u -r 1.1.2.3 -r 1.1.2.4 src/wizard.c; ) > 0.9.12cvs82.3.patchset

diff --git a/configure.ac b/configure.ac
index 538b283bee746a5f5fe9018c43641667049fbdca..afa999fe4078ef4961d85f7082ef38db81ff4fb6 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -13,7 +13,7 @@ INTERFACE_AGE=0
 BINARY_AGE=0
 EXTRA_VERSION=82
 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/main.c b/src/main.c
index e6648c2c6f87f9940f75405588779098910cd21f..60e35ce4b9a7978abce58dffbc222cab137f63c7 100644 (file)
--- a/src/main.c
+++ b/src/main.c
@@ -351,15 +351,17 @@ int main(int argc, char *argv[])
                                        lock_socket_input_cb,
                                        mainwin);
 
+       account_read_config_all();
+
        if (folder_read_list() < 0) {
-               run_wizard(mainwin, TRUE);
+               if (!run_wizard(mainwin, TRUE))
+                       exit(1);
                folder_write_list();
        }
-       
-       account_read_config_all();
-       
+
        if (!account_get_list()) {
-               run_wizard(mainwin, FALSE);
+               if (!run_wizard(mainwin, FALSE))
+                       exit(1);
                account_read_config_all();
                if(!account_get_list())
                        exit_sylpheed(mainwin);

diff --git a/src/wizard.c b/src/wizard.c
index b0734b35dff8d5e2e27cb0deeb71f017f0bddc6e..33a82d7315c2247a179c3e33997dd128f0652afe 100644 (file)
--- a/src/wizard.c
+++ b/src/wizard.c
@@ -44,6 +44,7 @@
 #include "intl.h"
 #include "utils.h"
 #include "gtk/menu.h"
+#include "account.h"
 #include "prefs_account.h"
 #include "mainwindow.h"
 #include "stock_pixmap.h"
@@ -88,6 +89,8 @@ typedef struct
        
        gboolean create_mailbox;
        gboolean finished;
+       gboolean result;
+
 } WizardWindow;
 
 static void wizard_write_config(WizardWindow *wizard)
@@ -139,6 +142,7 @@ static void wizard_write_config(WizardWindow *wizard)
        account_list = g_list_append(account_list, prefs_account);
        prefs_account_write_config_all(account_list);
        prefs_account_free(prefs_account);
+       account_read_config_all();
 }
 
 static GtkWidget* create_page (WizardWindow *wizard, const char * title)
@@ -398,12 +402,14 @@ wizard_response_cb (GtkDialog * dialog, int response, gpointer data)
        if (response == CANCEL)
        {
                wizard->finished = TRUE;
+               wizard->result = FALSE;
                gtk_widget_destroy (GTK_WIDGET(dialog));
        }
        else if (response == FINISHED)
        {
                wizard_write_config(wizard);
                wizard->finished = TRUE;
+               wizard->result = TRUE;
                gtk_widget_destroy (GTK_WIDGET(dialog));
        }
        else
@@ -438,7 +444,8 @@ gboolean run_wizard(MainWindow *mainwin, gboolean create_mailbox) {
        GtkWidget *page;
        GtkWidget *widget;
        gchar     *text;
-       GSList     *cur;
+       GSList    *cur;
+       gboolean   result;
        
        wizard->mainwin = mainwin;
        wizard->create_mailbox = create_mailbox;
@@ -532,10 +539,12 @@ gboolean run_wizard(MainWindow *mainwin, gboolean create_mailbox) {
        while (!wizard->finished)
                gtk_main_iteration();
 
+       result = wizard->result;
+       
        GTK_EVENTS_FLUSH();
 
        gtk_widget_show(mainwin->window);
        g_free(wizard);
 
-       return TRUE;
+       return result;
 }