filtering fix
authorHoà Viêt Dinh <dinh.viet.hoa@free.fr>
Tue, 5 Jun 2001 09:59:16 +0000 (09:59 +0000)
committerHoà Viêt Dinh <dinh.viet.hoa@free.fr>
Tue, 5 Jun 2001 09:59:16 +0000 (09:59 +0000)
ChangeLog.claws
src/Makefile.am
src/filtering.c
src/matcher.c
src/matcher.h
src/mbox_folder.c
src/prefs_filtering.c

index 4dba5fc..c9b7d4b 100644 (file)
@@ -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]
 
+       * src/Makefile.am
+               added quote_fmt.[ch]
+
        * 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
 
-       * src/Makefile.am
        * src/prefs_common.[ch]
                added configuration UI for replying
                and forwarding
index e9df9ef..03dfec9 100644 (file)
@@ -87,7 +87,7 @@ sylpheed_SOURCES = \
        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 \
index c7b2479..4fa8e09 100644 (file)
@@ -54,7 +54,7 @@ FilteringAction * filteringaction_parse(gchar ** str)
        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;
@@ -485,7 +485,7 @@ static gboolean filteringaction_apply(FilteringAction * action, MsgInfo * info,
                gtk_widget_destroy(compose->window);
                return FALSE;
 
-       case MATCHING_ACTION_EXECUTE:
+       case MATCHING_EXECUTE:
 
                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_EXECUTE:
                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:
-       case MATCHING_ACTION_EXECUTE:
+       case MATCHING_EXECUTE:
                return g_strconcat(command_str, " \"", action->destination,
                                   "\"", NULL);
 
index b78580c..1706d0e 100644 (file)
@@ -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_EXECUTE, "execute"},
+       /*      {MATCHING_EXECUTE, "execute"}, */
 };
 
 gchar * get_matchparser_tab_str(gint id)
index 46950f8..6afad95 100644 (file)
@@ -70,7 +70,7 @@ enum {
        MATCHING_ACTION_MARK_AS_UNREAD,
        MATCHING_ACTION_FORWARD,
        MATCHING_ACTION_FORWARD_AS_ATTACHMENT,
-       MATCHING_ACTION_EXECUTE,
+       /* MATCHING_ACTION_EXECUTE, */
 
        MATCHING_MATCH,
        MATCHING_REGEXP,
index 301eafe..ded6482 100644 (file)
@@ -2000,7 +2000,7 @@ static gboolean mbox_purge_deleted(gchar * mbox)
 
        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) {
index 25f2c59..3edaf6d 100644 (file)
@@ -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:
-               return MATCHING_ACTION_EXECUTE;
+               return MATCHING_EXECUTE;
        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;
-       case MATCHING_ACTION_EXECUTE:
+       case MATCHING_EXECUTE:
                gtk_list_select_item(GTK_LIST(filtering.action_list),
                                     ACTION_EXECUTE);
                break;