* src/main.c
* src/wizard.c
Fix account folders duplication
+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
2004-08-25 [colin] 0.9.12cvs82.2
* src/wizard.c
( 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.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
BINARY_AGE=0
EXTRA_VERSION=82
EXTRA_RELEASE=
BINARY_AGE=0
EXTRA_VERSION=82
EXTRA_RELEASE=
if test \( $EXTRA_VERSION -eq 0 \) -o \( "x$EXTRA_RELEASE" != "x" \); then
VERSION=${MAJOR_VERSION}.${MINOR_VERSION}.${MICRO_VERSION}${EXTRA_RELEASE}${EXTRA_GTK2_VERSION}
if test \( $EXTRA_VERSION -eq 0 \) -o \( "x$EXTRA_RELEASE" != "x" \); then
VERSION=${MAJOR_VERSION}.${MINOR_VERSION}.${MICRO_VERSION}${EXTRA_RELEASE}${EXTRA_GTK2_VERSION}
lock_socket_input_cb,
mainwin);
lock_socket_input_cb,
mainwin);
+ account_read_config_all();
+
if (folder_read_list() < 0) {
if (folder_read_list() < 0) {
- run_wizard(mainwin, TRUE);
+ if (!run_wizard(mainwin, TRUE))
+ exit(1);
-
- account_read_config_all();
-
if (!account_get_list()) {
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);
account_read_config_all();
if(!account_get_list())
exit_sylpheed(mainwin);
#include "intl.h"
#include "utils.h"
#include "gtk/menu.h"
#include "intl.h"
#include "utils.h"
#include "gtk/menu.h"
#include "prefs_account.h"
#include "mainwindow.h"
#include "stock_pixmap.h"
#include "prefs_account.h"
#include "mainwindow.h"
#include "stock_pixmap.h"
gboolean create_mailbox;
gboolean finished;
gboolean create_mailbox;
gboolean finished;
} WizardWindow;
static void wizard_write_config(WizardWindow *wizard)
} WizardWindow;
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_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)
}
static GtkWidget* create_page (WizardWindow *wizard, const char * title)
if (response == CANCEL)
{
wizard->finished = TRUE;
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;
gtk_widget_destroy (GTK_WIDGET(dialog));
}
else if (response == FINISHED)
{
wizard_write_config(wizard);
wizard->finished = TRUE;
gtk_widget_destroy (GTK_WIDGET(dialog));
}
else
gtk_widget_destroy (GTK_WIDGET(dialog));
}
else
GtkWidget *page;
GtkWidget *widget;
gchar *text;
GtkWidget *page;
GtkWidget *widget;
gchar *text;
+ GSList *cur;
+ gboolean result;
wizard->mainwin = mainwin;
wizard->create_mailbox = create_mailbox;
wizard->mainwin = mainwin;
wizard->create_mailbox = create_mailbox;
while (!wizard->finished)
gtk_main_iteration();
while (!wizard->finished)
gtk_main_iteration();
+ result = wizard->result;
+
GTK_EVENTS_FLUSH();
gtk_widget_show(mainwin->window);
g_free(wizard);
GTK_EVENTS_FLUSH();
gtk_widget_show(mainwin->window);
g_free(wizard);