/*
* Sylpheed -- a GTK+ based, lightweight, and fast e-mail client
- * Copyright (C) 1999-2011 Hiroyuki Yamamoto and the Claws Mail team
+ * Copyright (C) 1999-2013 Hiroyuki Yamamoto and 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
g_signal_connect(G_OBJECT(ctree), "button_press_event",
G_CALLBACK(folderview_button_pressed),
folderview);
-#ifndef MAEMO
g_signal_connect(G_OBJECT(ctree), "popup-menu",
G_CALLBACK(folderview_popup_menu), folderview);
-#else
- gtk_widget_tap_and_hold_setup(GTK_WIDGET(ctree), NULL, NULL,
- GTK_TAP_AND_HOLD_NONE | GTK_TAP_AND_HOLD_NO_INTERNALS);
- g_signal_connect(G_OBJECT(ctree), "tap-and-hold",
- G_CALLBACK(folderview_popup_menu), folderview);
-#endif
g_signal_connect(G_OBJECT(ctree), "button_release_event",
G_CALLBACK(folderview_button_released),
folderview);
FolderItem *sel_item = NULL, *op_item = NULL;
GtkWidget *scrolledwin = folderview->scrolledwin;
+ if (folderview->drag_timer_id != 0) {
+ g_source_remove(folderview->drag_timer_id);
+ folderview->drag_timer_id = 0;
+ }
+ if (folderview->deferred_refresh_id != 0) {
+ g_source_remove(folderview->deferred_refresh_id);
+ folderview->deferred_refresh_id = 0;
+ }
+ if (folderview->scroll_timeout_id != 0) {
+ g_source_remove(folderview->scroll_timeout_id);
+ folderview->scroll_timeout_id = 0;
+ }
+ if (folderview->postpone_select_id != 0) {
+ g_source_remove(folderview->postpone_select_id);
+ folderview->postpone_select_id = 0;
+ }
+
if (folderview->selected)
sel_item = gtk_cmctree_node_get_row_data(GTK_CMCTREE(ctree), folderview->selected);
if (folderview->opened)
folderview->target_list = gtk_target_list_new(folderview_drag_types, 2);
folderview_list = g_list_append(folderview_list, folderview);
- folderview->deferred_refresh_id = -1;
- folderview->scroll_timeout_id = -1;
+
+ folderview->drag_timer_id = 0;
+ folderview->deferred_refresh_id = 0;
+ folderview->scroll_timeout_id = 0;
+ folderview->postpone_select_id = 0;
+
return folderview;
}
debug_print("doing deferred folderview_set now\n");
folderview_set(folderview);
- folderview->deferred_refresh_id = -1;
+ folderview->deferred_refresh_id = 0;
return FALSE;
}
return;
if (mainwin->lock_count) {
- if (folderview->deferred_refresh_id == -1)
+ if (folderview->deferred_refresh_id == 0)
folderview->deferred_refresh_id =
g_timeout_add(500, folderview_defer_set, folderview);
debug_print("deferred folderview_set\n");
&& prefs_common.ask_mark_all_read) {
val = alertpanel_full(_("Mark all as read"),
_("Do you really want to mark all mails in this "
- "folder as read ?"), GTK_STOCK_NO, GTK_STOCK_YES, NULL,
+ "folder as read?"), GTK_STOCK_NO, GTK_STOCK_YES, NULL,
TRUE, NULL, ALERT_QUESTION, G_ALERTDEFAULT);
if ((val & ~G_ALERTDISABLE) != G_ALERTALTERNATE)
static gchar *get_scan_str(FolderItem *item)
{
if (item->path)
- return g_strdup_printf(_("Scanning folder %s%c%s ..."),
+ return g_strdup_printf(_("Scanning folder %s%c%s..."),
item->folder->name, G_DIR_SEPARATOR,
item->path);
else
- return g_strdup_printf(_("Scanning folder %s ..."),
+ return g_strdup_printf(_("Scanning folder %s..."),
item->folder->name);
}
static void folderview_scan_tree_func(Folder *folder, FolderItem *item,
inc_unlock();
}
-void folderview_fast_rescan_tree(Folder *folder)
-{
- GtkWidget *window;
- MainWindow *mainwin = mainwindow_get_mainwindow();
- FolderView *folderview = NULL;
- GtkAdjustment *pos = NULL;
- gint height = 0;
-
- cm_return_if_fail(folder != NULL);
-
- if (!folder->klass->scan_tree) return;
-
- inc_lock();
-
- window = label_window_create(_("Scanning folder tree..."));
-
- if (mainwin)
- folderview = mainwin->folderview;
-
- if (folderview) {
- pos = gtk_scrolled_window_get_vadjustment(
- GTK_SCROLLED_WINDOW(folderview->scrolledwin));
- height = gtk_adjustment_get_value(pos);
- }
-
- folder_set_ui_func(folder, folderview_scan_tree_func, NULL);
- folder_fast_scan_tree(folder);
- folder_set_ui_func(folder, NULL, NULL);
-
- folderview_set_all();
-
- if (folderview) {
- pos = gtk_scrolled_window_get_vadjustment(
- GTK_SCROLLED_WINDOW(folderview->scrolledwin));
- gtk_adjustment_set_value(pos, height);
- gtk_adjustment_changed(pos);
- }
- label_window_destroy(window);
- inc_unlock();
-}
-
/** folderview_check_new()
* Scan and update the folder and return the
* count the number of new messages since last check.
}
switch (stype) {
case F_INBOX:
- if (item->hide_read_msgs) {
+ if (item->hide_read_msgs || item->hide_read_threads) {
xpm = mark?m_inboxhrmxpm:inboxhrmxpm;
openxpm = mark?m_inboxopenhrmxpm:inboxopenhrmxpm;
} else {
}
break;
case F_OUTBOX:
- if (item->hide_read_msgs) {
+ if (item->hide_read_msgs || item->hide_read_threads) {
xpm = mark?m_outboxhrmxpm:outboxhrmxpm;
openxpm = mark?m_outboxopenhrmxpm:outboxopenhrmxpm;
} else {
}
break;
case F_QUEUE:
- if (item->hide_read_msgs) {
+ if (item->hide_read_msgs || item->hide_read_threads) {
xpm = mark?m_queuehrmxpm:queuehrmxpm;
openxpm = mark?m_queueopenhrmxpm:queueopenhrmxpm;
} else {
}
break;
case F_TRASH:
- if (item->hide_read_msgs) {
+ if (item->hide_read_msgs || item->hide_read_threads) {
xpm = mark?m_trashhrmxpm:trashhrmxpm;
openxpm = mark?m_trashopenhrmxpm:trashopenhrmxpm;
} else {
openxpm = mark?m_draftsopenxpm:draftsopenxpm;
break;
default:
- if (item->hide_read_msgs) {
+ if (item->hide_read_msgs || item->hide_read_threads) {
xpm = mark?m_folderhrmxpm:folderhrmxpm;
openxpm = mark?m_folderopenhrmxpm:folderopenhrmxpm;
} else {
}
if (folder_has_parent_of_type(item, F_OUTBOX) ||
- folder_has_parent_of_type(item, F_DRAFT) ||
folder_has_parent_of_type(item, F_TRASH)) {
use_bold = use_color = FALSE;
} else if (folder_has_parent_of_type(item, F_QUEUE)) {
break;
}
}
+ procmsg_msg_list_free(list);
} else {
/* if unread messages exist, print with bold font */
use_bold = (item->unread_msgs > 0|| item->new_msgs > 0)
if ((update_info->update_flags & F_ITEM_UPDATE_CONTENT) &&
update_info->item == folderview->summaryview->folder_item &&
update_info->item != NULL)
- if (!quicksearch_is_active(folderview->summaryview->quicksearch))
+ if (!quicksearch_has_sat_predicate(folderview->summaryview->quicksearch))
summary_show(folderview->summaryview, update_info->item);
}
{
PostponedSelectData *psdata = (PostponedSelectData *)data;
debug_print("trying again\n");
+
+ psdata->folderview->postpone_select_id = 0;
psdata->folderview->open_folder = TRUE;
main_window_cursor_normal(psdata->folderview->mainwin);
STATUSBAR_POP(psdata->folderview->mainwin);
olditem = gtk_cmctree_node_get_row_data(GTK_CMCTREE(folderview->ctree),
folderview->opened);
if (olditem) {
- gchar *buf = g_strdup_printf(_("Closing Folder %s..."),
+ gchar *buf = g_strdup_printf(_("Closing folder %s..."),
olditem->path ? olditem->path:olditem->name);
/* will be null if we just moved the previously opened folder */
STATUSBAR_PUSH(folderview->mainwin, buf);
/* Open Folder */
/* TODO: wwp: avoid displaying (null) in the status bar */
- buf = g_strdup_printf(_("Opening Folder %s..."), item->path ?
+ buf = g_strdup_printf(_("Opening folder %s..."), item->path ?
item->path : "(null)");
debug_print("%s\n", buf);
STATUSBAR_PUSH(folderview->mainwin, buf);
item->path ? item->path:item->name);
folderview->open_folder = FALSE;
can_select = TRUE;
- g_timeout_add(500, postpone_select, data);
+ if (folderview->postpone_select_id != 0)
+ g_source_remove(folderview->postpone_select_id);
+ folderview->postpone_select_id = g_timeout_add(500, postpone_select, data);
END_TIMING();
return;
}
void folderview_move_folder(FolderView *folderview, FolderItem *from_folder,
FolderItem *to_folder, gboolean copy)
{
- FolderItem *from_parent = NULL;
FolderItem *new_folder = NULL;
- GtkCMCTreeNode *src_node = NULL;
gchar *buf;
gint status;
cm_return_if_fail(from_folder != NULL);
cm_return_if_fail(to_folder != NULL);
- src_node = gtk_cmctree_find_by_row_data(GTK_CMCTREE(folderview->ctree), NULL, from_folder);
- from_parent = folder_item_parent(from_folder);
-
if (prefs_common.warn_dnd) {
- buf = g_strdup_printf(copy ? _("Do you really want to copy folder '%s' in '%s' ?"):
- _("Do you really want to make folder '%s' a subfolder of '%s' ?"),
+ buf = g_strdup_printf(copy ? _("Do you really want to copy folder '%s' in '%s'?"):
+ _("Do you really want to make folder '%s' a subfolder of '%s'?"),
from_folder->name, to_folder->name);
status = alertpanel_full(copy ? _("Copy folder"):_("Move folder"), buf,
GTK_STOCK_NO, GTK_STOCK_YES, NULL, TRUE,
static void drag_state_stop(FolderView *folderview)
{
- if (folderview->drag_timer)
- g_source_remove(folderview->drag_timer);
- folderview->drag_timer = 0;
+ if (folderview->drag_timer_id)
+ g_source_remove(folderview->drag_timer_id);
+ folderview->drag_timer_id = 0;
folderview->drag_node = NULL;
}
}
}
folderview->drag_item = NULL;
- folderview->drag_timer = 0;
+ folderview->drag_timer_id = 0;
return FALSE;
}
* we need to call drag_state_stop() */
drag_state_stop(folderview);
/* request expansion */
- if (0 != (folderview->drag_timer = g_timeout_add
+ if (0 != (folderview->drag_timer_id = g_timeout_add
(prefs_common.hover_timeout,
(GSourceFunc)folderview_defer_expand,
folderview))) {
(int)gtk_adjustment_get_page_size(pos);
if (folderview->scroll_value == 0) {
- folderview->scroll_timeout_id = -1;
+ folderview->scroll_timeout_id = 0;
return FALSE;
}
} else {
folderview->scroll_value = 0;
}
- if (folderview->scroll_value != 0 && folderview->scroll_timeout_id == -1) {
+ if (folderview->scroll_value != 0 && folderview->scroll_timeout_id == 0) {
folderview->scroll_timeout_id =
g_timeout_add(30, folderview_dnd_scroll_cb,
folderview);
projects / claws.git / blobdiff