2005-10-19 [paul] 1.9.15cvs74

	* src/folder.c
	* src/folderview.c
		fix summaryview update
		Patch by Colin

diff --git a/ChangeLog-gtk2.claws b/ChangeLog-gtk2.claws
index b64e7212fbc338dc3b0a4e527a049fc8b678976b..442f0fd23fda1dc41e1ebaffd82f6415ef1b306d 100644 (file)
--- a/ChangeLog-gtk2.claws
+++ b/ChangeLog-gtk2.claws
@@ -1,3 +1,10 @@
+2005-10-19 [paul]      1.9.15cvs74
+
+       * src/folder.c
+       * src/folderview.c
+               fix summaryview update
+               Patch by Colin
+

 2005-10-18 [colin]     1.9.15cvs73
 
        * src/plugins/pgpcore/passphrase.c
 2005-10-18 [colin]     1.9.15cvs73
 
        * src/plugins/pgpcore/passphrase.c

diff --git a/PATCHSETS b/PATCHSETS
index 936e2254ba0ba1db028d637dd0977e6fbe3f50e6..7eb7a97e63f325c5c504a4eaceae8c7dedb74283 100644 (file)
--- a/PATCHSETS
+++ b/PATCHSETS
@@ -910,3 +910,4 @@
 ( cvs diff -u -r 1.83.2.46 -r 1.83.2.47 src/mimeview.c;  ) > 1.9.15cvs71.patchset
 ( cvs diff -u -r 1.155.2.32 -r 1.155.2.33 src/Makefile.am;  cvs diff -u -r 1.9.2.5 -r 1.9.2.6 src/addressadd.c;  cvs diff -u -r 1.60.2.37 -r 1.60.2.38 src/addressbook.c;  cvs diff -u -r 1.207.2.73 -r 1.207.2.74 src/folderview.c;  cvs diff -u -r 1.14.2.11 -r 1.14.2.12 src/grouplistdialog.c;  cvs diff -u -r 1.83.2.47 -r 1.83.2.48 src/mimeview.c;  cvs diff -u -r 1.25.2.18 -r 1.25.2.19 src/stock_pixmap.c;  cvs diff -u -r 1.18.2.12 -r 1.18.2.13 src/stock_pixmap.h;  cvs diff -u -r 1.395.2.140 -r 1.395.2.141 src/summaryview.c;  cvs diff -u -r 1.1.4.9 -r 1.1.4.10 src/gtk/gtksctree.c;  cvs diff -u -r 1.1.4.3 -r 1.1.4.4 src/gtk/gtksctree.h;  diff -u /dev/null src/pixmaps/empty.xpm;  ) > 1.9.15cvs72.patchset
 ( cvs diff -u -r 1.1.2.6 -r 1.1.2.7 src/plugins/pgpcore/passphrase.c;  ) > 1.9.15cvs73.patchset
 ( cvs diff -u -r 1.83.2.46 -r 1.83.2.47 src/mimeview.c;  ) > 1.9.15cvs71.patchset
 ( cvs diff -u -r 1.155.2.32 -r 1.155.2.33 src/Makefile.am;  cvs diff -u -r 1.9.2.5 -r 1.9.2.6 src/addressadd.c;  cvs diff -u -r 1.60.2.37 -r 1.60.2.38 src/addressbook.c;  cvs diff -u -r 1.207.2.73 -r 1.207.2.74 src/folderview.c;  cvs diff -u -r 1.14.2.11 -r 1.14.2.12 src/grouplistdialog.c;  cvs diff -u -r 1.83.2.47 -r 1.83.2.48 src/mimeview.c;  cvs diff -u -r 1.25.2.18 -r 1.25.2.19 src/stock_pixmap.c;  cvs diff -u -r 1.18.2.12 -r 1.18.2.13 src/stock_pixmap.h;  cvs diff -u -r 1.395.2.140 -r 1.395.2.141 src/summaryview.c;  cvs diff -u -r 1.1.4.9 -r 1.1.4.10 src/gtk/gtksctree.c;  cvs diff -u -r 1.1.4.3 -r 1.1.4.4 src/gtk/gtksctree.h;  diff -u /dev/null src/pixmaps/empty.xpm;  ) > 1.9.15cvs72.patchset
 ( cvs diff -u -r 1.1.2.6 -r 1.1.2.7 src/plugins/pgpcore/passphrase.c;  ) > 1.9.15cvs73.patchset

+( cvs diff -u -r 1.213.2.64 -r 1.213.2.65 src/folder.c;  cvs diff -u -r 1.207.2.74 -r 1.207.2.75 src/folderview.c;  ) > 1.9.15cvs74.patchset

diff --git a/configure.ac b/configure.ac
index 9c222a72b787d78b4a927677b10811947a1e4fe5..a63069ad5014b7ac34e880e7b5d65e4c3b17ac72 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -11,7 +11,7 @@ MINOR_VERSION=9
 MICRO_VERSION=15
 INTERFACE_AGE=0
 BINARY_AGE=0
 MICRO_VERSION=15
 INTERFACE_AGE=0
 BINARY_AGE=0

-EXTRA_VERSION=73
+EXTRA_VERSION=74

 EXTRA_RELEASE=
 EXTRA_GTK2_VERSION=
 
 EXTRA_RELEASE=
 EXTRA_GTK2_VERSION=
 

diff --git a/src/folder.c b/src/folder.c
index be7a5f008770b91c81f4c043fbc1a54b55aeda1e..45227f8b02e6e013b6d7856f057bdd5c8a2d01c2 100644 (file)
--- a/src/folder.c
+++ b/src/folder.c
@@ -1497,9 +1497,8 @@ gint folder_item_open(FolderItem *item)
 {
        g_return_val_if_fail(item->no_select == FALSE, -1);
 
 {
        g_return_val_if_fail(item->no_select == FALSE, -1);
 

-       /* caller of folder_item_open *must* call 
-        * folder_item_process_open after ! */

        item->processing_pending = TRUE;
        item->processing_pending = TRUE;

+       folder_item_process_open (item, NULL, NULL, NULL);

        
        item->opened = TRUE;
 
        
        item->opened = TRUE;
 

diff --git a/src/folderview.c b/src/folderview.c
index f7b5344a9b2ef66688672a002a24c33d4996856a..743c4667002f91a6dc702d6200319972ca090f22 100644 (file)
--- a/src/folderview.c
+++ b/src/folderview.c
@@ -1846,44 +1846,6 @@ static void summary_thaw_for_proc(gpointer data)
        gtk_clist_thaw(GTK_CLIST(folderview->summaryview->ctree));
 }
 
        gtk_clist_thaw(GTK_CLIST(folderview->summaryview->ctree));
 }
 

-void folderview_process_open(FolderView *folderview, FolderItem *item)
-{
-       if (!item)
-               return;
-
-       folder_item_update_freeze();
-       folder_item_process_open(item, 
-               summary_freeze_for_proc,
-               summary_thaw_for_proc,
-               folderview);
-       folder_item_update_thaw();
-       
-       return; 
-}
-
-#if 0
-gboolean folderview_process_open_cb(gpointer data)
-{
-       FolderView *folderview = (FolderView *)data;
-       FolderItem *item = NULL;
-       
-       if (!folderview || !folderview->opened) {
-               debug_print("opened NULL\n");
-               return FALSE;
-       }
-       item = gtk_ctree_node_get_row_data(
-               GTK_CTREE(folderview->ctree), 
-               folderview->opened);
-       
-       if (!item)
-               return FALSE;
-
-       folderview_process_open(folderview, item);
-       
-       return FALSE;   
-}
-#endif
-

 static void folderview_selected(GtkCTree *ctree, GtkCTreeNode *row,
                                gint column, FolderView *folderview)
 {
 static void folderview_selected(GtkCTree *ctree, GtkCTreeNode *row,
                                gint column, FolderView *folderview)
 {


@@ -1971,8 +1933,6 @@ static void folderview_selected(GtkCTree *ctree, GtkCTreeNode *row,
                return;
         }
        
                return;
         }
        

-       folderview_process_open(folderview, item);
-

        main_window_cursor_normal(folderview->mainwin);
 
        /* Show messages */
        main_window_cursor_normal(folderview->mainwin);
 
        /* Show messages */