0.8.6claws51

[claws.git] / src / folderview.c

diff --git a/src/folderview.c b/src/folderview.c
index 65bdd2f14cc5c66390fda755b91651ab718b6f7c..f36e1be813fef07ec0ae82b7c9d1e051313dbcec 100644 (file)
--- a/src/folderview.c
+++ b/src/folderview.c
@@ -62,6 +62,7 @@
 #include "foldersel.h"
 #include "inc.h"
 #include "statusbar.h"
+#include "hooks.h"
 
 typedef enum
 {
@@ -259,9 +260,8 @@ static void folderview_drag_data_get     (GtkWidget        *widget,
 
 void folderview_create_folder_node       (FolderView       *folderview, 
                                          FolderItem       *item);
-void folderview_update_item             (FolderItem       *item,
-                                          gboolean         update_summary,
-                                         gpointer          data);
+void folderview_update_item             (gpointer          source,
+                                         gpointer          data);
 
 static void folderview_scoring_cb(FolderView *folderview, guint action,
                                  GtkWidget *widget);
@@ -506,7 +506,7 @@ FolderView *folderview_create(void)
        folderview->mbox_factory = mbox_factory;
 
        folderview->folder_item_update_callback_id =
-               folder_item_update_callback_register(folderview_update_item, (gpointer) folderview);
+               hooks_register_hook(FOLDER_ITEM_UPDATE_HOOKLIST, folderview_update_item, (gpointer) folderview);
 
        gtk_widget_show_all(scrolledwin);
 
@@ -1261,22 +1261,24 @@ static void folderview_update_node(FolderView *folderview, GtkCTreeNode *node)
                folderview_update_node(folderview, node);
 }
 
-void folderview_update_item(FolderItem *item, gboolean update_summary, gpointer data)
+void folderview_update_item(gpointer source, gpointer data)
 {
+       FolderItemUpdateData *update_info = (FolderItemUpdateData *)source;
        FolderView *folderview = (FolderView *)data;
        GtkCTree *ctree;
        GtkCTreeNode *node;
 
+       g_return_if_fail(update_info != NULL);
+       g_return_if_fail(update_info->item != NULL);
        g_return_if_fail(folderview != NULL);
-       g_return_if_fail(item != NULL);
 
        ctree = GTK_CTREE(folderview->ctree);
 
-       node = gtk_ctree_find_by_row_data(ctree, NULL, item);
+       node = gtk_ctree_find_by_row_data(ctree, NULL, update_info->item);
        if (node) {
                folderview_update_node(folderview, node);
-               if (update_summary && folderview->opened == node)
-                       summary_show(folderview->summaryview, item);
+               if (update_info->content_change && folderview->opened == node)
+                       summary_show(folderview->summaryview, update_info->item);
        }
 }
 
@@ -2628,9 +2630,20 @@ static gboolean folderview_drag_motion_cb(GtkWidget      *widget,
        FolderItem *item, *src_item;
        GtkCTreeNode *node = NULL;
        gboolean acceptable = FALSE;
+       gint height = folderview->ctree->allocation.height;
+       gint total_height = folderview->ctree->requisition.height;
+       GtkAdjustment *pos = gtk_scrolled_window_get_vadjustment(
+                               GTK_SCROLLED_WINDOW(folderview->scrolledwin));
+       gfloat vpos = pos->value;
 
        if (gtk_clist_get_selection_info
                (GTK_CLIST(widget), x - 24, y - 24, &row, &column)) {
+               if (y > height - 24 && height + vpos < total_height)
+                       gtk_adjustment_set_value(pos, (vpos+5 > height ? height : vpos+5));
+
+               if (y < 24 && y > 0)
+                       gtk_adjustment_set_value(pos, (vpos-5 < 0 ? 0 : vpos-5));
+
                node = gtk_ctree_node_nth(GTK_CTREE(widget), row);
                item = gtk_ctree_node_get_row_data(GTK_CTREE(widget), node);
                src_item = folderview->summaryview->folder_item;
@@ -2743,10 +2756,6 @@ static void folderview_drag_received_cb(GtkWidget        *widget,
        } else {
                /* comes from folderview */
                char *source;
-               char *buf;
-               gint status;
-               GtkCTreeNode *src_node;
-               FolderItem *new_item, *src_parent;
                
                source = data->data + 17;
                if (gtk_clist_get_selection_info