2012-05-11 [colin] 3.8.0cvs40

	* src/mimeview.c
	* src/common/utils.c
		Fix bug 2659, 'E-mail attachments are handled
		inconsistently'
		Fix problems iterating the mime tree, and determine
		whether a file is an email without To:

diff --git a/ChangeLog b/ChangeLog
index 4c5f8344073b7f4de437f8dff717f7fbf5016ecf..346d9a869ef44b3fd5719a676c065e0eb4c50e86 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,12 @@
+2012-05-11 [colin]     3.8.0cvs40
+
+       * src/mimeview.c
+       * src/common/utils.c
+               Fix bug 2659, 'E-mail attachments are handled
+               inconsistently'
+               Fix problems iterating the mime tree, and determine
+               whether a file is an email without To:
+

 2012-04-03 [colin]     3.8.0cvs39
 
        * src/Makefile.am
 2012-04-03 [colin]     3.8.0cvs39
 
        * src/Makefile.am

diff --git a/PATCHSETS b/PATCHSETS
index 32c8217760ee8b73906e2766ce665ef061d28095..efb7e98effd1bfedfeee9d9b461a451eadf3187b 100644 (file)
--- a/PATCHSETS
+++ b/PATCHSETS
@@ -4356,3 +4356,4 @@
 ( cvs diff -u -r 1.382.2.599 -r 1.382.2.600 src/compose.c;  ) > 3.8.0cvs37.patchset
 ( cvs diff -u -r 1.155.2.99 -r 1.155.2.100 src/Makefile.am;  ) > 3.8.0cvs38.patchset
 ( cvs diff -u -r 1.155.2.100 -r 1.155.2.101 src/Makefile.am;  ) > 3.8.0cvs39.patchset
 ( cvs diff -u -r 1.382.2.599 -r 1.382.2.600 src/compose.c;  ) > 3.8.0cvs37.patchset
 ( cvs diff -u -r 1.155.2.99 -r 1.155.2.100 src/Makefile.am;  ) > 3.8.0cvs38.patchset
 ( cvs diff -u -r 1.155.2.100 -r 1.155.2.101 src/Makefile.am;  ) > 3.8.0cvs39.patchset

+( cvs diff -u -r 1.83.2.188 -r 1.83.2.189 src/mimeview.c;  cvs diff -u -r 1.36.2.195 -r 1.36.2.196 src/common/utils.c;  ) > 3.8.0cvs40.patchset

diff --git a/configure.ac b/configure.ac
index b81cd9187675135bf55c1ee05b228916414113ac..3bba8a7900431874bcd6c680457a9b27e7e50bbd 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -12,7 +12,7 @@ MINOR_VERSION=8
 MICRO_VERSION=0
 INTERFACE_AGE=0
 BINARY_AGE=0
 MICRO_VERSION=0
 INTERFACE_AGE=0
 BINARY_AGE=0

-EXTRA_VERSION=39
+EXTRA_VERSION=40

 EXTRA_RELEASE=
 EXTRA_GTK2_VERSION=
 
 EXTRA_RELEASE=
 EXTRA_GTK2_VERSION=
 

diff --git a/src/common/utils.c b/src/common/utils.c
index d5a5a9483e388c16783f60e4006083dc930c5f48..3b82ed01ff7c1aaea29bd9c62d909853e73d1f1a 100644 (file)
--- a/src/common/utils.c
+++ b/src/common/utils.c
@@ -4844,9 +4844,11 @@ gboolean file_is_email (const gchar *filename)
               && fgets(buffer, sizeof (buffer), fp) > 0) {
                if (!strncmp(buffer, "From:", strlen("From:")))
                        score++;
               && fgets(buffer, sizeof (buffer), fp) > 0) {
                if (!strncmp(buffer, "From:", strlen("From:")))
                        score++;

-               if (!strncmp(buffer, "To:", strlen("To:")))
+               else if (!strncmp(buffer, "Date:", strlen("Date:")))

                        score++;
                        score++;

-               if (!strncmp(buffer, "Subject:", strlen("Subject:")))
+               else if (!strncmp(buffer, "Message-ID:", strlen("Message-ID:")))
+                       score++;
+               else if (!strncmp(buffer, "Subject:", strlen("Subject:")))

                        score++;
                i++;
        }
                        score++;
                i++;
        }

diff --git a/src/mimeview.c b/src/mimeview.c
index 0ab2c887e0f76dc112e0fc9e77accb84bb76c383..4773efd427087b73404e49c4f500b825e38c213e 100644 (file)
--- a/src/mimeview.c
+++ b/src/mimeview.c
@@ -630,10 +630,15 @@ static gboolean mimeview_tree_next(GtkTreeModel *model, GtkTreePath *path)
        has_parent = gtk_tree_model_iter_parent(model, &parent, &iter);
        
        if (!gtk_tree_model_iter_next(model, &iter)) {
        has_parent = gtk_tree_model_iter_parent(model, &parent, &iter);
        
        if (!gtk_tree_model_iter_next(model, &iter)) {

-               if (has_parent && gtk_tree_model_iter_next(model, &parent)) {
+               while (has_parent) {
+                       GtkTreeIter saved_parent = parent;

                        gtk_tree_path_up(path);
                        gtk_tree_path_up(path);

-                       gtk_tree_path_next(path);
-                       return TRUE;
+                       if (gtk_tree_model_iter_next(model, &parent)) {
+                               gtk_tree_path_next(path);
+                               return TRUE;
+                       } else {
+                               has_parent = gtk_tree_model_iter_parent(model, &parent, &saved_parent);
+                       }

                }
                
        } else {
                }
                
        } else {