remove old filtering stuff

diff --git a/ChangeLog.claws b/ChangeLog.claws
index 7dab804813cca2f1b7a40873aa405b88d735b07e..77d0d90246a9ffddf248b9638641e30f5d659e23 100644 (file)
--- a/ChangeLog.claws
+++ b/ChangeLog.claws
@@ -1,3 +1,9 @@
+2002-11-17 [colin]     0.8.5claws165
+
+       * src/main.c
+         src/defs.h
+               Remove old filtering stuff
+
 2002-11-17 [oliver]    0.8.5claws164
 
        * src/toolbar.h

diff --git a/configure.in b/configure.in
index 0015667ecaea07b978c512c6d2858d1aaa6147fe..ec8ba8e839b55425d122342fba31614dcb58045b 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -11,7 +11,7 @@ MINOR_VERSION=8
 MICRO_VERSION=5
 INTERFACE_AGE=0
 BINARY_AGE=0
-EXTRA_VERSION=claws164
+EXTRA_VERSION=claws165
 VERSION=$MAJOR_VERSION.$MINOR_VERSION.$MICRO_VERSION$EXTRA_VERSION
 
 dnl set $target

diff --git a/src/defs.h b/src/defs.h
index 771cb53e20d5887fd3d70ecc14ebcbd598bf56b6..7f33371932c7e01fab0afa31402de0846d0a4562 100644 (file)
--- a/src/defs.h
+++ b/src/defs.h
@@ -45,7 +45,6 @@
 #define MIME_TMP_DIR           "mimetmp"
 #define COMMON_RC              "sylpheedrc"
 #define ACCOUNT_RC             "accountrc"
-#define FILTER_RC              "filterrc"
 #define CUSTOM_HEADER_RC       "customheaderrc"
 #define DISPLAY_HEADER_RC      "dispheaderrc"
 #define FOLDERITEM_RC           "folderitemrc"

diff --git a/src/main.c b/src/main.c
index 6d1ab1b7917767def2fc58b18732e3cf02776871..f40e797b07905589a766b099b996481c59bd9362 100644 (file)
--- a/src/main.c
+++ b/src/main.c
@@ -252,14 +252,6 @@ int main(int argc, char *argv[])
        }
        set_log_file(RC_DIR G_DIR_SEPARATOR_S "sylpheed.log");
 
-       if (is_file_exist(RC_DIR G_DIR_SEPARATOR_S "assortrc") &&
-           !is_file_exist(RC_DIR G_DIR_SEPARATOR_S "filterrc")) {
-               if (rename(RC_DIR G_DIR_SEPARATOR_S "assortrc",
-                          RC_DIR G_DIR_SEPARATOR_S "filterrc") < 0)
-                       FILE_OP_ERROR(RC_DIR G_DIR_SEPARATOR_S "assortrc",
-                                     "rename");
-       }
-
        prefs_common_init();
        prefs_common_read_config();