* src/compose.c

* src/filtering.c
* src/summaryview.c
        remove calls to folder->change_flags that are now
        done by procmsg flag functions (seems it is not
        used by any foldertype anyway)
* src/folder.c
	init folder->change_flags with NULL

diff --git a/ChangeLog.claws b/ChangeLog.claws
index 50414c009108dc40672aba4dc0f31aeebd706771..bb3f58e4b2f22073a4fa97f16f5e426e34b142ad 100644 (file)
--- a/ChangeLog.claws
+++ b/ChangeLog.claws
@@ -1,3 +1,14 @@
+2002-10-14 [christoph] 0.8.5claws37
+
+       * src/compose.c
+       * src/filtering.c
+       * src/summaryview.c
+               remove calls to folder->change_flags that are now
+               done by procmsg flag functions (seems it is not
+               used by any foldertype anyway)
+       * src/folder.c
+               init folder->change_flags with NULL
+
 2002-10-14 [christoph] 0.8.5claws36
 
        * src/folder.[ch]

diff --git a/configure.in b/configure.in
index 93ae7e3551f6103aa8b9b9db85cc07967e8739a8..8551aca33626456f9ae7d9587e10a09c84cb3b43 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=claws36
+EXTRA_VERSION=claws37
 VERSION=$MAJOR_VERSION.$MINOR_VERSION.$MICRO_VERSION$EXTRA_VERSION
 
 dnl set $target

diff --git a/src/compose.c b/src/compose.c
index 42a63ad2e912341396ef439b95edce2a3a51c682..a81e1895c74288da73291ccecc49e243bacef51a 100644 (file)
--- a/src/compose.c
+++ b/src/compose.c
@@ -780,14 +780,6 @@ Compose *compose_generic_new(PrefsAccount *account, const gchar *mailto, FolderI
         return compose;
 }
 
-#define CHANGE_FLAGS(msginfo) \
-{ \
-if (msginfo->folder->folder->change_flags != NULL) \
-msginfo->folder->folder->change_flags(msginfo->folder->folder, \
-                                     msginfo->folder, \
-                                     msginfo); \
-}
-
 /*
 Compose *compose_new_followup_and_replyto(PrefsAccount *account,
                                           const gchar *followupto, gchar * to)
@@ -997,7 +989,6 @@ Compose *compose_forward(PrefsAccount *account, MsgInfo *msginfo,
        MSG_SET_PERM_FLAGS(msginfo->flags, MSG_FORWARDED);
        if (MSG_IS_IMAP(msginfo->flags))
                imap_msg_unset_perm_flags(msginfo, MSG_REPLIED);
-       CHANGE_FLAGS(msginfo);
 
        compose = compose_create(account, COMPOSE_FORWARD);
 
@@ -1097,7 +1088,6 @@ Compose *compose_forward_multiple(PrefsAccount *account, GSList *msginfo_list)
        for (msginfo = msginfo_list; msginfo != NULL; msginfo = msginfo->next) {
                MSG_UNSET_PERM_FLAGS(((MsgInfo *)msginfo->data)->flags, MSG_REPLIED);
                MSG_SET_PERM_FLAGS(((MsgInfo *)msginfo->data)->flags, MSG_FORWARDED);
-               CHANGE_FLAGS(((MsgInfo *)msginfo->data));
        }
 
        compose = compose_create(account, COMPOSE_FORWARD);

diff --git a/src/filtering.c b/src/filtering.c
index 80e7dfb01e8db0b3f43013e9e2fd4cdc2ecc9ad2..9cbc90905ff0e5e96de10e7ca7e7b4e5c1c1c33b 100644 (file)
--- a/src/filtering.c
+++ b/src/filtering.c
@@ -105,14 +105,6 @@ void filteringprop_free(FilteringProp * prop)
   return value : return TRUE if the action could be applied
 */
 
-#define CHANGE_FLAGS(msginfo) \
-{ \
-if (msginfo->folder->folder->change_flags != NULL) \
-msginfo->folder->folder->change_flags(msginfo->folder->folder, \
-                                     msginfo->folder, \
-                                     msginfo); \
-}
-
 static gboolean filteringaction_apply(FilteringAction * action, MsgInfo * info)
 {
        FolderItem * dest_folder;

diff --git a/src/folder.c b/src/folder.c
index 953b1625240bb86ce7de2ddd812d34f2fd4a1379..e5d9f89e6470ff5e65e0391e78bb9d20d7481a25 100644 (file)
--- a/src/folder.c
+++ b/src/folder.c
@@ -125,6 +125,7 @@ static void folder_init(Folder *folder, const gchar *name)
        folder->get_num_list = NULL;
        folder->ui_func = NULL;
        folder->ui_func_data = NULL;
+       folder->change_flags = NULL;
        folder->check_msgnum_validity = NULL;
 }
 

diff --git a/src/summaryview.c b/src/summaryview.c
index 45a2879093f73e5ee9d2433fe90565247ee72ac2..01ca28618447049d5ba3af2dc1184f979399b6a5 100644 (file)
--- a/src/summaryview.c
+++ b/src/summaryview.c
@@ -2283,14 +2283,6 @@ static void summary_set_header(SummaryView *summaryview, gchar *text[],
                        _("(No Subject)");
 }
 
-#define CHANGE_FLAGS(msginfo) \
-{ \
-if (msginfo->folder->folder->change_flags != NULL) \
-msginfo->folder->folder->change_flags(msginfo->folder->folder, \
-                                     msginfo->folder, \
-                                     msginfo); \
-}
-
 static void summary_display_msg(SummaryView *summaryview, GtkCTreeNode *row)
 {
        summary_display_msg_full(summaryview, row, FALSE, FALSE);