2005-02-25 [paul] 1.0.1cvs19

	* src/prefs_account.c
	* src/prefs_folder_item.c
	* src/gtk/prefswindow.c
	* src/gtk/prefswindow.h
		fix bug 698 'Clicking OK without username 'crashes'
		account edit window'. Patch by Alfons

diff --git a/ChangeLog.claws b/ChangeLog.claws
index 5754afbaee50fc2635d252e487cbfed9639fbc40..7965006f6a90cc50b083de89bd025d0d30a3f830 100644 (file)
--- a/ChangeLog.claws
+++ b/ChangeLog.claws
@@ -1,3 +1,12 @@
+2005-02-25 [paul]      1.0.1cvs19
+
+       * src/prefs_account.c
+       * src/prefs_folder_item.c
+       * src/gtk/prefswindow.c
+       * src/gtk/prefswindow.h
+               fix bug 698 'Clicking OK without username 'crashes'
+               account edit window'. Patch by Alfons
+
 2005-02-24 [colin]     1.0.1cvs18
 
        * src/messageview.c

diff --git a/PATCHSETS b/PATCHSETS
index a6b2ea36d4e97c9bfa3c679c36214a02df46ea46..daec3f690f38b0505db75547014bb35d10081fe6 100644 (file)
--- a/PATCHSETS
+++ b/PATCHSETS
@@ -256,3 +256,4 @@
 ( cvs diff -u -r 1.477 -r 1.478 src/compose.c; cvs diff -u -r 1.177 -r 1.178 src/procmsg.c; ) > 1.0.1cvs16.patchset
 ( cvs diff -u -r 1.478 -r 1.479 src/compose.c; ) > 1.0.1cvs17.patchset
 ( cvs diff -u -r 1.134 -r 1.135 src/messageview.c; ) > 1.0.1cvs18.patchset
+( cvs diff -u -r 1.123 -r 1.124 src/prefs_account.c; cvs diff -u -r 1.63 -r 1.64 src/prefs_folder_item.c; cvs diff -u -r 1.20 -r 1.21 src/gtk/prefswindow.c; cvs diff -u -r 1.9 -r 1.10 src/gtk/prefswindow.h; ) > 1.0.1cvs19.patchset

diff --git a/configure.ac b/configure.ac
index df18a2c5e21aa9589dd75220e16e948b5ad2bbb4..83f3a27412b81c6b9a542261002a9c4a31f3a29e 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -11,7 +11,7 @@ MINOR_VERSION=0
 MICRO_VERSION=1
 INTERFACE_AGE=0
 BINARY_AGE=0
-EXTRA_VERSION=18
+EXTRA_VERSION=19
 EXTRA_RELEASE=
 
 if test \( $EXTRA_VERSION -eq 0 \) -o \( "x$EXTRA_RELEASE" != "x" \); then

diff --git a/src/gtk/prefswindow.c b/src/gtk/prefswindow.c
index 42f6dcd24e55c6edd52d29d49f41d15bb84a2910..78f7a0e236a9391fd56677837c7000775c191516 100644 (file)
--- a/src/gtk/prefswindow.c
+++ b/src/gtk/prefswindow.c
@@ -117,6 +117,20 @@ static void save_all_pages(GSList *prefs_pages)
        }
 }
 
+static gboolean query_can_close_all_pages(GSList *prefs_pages)
+{
+       GSList *cur;
+
+       for (cur = prefs_pages; cur != NULL; cur = g_slist_next(cur)) {
+               PrefsPage *page = (PrefsPage *) cur->data;
+
+               if (page->can_close)
+                       if (!page->can_close(page))
+                               return FALSE;
+       }
+       return TRUE;
+}
+
 static void close_all_pages(GSList *prefs_pages)
 {
        GSList *cur;
@@ -154,8 +168,10 @@ static void ok_button_released(GtkButton *button, gpointer user_data)
 {
        PrefsWindow *prefswindow = (PrefsWindow *) user_data;
 
-       save_all_pages(prefswindow->prefs_pages);
-       close_prefs_window(prefswindow);
+       if (query_can_close_all_pages(prefswindow->prefs_pages)) {
+               save_all_pages(prefswindow->prefs_pages);
+               close_prefs_window(prefswindow);
+       }               
 }
 
 static void cancel_button_released(GtkButton *button, gpointer user_data)

diff --git a/src/gtk/prefswindow.h b/src/gtk/prefswindow.h
index b3122ab12fd4b7184351b8e4b65e332f9ca15238..93f4b89381f446f3c353e61f8b940215a2f3bdc9 100644 (file)
--- a/src/gtk/prefswindow.h
+++ b/src/gtk/prefswindow.h
@@ -28,6 +28,7 @@ typedef struct _PrefsPage PrefsPage;
 typedef void (*PrefsCreateWidgetFunc) (PrefsPage *, GtkWindow *window, gpointer);
 typedef void (*PrefsDestroyWidgetFunc) (PrefsPage *);
 typedef void (*PrefsSavePageFunc) (PrefsPage *);
+typedef gboolean (*PrefsCanClosePageFunc) (PrefsPage *);
 
 struct _PrefsPage
 {
@@ -39,12 +40,14 @@ struct _PrefsPage
        PrefsCreateWidgetFunc     create_widget;
        PrefsDestroyWidgetFunc    destroy_widget;
        PrefsSavePageFunc         save_page;
+       PrefsCanClosePageFunc     can_close;
 };
 
 void prefswindow_open_full             (const gchar *title, 
                                         GSList *prefs_pages,
                                         gpointer data,
                                         GtkDestroyNotify func);
+
 void prefswindow_open                  (const gchar *title, 
                                         GSList *prefs_pages,
                                         gpointer data);

diff --git a/src/prefs_account.c b/src/prefs_account.c
index f0a11c966e0ace7f626695469a7c8b02d6781b23..7cbbe28b0aecaf9df7e6f9f0880284f307cdf561 100644 (file)
--- a/src/prefs_account.c
+++ b/src/prefs_account.c
@@ -658,6 +658,11 @@ static void destroy_widget_func(PrefsPage *_page)
        gtk_container_remove(GTK_CONTAINER (page->vbox), notebook);
 }
 
+static gboolean can_close_func(PrefsPage *page_)
+{      
+       return prefs_account_apply() >= 0;
+}
+
 static void save_func(PrefsPage * _page)
 {
        if (prefs_account_apply() >= 0)
@@ -676,6 +681,7 @@ void prefs_account_init()
         account_page.page.create_widget = create_widget_func;
         account_page.page.destroy_widget = destroy_widget_func;
         account_page.page.save_page = save_func;
+       account_page.page.can_close = can_close_func;
 
         prefs_account_register_page((PrefsPage *) &account_page);
 }

diff --git a/src/prefs_folder_item.c b/src/prefs_folder_item.c
index 9b52af6f5002c4760ac1b64aabce6f2e9120d099..9164f0ac100f9dd67821372b6e02d265751bc042 100644 (file)
--- a/src/prefs_folder_item.c
+++ b/src/prefs_folder_item.c
@@ -759,11 +759,10 @@ static void folder_color_set_dialog(GtkWidget *widget, gpointer data)
 }
 
 
-FolderItemGeneralPage folder_item_general_page;
-
 static void register_general_page()
 {
        static gchar *pfi_general_path[2];
+       static FolderItemGeneralPage folder_item_general_page;
 
        pfi_general_path[0] = _("General");
        pfi_general_path[1] = NULL;
@@ -776,11 +775,11 @@ static void register_general_page()
        prefs_folder_item_register_page((PrefsPage *) &folder_item_general_page);
 }
 
-FolderItemComposePage folder_item_compose_page;
 
 static void register_compose_page(void)
 {
        static gchar *pfi_compose_path[2];
+       static FolderItemComposePage folder_item_compose_page;
 
        pfi_compose_path[0] = _("Compose");
        pfi_compose_path[1] = NULL;