2008-06-13 [wwp] 3.4.0cvs92

[claws.git] / src / foldersel.c

diff --git a/src/foldersel.c b/src/foldersel.c
index 1006e1fc255c3a6197255e47d5aecffb1eeacbfe..bc24af354e1da64df6b79209901228b69f66e241 100644 (file)
--- a/src/foldersel.c
+++ b/src/foldersel.c
@@ -1,10 +1,10 @@
 /*
  * Sylpheed -- a GTK+ based, lightweight, and fast e-mail client
- * Copyright (C) 1999-2006 Hiroyuki Yamamoto and the Sylpheed-Claws team
+ * Copyright (C) 1999-2007 Hiroyuki Yamamoto and the Claws Mail team
  *
  * 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
@@ -224,14 +226,13 @@ static void foldersel_create(void)
        GtkTreeSelection *selection;
        static GdkGeometry geometry;
 
-       window = gtk_window_new(GTK_WINDOW_TOPLEVEL);
+       window = gtkut_window_new(GTK_WINDOW_TOPLEVEL, "foldersel");
        gtk_window_set_title(GTK_WINDOW(window), _("Select folder"));
        gtk_container_set_border_width(GTK_CONTAINER(window), 4);
        gtk_window_set_position(GTK_WINDOW(window), GTK_WIN_POS_CENTER);
        gtk_window_set_modal(GTK_WINDOW(window), TRUE);
-       gtk_window_set_policy(GTK_WINDOW(window), FALSE, TRUE, FALSE);
-       gtk_window_set_wmclass
-               (GTK_WINDOW(window), "folder_selection", "Sylpheed-Claws");
+       gtk_window_set_resizable(GTK_WINDOW(window), TRUE);
+
        gtk_widget_realize(window);
        g_signal_connect(G_OBJECT(window), "delete_event",
                         G_CALLBACK(delete_event), NULL);
@@ -267,7 +268,9 @@ static void foldersel_create(void)
        g_object_unref(G_OBJECT(tree_store));
        gtk_tree_view_set_headers_visible(GTK_TREE_VIEW(treeview), FALSE);
        gtk_tree_view_set_rules_hint(GTK_TREE_VIEW(treeview),
-                                    prefs_common.enable_rules_hint);
+                                    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);
 
@@ -391,22 +394,6 @@ static void foldersel_append_item(GtkTreeStore *store, FolderItem *item,
                }
        }
 
-        /* CLAWS: already adds the UI string to the folder name */
-#ifndef CLAWS         
-       if (!item->parent) {
-               switch (FOLDER_TYPE(item->folder)) {
-               case F_MH:
-                       Xstrcat_a(name, name, " (MH)", ); break;
-               case F_IMAP:
-                       Xstrcat_a(name, name, " (IMAP4)", ); break;
-               case F_NEWS:
-                       Xstrcat_a(name, name, " (News)", ); break;
-               default:
-                       break;
-               }
-       }
-#endif        
-
        if (folder_has_parent_of_type(item, F_QUEUE) && item->total_msgs > 0) {
                name = g_strdup_printf("%s (%d)", name, item->total_msgs);
        } else if (item->unread_msgs > 0) {
@@ -494,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)
@@ -511,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), "");