2007-11-25 [paul] 3.1.0cvs27

	* src/folder_item_prefs.c
	* src/folder_item_prefs.h
		remove dead code

diff --git a/ChangeLog b/ChangeLog
index 689ce2e5a8fc9064702d410993b878ddd9e29593..f97c4abd6ae75c5066b64f09f6578a6f8486530e 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2007-11-25 [paul]      3.1.0cvs27
+
+       * src/folder_item_prefs.c
+       * src/folder_item_prefs.h
+               remove dead code
+

 2007-11-23 [wwp]       3.1.0cvs26
 
        * src/matcher.c
 2007-11-23 [wwp]       3.1.0cvs26
 
        * src/matcher.c

diff --git a/PATCHSETS b/PATCHSETS
index adc0699a7f3b2d70a3dbfd40525e59b5fb2c934b..003a88b9f5393c38175b3f8cebc84de67c312d77 100644 (file)
--- a/PATCHSETS
+++ b/PATCHSETS
@@ -3084,3 +3084,4 @@
 ( cvs diff -u -r 1.58.2.34 -r 1.58.2.35 po/de.po;  ) > 3.1.0cvs24.patchset
 ( cvs diff -u -r 1.204.2.154 -r 1.204.2.155 src/prefs_common.c;  cvs diff -u -r 1.103.2.99 -r 1.103.2.100 src/prefs_common.h;  cvs diff -u -r 1.1.2.5 -r 1.1.2.6 src/prefs_summary_open.c;  cvs diff -u -r 1.1.2.2 -r 1.1.2.3 src/prefs_summary_open.h;  cvs diff -u -r 1.395.2.338 -r 1.395.2.339 src/summaryview.c;  ) > 3.1.0cvs25.patchset
 ( cvs diff -u -r 1.75.2.51 -r 1.75.2.52 src/matcher.c;  cvs diff -u -r 1.39.2.15 -r 1.39.2.16 src/matcher.h;  cvs diff -u -r 1.25.2.32 -r 1.25.2.33 src/matcher_parser_parse.y;  cvs diff -u -r 1.43.2.64 -r 1.43.2.65 src/prefs_matcher.c;  ) > 3.1.0cvs26.patchset
 ( cvs diff -u -r 1.58.2.34 -r 1.58.2.35 po/de.po;  ) > 3.1.0cvs24.patchset
 ( cvs diff -u -r 1.204.2.154 -r 1.204.2.155 src/prefs_common.c;  cvs diff -u -r 1.103.2.99 -r 1.103.2.100 src/prefs_common.h;  cvs diff -u -r 1.1.2.5 -r 1.1.2.6 src/prefs_summary_open.c;  cvs diff -u -r 1.1.2.2 -r 1.1.2.3 src/prefs_summary_open.h;  cvs diff -u -r 1.395.2.338 -r 1.395.2.339 src/summaryview.c;  ) > 3.1.0cvs25.patchset
 ( cvs diff -u -r 1.75.2.51 -r 1.75.2.52 src/matcher.c;  cvs diff -u -r 1.39.2.15 -r 1.39.2.16 src/matcher.h;  cvs diff -u -r 1.25.2.32 -r 1.25.2.33 src/matcher_parser_parse.y;  cvs diff -u -r 1.43.2.64 -r 1.43.2.65 src/prefs_matcher.c;  ) > 3.1.0cvs26.patchset

+( cvs diff -u -r 1.2.2.24 -r 1.2.2.25 src/folder_item_prefs.c;  cvs diff -u -r 1.2.2.12 -r 1.2.2.13 src/folder_item_prefs.h;  ) > 3.1.0cvs27.patchset

diff --git a/configure.ac b/configure.ac
index 7e879896c9dba4829627e236abf13f2c8b3168c2..568bae653182cce396e499f87d04b010ee216eb3 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -11,7 +11,7 @@ MINOR_VERSION=1
 MICRO_VERSION=0
 INTERFACE_AGE=0
 BINARY_AGE=0
 MICRO_VERSION=0
 INTERFACE_AGE=0
 BINARY_AGE=0

-EXTRA_VERSION=26
+EXTRA_VERSION=27

 EXTRA_RELEASE=
 EXTRA_GTK2_VERSION=
 
 EXTRA_RELEASE=
 EXTRA_GTK2_VERSION=
 

diff --git a/src/folder_item_prefs.c b/src/folder_item_prefs.c
index 320420dfc372d8827ebf8f7e873d7e67b746ba3f..7e223b6646af6ec88dab563933581771e97c47d0 100644 (file)
--- a/src/folder_item_prefs.c
+++ b/src/folder_item_prefs.c
@@ -17,10 +17,6 @@
  * 
  */
 
  * 
  */
 

-/* alfons - all folder item specific settings should migrate into 
- * folderlist.xml!!! the old folderitemrc file will only serve for a few 
- * versions (for compatibility) */
-

 #ifdef HAVE_CONFIG_H
 #  include "config.h"
 #endif
 #ifdef HAVE_CONFIG_H
 #  include "config.h"
 #endif


@@ -38,23 +34,6 @@
 FolderItemPrefs tmp_prefs;
 
 static PrefParam param[] = {
 FolderItemPrefs tmp_prefs;
 
 static PrefParam param[] = {

-       {"sort_by_number", "FALSE", &tmp_prefs.sort_by_number, P_BOOL,
-        NULL, NULL, NULL},
-       {"sort_by_size", "FALSE", &tmp_prefs.sort_by_size, P_BOOL,
-        NULL, NULL, NULL},
-       {"sort_by_date", "FALSE", &tmp_prefs.sort_by_date, P_BOOL,
-        NULL, NULL, NULL},
-       {"sort_by_from", "FALSE", &tmp_prefs.sort_by_from, P_BOOL,
-        NULL, NULL, NULL},
-       {"sort_by_subject", "FALSE", &tmp_prefs.sort_by_subject, P_BOOL,
-        NULL, NULL, NULL},
-       {"sort_by_score", "FALSE", &tmp_prefs.sort_by_score, P_BOOL,
-        NULL, NULL, NULL},
-       {"sort_descending", "FALSE", &tmp_prefs.sort_descending, P_BOOL,
-        NULL, NULL, NULL},
-       /* MIGRATION */  
-       {"request_return_receipt", "", &tmp_prefs.request_return_receipt, P_BOOL,
-        NULL, NULL, NULL},

        {"enable_default_to", "", &tmp_prefs.enable_default_to, P_BOOL,
         NULL, NULL, NULL},
        {"default_to", "", &tmp_prefs.default_to, P_STRING,
        {"enable_default_to", "", &tmp_prefs.enable_default_to, P_BOOL,
         NULL, NULL, NULL},
        {"default_to", "", &tmp_prefs.default_to, P_STRING,


@@ -136,28 +115,6 @@ void folder_item_prefs_read_config(FolderItem * item)
        g_free(rcpath);
 
        *item->prefs = tmp_prefs;
        g_free(rcpath);
 
        *item->prefs = tmp_prefs;

-
-       /*
-        * MIGRATION: next lines are migration code. the idea is that
-        *            if used regularly, claws folder config ends up
-        *            in the same file as sylpheed-main
-        */
-
-       item->ret_rcpt = tmp_prefs.request_return_receipt ? TRUE : FALSE;
-
-       /* MIGRATION: 0.7.8main+ has persistent sort order. claws had the sort
-        *            order in different members, which is ofcourse a little
-        *            bit phoney. */
-       if (item->sort_key == SORT_BY_NONE) {
-               item->sort_key  = (tmp_prefs.sort_by_number  ? SORT_BY_NUMBER  :
-                                  tmp_prefs.sort_by_size    ? SORT_BY_SIZE    :
-                                  tmp_prefs.sort_by_date    ? SORT_BY_DATE    :
-                                  tmp_prefs.sort_by_from    ? SORT_BY_FROM    :
-                                  tmp_prefs.sort_by_subject ? SORT_BY_SUBJECT :
-                                  tmp_prefs.sort_by_score   ? SORT_BY_SCORE   :
-                                                                SORT_BY_NONE);
-               item->sort_type = tmp_prefs.sort_descending ? SORT_DESCENDING : SORT_ASCENDING;
-       }                                                               

 }
 
 void folder_item_prefs_save_config(FolderItem * item)
 }
 
 void folder_item_prefs_save_config(FolderItem * item)


@@ -170,9 +127,6 @@ void folder_item_prefs_save_config(FolderItem * item)
        debug_print("saving prefs for %s\n", id?id:"(null)");
        prefs_write_config(param, id, FOLDERITEM_RC);
        g_free(id);
        debug_print("saving prefs for %s\n", id?id:"(null)");
        prefs_write_config(param, id, FOLDERITEM_RC);
        g_free(id);

-
-       /* MIGRATION: make sure migrated items are not saved
-        */

 }
 
 static gboolean folder_item_prefs_save_config_func(GNode *node, gpointer data)
 }
 
 static gboolean folder_item_prefs_save_config_func(GNode *node, gpointer data)


@@ -190,15 +144,6 @@ void folder_item_prefs_save_config_recursive(FolderItem * item)
 
 static FolderItemPrefs *folder_item_prefs_clear(FolderItemPrefs *prefs)
 {
 
 static FolderItemPrefs *folder_item_prefs_clear(FolderItemPrefs *prefs)
 {

-       prefs->sort_by_number = FALSE;
-       prefs->sort_by_size = FALSE;
-       prefs->sort_by_date = FALSE;
-       prefs->sort_by_from = FALSE;
-       prefs->sort_by_subject = FALSE;
-       prefs->sort_by_score = FALSE;
-       prefs->sort_descending = FALSE;
-
-       prefs->request_return_receipt = FALSE;

        prefs->enable_default_to = FALSE;
        prefs->default_to = NULL;
        prefs->enable_default_reply_to = FALSE;
        prefs->enable_default_to = FALSE;
        prefs->default_to = NULL;
        prefs->enable_default_reply_to = FALSE;


@@ -270,14 +215,6 @@ void folder_item_prefs_copy_prefs(FolderItem * src, FolderItem * dest)
        folder_item_prefs_read_config(src);
 
        tmp_prefs.directory                     = g_strdup(src->prefs->directory);
        folder_item_prefs_read_config(src);
 
        tmp_prefs.directory                     = g_strdup(src->prefs->directory);

-       tmp_prefs.sort_by_number                = src->prefs->sort_by_number;
-       tmp_prefs.sort_by_size                  = src->prefs->sort_by_size;
-       tmp_prefs.sort_by_date                  = src->prefs->sort_by_date;
-       tmp_prefs.sort_by_from                  = src->prefs->sort_by_from;
-       tmp_prefs.sort_by_subject               = src->prefs->sort_by_subject;
-       tmp_prefs.sort_by_score                 = src->prefs->sort_by_score;
-       tmp_prefs.sort_descending               = src->prefs->sort_descending;
-       tmp_prefs.enable_thread                 = src->prefs->enable_thread;

         tmp_prefs.enable_processing             = src->prefs->enable_processing;
        tmp_prefs.newmailcheck                  = src->prefs->newmailcheck;
        tmp_prefs.offlinesync                   = src->prefs->offlinesync;
         tmp_prefs.enable_processing             = src->prefs->enable_processing;
        tmp_prefs.newmailcheck                  = src->prefs->newmailcheck;
        tmp_prefs.offlinesync                   = src->prefs->offlinesync;

diff --git a/src/folder_item_prefs.h b/src/folder_item_prefs.h
index 7973cf9a91c781ebaffdcfbb4c8744791ab6891a..523924526bac12b460d906cbb31329a111ffdfa8 100644 (file)
--- a/src/folder_item_prefs.h
+++ b/src/folder_item_prefs.h
@@ -30,17 +30,6 @@ typedef struct _FolderItemPrefs FolderItemPrefs;
 struct _FolderItemPrefs {
        gchar * directory;
 
 struct _FolderItemPrefs {
        gchar * directory;
 

-       gboolean sort_by_number;
-       gboolean sort_by_size;
-       gboolean sort_by_date;
-       gboolean sort_by_from;
-       gboolean sort_by_subject;
-       gboolean sort_by_score;
-
-       gboolean sort_descending;
-
-       gboolean enable_thread;
-

         int enable_processing;
        GSList * processing;
 
         int enable_processing;
        GSList * processing;