2007-03-16 [wwp] 2.8.1cvs19

[claws.git] / src / action.c

diff --git a/src/action.c b/src/action.c
index 9f9dd05c343b58b546730b3db7369ff568f70abb..d807eecea39fd235d9d966689f8437d632afa89c 100644 (file)
--- a/src/action.c
+++ b/src/action.c
@@ -1,6 +1,6 @@
 /*
  * Sylpheed -- a GTK+ based, lightweight, and fast e-mail client
- * Copyright (C) 1999-2006 Hiroyuki Yamamoto & The Sylpheed Claws Team
+ * Copyright (C) 1999-2007 Hiroyuki Yamamoto & The Claws Mail Team
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -400,7 +400,7 @@ static gboolean parse_append_msgpart(GString *cmd, MsgInfo *msginfo,
        g_free(filename);
 
        if (ret < 0) {
-               alertpanel_error(_("Can't get part of multipart message"));
+               alertpanel_error(_("Can't get part of multipart message: %s"), strerror(-ret));
                g_free(part_filename);
                return FALSE;
        }
@@ -607,19 +607,29 @@ static gboolean execute_filtering_actions(gchar *action, GSList *msglist)
        action_string = g_strndup(sbegin, send - sbegin);
        
        action_list = matcher_parser_get_action_list(action_string);
+       if (action_list == NULL) {
+               gchar *tmp = g_strdup(action_string);
+
+               g_strstrip(tmp);
+               if (*tmp == '\0')
+                       alertpanel_error(_("There is no filtering action set"));
+               else
+                       alertpanel_error(_("Invalid filtering action(s):\n%s"), tmp);
+               g_free(action_string);
+               g_free(tmp);
+               return FALSE;
+       }
        g_free(action_string);
-       if (action_list == NULL) return FALSE;
        
        /* apply actions on each message info */
        for (p = msglist; p && p->data; p = g_slist_next(p)) {
                filteringaction_apply_action_list(action_list, (MsgInfo *) p->data);
-               
        }
 
        if (summaryview) {
                summary_lock(summaryview);                              
                main_window_cursor_wait(mainwin);               
-               gtk_clist_freeze(GTK_CLIST(summaryview->ctree));        
+               summary_freeze(summaryview);    
                folder_item_update_freeze();                            
        }
 
@@ -627,7 +637,7 @@ static gboolean execute_filtering_actions(gchar *action, GSList *msglist)
 
        if (summaryview) {
                folder_item_update_thaw();                              
-               gtk_clist_thaw(GTK_CLIST(summaryview->ctree));          
+               summary_thaw(summaryview);              
                main_window_cursor_normal(mainwin);     
                summary_unlock(summaryview);                            
                summary_show(summaryview, summaryview->folder_item);
@@ -912,7 +922,7 @@ static ChildInfo *fork_child(gchar *cmd, const gchar *msg_str,
                                close(chld_err[1]);
                                close(chld_status[0]);
 
-                               debug_print("Child: Waiting for grandchild\n");
+                               debug_print("Child: waiting for grandchild\n");
                                waitpid(gch_pid, NULL, 0);
                                debug_print("Child: grandchild ended\n");
                                write(chld_status[1], "0\n", 2);
@@ -1030,11 +1040,8 @@ static gint wait_for_children(Children *children)
        if (children->nb)
                return FALSE;
 
-       if (!children->dialog) {
+       if (!children->dialog)
                free_children(children);
-       } else if (!children->output) {
-               gtk_widget_destroy(children->dialog);
-       }
 
        return FALSE;
 }
@@ -1047,7 +1054,6 @@ static void send_input(GtkWidget *w, gpointer data)
        child_info->tag_in = gdk_input_add(child_info->chld_in,
                                           GDK_INPUT_WRITE,
                                           catch_input, children);
-       gtk_widget_set_sensitive(children->input_hbox, FALSE);
 }
 
 static gint delete_io_dialog_cb(GtkWidget *w, GdkEvent *e, gpointer data)
@@ -1350,7 +1356,8 @@ static void catch_status(gpointer data, gint source, GdkInputCondition cond)
                GSList      *cur;
                MsgInfo     *msginfo, *nmi;     /* newmsginfo */
                char        *file;
-
+               gboolean     modified_something = FALSE;
+               FolderItem  *last_item = NULL;
                if (mainwindow_get_mainwindow ())
                        summaryview = mainwindow_get_mainwindow ()->summaryview;
                for (cur = child_info->msginfo_list; cur; cur = cur->next) {
@@ -1361,25 +1368,26 @@ static void catch_status(gpointer data, gint source, GdkInputCondition cond)
                        file = procmsg_get_message_file_path (msginfo);
                        if (!file) 
                                continue;
-                       nmi = procheader_parse_file (file, msginfo->flags, FALSE, FALSE);
+                       nmi = procheader_parse_file (file, msginfo->flags, TRUE, FALSE);
                        if (!nmi) 
                                continue; /* Deleted? */
                        if (msginfo->mtime != nmi->mtime || msginfo->size != nmi->size) {
-                               msginfo->mtime  = nmi->mtime;
-                               msginfo->size   = nmi->size;
-                               msgcache_update_msg (msginfo->folder->cache, msginfo);
+                               nmi->folder = msginfo->folder;
+                               nmi->msgnum = msginfo->msgnum;
+                               msgcache_update_msg (msginfo->folder->cache, nmi);
+                               modified_something = TRUE;
+                               last_item = nmi->folder;
                        }
                        procmsg_msginfo_free (nmi);
-
-                       /* refresh the message display, but only if this message is still
-                       * in focus */
-                       if (summaryview
-                           && summaryview->displayed
-                           && summaryview->folder_item == msginfo->folder
-                           && summary_get_msgnum (summaryview, summaryview->displayed) == msginfo->msgnum) {
-                               summary_show (summaryview, summaryview->folder_item);
-                               summary_select_node (summaryview, summaryview->displayed, TRUE, TRUE);
-                       }
+                       if (summaryview && summaryview->displayed &&
+                           summaryview->folder_item == msginfo->folder &&
+                           summary_get_msgnum(summaryview, summaryview->displayed) == msginfo->msgnum)
+                               summary_redisplay_msg(summaryview);
+                                       
+               }
+               if (modified_something && last_item && 
+                   summaryview && summaryview->folder_item == last_item) {
+                       summary_show (summaryview, summaryview->folder_item);
                }
                g_slist_free (child_info->msginfo_list);
                child_info->msginfo_list = NULL;
@@ -1400,6 +1408,9 @@ static void catch_input(gpointer data, gint source, GdkInputCondition cond)
        if (!(cond && GDK_INPUT_WRITE))
                return;
 
+       gtk_widget_set_sensitive(children->input_hbox, FALSE);
+       gtk_widget_grab_focus(children->abort_btn);
+
        gdk_input_remove(child_info->tag_in);
        child_info->tag_in = -1;
 
@@ -1426,8 +1437,6 @@ static void catch_input(gpointer data, gint source, GdkInputCondition cond)
 
        g_free(input);
 
-       gtk_entry_set_text(GTK_ENTRY(children->input_entry), "");
-       gtk_widget_set_sensitive(children->input_hbox, TRUE);
        close(child_info->chld_in);
        child_info->chld_in = -1;
        debug_print("Input to grand child sent.\n");
@@ -1467,7 +1476,7 @@ static void catch_output(gpointer data, gint source, GdkInputCondition cond)
                        if (ret_str && bytes_written > 0) {
                                gtk_text_buffer_insert
                                        (textbuf, &iter, ret_str,
-                                        bytes_written);
+                                        -1);
                                g_free(ret_str);
                        } else
                                gtk_text_buffer_insert(textbuf, &iter, buf, c);