diff options
| -rw-r--r-- | filter/ChangeLog | 10 | ||||
| -rw-r--r-- | filter/filter-driver.c | 3 | ||||
| -rw-r--r-- | filter/filter-rule.c | 6 |
3 files changed, 16 insertions, 3 deletions
diff --git a/filter/ChangeLog b/filter/ChangeLog index 60b3203d67..67e4aa9d3d 100644 --- a/filter/ChangeLog +++ b/filter/ChangeLog @@ -1,3 +1,13 @@ +2000-12-20 Jeffrey Stedfast <fejj@helixcode.com> + + * filter-driver.c (filter_driver_filter_message): Oops, slight + logic error. We want to copy the message to the default folder if + the message hasn't been Moved (which is the same as Copied && + Deleted). This fixes bug #1007. + + * filter-rule.c (more_parts): Make sure we have more than 1 part + before we sensitize the "remove" button. + 2000-12-20 Not Zed <NotZed@HelixCode.com> * filter-message-search.c (filter_message_search): Oops, missed a diff --git a/filter/filter-driver.c b/filter/filter-driver.c index 538a6bb5bc..5765a739c3 100644 --- a/filter/filter-driver.c +++ b/filter/filter-driver.c @@ -751,7 +751,8 @@ filter_driver_filter_message (FilterDriver *driver, CamelMimeMessage *message, C g_string_free (fsearch, TRUE); g_string_free (faction, TRUE); - if (p->defaultfolder && !p->copied && !p->deleted) { + /* Logic: if !Moved and there exists a default folder... */ + if (!(p->copied && p->deleted) && p->defaultfolder) { /* copy it to the default inbox */ filtered = TRUE; filter_driver_log (driver, FILTER_LOG_ACTION, "Copy to default folder"); diff --git a/filter/filter-rule.c b/filter/filter-rule.c index 180b070cb1..17173a1c97 100644 --- a/filter/filter-rule.c +++ b/filter/filter-rule.c @@ -479,8 +479,10 @@ more_parts (GtkWidget *button, struct _rule_data *data) } /* set the "Remove criterion" button sensitive */ - w = gtk_object_get_data (GTK_OBJECT (button), "remove"); - gtk_widget_set_sensitive (w, TRUE); + if (g_list_length (data->fr->parts) > 1) { + w = gtk_object_get_data (GTK_OBJECT (button), "remove"); + gtk_widget_set_sensitive (w, TRUE); + } } static void |