2007-09-16 [colin] 3.0.0cvs17

[claws.git] / src / folderview.c

diff --git a/src/folderview.c b/src/folderview.c
index 555b4f5a3a81f61ad3f25797c75805ae47e1585b..1b6fe080ab117341a98379ed7e380d1b1eda1982 100644 (file)
--- a/src/folderview.c
+++ b/src/folderview.c
@@ -292,7 +292,7 @@ static GtkItemFactoryEntry folderview_common_popup_entries[] =
 {
        {N_("/Mark all re_ad"),         NULL, mark_all_read_cb, 0, NULL},
        {"/---",                        NULL, NULL, 0, "<Separator>"},
-       {N_("/Run processing rules"),   NULL, folderview_run_processing_cb, 0, NULL},
+       {N_("/R_un processing rules"),  NULL, folderview_run_processing_cb, 0, NULL},
        {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},
@@ -754,7 +754,7 @@ static gboolean folderview_defer_set(gpointer data)
        if (mainwin->lock_count)
                return TRUE;
                
-       g_print("doing deferred folderview_set now\n");
+       debug_print("doing deferred folderview_set now\n");
        folderview_set(folderview);
 
        folderview->deferred_refresh_id = -1;
@@ -774,7 +774,7 @@ void folderview_set(FolderView *folderview)
                if (folderview->deferred_refresh_id == -1)
                        folderview->deferred_refresh_id = 
                                g_timeout_add(500, folderview_defer_set, folderview);
-               g_print("deferred folderview_set\n");
+               debug_print("deferred folderview_set\n");
                return;
        }
 
@@ -1130,6 +1130,7 @@ void folderview_rescan_tree(Folder *folder, gboolean rebuild)
                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();
@@ -1170,6 +1171,7 @@ void folderview_fast_rescan_tree(Folder *folder)
                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();
@@ -1925,7 +1927,8 @@ static void folderview_set_sens_and_popup_menu(FolderView *folderview, gint row,
 #define SET_SENS(name, sens) \
        menu_set_sensitive(fpopup_factory, name, sens)
 
-       SET_SENS("/Download messages", !item->no_select);
+       if ( FOLDER_TYPE(item->folder) == F_NEWS || FOLDER_TYPE(item->folder) == F_IMAP )
+               SET_SENS("/Download messages", !item->no_select);
        SET_SENS("/Mark all read", item->unread_msgs >= 1);
        SET_SENS("/Search folder...", item->total_msgs >= 1 && 
                 folderview->selected == folderview->opened);
@@ -1950,8 +1953,6 @@ static void folderview_set_sens_and_popup_menu(FolderView *folderview, gint row,
        popup = gtk_item_factory_get_widget(fpopup_factory, fpopup->path);
        gtk_menu_popup(GTK_MENU(popup), NULL, NULL, NULL, NULL,
                       event->button, event->time);
-
-
 }
 
 static gboolean folderview_button_pressed(GtkWidget *ctree, GdkEventButton *event,
@@ -2017,8 +2018,13 @@ static gboolean folderview_button_pressed(GtkWidget *ctree, GdkEventButton *even
 static gboolean folderview_button_released(GtkWidget *ctree, GdkEventButton *event,
                                           FolderView *folderview)
 {
+       int row = -1, column = -1;
+
        if (!event) return FALSE;
 
+       if (!gtk_clist_get_selection_info(GTK_CLIST(ctree), event->x, event->y,
+                                         &row, &column))
+               return FALSE;
        if (event->button == 1 && folderview->open_folder == FALSE &&
            folderview->opened != NULL) {
                gtkut_ctree_set_focus_row(GTK_CTREE(ctree),
@@ -2441,11 +2447,9 @@ static void folderview_send_queue_cb(FolderView *folderview, guint action,
                        alertpanel_error_log(_("Some errors occurred while "
                                           "sending queued messages."));
                else {
-                       gchar *tmp = g_strdup_printf(_("Some errors occurred "
+                       alertpanel_error_log(_("Some errors occurred "
                                        "while sending queued messages:\n%s"), errstr);
                        g_free(errstr);
-                       alertpanel_error_log(tmp);
-                       g_free(tmp);
                }
        }
 }
@@ -2708,6 +2712,7 @@ void folderview_reflect_prefs(void)
        pos = gtk_scrolled_window_get_vadjustment(
                                GTK_SCROLLED_WINDOW(folderview->scrolledwin));
        gtk_adjustment_set_value(pos, height);
+       gtk_adjustment_changed(pos);
        gtk_clist_thaw(GTK_CLIST(folderview->ctree));
 }
 
@@ -2848,16 +2853,20 @@ static gboolean folderview_drag_motion_cb(GtkWidget      *widget,
        int height = (int)pos->page_size;
        int total_height = (int)pos->upper;
        int vpos = (int) pos->value;
-
+       int offset = prefs_common.show_col_headers ? 24:0;
+       
        if (gtk_clist_get_selection_info
-               (GTK_CLIST(widget), x - 24, y - 24, &row, &column)) {
+               (GTK_CLIST(widget), x - offset, y - offset, &row, &column)) {
                GtkWidget *srcwidget;
 
-               if (y > height - 24 && height + vpos < total_height)
+               if (y > height - 24 && height + vpos < total_height) {
                        gtk_adjustment_set_value(pos, (vpos+5 > height ? height : vpos+5));
-
-               if (y < 48 && y > 0)
+                       gtk_adjustment_changed(pos);
+               }
+               if (y < 48 && y > 0) {
                        gtk_adjustment_set_value(pos, (vpos-5 < 0 ? 0 : vpos-5));
+                       gtk_adjustment_changed(pos);
+               }
 
                node = gtk_ctree_node_nth(GTK_CTREE(widget), row);
                item = gtk_ctree_node_get_row_data(GTK_CTREE(widget), node);
@@ -2986,13 +2995,14 @@ static void folderview_drag_received_cb(GtkWidget        *widget,
        gint row, column;
        FolderItem *item = NULL, *src_item;
        GtkCTreeNode *node;
+       int offset = prefs_common.show_col_headers ? 24:0;
 
        if (info == TARGET_DUMMY) {
                drag_state_stop(folderview);
                if ((void *)strstr(data->data, "FROM_OTHER_FOLDER") != (void *)data->data) {
                        /* comes from summaryview */
                        if (gtk_clist_get_selection_info
-                               (GTK_CLIST(widget), x - 24, y - 24, &row, &column) == 0)
+                               (GTK_CLIST(widget), x - offset, y - offset, &row, &column) == 0)
                                return;
 
                        node = gtk_ctree_node_nth(GTK_CTREE(widget), row);
@@ -3034,7 +3044,7 @@ static void folderview_drag_received_cb(GtkWidget        *widget,
 
                        source = data->data + 17;
                        if (gtk_clist_get_selection_info
-                           (GTK_CLIST(widget), x - 24, y - 24, &row, &column) == 0
+                           (GTK_CLIST(widget), x - offset, y - offset, &row, &column) == 0
                            || *source == 0) {
                                gtk_drag_finish(drag_context, FALSE, FALSE, time);                      
                                return;
@@ -3061,7 +3071,7 @@ static void folderview_drag_received_cb(GtkWidget        *widget,
                folderview->nodes_to_recollapse = NULL;
        } else if (info == TARGET_MAIL_URI_LIST) {
                if (gtk_clist_get_selection_info
-                       (GTK_CLIST(widget), x - 24, y - 24, &row, &column) == 0)
+                       (GTK_CLIST(widget), x - offset, y - offset, &row, &column) == 0)
                        return;
 
                node = gtk_ctree_node_nth(GTK_CTREE(widget), row);