/*
* Sylpheed -- a GTK+ based, lightweight, and fast e-mail client
- * Copyright (C) 1999-2006 Hiroyuki Yamamoto & The Sylpheed Claws Team
+ * Copyright (C) 1999-2011 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
- * the Free Software Foundation; either version 2 of the License, or
+ * the Free Software Foundation; either version 3 of the License, or
* (at your option) any later version.
*
* This program is distributed in the hope that it will be useful,
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ *
*/
#ifdef HAVE_CONFIG_H
Children *children;
gchar *cmd;
pid_t pid;
+ gint next_sig;
gint chld_in;
gint chld_out;
gint chld_err;
GSList *msginfo_list;
};
-static void action_update_menu (GtkItemFactory *ifactory,
+static void action_update_menu (GtkUIManager *ui_manager,
+ const gchar *accel_group,
gchar *branch_path,
gpointer callback,
gpointer data);
-static void compose_actions_execute_cb (Compose *compose,
+static void compose_actions_execute_cb (GtkWidget *widget,
+ gpointer data);
+static void compose_actions_execute (Compose *compose,
guint action_nb,
- GtkWidget *widget);
-static void mainwin_actions_execute_cb (MainWindow *mainwin,
+ GtkWidget *widget);
+
+static void mainwin_actions_execute_cb (GtkWidget *widget,
+ gpointer data);
+static void mainwin_actions_execute (MainWindow *mainwin,
guint action_nb,
GtkWidget *widget);
-static void msgview_actions_execute_cb (MessageView *msgview,
+
+static void msgview_actions_execute_cb (GtkWidget *widget,
+ gpointer data);
+static void msgview_actions_execute (MessageView *msgview,
guint action_nb,
- GtkWidget *widget);
+ GtkWidget *widget);
+
static void message_actions_execute (MessageView *msgview,
guint action_nb,
GSList *msg_list);
ActionType action_get_type(const gchar *action_str)
{
const gchar *p;
+ gboolean in_filtering_action = FALSE;
ActionType action_type = ACTION_NONE;
- g_return_val_if_fail(action_str, ACTION_ERROR);
- g_return_val_if_fail(*action_str, ACTION_ERROR);
+ cm_return_val_if_fail(action_str, ACTION_ERROR);
+ cm_return_val_if_fail(*action_str, ACTION_ERROR);
p = action_str;
return ACTION_ERROR;
while (*p && action_type != ACTION_ERROR) {
- if (p[0] == '%' && p[1]) {
- switch (p[1]) {
- case 'a':
- /* CLAWS: filtering action is a mutually exclusive
- * action. we can enable others if needed later. we
- * add ACTION_SINGLE | ACTION_MULTIPLE so it will
- * only be executed from the main window toolbar */
- if (p[2] == 's') /* source messages */
- action_type = ACTION_FILTERING_ACTION
- | ACTION_SINGLE
- | ACTION_MULTIPLE;
- break;
- case 'f':
- action_type |= ACTION_SINGLE;
- break;
- case 'F':
- action_type |= ACTION_MULTIPLE;
- break;
- case 'p':
- action_type |= ACTION_SINGLE;
- break;
- case 's':
- action_type |= ACTION_SELECTION_STR;
- break;
- case 'u':
- action_type |= ACTION_USER_STR;
- break;
- case 'h':
- action_type |= ACTION_USER_HIDDEN_STR;
- break;
- default:
- action_type = ACTION_ERROR;
- break;
+ if (!in_filtering_action) {
+ if (p[0] == '%' && p[1]) {
+ switch (p[1]) {
+ case 'a':
+ /* CLAWS: filtering action is a mutually exclusive
+ * action. we can enable others if needed later. we
+ * add ACTION_SINGLE | ACTION_MULTIPLE so it will
+ * only be executed from the main window toolbar */
+ if (p[2] == 's') /* source messages */
+ action_type = ACTION_FILTERING_ACTION
+ | ACTION_SINGLE
+ | ACTION_MULTIPLE;
+ in_filtering_action = TRUE;
+ break;
+ case 'f':
+ action_type |= ACTION_SINGLE;
+ break;
+ case 'F':
+ action_type |= ACTION_MULTIPLE;
+ break;
+ case 'p':
+ action_type |= ACTION_SINGLE;
+ break;
+ case 's':
+ action_type |= ACTION_SELECTION_STR;
+ break;
+ case 'u':
+ action_type |= ACTION_USER_STR;
+ break;
+ case 'h':
+ action_type |= ACTION_USER_HIDDEN_STR;
+ break;
+ case '%':
+ /* literal '%' */
+ break;
+ default:
+ action_type = ACTION_ERROR;
+ break;
+ }
+ p++;
+ } else if (p[0] == '|') {
+ if (p[1] == '\0')
+ action_type |= ACTION_PIPE_OUT;
+ } else if (p[0] == '>') {
+ if (p[1] == '\0')
+ action_type |= ACTION_INSERT;
+ } else if (p[0] == '&') {
+ if (p[1] == '\0')
+ action_type |= ACTION_ASYNC;
+ } else if (p[0] == '}') {
+ in_filtering_action = FALSE;
}
- } else if (p[0] == '|') {
- if (p[1] == '\0')
- action_type |= ACTION_PIPE_OUT;
- } else if (p[0] == '>') {
- if (p[1] == '\0')
- action_type |= ACTION_INSERT;
- } else if (p[0] == '&') {
- if (p[1] == '\0')
- action_type |= ACTION_ASYNC;
}
- p++;
+ p++;
}
return action_type;
g_string_append(cmd, user_hidden_str);
p++;
break;
+ case '%':
+ g_string_append_c(cmd, p[1]);
+ p++;
+ break;
default:
g_string_append_c(cmd, p[0]);
g_string_append_c(cmd, p[1]);
gchar *p, *q;
gchar escape_ch[] = "\\ ";
- g_return_val_if_fail(msginfo, FALSE);
+ cm_return_val_if_fail(msginfo, FALSE);
filename = procmsg_get_message_file(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;
}
gint source)
{
if (source == TOOLBAR_MAIN)
- mainwin_actions_execute_cb((MainWindow*)data, action_nb, widget);
+ mainwin_actions_execute((MainWindow*)data, action_nb, widget);
else if (source == TOOLBAR_COMPOSE)
- compose_actions_execute_cb((Compose*)data, action_nb, widget);
+ compose_actions_execute((Compose*)data, action_nb, widget);
else if (source == TOOLBAR_MSGVIEW)
- msgview_actions_execute_cb((MessageView*)data, action_nb, widget);
+ msgview_actions_execute((MessageView*)data, action_nb, widget);
}
-void action_update_mainwin_menu(GtkItemFactory *ifactory,
+void action_update_mainwin_menu(GtkUIManager *ui_manager,
gchar *branch_path,
MainWindow *mainwin)
{
- action_update_menu(ifactory, branch_path,
+ action_update_menu(ui_manager, "<MainwinActions>", branch_path,
mainwin_actions_execute_cb, mainwin);
}
-void action_update_msgview_menu(GtkItemFactory *ifactory,
+void action_update_msgview_menu(GtkUIManager *ui_manager,
gchar *branch_path,
MessageView *msgview)
{
- action_update_menu(ifactory, branch_path,
+ action_update_menu(ui_manager, "<MsgviewActions>", branch_path,
msgview_actions_execute_cb, msgview);
}
-void action_update_compose_menu(GtkItemFactory *ifactory,
+void action_update_compose_menu(GtkUIManager *ui_manager,
gchar *branch_path,
Compose *compose)
{
- action_update_menu(ifactory, branch_path,
+ action_update_menu(ui_manager, "<ComposeActions>", branch_path,
compose_actions_execute_cb, compose);
}
-static void action_update_menu(GtkItemFactory *ifactory,
+static GtkWidget *find_item_in_menu(GtkWidget *menu, gchar *name)
+{
+ GList *amenu = GTK_MENU_SHELL(menu)->children;
+ const gchar *existing_name;
+ while (amenu) {
+ GtkWidget *item = GTK_WIDGET(amenu->data);
+ if ((existing_name = g_object_get_data(G_OBJECT(item), "s_name")) != NULL &&
+ !strcmp2(name, existing_name))
+ return item;
+ amenu = amenu->next;
+ }
+ return NULL;
+}
+
+static GtkWidget *create_submenus(GtkWidget *menu, const gchar *action)
+{
+ gchar *submenu = g_strdup(action);
+ GtkWidget *new_menu = NULL;
+
+ if (strchr(submenu, '/')) {
+ const gchar *end = (strchr(submenu, '/')+1);
+ GtkWidget *menu_item = NULL;
+ if (end && *end) {
+ *strchr(submenu, '/') = '\0';
+ if ((menu_item = find_item_in_menu(menu, submenu)) == NULL) {
+ menu_item = gtk_menu_item_new_with_mnemonic(submenu);
+ g_object_set_data_full(G_OBJECT(menu_item), "s_name", g_strdup(submenu), g_free);
+ gtk_widget_show(menu_item);
+ gtk_menu_shell_append(GTK_MENU_SHELL(menu), menu_item);
+ new_menu = gtk_menu_new();
+ gtk_widget_show(new_menu);
+ gtk_menu_item_set_submenu(GTK_MENU_ITEM(menu_item), new_menu);
+ } else {
+ new_menu = gtk_menu_item_get_submenu(GTK_MENU_ITEM(menu_item));
+ }
+ new_menu = create_submenus(new_menu, end);
+ }
+ }
+ g_free(submenu);
+ return new_menu ? new_menu : menu;
+}
+
+static void action_update_menu(GtkUIManager *ui_manager,
+ const gchar *accel_group,
gchar *branch_path,
gpointer callback, gpointer data)
{
- GtkWidget *menuitem;
- gchar *menu_path;
GSList *cur;
gchar *action, *action_p;
- GList *amenu;
- GtkItemFactoryEntry ifentry = {NULL, NULL, NULL, 0, "<Branch>"};
-
- ifentry.path = branch_path;
- menuitem = gtk_item_factory_get_widget(ifactory, branch_path);
- g_return_if_fail(menuitem != NULL);
-
- amenu = GTK_MENU_SHELL(menuitem)->children;
- while (amenu != NULL) {
- GList *alist = amenu->next;
- gtk_widget_destroy(GTK_WIDGET(amenu->data));
- amenu = alist;
- }
-
- ifentry.accelerator = NULL;
- ifentry.callback_action = 0;
- ifentry.callback = callback;
- ifentry.item_type = NULL;
+ int callback_action = 0;
+ GtkWidget *menu = gtk_menu_new();
+ GtkWidget *item;
- for (cur = prefs_common.actions_list; cur; cur = cur->next) {
+ for (cur = prefs_common.actions_list; cur != NULL; cur = cur->next) {
+ GtkWidget *cur_menu = menu;
+ const gchar *action_name = NULL;
action = g_strdup((gchar *)cur->data);
action_p = strstr(action, ": ");
if (action_p && action_p[2] &&
(action_get_type(&action_p[2]) != ACTION_ERROR) &&
(action[0] != '/')) {
+ gchar *accel_path = NULL;
+
action_p[0] = '\0';
- menu_path = g_strdup_printf("%s/%s", branch_path,
- action);
- ifentry.path = menu_path;
- gtk_item_factory_create_item(ifactory, &ifentry, data,
- 1);
- g_free(menu_path);
+ if (strchr(action, '/')) {
+ cur_menu = create_submenus(cur_menu, action);
+ action_name = strrchr(action, '/')+1;
+ } else {
+ action_name = action;
+ }
+ gtk_menu_set_accel_group (GTK_MENU (cur_menu),
+ gtk_ui_manager_get_accel_group(ui_manager));
+ item = gtk_menu_item_new_with_label(action_name);
+ gtk_menu_shell_append(GTK_MENU_SHELL(cur_menu), item);
+ g_signal_connect(G_OBJECT(item), "activate",
+ G_CALLBACK(callback), data);
+ g_object_set_data(G_OBJECT(item), "action_num", GINT_TO_POINTER(callback_action));
+ gtk_widget_show(item);
+ accel_path = g_strconcat(accel_group,branch_path, "/", action, NULL);
+ gtk_menu_item_set_accel_path(GTK_MENU_ITEM(item), accel_path);
+ g_free(accel_path);
+
}
g_free(action);
- ifentry.callback_action++;
+ callback_action++;
}
+
+ gtk_widget_show(menu);
+ gtk_menu_item_set_submenu(GTK_MENU_ITEM(gtk_ui_manager_get_widget(ui_manager, branch_path)), menu);
}
-static void compose_actions_execute_cb(Compose *compose, guint action_nb,
- GtkWidget *widget)
+static void compose_actions_execute_cb(GtkWidget *widget, gpointer data)
+{
+ Compose *compose = (Compose *)data;
+ gint action_nb = GPOINTER_TO_INT(g_object_get_data(G_OBJECT(widget), "action_num"));
+ compose_actions_execute(compose, action_nb, NULL);
+}
+
+static void compose_actions_execute(Compose *compose, guint action_nb, GtkWidget *widget)
{
gchar *buf, *action;
ActionType action_type;
- g_return_if_fail(action_nb < g_slist_length(prefs_common.actions_list));
+ cm_return_if_fail(action_nb < g_slist_length(prefs_common.actions_list));
buf = (gchar *)g_slist_nth_data(prefs_common.actions_list, action_nb);
- g_return_if_fail(buf != NULL);
+ cm_return_if_fail(buf != NULL);
action = strstr(buf, ": ");
- g_return_if_fail(action != NULL);
+ cm_return_if_fail(action != NULL);
/* Point to the beginning of the command-line */
action += 2;
compose_action_cb, compose);
}
-static void mainwin_actions_execute_cb(MainWindow *mainwin, guint action_nb,
+static void mainwin_actions_execute_cb(GtkWidget *widget, gpointer data)
+{
+ MainWindow *mainwin = (MainWindow *)data;
+ gint action_nb = GPOINTER_TO_INT(g_object_get_data(G_OBJECT(widget), "action_num"));
+ mainwin_actions_execute(mainwin, action_nb, NULL);
+}
+
+static void mainwin_actions_execute(MainWindow *mainwin, guint action_nb,
GtkWidget *widget)
{
GSList *msg_list;
g_slist_free(msg_list);
}
-static void msgview_actions_execute_cb(MessageView *msgview, guint action_nb,
+static void msgview_actions_execute_cb(GtkWidget *widget, gpointer data)
+{
+ MessageView *msgview = (MessageView *)data;
+ gint action_nb = GPOINTER_TO_INT(g_object_get_data(G_OBJECT(widget), "action_num"));
+ msgview_actions_execute(msgview, action_nb, NULL);
+}
+
+static void msgview_actions_execute(MessageView *msgview, guint action_nb,
GtkWidget *widget)
{
GSList *msg_list = NULL;
guint body_pos = 0;
ActionType action_type;
- g_return_if_fail(action_nb < g_slist_length(prefs_common.actions_list));
+ cm_return_if_fail(action_nb < g_slist_length(prefs_common.actions_list));
buf = (gchar *)g_slist_nth_data(prefs_common.actions_list, action_nb);
- g_return_if_fail(buf);
- g_return_if_fail((action = strstr(buf, ": ")));
+ cm_return_if_fail(buf);
+ cm_return_if_fail((action = strstr(buf, ": ")));
/* Point to the beginning of the command-line */
action += 2;
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();
}
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);
GtkTextIter start_iter, end_iter;
gboolean is_selection = FALSE;
- g_return_val_if_fail(action && *action, FALSE);
+ cm_return_val_if_fail(action && *action, FALSE);
action_type = action_get_type(action);
}
if ((child_info = fork_child(cmd, msg_str, children))) {
/* Pass msginfo to catch_status () */
- child_info->msginfo_list = g_slist_append (NULL, msginfo);
+ if (!(action_type & (ACTION_PIPE_OUT | ACTION_INSERT)))
+ child_info->msginfo_list =
+ g_slist_append (NULL, msginfo);
children_list = g_slist_append(children_list,
child_info);
}
user_str, user_hidden_str, sel_str);
if (cmd) {
if ((child_info = fork_child(cmd, msg_str, children))) {
- child_info->msginfo_list = g_slist_copy (msg_list);
+ if (!(action_type & (ACTION_PIPE_OUT | ACTION_INSERT)))
+ child_info->msginfo_list =
+ g_slist_copy (msg_list);
children_list = g_slist_append(children_list,
child_info);
}
child_info->callback = callback;
child_info->data = data;
child_info->tag_status =
- gdk_input_add(child_info->chld_status,
+ claws_input_add(child_info->chld_status,
GDK_INPUT_READ,
- catch_status, child_info);
+ catch_status, child_info,
+ FALSE);
}
create_io_dialog(children);
"Pipe creation failed.\n%s"),
g_strerror(errno));
/* Closing fd = -1 fails silently */
- close(chld_in[0]);
- close(chld_in[1]);
- close(chld_out[0]);
- close(chld_out[1]);
- close(chld_err[0]);
- close(chld_err[1]);
- close(chld_status[0]);
- close(chld_status[1]);
+ (void)close(chld_in[0]);
+ (void)close(chld_in[1]);
+ (void)close(chld_out[0]);
+ (void)close(chld_out[1]);
+ (void)close(chld_err[0]);
+ (void)close(chld_err[1]);
+ (void)close(chld_status[0]);
+ (void)close(chld_status[1]);
return NULL; /* Pipe error */
}
}
pid = fork();
if (pid == 0) { /* Child */
+ int r = 0;
if (setpgid(0, 0))
perror("setpgid");
-#ifdef GDK_WINDOWING_X11
- close(ConnectionNumber(gdk_display));
-#endif /* GDK_WINDOWING_X11 */
-
gch_pid = fork();
if (gch_pid == 0) {
(ACTION_PIPE_IN |
ACTION_USER_IN |
ACTION_USER_HIDDEN_IN)) {
- close(fileno(stdin));
- dup (chld_in[0]);
+ r |= close(fileno(stdin));
+ (void) dup (chld_in[0]);
}
- close(chld_in[0]);
- close(chld_in[1]);
-
- close(fileno(stdout));
- dup (chld_out[1]);
- close(chld_out[0]);
- close(chld_out[1]);
-
- close(fileno(stderr));
- dup (chld_err[1]);
- close(chld_err[0]);
- close(chld_err[1]);
+ r |= close(chld_in[0]);
+ r |= close(chld_in[1]);
+
+ r |= close(fileno(stdout));
+ (void) dup (chld_out[1]);
+ r |= close(chld_out[0]);
+ r |= close(chld_out[1]);
+
+ r |= close(fileno(stderr));
+ (void) dup (chld_err[1]);
+ r |= close(chld_err[0]);
+ r |= close(chld_err[1]);
+
+ if (r != 0)
+ debug_print("%s(%d)", strerror(errno), errno);
}
cmdline[0] = "sh";
_exit(1);
} else if (gch_pid < (pid_t) 0) { /* Fork error */
if (sync)
- write(chld_status[1], "1\n", 2);
+ r = write(chld_status[1], "1\n", 2);
+ if (r != 0)
+ debug_print("%s(%d)", strerror(errno), errno);
perror("fork");
_exit(1);
} else { /* Child */
if (sync) {
- close(chld_in[0]);
- close(chld_in[1]);
- close(chld_out[0]);
- close(chld_out[1]);
- close(chld_err[0]);
- close(chld_err[1]);
- close(chld_status[0]);
-
- debug_print("Child: Waiting for grandchild\n");
- waitpid(gch_pid, NULL, 0);
+ r |= close(chld_in[0]);
+ r |= close(chld_in[1]);
+ r |= close(chld_out[0]);
+ r |= close(chld_out[1]);
+ r |= close(chld_err[0]);
+ r |= close(chld_err[1]);
+ r |= close(chld_status[0]);
+
+ debug_print("Child: waiting for grandchild\n");
+ r |= waitpid(gch_pid, NULL, 0);
debug_print("Child: grandchild ended\n");
- write(chld_status[1], "0\n", 2);
- close(chld_status[1]);
+ r |= write(chld_status[1], "0\n", 2);
+ r |= close(chld_status[1]);
+
+ if (r != 0)
+ debug_print("%s(%d)", strerror(errno), errno);
}
_exit(0);
}
return NULL;
}
- close(chld_in[0]);
+ (void)close(chld_in[0]);
if (!(children->action_type &
(ACTION_PIPE_IN | ACTION_USER_IN | ACTION_USER_HIDDEN_IN)))
- close(chld_in[1]);
- close(chld_out[1]);
- close(chld_err[1]);
- close(chld_status[1]);
+ (void)close(chld_in[1]);
+ (void)close(chld_out[1]);
+ (void)close(chld_err[1]);
+ (void)close(chld_status[1]);
child_info = g_new0(ChildInfo, 1);
child_info->children = children;
child_info->pid = pid;
+ child_info->next_sig = SIGTERM;
child_info->cmd = g_strdup(cmd);
child_info->new_out = FALSE;
child_info->output = g_string_new(NULL);
child_info->chld_err = chld_err[0];
child_info->chld_status = chld_status[0];
child_info->tag_in = -1;
- child_info->tag_out = gdk_input_add(chld_out[0], GDK_INPUT_READ,
- catch_output, child_info);
- child_info->tag_err = gdk_input_add(chld_err[0], GDK_INPUT_READ,
- catch_output, child_info);
+ child_info->tag_out = claws_input_add(chld_out[0], GDK_INPUT_READ,
+ catch_output, child_info, FALSE);
+ child_info->tag_err = claws_input_add(chld_err[0], GDK_INPUT_READ,
+ catch_output, child_info, FALSE);
if (!(children->action_type &
(ACTION_PIPE_IN | ACTION_PIPE_OUT | ACTION_INSERT)))
return child_info;
if ((children->action_type & ACTION_PIPE_IN) && msg_str) {
+ int r;
ret_str = g_locale_from_utf8(msg_str, strlen(msg_str),
&by_read, &by_written, NULL);
if (ret_str && by_written) {
- write(chld_in[1], ret_str, strlen(ret_str));
+ r = write(chld_in[1], ret_str, strlen(ret_str));
g_free(ret_str);
} else
- write(chld_in[1], msg_str, strlen(msg_str));
+ r = write(chld_in[1], msg_str, strlen(msg_str));
if (!(children->action_type &
(ACTION_USER_IN | ACTION_USER_HIDDEN_IN)))
- close(chld_in[1]);
+ r = close(chld_in[1]);
child_info->chld_in = -1; /* No more input */
+ if (r != 0)
+ debug_print("%s(%d)", strerror(errno), errno);
}
return child_info;
for (cur = children->list; cur; cur = cur->next) {
child_info = (ChildInfo *)(cur->data);
debug_print("Killing child group id %d\n", child_info->pid);
- if (child_info->pid && kill(-child_info->pid, SIGTERM) < 0)
+ if (child_info->pid && kill(-child_info->pid, child_info->next_sig) < 0)
perror("kill");
+ child_info->next_sig = SIGKILL;
}
#endif /* G_OS_UNIX */
}
gboolean new_output;
ChildInfo *child_info;
GSList *cur;
- gint nb = children->nb;
-
- children->nb = 0;
cur = children->list;
new_output = FALSE;
while (cur) {
child_info = (ChildInfo *)cur->data;
- if (child_info->pid)
- children->nb++;
new_output |= child_info->new_out;
cur = cur->next;
}
children->output |= new_output;
- if (new_output || (children->dialog && (nb != children->nb)))
+ if (new_output || (children->dialog && (children->initial_nb != children->nb)))
update_io_dialog(children);
if (children->nb)
Children *children = (Children *) data;
ChildInfo *child_info = (ChildInfo *) children->list->data;
- child_info->tag_in = gdk_input_add(child_info->chld_in,
+ child_info->tag_in = claws_input_add(child_info->chld_in,
GDK_INPUT_WRITE,
- catch_input, children);
- gtk_widget_set_sensitive(children->input_hbox, FALSE);
+ catch_input, children, FALSE);
}
static gint delete_io_dialog_cb(GtkWidget *w, GdkEvent *e, gpointer data)
static gint io_dialog_key_pressed_cb(GtkWidget *widget, GdkEventKey *event,
gpointer data)
{
- if (event && event->keyval == GDK_Escape)
+ if (event && (event->keyval == GDK_Escape ||
+ event->keyval == GDK_Return ||
+ event->keyval == GDK_KP_Enter))
hide_io_dialog_cb(widget, data);
return TRUE;
}
* them if necessary
*/
if (child_info->tag_in > 0)
- gdk_input_remove(child_info->tag_in);
+ g_source_remove(child_info->tag_in);
if (child_info->tag_out > 0)
- gdk_input_remove(child_info->tag_out);
+ g_source_remove(child_info->tag_out);
if (child_info->tag_err > 0)
- gdk_input_remove(child_info->tag_err);
+ g_source_remove(child_info->tag_err);
if (child_info->chld_in >= 0)
- close(child_info->chld_in);
+ (void)close(child_info->chld_in);
if (child_info->chld_out >= 0)
- close(child_info->chld_out);
+ (void)close(child_info->chld_out);
if (child_info->chld_err >= 0)
- close(child_info->chld_err);
+ (void)close(child_info->chld_err);
- close(child_info->chld_status);
+ (void)close(child_info->chld_status);
}
static void free_children(Children *children)
if (children->progress_bar) {
gchar *text;
+#ifdef GENERIC_UMPC
+ /* use a more compact format */
+ const gchar *format = "%s %d/%d";
+#else
+ const gchar *format = "%s %d / %d";
+#endif
gtk_progress_bar_set_fraction(GTK_PROGRESS_BAR(children->progress_bar),
+ (children->initial_nb == 0) ? 0 :
(gdouble) (children->initial_nb - children->nb) /
(gdouble) children->initial_nb);
- text = g_strdup_printf("%s %d/%d", _("Completed"),
+ text = g_strdup_printf(format, _("Completed"),
children->initial_nb - children->nb,
children->initial_nb);
gtk_progress_bar_set_text(GTK_PROGRESS_BAR(children->progress_bar), text);
g_free(text);
- }
+ }
if (!children->nb) {
gtk_widget_set_sensitive(children->abort_btn, FALSE);
g_signal_connect(G_OBJECT(entry), "activate",
G_CALLBACK(send_input), children);
gtk_box_pack_start(GTK_BOX(input_hbox), entry, TRUE, TRUE, 0);
- if (children->action_type & ACTION_USER_HIDDEN_IN)
+ if (children->action_type & ACTION_USER_HIDDEN_IN) {
gtk_entry_set_visibility(GTK_ENTRY(entry), FALSE);
+#ifdef MAEMO
+ hildon_gtk_entry_set_input_mode(GTK_ENTRY(entry),
+ HILDON_GTK_INPUT_MODE_FULL |
+ HILDON_GTK_INPUT_MODE_INVISIBLE);
+#endif
+ }
gtk_widget_show(entry);
send_button = gtk_button_new_from_stock(GTK_STOCK_EXECUTE);
}
if (children->initial_nb > 1) {
- gchar * text;
+ gchar *text;
+#ifdef GENERIC_UMPC
+ /* use a more compact format */
+ const gchar *format = "%s 0/%d\n";
+#else
+ const gchar *format = "%s 0 / %d\n";
+#endif
progress_bar = gtk_progress_bar_new();
gtk_progress_bar_set_orientation(GTK_PROGRESS_BAR(progress_bar),
GTK_PROGRESS_LEFT_TO_RIGHT);
- text = g_strdup_printf("%s 0/%d\n", _("Completed"),
+ text = g_strdup_printf(format, _("Completed"),
children->initial_nb);
gtk_progress_bar_set_text(GTK_PROGRESS_BAR(progress_bar),
text);
gchar buf;
gint c;
- gdk_input_remove(child_info->tag_status);
+ g_source_remove(child_info->tag_status);
c = read(source, &buf, 1);
debug_print("Child returned %c\n", buf);
if (child_info->children->action_type & (ACTION_SINGLE | ACTION_MULTIPLE)
&& child_info->msginfo_list) {
- /* Actions on message *files* might change size and
- * time stamp, and thus invalidate the cache */
- SummaryView *summaryview = NULL;
- GSList *cur;
- MsgInfo *msginfo, *nmi; /* newmsginfo */
- char *file;
-
- if (mainwindow_get_mainwindow ())
- summaryview = mainwindow_get_mainwindow ()->summaryview;
- for (cur = child_info->msginfo_list; cur; cur = cur->next) {
- msginfo = (MsgInfo *)cur->data;
- if (!(msginfo && /* Stuff used valid? */
- msginfo->folder && msginfo->folder->cache))
- continue;
- file = procmsg_get_message_file_path (msginfo);
- if (!file)
- continue;
- nmi = procheader_parse_file (file, msginfo->flags, FALSE, 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);
+ /* Actions on message *files* might change size and
+ * time stamp, and thus invalidate the cache */
+ SummaryView *summaryview = NULL;
+ 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) {
+ msginfo = (MsgInfo *)cur->data;
+ if (!(msginfo && /* Stuff used valid? */
+ msginfo->folder && msginfo->folder->cache))
+ continue;
+ file = procmsg_get_message_file_path (msginfo);
+ if (!file)
+ continue;
+ nmi = procheader_parse_file (file, msginfo->flags, TRUE, FALSE);
+ if (!nmi)
+ continue; /* Deleted? */
+ if (msginfo->mtime != nmi->mtime || msginfo->size != nmi->size) {
+ 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);
+ if (summaryview && summaryview->displayed &&
+ summaryview->folder_item == msginfo->folder &&
+ summary_get_msgnum(summaryview, summaryview->displayed) == msginfo->msgnum)
+ summary_redisplay_msg(summaryview);
+
}
- 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) {
+ if (modified_something && last_item &&
+ summaryview && summaryview->folder_item == last_item) {
summary_show (summaryview, summaryview->folder_item);
- summary_select_node (summaryview, summaryview->displayed, TRUE, TRUE);
}
+ g_slist_free (child_info->msginfo_list);
+ child_info->msginfo_list = NULL;
}
- g_slist_free (child_info->msginfo_list);
- child_info->msginfo_list = NULL;
- }
+
+ if (!child_info->pid)
+ child_info->children->nb--;
wait_for_children(child_info->children);
}
Children *children = (Children *)data;
ChildInfo *child_info = (ChildInfo *)children->list->data;
gchar *input, *ret_str;
- gint c, count, len;
+ gint c, count, len, r;
gssize by_read = 0, by_written = 0;
debug_print("Sending input to grand child.\n");
- if (!(cond && GDK_INPUT_WRITE))
+ if (!(cond & GDK_INPUT_WRITE))
return;
- gdk_input_remove(child_info->tag_in);
+ gtk_widget_set_sensitive(children->input_hbox, FALSE);
+ gtk_widget_grab_focus(children->abort_btn);
+
+ g_source_remove(child_info->tag_in);
child_info->tag_in = -1;
input = gtk_editable_get_chars(GTK_EDITABLE(children->input_entry),
} while (c >= 0 && count < len);
if (c >= 0)
- write(child_info->chld_in, "\n", 2);
+ r = write(child_info->chld_in, "\n", 2);
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);
+ r = close(child_info->chld_in);
+ if (r != 0)
+ debug_print("%s(%d)", strerror(errno), errno);
child_info->chld_in = -1;
debug_print("Input to grand child sent.\n");
}
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);
}
if (c == 0) {
if (source == child_info->chld_out) {
- gdk_input_remove(child_info->tag_out);
+ g_source_remove(child_info->tag_out);
child_info->tag_out = -1;
- close(child_info->chld_out);
+ (void)close(child_info->chld_out);
child_info->chld_out = -1;
} else {
- gdk_input_remove(child_info->tag_err);
+ g_source_remove(child_info->tag_err);
child_info->tag_err = -1;
- close(child_info->chld_err);
+ (void)close(child_info->chld_err);
child_info->chld_err = -1;
}
}
projects / claws.git / blobdiff