remove selective download
authorOliver Haertel <o.h.a@gmx.net>
Wed, 26 Mar 2003 22:28:43 +0000 (22:28 +0000)
committerOliver Haertel <o.h.a@gmx.net>
Wed, 26 Mar 2003 22:28:43 +0000 (22:28 +0000)
ChangeLog.claws
configure.ac
src/filtering.c
src/inc.c
src/inc.h
src/mainwindow.c
src/matcher.c
src/matcher.h

index 08f5f13..384b974 100644 (file)
@@ -1,3 +1,10 @@
+2003-03-26 [oliver]    0.8.11claws52
+
+       * src/inc.[ch] 
+       * src/filtering.c 
+       * src/mainwindow.c 
+               remove selective donwload
+
 2003-03-26 [oliver]    0.8.11claws51
        
        * src/Makefile.am
index ff8830a..6834adf 100644 (file)
@@ -11,7 +11,7 @@ MINOR_VERSION=8
 MICRO_VERSION=11
 INTERFACE_AGE=0
 BINARY_AGE=0
-EXTRA_VERSION=claws51
+EXTRA_VERSION=claws52
 VERSION=$MAJOR_VERSION.$MINOR_VERSION.$MICRO_VERSION$EXTRA_VERSION
 
 dnl set $target
index 7cbb0d4..5640ad6 100644 (file)
@@ -463,9 +463,6 @@ gchar *filteringaction_to_string(gchar *dest, gint destlen, FilteringAction *act
        case MATCHACTION_COLOR:
                g_snprintf(dest, destlen, "%s %d", command_str, action->labelcolor);
                return dest;  
-       case MATCHACTION_DELETE_ON_SERVER:
-               g_snprintf(dest, destlen, "%s", command_str);
-               return dest;
        default:
                return NULL;
        }
index 3e70ad4..2a9955f 100644 (file)
--- a/src/inc.c
+++ b/src/inc.c
@@ -63,7 +63,6 @@
 #include "alertpanel.h"
 #include "folder.h"
 #include "filtering.h"
-#include "selective_download.h"
 #include "log.h"
 #include "hooks.h"
 
@@ -206,30 +205,6 @@ void inc_mail(MainWindow *mainwin, gboolean notify)
        inc_unlock();
 }
 
-void inc_selective_download(MainWindow *mainwin, PrefsAccount *acc, gint session)
-{
-       GSList *cur;
-       gint new_msgs = 0;
-
-       acc->session = session;
-       inc_account_mail(acc, mainwin);
-       acc->session = STYPE_NORMAL;
-       
-       for (cur = acc->msg_list; cur != NULL; cur = cur->next) {
-               HeaderItems *items =(HeaderItems*)cur->data;
-
-               if (items->state == SD_DOWNLOADED && 
-                   items->del_by_old_session == FALSE) {
-                       new_msgs++;                     
-               }
-       }
-
-       if (new_msgs) {
-               inc_finished(mainwin, TRUE);
-               inc_notify_cmd(new_msgs, prefs_common.newmail_notify_manu);
-       }
-}
-
 void inc_pop_before_smtp(PrefsAccount *acc)
 {
        acc->session = STYPE_POP_BEFORE_SMTP;
index 71917c6..013864e 100644 (file)
--- a/src/inc.h
+++ b/src/inc.h
@@ -82,9 +82,6 @@ void inc_mail                 (MainWindow     *mainwin,
                                 gboolean notify);
 void inc_all_account_mail      (MainWindow     *mainwin,
                                 gboolean notify);
-void inc_selective_download     (MainWindow    *mainwin, 
-                                PrefsAccount   *acc,
-                                gint            session);
 void inc_progress_update       (Pop3Session    *session);
 gint inc_drop_message          (const gchar    *file,
                                 Pop3Session    *session);
index 0aa6c49..c0f41d2 100644 (file)
@@ -80,7 +80,6 @@
 #include "about.h"
 #include "manual.h"
 #include "version.h"
-#include "selective_download.h"
 #include "ssl_manager.h"
 #include "sslcertwindow.h"
 #include "prefs_gtk.h"
@@ -638,8 +637,6 @@ static GtkItemFactoryEntry mainwin_entries[] =
        {N_("/_Message/_Mark/Mark all _read"),  NULL, mark_all_read_cb, 0, NULL},
 
        {N_("/_Tools"),                         NULL, NULL, 0, "<Branch>"},
-       {N_("/_Tools/_Selective download..."),  "<alt>S", sel_download_cb, 0, NULL},
-       {N_("/_Tools/---"),                     NULL, NULL, 0, "<Separator>"},
        {N_("/_Tools/_Address book..."),        "<shift><control>A", addressbook_open_cb, 0, NULL},
        {N_("/_Tools/Add sender to address boo_k"),
                                                NULL, add_address_cb, 0, NULL},
@@ -1583,7 +1580,6 @@ void main_window_set_menu_sensitive(MainWindow *mainwin)
                {"/Message/Cancel a news message" , M_TARGET_EXIST|M_ALLOW_DELETE|M_UNLOCKED|M_NEWS},
                {"/Message/Mark"                  , M_TARGET_EXIST},
 
-               {"/Tools/Selective download..."     , M_HAVE_ACCOUNT|M_UNLOCKED},
                {"/Tools/Add sender to address book", M_SINGLE_TARGET_EXIST},
                {"/Tools/Harvest addresses"         , M_UNLOCKED},
                {"/Tools/Filter messages"           , M_MSG_EXIST|M_EXEC|M_UNLOCKED},
@@ -2256,12 +2252,6 @@ static void log_window_show_cb(MainWindow *mainwin, guint action,
        log_window_show(mainwin->logwin);
 }
 
-static void sel_download_cb(MainWindow *mainwin, guint action,
-                              GtkWidget *widget)
-{
-       selective_download(mainwin);
-}
-
 static void inc_cancel_cb(MainWindow *mainwin, guint action, GtkWidget *widget)
 {
        inc_cancel_all();
index 312b7cc..22af840 100644 (file)
@@ -123,7 +123,6 @@ static const MatchParser matchparser_tab[] = {
        {MATCHACTION_EXECUTE, "execute"},
        {MATCHACTION_COLOR, "color"},
        {MATCHACTION_REDIRECT, "redirect"},
-       {MATCHACTION_DELETE_ON_SERVER, "delete_on_server"},
        {MATCHACTION_CHANGE_SCORE, "change_score"}
 };
 
index ba5b898..e62da4a 100644 (file)
@@ -117,7 +117,6 @@ enum {
        MA_(FORWARD_AS_ATTACHMENT),
        MA_(COLOR),
        MA_(REDIRECT),
-       MA_(DELETE_ON_SERVER),
        MA_(CHANGE_SCORE),
        /* boolean operations */
        MB_(OR),