2006-12-06 [colin] 2.6.1cvs6

[claws.git] / src / folderview.c

diff --git a/src/folderview.c b/src/folderview.c
index bd68aea4270c42d59c5e0fa0ca14d7dc6d028c72..2a1e0c1b28e965115c9ff38c273fb6a36288075e 100644 (file)
--- a/src/folderview.c
+++ b/src/folderview.c
@@ -394,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));
         
@@ -1168,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) {
@@ -2604,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;
 }
@@ -2631,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))) {