Fix some copyright headers

[claws.git] / src / foldersel.c

diff --git a/src/foldersel.c b/src/foldersel.c
index faf8293193d1905aac871a7fe69abbd4ac9f655e..21cd2798219d12610e9fc2648446775b097ba8f2 100644 (file)
--- a/src/foldersel.c
+++ b/src/foldersel.c
@@ -1,6 +1,6 @@
 /*
- * Sylpheed -- a GTK+ based, lightweight, and fast e-mail client
- * Copyright (C) 1999-2013 Hiroyuki Yamamoto and the Claws Mail team
+ * Claws Mail -- a GTK+ based, lightweight, and fast e-mail client
+ * Copyright (C) 1999-2018 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
@@ -14,7 +14,6 @@
  *
  * You should have received a copy of the GNU General Public License
  * along with this program. If not, see <http://www.gnu.org/licenses/>.
- * 
  */
 
 #include "defs.h"
@@ -83,7 +82,7 @@ static GtkTreeStore *tree_store;
 static gboolean cancelled;
 static gboolean finished;
 
-static void foldersel_create           (void);
+static void foldersel_create           (const gchar *title);
 static void foldersel_init             (void);
 
 static void foldersel_append_item      (GtkTreeStore   *store,
@@ -133,13 +132,14 @@ static gboolean tree_view_folder_item_func        (GtkTreeModel     *model,
                                                 FolderItemSearch *data);
 
 FolderItem *foldersel_folder_sel(Folder *cur_folder, FolderSelectionType type,
-                                const gchar *default_folder, gboolean can_sel_mailbox)
+                                const gchar *default_folder, gboolean can_sel_mailbox,
+                                const gchar *title)
 {
        selected_item = NULL;
        root_selectable = can_sel_mailbox;
 
        if (!window) {
-               foldersel_create();
+               foldersel_create(title);
                foldersel_init();
        }
 
@@ -234,18 +234,19 @@ static void foldersel_size_allocate_cb(GtkWidget *widget,
        prefs_common.folderselwin_height = allocation->height;
 }
 
-static void foldersel_create(void)
+static void foldersel_create(const gchar *title)
 {
        GtkWidget *vbox;
        GtkWidget *scrolledwin;
        GtkWidget *confirm_area;
+       GtkWidget *label;
        GtkTreeViewColumn *column;
        GtkCellRenderer *renderer;
        GtkTreeSelection *selection;
        static GdkGeometry geometry;
 
        window = gtkut_window_new(GTK_WINDOW_TOPLEVEL, "foldersel");
-       gtk_window_set_title(GTK_WINDOW(window), _("Select folder"));
+       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_resizable(GTK_WINDOW(window), TRUE);
@@ -262,6 +263,12 @@ static void foldersel_create(void)
        vbox = gtk_vbox_new(FALSE, 4);
        gtk_container_add(GTK_CONTAINER(window), vbox);
 
+       if (title != NULL) {
+               label = gtk_label_new(title);
+               gtk_label_set_line_wrap(GTK_LABEL(label), TRUE);
+               gtk_box_pack_start(GTK_BOX(vbox), label, FALSE, FALSE, 0);
+       }
+
        scrolledwin = gtk_scrolled_window_new(NULL, NULL);
        gtk_scrolled_window_set_policy(GTK_SCROLLED_WINDOW(scrolledwin),
                                       GTK_POLICY_AUTOMATIC, GTK_POLICY_ALWAYS);
@@ -315,6 +322,7 @@ static void foldersel_create(void)
 
        /* create text renderer */
        renderer = gtk_cell_renderer_text_new();
+       gtk_cell_renderer_set_padding(renderer, 0, 0);
        gtk_tree_view_column_pack_start(column, renderer, TRUE);
        gtk_tree_view_column_set_attributes
                (column, renderer,
@@ -393,43 +401,19 @@ static void foldersel_append_item(GtkTreeStore *store, FolderItem *item,
        static GdkColor color_noselect = {0, COLOR_DIM, COLOR_DIM, COLOR_DIM};
        static GdkColor color_new;
 
-       gtkut_convert_int_to_gdk_color(prefs_common.color_new, &color_new);
-
-        name = tmpname = folder_item_get_name(item);
+       gtkut_convert_int_to_gdk_color(prefs_common.color[COL_NEW], &color_new);
 
-       if (item->stype != F_NORMAL && FOLDER_IS_LOCAL(item->folder)) {
-               switch (item->stype) {
-               case F_INBOX:
-                       if (!strcmp2(item->name, INBOX_DIR))
-                               name = _("Inbox");
-                       break;
-               case F_OUTBOX:
-                       if (!strcmp2(item->name, OUTBOX_DIR))
-                               name = _("Sent");
-                       break;
-               case F_QUEUE:
-                       if (!strcmp2(item->name, QUEUE_DIR))
-                               name = _("Queue");
-                       break;
-               case F_TRASH:
-                       if (!strcmp2(item->name, TRASH_DIR))
-                               name = _("Trash");
-                       break;
-               case F_DRAFT:
-                       if (!strcmp2(item->name, DRAFT_DIR))
-                               name = _("Drafts");
-                       break;
-               default:
-                       break;
-               }
-       }
+       name = folder_item_get_name(item);
 
        if (folder_has_parent_of_type(item, F_QUEUE) && item->total_msgs > 0) {
-               name = g_strdup_printf("%s (%d)", name, item->total_msgs);
+               tmpname = g_strdup_printf("%s (%d)", name, item->total_msgs);
        } else if (item->unread_msgs > 0) {
-               name = g_strdup_printf("%s (%d)", name, item->unread_msgs);
+               tmpname = g_strdup_printf("%s (%d)", name, item->unread_msgs);
        } else
-               name = g_strdup(name);
+               tmpname = g_strdup(name);
+
+       g_free(name);
+       name = tmpname;
 
        pixbuf = item->no_select ? foldernoselect_pixbuf : folder_pixbuf;
        pixbuf_open =
@@ -465,7 +449,7 @@ static void foldersel_append_item(GtkTreeStore *store, FolderItem *item,
                           FOLDERSEL_BOLD, weight,
                           -1);
         
-        g_free(tmpname);
+        g_free(name);
 }
 
 static void foldersel_insert_gnode_in_store(GtkTreeStore *store, GNode *node,