2006-12-06 [colin] 2.6.1cvs6
[claws.git] / src / folderview.c
index 33af3301e0fc3a15ffeda84b4eeac557afd7da70..2a1e0c1b28e965115c9ff38c273fb6a36288075e 100644 (file)
@@ -1,6 +1,6 @@
 /*
  * Sylpheed -- a GTK+ based, lightweight, and fast e-mail client
- * Copyright (C) 1999-2006 Hiroyuki Yamamoto and the Sylpheed-Claws team
+ * Copyright (C) 1999-2006 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
@@ -288,6 +288,7 @@ GHashTable *folderview_popups;
 static GtkItemFactoryEntry folderview_common_popup_entries[] =
 {
        {N_("/Mark all re_ad"),         NULL, mark_all_read_cb, 0, NULL},
+       {"/---",                        NULL, NULL, 0, "<Separator>"},
        {N_("/_Search folder..."),      NULL, folderview_search_cb, 0, NULL},
        {N_("/_Properties..."),         NULL, folderview_property_cb, 0, NULL},
        {N_("/Process_ing..."),         NULL, folderview_processing_cb, 0, NULL},
@@ -306,7 +307,7 @@ static GtkItemFactoryEntry folder_view_queue_popup_entries[] = {
 
 GtkTargetEntry folderview_drag_types[] =
 {
-       {"sylpheed-claws/internal", GTK_TARGET_SAME_APP, TARGET_DUMMY},
+       {"claws-mail/internal", GTK_TARGET_SAME_APP, TARGET_DUMMY},
        {"text/uri-list", 0, TARGET_MAIL_URI_LIST}
 };
 
@@ -393,9 +394,9 @@ static void folderview_column_set_titles(FolderView *folderview)
        stock_pixmap_gdk(ctree, STOCK_PIXMAP_READ,
                         &readxpm, &readxpmmask);
                
-       label_new = gtk_pixmap_new(newxpm, newxpmmask);
-       label_unread = gtk_pixmap_new(unreadxpm, unreadxpmmask);
-       label_total = gtk_pixmap_new(readxpm, readxpmmask);
+       label_new = gtk_image_new_from_pixmap(newxpm, newxpmmask);
+       label_unread = gtk_image_new_from_pixmap(unreadxpm, unreadxpmmask);
+       label_total = gtk_image_new_from_pixmap(readxpm, readxpmmask);
        
        gtk_clist_column_titles_active(GTK_CLIST(ctree));
         
@@ -494,6 +495,7 @@ GtkWidget *folderview_ctree_create(FolderView *folderview)
        }
 
        gtk_sctree_set_stripes(GTK_SCTREE(ctree), prefs_common.use_stripes_in_summaries);
+       gtk_sctree_set_recursive_expand(GTK_SCTREE(ctree), FALSE);
 
        gtk_ctree_set_indent(GTK_CTREE(ctree), CTREE_INDENT);
        gtk_clist_set_compare_func(GTK_CLIST(ctree), folderview_clist_compare);
@@ -781,10 +783,10 @@ static void mark_all_read_cb(FolderView *folderview, guint action,
        summary_lock(folderview->summaryview);
        folder_item_update_freeze();
        if (folderview->summaryview->folder_item == item)
-               gtk_clist_freeze(GTK_CLIST(folderview->summaryview->ctree));
+               summary_freeze(folderview->summaryview);
        folderutils_mark_all_read(item);
        if (folderview->summaryview->folder_item == item)
-               gtk_clist_thaw(GTK_CLIST(folderview->summaryview->ctree));
+               summary_thaw(folderview->summaryview);
        folder_item_update_thaw();
        summary_unlock(folderview->summaryview);
 }
@@ -804,7 +806,7 @@ static void folderview_select_node(FolderView *folderview, GtkCTreeNode *node)
        gtk_ctree_select(ctree, node);
        if (folderview->summaryview->folder_item &&
            folderview->summaryview->folder_item->total_msgs > 0)
-               gtk_widget_grab_focus(folderview->summaryview->ctree);
+               summary_grab_focus(folderview->summaryview);
        else
                gtk_widget_grab_focus(folderview->ctree);
 
@@ -1044,29 +1046,9 @@ void folderview_append_item(FolderItem *item)
 static void folderview_set_folders(FolderView *folderview)
 {
        GList *list;
-#ifndef HAVE_LIBETPAN
-       static gboolean missing_imap_warning = TRUE;
-#endif
        list = folder_get_list();
 
        for (; list != NULL; list = list->next) {
-#ifndef HAVE_LIBETPAN
-               if ((FOLDER(list->data))
-               &&  (FOLDER(list->data))->klass
-               &&  (FOLDER(list->data))->klass->type == F_IMAP
-               &&  missing_imap_warning) {
-                       missing_imap_warning = FALSE;
-                       alertpanel_error(
-                               _("You have one or more IMAP accounts "
-                                 "defined. However this version of "
-                                 "Sylpheed-Claws has been built without "
-                                 "IMAP support; your IMAP account(s) are "
-                                 "disabled.\n\n"
-                                 "You probably need to "
-                                 "install libetpan and recompile "
-                                 "Sylpheed-Claws."));
-               }
-#endif
                folderview_append_folder(folderview, FOLDER(list->data));
        }
 }
@@ -1186,10 +1168,16 @@ gint folderview_check_new(Folder *folder)
                             item->opened == TRUE ||
                             item->processing_pending == TRUE)) {
                                if (folder_item_scan(item) < 0) {
-                                       summaryview_unlock(folderview->summaryview, item);
-                                       if (folder && !FOLDER_IS_LOCAL(folder)) {
-                                               STATUSBAR_POP(folderview->mainwin);
-                                               break;
+                                       if (folder) {
+                                               summaryview_unlock(folderview->summaryview, item);
+                                               if (FOLDER_TYPE(item->folder) == F_NEWS || FOLDER_IS_LOCAL(folder)) {
+                                                       log_error(_("Couldn't scan folder %s\n"),
+                                                               item->path ? item->path:item->name);
+                                                       continue;
+                                               } else if (!FOLDER_IS_LOCAL(folder)) {
+                                                       STATUSBAR_POP(folderview->mainwin);
+                                                       break;
+                                               }
                                        }
                                }
                        } else if (!item->folder->klass->scan_required) {
@@ -1703,6 +1691,7 @@ gboolean folderview_update_item_claws(gpointer source, gpointer data)
        ctree = GTK_CTREE(folderview->ctree);
 
        node = gtk_ctree_find_by_row_data(ctree, NULL, update_info->item);
+
        if (node) {
                if (update_info->update_flags & (F_ITEM_UPDATE_MSGCNT | F_ITEM_UPDATE_NAME))
                        folderview_update_node(folderview, node);
@@ -1931,17 +1920,20 @@ static gboolean folderview_button_pressed(GtkWidget *ctree, GdkEventButton *even
        if (!event) return FALSE;
 
        if (event->button == 1 || event->button == 2) {
-               folderview->open_folder = TRUE;
+               if (!gtk_ctree_is_hot_spot (GTK_CTREE(clist), event->x, event->y))
+                       folderview->open_folder = TRUE;
 
                if (event->type == GDK_2BUTTON_PRESS) {
                        if (clist->selection) {
                                GtkCTreeNode *node;
 
                                node = GTK_CTREE_NODE(clist->selection->data);
-                               if (node)
+                               if (node) {
                                        gtk_ctree_toggle_expansion(
                                                GTK_CTREE(ctree),
                                                node);
+                                       folderview->open_folder = FALSE;
+                               }
                        }
                }
                return FALSE;
@@ -2081,6 +2073,7 @@ static void folderview_selected(GtkCTree *ctree, GtkCTreeNode *row,
        item = gtk_ctree_node_get_row_data(ctree, row);
        if (!item || item->no_select) {
                END_TIMING();
+               folderview->open_folder = FALSE;
                return;
        }
 
@@ -2600,6 +2593,7 @@ void folderview_reflect_prefs(void)
                        GTK_CTREE(folderview->ctree), NULL, item);
 
                folderview_select(folderview, item);
+               folderview->open_folder = FALSE;
                folderview->selected = node;
        }
 
@@ -2616,7 +2610,7 @@ void folderview_reflect_prefs(void)
 static void drag_state_stop(FolderView *folderview)
 {
        if (folderview->drag_timer)
-               gtk_timeout_remove(folderview->drag_timer);
+               g_source_remove(folderview->drag_timer);
        folderview->drag_timer = 0;
        folderview->drag_node = NULL;
 }
@@ -2643,7 +2637,7 @@ static void drag_state_start(FolderView *folderview, GtkCTreeNode *node, FolderI
         * we need to call drag_state_stop() */
        drag_state_stop(folderview);
        /* request expansion */
-       if (0 != (folderview->drag_timer = gtk_timeout_add
+       if (0 != (folderview->drag_timer = g_timeout_add
                        (prefs_common.hover_timeout, 
                         (GtkFunction)folderview_defer_expand,
                         folderview))) {
@@ -2761,12 +2755,13 @@ static gboolean folderview_drag_motion_cb(GtkWidget      *widget,
                src_item = folderview->summaryview->folder_item;
 
                srcwidget = gtk_drag_get_source_widget(context);
-               if (srcwidget == folderview->summaryview->ctree) {
+               if (srcwidget == summary_get_main_widget(folderview->summaryview)) {
                        /* comes from summaryview */
                        /* we are copying messages, so only accept folder items that are not
                           the source item, are no root items and can copy messages */
                        if (item && item->folder && folder_item_parent(item) != NULL && src_item &&
-                           src_item != item && FOLDER_CLASS(item->folder)->copy_msg != NULL)
+                           src_item != item && FOLDER_CLASS(item->folder)->copy_msg != NULL &&
+                           FOLDER_TYPE(item->folder) != F_UNKNOWN)
                                acceptable = TRUE;
                } else if (srcwidget == folderview->ctree) {
                        /* comes from folderview */
@@ -2774,14 +2769,17 @@ static gboolean folderview_drag_motion_cb(GtkWidget      *widget,
                            the source items and can copy messages and create folder items */
                        if (item && item->folder && src_item && src_item != item &&
                            FOLDER_CLASS(item->folder)->copy_msg != NULL &&
-                           FOLDER_CLASS(item->folder)->create_folder != NULL)
+                           FOLDER_CLASS(item->folder)->create_folder != NULL &&
+                           ((FOLDER_TYPE(item->folder) != F_UNKNOWN &&  FOLDER_TYPE(src_item->folder) != F_UNKNOWN)
+                            || item->folder == src_item->folder))
                                acceptable = TRUE;
                } else {
                        /* comes from another app */
                        /* we are adding messages, so only accept folder items that are 
                           no root items and can copy messages */
                        if (item && item->folder && folder_item_parent(item) != NULL
-                           && FOLDER_CLASS(item->folder)->add_msg != NULL)
+                           && FOLDER_CLASS(item->folder)->add_msg != NULL &&
+                           FOLDER_TYPE(item->folder) != F_UNKNOWN)
                                acceptable = TRUE;
                }
        }