balsa r7873 - in branches/mailbox-gsequence: . libbalsa

[PeterB svn gnome org]

Author: PeterB
Date: Thu Feb 28 02:46:59 2008
New Revision: 7873
URL: http://svn.gnome.org/viewvc/balsa?rev=7873&view=rev

Log:
port changes from trunk

Modified:
   branches/mailbox-gsequence/ChangeLog
   branches/mailbox-gsequence/libbalsa/filter-funcs.c

Modified: branches/mailbox-gsequence/libbalsa/filter-funcs.c
==============================================================================
--- branches/mailbox-gsequence/libbalsa/filter-funcs.c	(original)
+++ branches/mailbox-gsequence/libbalsa/filter-funcs.c	Thu Feb 28 02:46:59 2008
@@ -481,20 +481,12 @@
 /* Helper to compare conditions, a bit obscure at first glance
    but we have to compare complex structure, so we must check
    all fields.
-   NULL conditions are OK, and compare equal only if both are NULL.
 */
 
 gboolean
 libbalsa_condition_compare(LibBalsaCondition *c1,LibBalsaCondition *c2)
 {
     gboolean res = FALSE;
-
-    if (c1 == c2) 
-        return TRUE;
-
-    if (c1 == NULL || c2 == NULL)
-        return FALSE;
-
     switch (c1->type) {
     case CONDITION_STRING:
         res = (c2->type == CONDITION_STRING ||