filtering fix

diff --git a/ChangeLog.claws b/ChangeLog.claws
index 4dba5fcf6e2d74789c9866f3c0814e80eaf9356e..c9b7d4b46d25165ee4f9bd299c3289f23b6b1599 100644 (file)
--- a/ChangeLog.claws
+++ b/ChangeLog.claws
@@ -1,9 +1,26 @@
+2001-06-05 [hoa]
+
+       * src/Makefile.am
+               changed quote_fmt.[ch] into quote_fmt.tab.[ch]
+
+       * src/filtering.c
+       * src/matcher.c
+       * src/matcher.h
+       * src/prefs_filtering.c
+               now keep the configuration for execute action
+
+       * src/mbox_folder.c
+               fixed a warning
+

 2001-06-05 [paul]
 
         * sync with sylpheed 0.4.99cvs5
 
 2001-06-05 [hoa]
 
 2001-06-05 [paul]
 
         * sync with sylpheed 0.4.99cvs5
 
 2001-06-05 [hoa]
 

+       * src/Makefile.am
+               added quote_fmt.[ch]
+

        * added src/quote_fmt.y
        * added src/quote_fmt.l
        * added src/quote_fmt.tab.h
        * added src/quote_fmt.y
        * added src/quote_fmt.l
        * added src/quote_fmt.tab.h


@@ -12,7 +29,6 @@
                parsing configuration for replying
                and forwarding
 
                parsing configuration for replying
                and forwarding
 

-       * src/Makefile.am

        * src/prefs_common.[ch]
                added configuration UI for replying
                and forwarding
        * src/prefs_common.[ch]
                added configuration UI for replying
                and forwarding

diff --git a/src/Makefile.am b/src/Makefile.am
index e9df9ef3e47d44dd58d0152bc440f624a006cd0f..03dfec94d1f8f319725090e12e4610071227c828 100644 (file)
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -87,7 +87,7 @@ sylpheed_SOURCES = \
        filtering.c filtering.h \
        prefs_filtering.c prefs_filtering.h \
        mbox_folder.c mbox_folder.h \
        filtering.c filtering.h \
        prefs_filtering.c prefs_filtering.h \
        mbox_folder.c mbox_folder.h \

-       quote_fmt.c quote_fmt.h
+       quote_fmt.tab.c quote_fmt.tab.h

 
 EXTRA_DIST = \
        pixmaps/clip.xpm \
 
 EXTRA_DIST = \
        pixmaps/clip.xpm \

diff --git a/src/filtering.c b/src/filtering.c
index c7b24797d518f0af4bb552ff2481af73bd5f52f2..4fa8e096ad7ff179b09ffadbdd4b1f92992c9a43 100644 (file)
--- a/src/filtering.c
+++ b/src/filtering.c
@@ -54,7 +54,7 @@ FilteringAction * filteringaction_parse(gchar ** str)
        switch (key) {
        case MATCHING_ACTION_MOVE:
        case MATCHING_ACTION_COPY:
        switch (key) {
        case MATCHING_ACTION_MOVE:
        case MATCHING_ACTION_COPY:

-       case MATCHING_ACTION_EXECUTE:
+       case MATCHING_EXECUTE:

                destination = matcher_parse_str(&tmp);
                if (tmp == NULL) {
                        * str = NULL;
                destination = matcher_parse_str(&tmp);
                if (tmp == NULL) {
                        * str = NULL;


@@ -485,7 +485,7 @@ static gboolean filteringaction_apply(FilteringAction * action, MsgInfo * info,
                gtk_widget_destroy(compose->window);
                return FALSE;
 
                gtk_widget_destroy(compose->window);
                return FALSE;
 

-       case MATCHING_ACTION_EXECUTE:
+       case MATCHING_EXECUTE:

 
                cmd = matching_build_command(action->destination, info);
                if (cmd == NULL)
 
                cmd = matching_build_command(action->destination, info);
                if (cmd == NULL)


@@ -536,6 +536,7 @@ static gboolean filteringprop_apply(FilteringProp * filtering, MsgInfo * info,
                case MATCHING_ACTION_MOVE:
                case MATCHING_ACTION_DELETE:
                        return TRUE;
                case MATCHING_ACTION_MOVE:
                case MATCHING_ACTION_DELETE:
                        return TRUE;

+               case MATCHING_EXECUTE:

                case MATCHING_ACTION_COPY:
                case MATCHING_ACTION_MARK:
                case MATCHING_ACTION_MARK_AS_READ:
                case MATCHING_ACTION_COPY:
                case MATCHING_ACTION_MARK:
                case MATCHING_ACTION_MARK_AS_READ:


@@ -690,7 +691,7 @@ gchar * filteringaction_to_string(FilteringAction * action)
        switch(action->type) {
        case MATCHING_ACTION_MOVE:
        case MATCHING_ACTION_COPY:
        switch(action->type) {
        case MATCHING_ACTION_MOVE:
        case MATCHING_ACTION_COPY:

-       case MATCHING_ACTION_EXECUTE:
+       case MATCHING_EXECUTE:

                return g_strconcat(command_str, " \"", action->destination,
                                   "\"", NULL);
 
                return g_strconcat(command_str, " \"", action->destination,
                                   "\"", NULL);
 

diff --git a/src/matcher.c b/src/matcher.c
index b78580cdc6f61d39d867fb67ace4a22805cc74e6..1706d0e7c6646deb2fb44cf519f7340839fa2083 100644 (file)
--- a/src/matcher.c
+++ b/src/matcher.c
@@ -84,7 +84,7 @@ static MatchParser matchparser_tab[] = {
        {MATCHING_ACTION_MARK_AS_UNREAD, "mark_as_unread"},
        {MATCHING_ACTION_FORWARD, "forward"},
        {MATCHING_ACTION_FORWARD_AS_ATTACHMENT, "forward_as_attachment"},
        {MATCHING_ACTION_MARK_AS_UNREAD, "mark_as_unread"},
        {MATCHING_ACTION_FORWARD, "forward"},
        {MATCHING_ACTION_FORWARD_AS_ATTACHMENT, "forward_as_attachment"},

-       {MATCHING_ACTION_EXECUTE, "execute"},
+       /*      {MATCHING_EXECUTE, "execute"}, */

 };
 
 gchar * get_matchparser_tab_str(gint id)
 };
 
 gchar * get_matchparser_tab_str(gint id)

diff --git a/src/matcher.h b/src/matcher.h
index 46950f801eeacc9a76c4302836af4f192c554dee..6afad950bb59b44369bc9f508a80739f2e3d61c1 100644 (file)
--- a/src/matcher.h
+++ b/src/matcher.h
@@ -70,7 +70,7 @@ enum {
        MATCHING_ACTION_MARK_AS_UNREAD,
        MATCHING_ACTION_FORWARD,
        MATCHING_ACTION_FORWARD_AS_ATTACHMENT,
        MATCHING_ACTION_MARK_AS_UNREAD,
        MATCHING_ACTION_FORWARD,
        MATCHING_ACTION_FORWARD_AS_ATTACHMENT,

-       MATCHING_ACTION_EXECUTE,
+       /* MATCHING_ACTION_EXECUTE, */

 
        MATCHING_MATCH,
        MATCHING_REGEXP,
 
        MATCHING_MATCH,
        MATCHING_REGEXP,

diff --git a/src/mbox_folder.c b/src/mbox_folder.c
index 301eafe38466e88a43ed77a7843193d12f588333..ded6482cb06a480dabc15bc41d92db39846ae63a 100644 (file)
--- a/src/mbox_folder.c
+++ b/src/mbox_folder.c
@@ -2000,7 +2000,7 @@ static gboolean mbox_purge_deleted(gchar * mbox)
 
        mbox_cache_synchronize_from_file(mbox_fp, mbox, TRUE);
 
 
        mbox_cache_synchronize_from_file(mbox_fp, mbox, TRUE);
 

-       new = g_strconcat(mbox, ".", itos(mbox), NULL);
+       new = g_strconcat(mbox, ".", itos((int) mbox), NULL);

        new_fp = fopen(new, "w");
 
        if (change_file_mode_rw(new_fp, new) < 0) {
        new_fp = fopen(new, "w");
 
        if (change_file_mode_rw(new_fp, new) < 0) {

diff --git a/src/prefs_filtering.c b/src/prefs_filtering.c
index 25f2c59f2ce24e71dc0ad6cdc9c6043eb66ad8b0..3edaf6d6dc16fc4627b695d2c5b9ad1a55522754 100644 (file)
--- a/src/prefs_filtering.c
+++ b/src/prefs_filtering.c
@@ -188,7 +188,7 @@ static gint prefs_filtering_get_matching_from_action(gint action_id)
        case ACTION_FORWARD_AS_ATTACHMENT:
                return MATCHING_ACTION_FORWARD_AS_ATTACHMENT;
        case ACTION_EXECUTE:
        case ACTION_FORWARD_AS_ATTACHMENT:
                return MATCHING_ACTION_FORWARD_AS_ATTACHMENT;
        case ACTION_EXECUTE:

-               return MATCHING_ACTION_EXECUTE;
+               return MATCHING_EXECUTE;

        default:
                return -1;
        }
        default:
                return -1;
        }


@@ -860,7 +860,7 @@ static void prefs_filtering_select_set(FilteringProp * prop)
                gtk_list_select_item(GTK_LIST(filtering.account_list),
                                     list_id);
                break;
                gtk_list_select_item(GTK_LIST(filtering.account_list),
                                     list_id);
                break;

-       case MATCHING_ACTION_EXECUTE:
+       case MATCHING_EXECUTE:

                gtk_list_select_item(GTK_LIST(filtering.action_list),
                                     ACTION_EXECUTE);
                break;
                gtk_list_select_item(GTK_LIST(filtering.action_list),
                                     ACTION_EXECUTE);
                break;