2005-02-25 [paul] 1.0.1cvs19.1
authorPaul Mangan <paul@claws-mail.org>
Fri, 25 Feb 2005 10:21:53 +0000 (10:21 +0000)
committerPaul Mangan <paul@claws-mail.org>
Fri, 25 Feb 2005 10:21:53 +0000 (10:21 +0000)
* ChangeLog.claws
* configure.ac
* src/prefs_account.c
* src/prefs_folder_item.c
* src/gtk/prefswindow.c
* src/gtk/prefswindow.h
sync with HEAD

ChangeLog-gtk2.claws
ChangeLog.claws
PATCHSETS
configure.ac
src/gtk/prefswindow.c
src/gtk/prefswindow.h
src/prefs_account.c
src/prefs_folder_item.c

index 797468b..c0054c8 100644 (file)
@@ -1,3 +1,13 @@
+2005-02-25 [paul]      1.0.1cvs19.1
+
+       * ChangeLog.claws
+       * configure.ac
+       * src/prefs_account.c
+       * src/prefs_folder_item.c
+       * src/gtk/prefswindow.c
+       * src/gtk/prefswindow.h
+               sync with HEAD
+
 2005-02-25 [paul]      1.0.1cvs15.12
 
        * src/alertpanel.c
index 26717fa..7965006 100644 (file)
@@ -1,3 +1,91 @@
+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
+               Don't send out receipts if offline. Ask.
+
+2005-02-23 [colin]     1.0.1cvs17
+
+       * src/compose.c
+               Encode parts when signing
+
+2005-02-23 [colin]     1.0.1cvs16
+
+       * src/compose.c
+       * src/procmsg.c
+               Fix mimeinfo leakages
+
+2005-02-21 [colin]     1.0.1cvs15
+
+       * src/compose.c
+               Fix signing/encrypting still on after
+               privacy system has been disabled
+
+2005-02-18 [colin]     1.0.1cvs14
+
+       * src/quote_fmt_lex.l
+       * src/quote_fmt_parse.y
+               Bugfix: Fix parser init (patch by Ivan)
+
+2005-02-18 [colin]     1.0.1cvs13
+
+       * src/plugins/pgpmime/pgpmime.c
+               Fix build (missed my `mv`)
+
+2005-02-18 [colin]     1.0.1cvs12
+
+       * src/Makefile.am
+       * src/privacy.c         ** RE-ADDED **
+       * src/privacy.cpp       ** REMOVED **
+       * src/privacy.h
+       * src/plugins/pgpmime/Makefile.am
+       * src/plugins/pgpmime/passphrase.h
+       * src/plugins/pgpmime/pgpmime.c         ** RE-ADDED **
+       * src/plugins/pgpmime/pgpmime.cpp       ** REMOVED **
+       * src/plugins/pgpmime/pgpmime.h
+       * src/plugins/pgpmime/prefs_gpg.h
+       * src/plugins/pgpmime/select-keys.h
+       * src/plugins/pgpmime/sgpgme.h
+               Revert huge API breakage.
+
+2005-02-16 [christoph] 1.0.1cvs11
+
+       * src/mh.c
+               add scan required function for MH folders
+
+       (Patch by Ivan Rayner <ivanr@sgi.com>)
+
+2005-02-15 [christoph] 1.0.1cvs10
+
+       * src/plugins/pgpmime/pgpmime.cpp
+       * src/plugins/pgpmime/pgpmime.h
+               add sign and encrypt functions
+
+2005-02-15 [christoph] 1.0.1cvs9
+
+       * configure.ac
+       * src/Makefile.am
+       * src/privacy.c                                 ** REMOVE **
+       * src/privacy.cpp                               ** NEW **
+       * src/privacy.h
+       * src/plugins/pgpmime/Makefile.am
+       * src/plugins/pgpmime/passphrase.h
+       * src/plugins/pgpmime/pgpmime.c                 ** REMOVE **
+       * src/plugins/pgpmime/pgpmime.cpp               ** NEW **
+       * src/plugins/pgpmime/pgpmime.h
+       * src/plugins/pgpmime/prefs_gpg.h
+       * src/plugins/pgpmime/select-keys.h
+       * src/plugins/pgpmime/sgpgme.h
+               change Privacy-API to C++
+
 2005-02-15 [colin]     1.0.1cvs8
 
        * src/mimeview.c
 2004-07-14 [christoph] 0.9.12cvs23
 
        * src/pgpmime.c
-               add missing fclose
+               add missing fclose. Patch by Thomas Gilgin.
 
        * src/procmime.c
                add checks if fopen really worked
index cf79063..611ee27 100644 (file)
--- a/PATCHSETS
+++ b/PATCHSETS
 ( cvs diff -u -r 1.94.2.46 -r 1.94.2.47 src/messageview.c; ) > 1.0.1cvs15.10.patchset
 ( cvs diff -u -r 1.1.2.4 -r 1.1.2.5 src/plugins/pgpmime/passphrase.c; ) > 1.0.1cvs15.11.patchset
 ( cvs diff -u -r 1.17.2.11 -r 1.17.2.12 src/alertpanel.c; cvs diff -u -r 1.65.2.24 -r 1.65.2.25 src/codeconv.c; cvs diff -u -r 1.382.2.107 -r 1.382.2.108 src/compose.c; cvs diff -u -r 1.96.2.48 -r 1.96.2.49 src/textview.c; cvs diff -u -r 1.5.2.9 -r 1.5.2.10 src/gtk/gtkutils.c; cvs diff -u -r 1.4.2.7 -r 1.4.2.8 src/gtk/gtkutils.h; cvs diff -u -r 1.1.4.7 -r 1.1.4.8 src/gtk/logwindow.c; cvs diff -u -r 1.1.4.7 -r 1.1.4.8 src/gtk/progressdialog.c; ) > 1.0.1cvs15.12.patchset
+( cvs diff -u -r 1.2504.2.49 -r 1.2504.2.50 ChangeLog.claws; cvs diff -u -r 1.654.2.437 -r 1.654.2.438 configure.ac; cvs diff -u -r 1.105.2.17 -r 1.105.2.18 src/prefs_account.c; cvs diff -u -r 1.52.2.9 -r 1.52.2.10 src/prefs_folder_item.c; cvs diff -u -r 1.12.2.16 -r 1.12.2.17 src/gtk/prefswindow.c; cvs diff -u -r 1.7.2.2 -r 1.7.2.3 src/gtk/prefswindow.h; ) > 1.0.1cvs19.1.patchset
index 2596bc4..b247ecc 100644 (file)
@@ -11,9 +11,9 @@ MINOR_VERSION=0
 MICRO_VERSION=1
 INTERFACE_AGE=0
 BINARY_AGE=0
-EXTRA_VERSION=15
+EXTRA_VERSION=19
 EXTRA_RELEASE=
-EXTRA_GTK2_VERSION=.12
+EXTRA_GTK2_VERSION=.1
 
 if test \( $EXTRA_VERSION -eq 0 \) -o \( "x$EXTRA_RELEASE" != "x" \); then
     VERSION=${MAJOR_VERSION}.${MINOR_VERSION}.${MICRO_VERSION}${EXTRA_RELEASE}${EXTRA_GTK2_VERSION}
index ffb5211..345f236 100644 (file)
@@ -95,6 +95,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;
@@ -133,8 +147,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)
index 786ae9c..ce8cdb1 100644 (file)
@@ -28,6 +28,8 @@ 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,6 +41,7 @@ struct _PrefsPage
        PrefsCreateWidgetFunc     create_widget;
        PrefsDestroyWidgetFunc    destroy_widget;
        PrefsSavePageFunc         save_page;
+       PrefsCanClosePageFunc     can_close;
 };
 
 void prefswindow_open_full             (const gchar *title, 
index c06ffc6..663ce6c 100644 (file)
@@ -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);
 }
index 1df7415..2f957ae 100644 (file)
@@ -763,11 +763,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;
@@ -780,11 +779,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;