2006-09-30 [colin] 2.5.2cvs29

	* src/folder.c
	* src/mh.c
		Debug forced mtime changes

diff --git a/ChangeLog b/ChangeLog
index 63aa7b1b2970292ecdd1a5560c98ad7204999c06..e24da88629ced79898d7518c9a42c23e3414794e 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2006-09-30 [colin]     2.5.2cvs29
+
+       * src/folder.c
+       * src/mh.c
+               Debug forced mtime changes
+

 2006-09-30 [colin]     2.5.2cvs28
 
        * src/folder.c
 2006-09-30 [colin]     2.5.2cvs28
 
        * src/folder.c

diff --git a/PATCHSETS b/PATCHSETS
index 177622ec83dff9524c5f7c70efbdfa633be8028a..4fe3bf574fdf42d2629676540aa1dab352fac309 100644 (file)
--- a/PATCHSETS
+++ b/PATCHSETS
@@ -1942,3 +1942,4 @@
 ( cvs diff -u -r 1.79.2.41 -r 1.79.2.42 src/mh.c;  ) > 2.5.2cvs26.patchset
 ( cvs diff -u -r 1.79.2.42 -r 1.79.2.43 src/mh.c;  ) > 2.5.2cvs27.patchset
 ( cvs diff -u -r 1.213.2.116 -r 1.213.2.117 src/folder.c;  cvs diff -u -r 1.115.2.106 -r 1.115.2.107 src/main.c;  ) > 2.5.2cvs28.patchset
 ( cvs diff -u -r 1.79.2.41 -r 1.79.2.42 src/mh.c;  ) > 2.5.2cvs26.patchset
 ( cvs diff -u -r 1.79.2.42 -r 1.79.2.43 src/mh.c;  ) > 2.5.2cvs27.patchset
 ( cvs diff -u -r 1.213.2.116 -r 1.213.2.117 src/folder.c;  cvs diff -u -r 1.115.2.106 -r 1.115.2.107 src/main.c;  ) > 2.5.2cvs28.patchset

+( cvs diff -u -r 1.213.2.117 -r 1.213.2.118 src/folder.c;  cvs diff -u -r 1.79.2.43 -r 1.79.2.44 src/mh.c;  ) > 2.5.2cvs29.patchset

diff --git a/configure.ac b/configure.ac
index a924eb0495294d329ef7ef9ede9832b047dfe469..6f5bc72066e24faf92cdcec845e1d4246e496602 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -11,7 +11,7 @@ MINOR_VERSION=5
 MICRO_VERSION=2
 INTERFACE_AGE=0
 BINARY_AGE=0
 MICRO_VERSION=2
 INTERFACE_AGE=0
 BINARY_AGE=0

-EXTRA_VERSION=28
+EXTRA_VERSION=29

 EXTRA_RELEASE=
 EXTRA_GTK2_VERSION=
 
 EXTRA_RELEASE=
 EXTRA_GTK2_VERSION=
 

diff --git a/src/folder.c b/src/folder.c
index 50ed506159e1909deedc04da1eedb9c678ee938c..ae856f97a2051ef15a7d4a2028324f3572a5a355 100644 (file)
--- a/src/folder.c
+++ b/src/folder.c
@@ -2303,8 +2303,10 @@ void folder_item_write_cache(FolderItem *item)
         }
 
        if (!need_scan && FOLDER_TYPE(item->folder) == F_MH) {
         }
 
        if (!need_scan && FOLDER_TYPE(item->folder) == F_MH) {

-               if (item->mtime == last_mtime)
+               if (item->mtime == last_mtime) {

                        item->mtime = time(NULL);
                        item->mtime = time(NULL);

+                       debug_print("MH: forced mtime of %s to %ld\n", item->name, item->mtime);
+               }

        }
 
        g_free(cache_file);
        }
 
        g_free(cache_file);

diff --git a/src/mh.c b/src/mh.c
index 86a28f33d74cbb15f7faccc7c4fa4e9d01cbda4f..bbed7e84f97e410e1a22b36eb768c1a89998249f 100644 (file)
--- a/src/mh.c
+++ b/src/mh.c
@@ -311,6 +311,7 @@ gint mh_get_num_list(Folder *folder, FolderItem *item, GSList **list, gboolean *
        closedir(dp);
 
        item->mtime = time(NULL);
        closedir(dp);
 
        item->mtime = time(NULL);

+       debug_print("MH: forced mtime of %s to %ld\n", item->name, item->mtime);

        return nummsgs;
 }
 
        return nummsgs;
 }
 


@@ -575,9 +576,10 @@ static gint mh_copy_msgs(Folder *folder, FolderItem *dest, MsgInfoList *msglist,
        g_free(srcpath);
        mh_write_sequences(dest, TRUE);
 
        g_free(srcpath);
        mh_write_sequences(dest, TRUE);
 

-       if (dest->mtime == last_mtime && !dest_need_scan)
+       if (dest->mtime == last_mtime && !dest_need_scan) {

                dest->mtime = time(NULL);
                dest->mtime = time(NULL);

-       
+               debug_print("MH: forced mtime of %s to %ld\n", dest->name, dest->mtime);
+       }

        if (total > 100) {
                statusbar_progress_all(0,0,0);
                statusbar_pop_all();
        if (total > 100) {
                statusbar_progress_all(0,0,0);
                statusbar_pop_all();


@@ -614,9 +616,10 @@ static gint mh_remove_msg(Folder *folder, FolderItem *item, gint num)
                return -1;
        }
 
                return -1;
        }
 

-       if (item->mtime == last_mtime && !need_scan)
+       if (item->mtime == last_mtime && !need_scan) {

                item->mtime = time(NULL);
                item->mtime = time(NULL);

-
+               debug_print("MH: forced mtime of %s to %ld\n", item->name, item->mtime);
+       }

        g_free(file);
        return 0;
 }
        g_free(file);
        return 0;
 }


@@ -673,8 +676,10 @@ static gint mh_remove_msgs(Folder *folder, FolderItem *item,
                statusbar_progress_all(0,0,0);
                statusbar_pop_all();
        }
                statusbar_progress_all(0,0,0);
                statusbar_pop_all();
        }

-       if (item->mtime == last_mtime && !need_scan)
+       if (item->mtime == last_mtime && !need_scan) {

                item->mtime = time(NULL);
                item->mtime = time(NULL);

+               debug_print("MH: forced mtime of %s to %ld\n", item->name, item->mtime);
+       }

 
        g_free(path);
        return 0;
 
        g_free(path);
        return 0;


@@ -1123,6 +1128,7 @@ static void mh_scan_tree_recursive(FolderItem *item)
 #endif
 
        item->mtime = time(NULL);
 #endif
 
        item->mtime = time(NULL);

+       debug_print("MH: forced mtime of %s to %ld\n", item->name, item->mtime);

 }
 
 static gboolean mh_rename_folder_func(GNode *node, gpointer data)
 }
 
 static gboolean mh_rename_folder_func(GNode *node, gpointer data)


@@ -1409,8 +1415,10 @@ static int mh_item_close(Folder *folder, FolderItem *item)
 
        mh_write_sequences(item, FALSE);
 
 
        mh_write_sequences(item, FALSE);
 

-       if (item->mtime == last_mtime && !need_scan)
+       if (item->mtime == last_mtime && !need_scan) {

                item->mtime = time(NULL);
                item->mtime = time(NULL);

+               debug_print("MH: forced mtime of %s to %ld\n", item->name, item->mtime);
+       }

 
        return 0;
 }
 
        return 0;
 }