2008-06-13 [wwp] 3.4.0cvs92

[claws.git] / src / foldersel.c

diff --git a/src/foldersel.c b/src/foldersel.c
index 12b6346f95e5f8b6bf0880ec0bbc302af3645699..bc24af354e1da64df6b79209901228b69f66e241 100644 (file)
--- a/src/foldersel.c
+++ b/src/foldersel.c
@@ -4,7 +4,7 @@
  *
  * 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
- * the Free Software Foundation; either version 2 of the License, or
+ * the Free Software Foundation; either version 3 of the License, or
  * (at your option) any later version.
  *
  * This program is distributed in the hope that it will be useful,
@@ -13,8 +13,8 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ * 
  */
 
 #include "defs.h"
@@ -81,6 +81,7 @@ static GtkWidget *entry;
 static GtkWidget *ok_button;
 static GtkWidget *cancel_button;
 static GtkWidget *new_button;
+static gboolean   root_selectable;
 
 static FolderItem *folder_item;
 static FolderItem *selected_item;
@@ -140,9 +141,10 @@ static gboolean tree_view_folder_item_func (GtkTreeModel     *model,
                                                 FolderItemSearch *data);
 
 FolderItem *foldersel_folder_sel(Folder *cur_folder, FolderSelectionType type,
-                                const gchar *default_folder)
+                                const gchar *default_folder, gboolean can_sel_mailbox)
 {
        selected_item = NULL;
+       root_selectable = can_sel_mailbox;
 
        if (!window) {
                foldersel_create();
@@ -198,7 +200,7 @@ FolderItem *foldersel_folder_sel(Folder *cur_folder, FolderSelectionType type,
        gtk_tree_store_clear(tree_store);
 
        if (!cancelled &&
-           selected_item && selected_item->path && !selected_item->no_select) {
+           selected_item && (selected_item->path || root_selectable)) {
                folder_item = selected_item;
                return folder_item;
        } else
@@ -267,6 +269,8 @@ static void foldersel_create(void)
        gtk_tree_view_set_headers_visible(GTK_TREE_VIEW(treeview), FALSE);
        gtk_tree_view_set_rules_hint(GTK_TREE_VIEW(treeview),
                                     prefs_common.use_stripes_everywhere);
+       gtk_tree_view_set_enable_tree_lines(GTK_TREE_VIEW(treeview),
+                                                       prefs_common.enable_dotted_lines);
        gtk_tree_view_set_search_column(GTK_TREE_VIEW(treeview),
                                        FOLDERSEL_FOLDERNAME);
 
@@ -477,6 +481,7 @@ static void foldersel_set_tree(Folder *cur_folder, FolderSelectionType type)
        gtk_tree_view_expand_all(GTK_TREE_VIEW(treeview));
 }
 
+#include "localfolder.h"
 static gboolean foldersel_selected(GtkTreeSelection *selection,
                                   GtkTreeModel *model, GtkTreePath *path,
                                   gboolean currently_selected, gpointer data)
@@ -494,11 +499,19 @@ static gboolean foldersel_selected(GtkTreeSelection *selection,
                           FOLDERSEL_FOLDERITEM, &item, -1);
 
        selected_item = item;
-       if (selected_item && selected_item->path && !selected_item->no_select) {
+       if (selected_item && selected_item->path) {
                gchar *id;
                id = folder_item_get_identifier(selected_item);
                gtk_entry_set_text(GTK_ENTRY(entry), id);
                g_free(id);
+       } else
+       if (root_selectable && selected_item && selected_item->folder &&
+                       (FOLDER_TYPE(selected_item->folder) == F_MH ||
+                        FOLDER_TYPE(selected_item->folder) == F_MBOX ||
+                        FOLDER_TYPE(selected_item->folder) == F_IMAP)) {
+               gchar *id = folder_get_identifier(selected_item->folder);
+               gtk_entry_set_text(GTK_ENTRY(entry), id);
+               g_free(id);
        } else
                gtk_entry_set_text(GTK_ENTRY(entry), "");