subject threading not when subject starts with "Re: "

diff --git a/ChangeLog.claws b/ChangeLog.claws
index 1cdfbe39e903fcb023209e30dcf23d0a151c1474..404103e21c038c3694698524484c957630d37699 100644 (file)
--- a/ChangeLog.claws
+++ b/ChangeLog.claws
@@ -1,3 +1,11 @@
+2001-11-07 [alfons]    0.6.5.claws2
+
+       * src/procmsg.c
+       * src/utils.[ch]
+               only attract by subject if a subject line starts with a "Re: "
+       * src/syldap.c
+               remove warning
+
 2001-11-07 [paul]      0.6.5claws1
 
        * sync with sylpheed 0.6.5. release

diff --git a/configure.in b/configure.in
index 40e151bf353535f1163326c39b8d817912d148b1..d31a76abaf001e813dc620b5ef5defb238d8bd5a 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -8,7 +8,7 @@ MINOR_VERSION=6
 MICRO_VERSION=5
 INTERFACE_AGE=0
 BINARY_AGE=0
-EXTRA_VERSION=claws1
+EXTRA_VERSION=claws2
 VERSION=$MAJOR_VERSION.$MINOR_VERSION.$MICRO_VERSION$EXTRA_VERSION
 
 dnl

diff --git a/src/procmsg.c b/src/procmsg.c
index a466ca35f724554ce984d4e9a3d458f699e3abc0..979cf4e0e55bec6fd7e227cfb4f2e0fd632db3f3 100644 (file)
--- a/src/procmsg.c
+++ b/src/procmsg.c
@@ -546,9 +546,8 @@ GNode *procmsg_get_thread_tree(GSList *mlist)
 
                if (msginfo->inreplyto)
                        parent = g_hash_table_lookup(msgid_table, msginfo->inreplyto);
-               if (parent == NULL)
+               if (parent == NULL && !subject_is_reply(msginfo->subject))
                        parent = subject_table_lookup(subject_table, msginfo->subject);
-
                
                if (parent && parent != node) {
                        g_node_unlink(node);

diff --git a/src/syldap.c b/src/syldap.c
index c8f7a8be95089371cf5ccb3c3a82ec2c8d1d3dc0..678b333cf3f3149d52246dc4fa4fa645a1951929 100644 (file)
--- a/src/syldap.c
+++ b/src/syldap.c
@@ -675,7 +675,7 @@ gint syldap_read_data( SyldapServer *ldapServer ) {
                /* TODO: really necessary to call gdk_threads_XXX()??? gtk_idle_add()
                 * should do this - could someone check the GTK sources please? */
                gdk_threads_enter();
-               ldapServer->idleId = gtk_idle_add(syldap_display_search_results, ldapServer);
+               ldapServer->idleId = gtk_idle_add((GtkFunction)syldap_display_search_results, ldapServer);
                gdk_threads_leave();
        }
 

diff --git a/src/utils.c b/src/utils.c
index 1d6bc324436798e99a427db4387a41965e0d2517..afc93634afe619110b21154e48796416671f3397 100644 (file)
--- a/src/utils.c
+++ b/src/utils.c
@@ -2313,3 +2313,12 @@ void subject_table_remove(GHashTable *subject_table, gchar * subject)
        else
                g_hash_table_remove(subject_table, subject);
 }
+
+gboolean subject_is_reply(const gchar *subject)
+{
+       /* XXX: just simply here so someone can handle really
+        * advanced Re: detection like "Re[4]", "ANTW:" or
+        * Re: Re: Re: Re: Re: Re: Re: Re:" stuff. */
+       if (subject == NULL) return FALSE;
+       else return 0 == g_strcasecmp(subject, "Re: ");
+}

diff --git a/src/utils.h b/src/utils.h
index 8cc61749866531a82d1851c7fcd58a6e05e591fd..b3271f2393f7fbb5a0557d84a0a23bbf1998d684 100644 (file)
--- a/src/utils.h
+++ b/src/utils.h
@@ -322,5 +322,7 @@ void * subject_table_lookup(GHashTable *subject_table, gchar * subject);
 void subject_table_insert(GHashTable *subject_table, gchar * subject,
                          void * data);
 void subject_table_remove(GHashTable *subject_table, gchar * subject);
+gboolean subject_is_reply(const gchar *subject);
+
 
 #endif /* __UTILS_H__ */