GtkWidget *cond_clist;
} filtering;
+static GSList ** p_processing_list = NULL;
+
/* widget creating functions */
static void prefs_filtering_create (void);
static gint prefs_filtering_deleted (GtkWidget *widget,
GdkEventAny *event,
gpointer data);
-static void prefs_filtering_key_pressed (GtkWidget *widget,
+static gboolean prefs_filtering_key_pressed(GtkWidget *widget,
GdkEventKey *event,
gpointer data);
static void prefs_filtering_cancel (void);
static gboolean prefs_filtering_rename_path_func(GNode *node, gpointer data);
static gboolean prefs_filtering_delete_path_func(GNode *node, gpointer data);
-static FolderItem * cur_item = NULL; /* folder (if dialog opened for processing) */
-
-typedef enum Action_ {
- ACTION_MOVE,
- ACTION_COPY,
- ACTION_DELETE,
- ACTION_MARK,
- ACTION_UNMARK,
- ACTION_LOCK,
- ACTION_UNLOCK,
- ACTION_MARK_AS_READ,
- ACTION_MARK_AS_UNREAD,
- ACTION_FORWARD,
- ACTION_FORWARD_AS_ATTACHMENT,
- ACTION_REDIRECT,
- ACTION_EXECUTE,
- ACTION_COLOR,
- /* add other action constants */
-} Action;
-
-void prefs_filtering_open(FolderItem * item,
+static void delete_path(GSList ** p_filters, const gchar * path);
+
+void prefs_filtering_open(GSList ** p_processing,
+ const gchar * title,
const gchar *header,
const gchar *key)
{
- gchar *esckey;
-
if (prefs_rc_is_readonly(FILTERING_RC))
return;
manage_window_set_transient(GTK_WINDOW(filtering.window));
gtk_widget_grab_focus(filtering.ok_btn);
-
- cur_item = item;
-
- esckey = matcher_escape_str(key);
- prefs_filtering_set_dialog(header, esckey);
- g_free(esckey);
+
+ if (title != NULL)
+ gtk_window_set_title(GTK_WINDOW(filtering.window), title);
+ else
+ gtk_window_set_title (GTK_WINDOW(filtering.window),
+ _("Filtering/Processing configuration"));
+
+ p_processing_list = p_processing;
+
+ prefs_filtering_set_dialog(header, key);
gtk_widget_show(filtering.window);
window = gtk_window_new (GTK_WINDOW_TOPLEVEL);
gtk_container_set_border_width (GTK_CONTAINER (window), 8);
- gtk_window_position (GTK_WINDOW (window), GTK_WIN_POS_CENTER);
+ gtk_window_set_position (GTK_WINDOW (window), GTK_WIN_POS_CENTER);
gtk_window_set_modal (GTK_WINDOW (window), TRUE);
- gtk_window_set_policy (GTK_WINDOW (window), FALSE, TRUE, FALSE);
+ gtk_window_set_resizable(GTK_WINDOW (window), TRUE);
vbox = gtk_vbox_new (FALSE, 6);
gtk_widget_show (vbox);
gtk_window_set_title (GTK_WINDOW(window),
_("Filtering/Processing configuration"));
- gtk_signal_connect (GTK_OBJECT(window), "delete_event",
- GTK_SIGNAL_FUNC(prefs_filtering_deleted), NULL);
- gtk_signal_connect (GTK_OBJECT(window), "key_press_event",
- GTK_SIGNAL_FUNC(prefs_filtering_key_pressed), NULL);
+ g_signal_connect(G_OBJECT(window), "delete_event",
+ G_CALLBACK(prefs_filtering_deleted), NULL);
+ g_signal_connect(G_OBJECT(window), "key_press_event",
+ G_CALLBACK(prefs_filtering_key_pressed), NULL);
MANAGE_WINDOW_SIGNALS_CONNECT (window);
- gtk_signal_connect (GTK_OBJECT(ok_btn), "clicked",
- GTK_SIGNAL_FUNC(prefs_filtering_ok), NULL);
- gtk_signal_connect (GTK_OBJECT(cancel_btn), "clicked",
- GTK_SIGNAL_FUNC(prefs_filtering_cancel), NULL);
+ g_signal_connect(G_OBJECT(ok_btn), "clicked",
+ G_CALLBACK(prefs_filtering_ok), NULL);
+ g_signal_connect(G_OBJECT(cancel_btn), "clicked",
+ G_CALLBACK(prefs_filtering_cancel), NULL);
vbox1 = gtk_vbox_new (FALSE, VSPACING);
gtk_widget_show (vbox1);
cond_btn = gtk_button_new_with_label (_("Define ..."));
gtk_widget_show (cond_btn);
gtk_box_pack_start (GTK_BOX (hbox1), cond_btn, FALSE, FALSE, 0);
- gtk_signal_connect (GTK_OBJECT (cond_btn), "clicked",
- GTK_SIGNAL_FUNC (prefs_filtering_condition_define),
- NULL);
+ g_signal_connect(G_OBJECT (cond_btn), "clicked",
+ G_CALLBACK(prefs_filtering_condition_define),
+ NULL);
action_label = gtk_label_new (_("Action"));
gtk_widget_show (action_label);
action_btn = gtk_button_new_with_label (_("Define ..."));
gtk_widget_show (action_btn);
gtk_box_pack_start (GTK_BOX (hbox1), action_btn, FALSE, FALSE, 0);
- gtk_signal_connect (GTK_OBJECT (action_btn), "clicked",
- GTK_SIGNAL_FUNC (prefs_filtering_action_define),
- NULL);
+ g_signal_connect(G_OBJECT (action_btn), "clicked",
+ G_CALLBACK(prefs_filtering_action_define),
+ NULL);
/* register / substitute / delete */
reg_btn = gtk_button_new_with_label (_("Add"));
gtk_widget_show (reg_btn);
gtk_box_pack_start (GTK_BOX (btn_hbox), reg_btn, FALSE, TRUE, 0);
- gtk_signal_connect (GTK_OBJECT (reg_btn), "clicked",
- GTK_SIGNAL_FUNC (prefs_filtering_register_cb), NULL);
+ g_signal_connect(G_OBJECT (reg_btn), "clicked",
+ G_CALLBACK(prefs_filtering_register_cb), NULL);
subst_btn = gtk_button_new_with_label (_(" Replace "));
gtk_widget_show (subst_btn);
gtk_box_pack_start (GTK_BOX (btn_hbox), subst_btn, FALSE, TRUE, 0);
- gtk_signal_connect (GTK_OBJECT (subst_btn), "clicked",
- GTK_SIGNAL_FUNC (prefs_filtering_substitute_cb),
- NULL);
+ g_signal_connect(G_OBJECT (subst_btn), "clicked",
+ G_CALLBACK(prefs_filtering_substitute_cb),
+ NULL);
del_btn = gtk_button_new_with_label (_("Delete"));
gtk_widget_show (del_btn);
gtk_box_pack_start (GTK_BOX (btn_hbox), del_btn, FALSE, TRUE, 0);
- gtk_signal_connect (GTK_OBJECT (del_btn), "clicked",
- GTK_SIGNAL_FUNC (prefs_filtering_delete_cb), NULL);
+ g_signal_connect(G_OBJECT (del_btn), "clicked",
+ G_CALLBACK(prefs_filtering_delete_cb), NULL);
cond_hbox = gtk_hbox_new (FALSE, 8);
gtk_widget_show (cond_hbox);
GTK_SELECTION_BROWSE);
GTK_WIDGET_UNSET_FLAGS (GTK_CLIST (cond_clist)->column[0].button,
GTK_CAN_FOCUS);
- gtk_signal_connect (GTK_OBJECT (cond_clist), "select_row",
- GTK_SIGNAL_FUNC (prefs_filtering_select), NULL);
+ g_signal_connect(G_OBJECT (cond_clist), "select_row",
+ G_CALLBACK(prefs_filtering_select), NULL);
btn_vbox = gtk_vbox_new (FALSE, 8);
gtk_widget_show (btn_vbox);
top_btn = gtk_button_new_with_label (_("Top"));
gtk_widget_show (top_btn);
gtk_box_pack_start (GTK_BOX (btn_vbox), top_btn, FALSE, FALSE, 0);
- gtk_signal_connect (GTK_OBJECT (top_btn), "clicked",
- GTK_SIGNAL_FUNC (prefs_filtering_top), NULL);
+ g_signal_connect(G_OBJECT (top_btn), "clicked",
+ G_CALLBACK(prefs_filtering_top), NULL);
PACK_VSPACER (btn_vbox, spc_vbox, VSPACING_NARROW_2);
up_btn = gtk_button_new_with_label (_("Up"));
gtk_widget_show (up_btn);
gtk_box_pack_start (GTK_BOX (btn_vbox), up_btn, FALSE, FALSE, 0);
- gtk_signal_connect (GTK_OBJECT (up_btn), "clicked",
- GTK_SIGNAL_FUNC (prefs_filtering_up), NULL);
+ g_signal_connect(G_OBJECT (up_btn), "clicked",
+ G_CALLBACK(prefs_filtering_up), NULL);
down_btn = gtk_button_new_with_label (_("Down"));
gtk_widget_show (down_btn);
gtk_box_pack_start (GTK_BOX (btn_vbox), down_btn, FALSE, FALSE, 0);
- gtk_signal_connect (GTK_OBJECT (down_btn), "clicked",
- GTK_SIGNAL_FUNC (prefs_filtering_down), NULL);
+ g_signal_connect(G_OBJECT (down_btn), "clicked",
+ G_CALLBACK(prefs_filtering_down), NULL);
PACK_VSPACER (btn_vbox, spc_vbox, VSPACING_NARROW_2);
bottom_btn = gtk_button_new_with_label (_("Bottom"));
gtk_widget_show (bottom_btn);
gtk_box_pack_start (GTK_BOX (btn_vbox), bottom_btn, FALSE, FALSE, 0);
- gtk_signal_connect (GTK_OBJECT (bottom_btn), "clicked",
- GTK_SIGNAL_FUNC (prefs_filtering_bottom), NULL);
+ g_signal_connect(G_OBJECT (bottom_btn), "clicked",
+ G_CALLBACK(prefs_filtering_bottom), NULL);
gtk_widget_set_usize(window, 500, -1);
gtk_clist_set_column_width(GTK_CLIST(filtering.cond_clist), 0, optwidth);
}
+static void rename_path(GSList * filters,
+ const gchar * old_path, const gchar * new_path);
+
void prefs_filtering_rename_path(const gchar *old_path, const gchar *new_path)
{
GList * cur;
- gchar *paths[2] = {NULL, NULL};
- paths[0] = (gchar*)old_path;
- paths[1] = (gchar*)new_path;
+ const gchar *paths[2] = {NULL, NULL};
+ paths[0] = old_path;
+ paths[1] = new_path;
for (cur = folder_get_list() ; cur != NULL ; cur = g_list_next(cur)) {
Folder *folder;
folder = (Folder *) cur->data;
g_node_traverse(folder->node, G_PRE_ORDER, G_TRAVERSE_ALL, -1,
prefs_filtering_rename_path_func, paths);
}
- prefs_filtering_rename_path_func(NULL, paths);
+
+ rename_path(pre_global_processing, old_path, new_path);
+ rename_path(post_global_processing, old_path, new_path);
+ rename_path(filtering_rules, old_path, new_path);
+
+ prefs_matcher_write_config();
}
-static gboolean prefs_filtering_rename_path_func(GNode *node, gpointer data)
+static void rename_path(GSList * filters,
+ const gchar * old_path, const gchar * new_path)
{
- GSList *cur;
- gchar *old_path, *new_path;
gchar *base;
gchar *prefix;
gchar *suffix;
gint destlen;
gint prefixlen;
gint oldpathlen;
- FolderItem *item;
GSList * action_cur;
-
- old_path = ((gchar **)data)[0];
- new_path = ((gchar **)data)[1];
-
- g_return_val_if_fail(old_path != NULL, FALSE);
- g_return_val_if_fail(new_path != NULL, FALSE);
+ GSList * cur;
oldpathlen = strlen(old_path);
old_path_with_sep = g_strconcat(old_path,G_DIR_SEPARATOR_S,NULL);
- if (node == NULL)
- cur = global_processing;
- else {
- item = node->data;
- if (!item || !item->prefs)
- return FALSE;
- cur = item->prefs->processing;
- }
-
- for (; cur != NULL; cur = cur->next) {
+ for (cur = filters; cur != NULL; cur = cur->next) {
FilteringProp *filtering = (FilteringProp *)cur->data;
for(action_cur = filtering->action_list ; action_cur != NULL ;
}
} else {
/* folder-moving a leaf */
- if (!strcmp(old_path, action->destination)) {
+ if (!strcmp(old_path, action->destination)) {
dest_path = g_strdup(new_path);
g_free(action->destination);
action->destination = dest_path;
}
}
}
+}
+
+static gboolean prefs_filtering_rename_path_func(GNode *node, gpointer data)
+{
+ GSList *filters;
+ const gchar * old_path;
+ const gchar * new_path;
+ const gchar ** paths;
+ FolderItem *item;
- g_free(old_path_with_sep);
- prefs_matcher_write_config();
+ paths = data;
+ old_path = paths[0];
+ new_path = paths[1];
+
+ g_return_val_if_fail(old_path != NULL, FALSE);
+ g_return_val_if_fail(new_path != NULL, FALSE);
+ g_return_val_if_fail(node != NULL, FALSE);
+
+ item = node->data;
+ if (!item || !item->prefs)
+ return FALSE;
+ filters = item->prefs->processing;
+
+ rename_path(filters, old_path, new_path);
return FALSE;
}
g_node_traverse(folder->node, G_PRE_ORDER, G_TRAVERSE_ALL, -1,
prefs_filtering_delete_path_func, (gchar *)path);
}
- prefs_filtering_delete_path_func(NULL, (gchar *)path);
+ delete_path(&pre_global_processing, path);
+ delete_path(&post_global_processing, path);
+ delete_path(&filtering_rules, path);
+
+ prefs_matcher_write_config();
}
-static gboolean prefs_filtering_delete_path_func(GNode *node, gpointer data)
+static void delete_path(GSList ** p_filters, const gchar * path)
{
- GSList *cur, *filters, *duplist;
- gchar *path = (gchar *) data;
+ GSList * filters;
+ GSList * duplist;
gchar *suffix;
gint destlen;
gint prefixlen;
gint pathlen;
- FolderItem *item;
GSList * action_cur;
-
- g_return_val_if_fail(path != NULL, FALSE);
-
+ GSList * cur;
+
+ filters = *p_filters;
pathlen = strlen(path);
- if (node == NULL)
- filters = global_processing;
- else {
- item = node->data;
- if (!item || !item->prefs)
- return FALSE;
- filters = item->prefs->processing;
- }
-
duplist = g_slist_copy(filters);
for (cur = duplist ; cur != NULL; cur = g_slist_next(cur)) {
FilteringProp *filtering = (FilteringProp *) cur->data;
}
}
g_slist_free(duplist);
+
+ * p_filters = filters;
+}
- if (node == NULL)
- global_processing = filters;
- else {
- item = node->data;
- if (!item || !item->prefs)
- return FALSE;
- item->prefs->processing = filters;
- }
+static gboolean prefs_filtering_delete_path_func(GNode *node, gpointer data)
+{
+ const gchar *path = data;
+ FolderItem *item;
+ GSList ** p_filters;
+
+ g_return_val_if_fail(path != NULL, FALSE);
+ g_return_val_if_fail(node != NULL, FALSE);
+
+ item = node->data;
+ if (!item || !item->prefs)
+ return FALSE;
+ p_filters = &item->prefs->processing;
- prefs_matcher_write_config();
+ delete_path(p_filters, path);
return FALSE;
}
row = gtk_clist_append(clist, cond_str);
gtk_clist_set_row_data(clist, row, NULL);
- if (cur_item == NULL)
- prefs_filtering = global_processing;
- else
- prefs_filtering = cur_item->prefs->processing;
+ prefs_filtering = * p_processing_list;
for(cur = prefs_filtering ; cur != NULL ; cur = g_slist_next(cur)) {
FilteringProp * prop = (FilteringProp *) cur->data;
prefs_filtering_reset_dialog();
if (header && key) {
- gchar *match_str = g_strconcat(header, " ",
- get_matchparser_tab_str(MATCHTYPE_MATCHCASE),
- " \"", key, "\"", NULL);
+ gchar * quoted_key;
+ gchar *match_str;
+
+ quoted_key = matcher_quote_str(key);
+
+ match_str = g_strconcat(header, " ", get_matchparser_tab_str(MATCHTYPE_MATCHCASE),
+ " \"", quoted_key, "\"", NULL);
+ g_free(quoted_key);
+
gtk_entry_set_text(GTK_ENTRY(filtering.cond_entry), match_str);
g_free(match_str);
}
gchar * filtering_str;
GSList * prefs_filtering;
- if (cur_item == NULL)
- prefs_filtering = global_processing;
- else
- prefs_filtering = cur_item->prefs->processing;
+ prefs_filtering = * p_processing_list;
for(cur = prefs_filtering ; cur != NULL ; cur = g_slist_next(cur))
filteringprop_free((FilteringProp *) cur->data);
row++;
}
- if (cur_item == NULL)
- global_processing = prefs_filtering;
- else
- cur_item->prefs->processing = prefs_filtering;
+ * p_processing_list = prefs_filtering;
}
static gint prefs_filtering_clist_set_row(gint row, FilteringProp * prop)
return TRUE;
}
-static void prefs_filtering_key_pressed(GtkWidget *widget, GdkEventKey *event,
+static gboolean prefs_filtering_key_pressed(GtkWidget *widget, GdkEventKey *event,
gpointer data)
{
- if (event && event->keyval == GDK_Escape)
+ if (event && event->keyval == GDK_Escape) {
prefs_filtering_cancel();
+ return TRUE;
+ }
+ return FALSE;
}
static void prefs_filtering_ok(void)
projects / claws.git / blobdiff