2006-10-02 [colin] 2.5.2cvs34

	* src/mh.c
		Time mh_write_sequences() - it's fast
	* src/summaryview.c
		Init a variable to shut up gcc

diff --git a/ChangeLog b/ChangeLog
index 607bf385f43542c32e34abf255a865aba92c9a51..3ac65737efeed73fc06b059de272f37b9d7f2d35 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2006-10-02 [colin]     2.5.2cvs34
+
+       * src/mh.c
+               Time mh_write_sequences() - it's fast
+       * src/summaryview.c
+               Init a variable to shut up gcc
+
 2006-10-01 [colin]     2.5.2cvs33
 
        * src/folder.c

diff --git a/PATCHSETS b/PATCHSETS
index 99355e6c2b1ec0a6adbbda4720952889cf7439df..d93d04aea488844949580b94edc628373f665945 100644 (file)
--- a/PATCHSETS
+++ b/PATCHSETS
@@ -1947,3 +1947,4 @@
 ( cvs diff -u -r 1.16.2.41 -r 1.16.2.42 src/msgcache.c;  ) > 2.5.2cvs31.patchset
 ( cvs diff -u -r 1.79.2.44 -r 1.79.2.45 src/mh.c;  cvs diff -u -r 1.16.2.42 -r 1.16.2.43 src/msgcache.c;  ) > 2.5.2cvs32.patchset
 ( cvs diff -u -r 1.213.2.118 -r 1.213.2.119 src/folder.c;  cvs diff -u -r 1.79.2.45 -r 1.79.2.46 src/mh.c;  cvs diff -u -r 1.9.2.3 -r 1.9.2.4 src/mh.h;  cvs diff -u -r 1.16.2.43 -r 1.16.2.44 src/msgcache.c;  ) > 2.5.2cvs33.patchset
+( cvs diff -u -r 1.79.2.46 -r 1.79.2.47 src/mh.c;  cvs diff -u -r 1.395.2.259 -r 1.395.2.260 src/summaryview.c;  ) > 2.5.2cvs34.patchset

diff --git a/configure.ac b/configure.ac
index c87ac8669811a90448a1d11aeb7791311dcdc920..ef62708daa007c5db3ff21fa9dd42befff24aed2 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -11,7 +11,7 @@ MINOR_VERSION=5
 MICRO_VERSION=2
 INTERFACE_AGE=0
 BINARY_AGE=0
-EXTRA_VERSION=33
+EXTRA_VERSION=34
 EXTRA_RELEASE=
 EXTRA_GTK2_VERSION=
 

diff --git a/src/mh.c b/src/mh.c
index 0854d593794caa58d626548776ba6601be9915eb..72c368c93a90bba306c892d9afa10f97f19103df 100644 (file)
--- a/src/mh.c
+++ b/src/mh.c
@@ -30,12 +30,7 @@
 #include <unistd.h>
 #include <string.h>
 #include <errno.h>
-
-#undef MEASURE_TIME
-
-#ifdef MEASURE_TIME
-#  include <sys/time.h>
-#endif
+#include <time.h>
 
 #include "folder.h"
 #include "mh.h"
@@ -45,6 +40,7 @@
 #include "codeconv.h"
 #include "statusbar.h"
 #include "gtkutils.h"
+#include "timing.h"
 
 /* Define possible missing constants for Windows. */
 #ifdef G_OS_WIN32
@@ -1322,10 +1318,8 @@ static void mh_write_sequences(FolderItem *item, gboolean remove_unseen)
        FILE *mh_sequences_old_fp, *mh_sequences_new_fp;
        gchar buf[BUFFSIZE];
        gchar *path = NULL;
-/*
-       GTimer *timer = g_timer_new();
-       g_timer_start(timer);
-*/
+       START_TIMING("");
+
        if (!item)
                return;
        
@@ -1400,11 +1394,8 @@ static void mh_write_sequences(FolderItem *item, gboolean remove_unseen)
        g_free(mh_sequences_old);
        g_free(mh_sequences_new);
        g_free(path);
-/*
-       g_timer_stop(timer);
-       printf("mh_get_flags: %f secs\n", g_timer_elapsed(timer, NULL));
-       g_timer_destroy(timer);
-*/
+
+       END_TIMING();
 }
 
 static int mh_item_close(Folder *folder, FolderItem *item)

diff --git a/src/summaryview.c b/src/summaryview.c
index 6a598c74a9338b2d4695ec0197add901da515941..ff260a2d191b0e05204d64b266e2e34dbb952cb0 100644 (file)
--- a/src/summaryview.c
+++ b/src/summaryview.c
@@ -2564,7 +2564,7 @@ static void summary_set_ctree_from_list(SummaryView *summaryview,
        MsgInfo *msginfo;
        GtkCTreeNode *node = NULL;
        GHashTable *msgid_table;
-       GHashTable *subject_table;
+       GHashTable *subject_table = NULL;
        GSList * cur;
        START_TIMING("");