subject threading not when subject starts with "Re: "
authorAlfons Hoogervorst <alfons@proteus.demon.nl>
Thu, 8 Nov 2001 20:57:06 +0000 (20:57 +0000)
committerAlfons Hoogervorst <alfons@proteus.demon.nl>
Thu, 8 Nov 2001 20:57:06 +0000 (20:57 +0000)
ChangeLog.claws
configure.in
src/procmsg.c
src/syldap.c
src/utils.c
src/utils.h

index 1cdfbe3..404103e 100644 (file)
@@ -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
index 40e151b..d31a76a 100644 (file)
@@ -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
index a466ca3..979cf4e 100644 (file)
@@ -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);
index c8f7a8b..678b333 100644 (file)
@@ -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();
        }
 
index 1d6bc32..afc9363 100644 (file)
@@ -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: ");
+}
index 8cc6174..b3271f2 100644 (file)
@@ -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__ */