2005-01-04 [christoph] 0.9.13cvs27

[claws.git] / src / folderview.c

diff --git a/src/folderview.c b/src/folderview.c
index 2c8713efcb032793e28e31bf9a6d5c2152a56fec..616396a65fd184d910309426103a2c5d1144f148 100644 (file)
--- a/src/folderview.c
+++ b/src/folderview.c
@@ -62,6 +62,7 @@
 #include "statusbar.h"
 #include "hooks.h"
 #include "folderutils.h"
+#include "partial_download.h"
 
 typedef enum
 {
@@ -242,7 +243,7 @@ static GtkItemFactoryEntry folderview_common_popup_entries[] =
 };
 
 static GtkItemFactoryEntry folder_view_trash_popup_entries[] = {
-       {N_("/---"),                    NULL, NULL, 0, "<Separator>"},
+       {N_("/------"),                 NULL, NULL, 0, "<Separator>"},
        {N_("/Empty trash..."),         NULL, folderview_empty_trash_cb, 0, NULL},
 };
 
@@ -578,7 +579,7 @@ static void mark_all_read_cb(FolderView *folderview, guint action,
 {
        FolderItem *item;
 
-       item = folderview_get_selected(folderview);
+       item = folderview_get_selected_item(folderview);
        if (item == NULL)
                return;
 
@@ -650,6 +651,14 @@ void folderview_select_next_unread(FolderView *folderview)
                folderview_select_node(folderview, node);
 }
 
+FolderItem *folderview_get_selected_item(FolderView *folderview)
+{
+       GtkCTree *ctree = GTK_CTREE(folderview->ctree);
+
+       if (!folderview->selected) return NULL;
+       return gtk_ctree_node_get_row_data(ctree, folderview->selected);
+}
+
 void folderview_update_msg_num(FolderView *folderview, GtkCTreeNode *row)
 {
        GtkCTree *ctree = GTK_CTREE(folderview->ctree);
@@ -1413,7 +1422,7 @@ static void folderview_button_pressed(GtkWidget *ctree, GdkEventButton *event,
        SET_SENS("/Mark all read", item->unread_msgs >= 1);
        SET_SENS("/Search folder...", item->total_msgs >= 1 && 
                 folderview->selected == folderview->opened);
-       SET_SENS("/Properties...", TRUE);
+       SET_SENS("/Properties...", item->node->parent != NULL);
        SET_SENS("/Processing...", item->node->parent != NULL);
        if (item == folder->trash)
                SET_SENS("/Empty trash...", folder_item_get_msg_list(item) != NULL);
@@ -1723,11 +1732,10 @@ static void folderview_property_cb(FolderView *folderview, guint action,
        g_return_if_fail(item != NULL);
        g_return_if_fail(item->folder != NULL);
 
-       if (folder_item_parent(item) == NULL && item->folder->account)
-               account_open(item->folder->account);
-       else {
-               prefs_folder_item_open(item);
-       }
+       if (folder_item_parent(item) == NULL)
+               return;
+
+       prefs_folder_item_open(item);
 }
 
 static void folderview_recollapse_nodes(FolderView *folderview, GtkCTreeNode *node)
@@ -2135,12 +2143,6 @@ static void folderview_drag_end_cb(GtkWidget         *widget,
        folderview->nodes_to_recollapse = NULL;
 }
 
-FolderItem *folderview_get_selected(FolderView *folderview)
-{
-       return (FolderItem *) gtk_ctree_node_get_row_data(
-               GTK_CTREE(folderview->ctree), folderview->selected);
-}
-
 void folderview_register_popup(FolderViewPopup *fpopup)
 {
        GList *folderviews;