[balsa/gtk3] Use a single MRU folder list

[Peter Bloomfield <PeterB src gnome org>]

commit c819f8c92d6b4401acf2db7d21de9bd87780ae34
Author: Peter Bloomfield <PeterBloomfield bellsouth net>
Date:   Tue Mar 27 18:04:47 2012 -0400

    Use a single MRU folder list
    
    	* src/balsa-app.h: drop separate Fcc list.
    	* src/balsa-app.c (balsa_app_init): ditto.
    	* src/save-restore.c (config_mailbox_set_as_special): use
    	combined list;
    	(config_global_load), (config_save): do not save and restore
    	separate Fcc list.
    	* src/sendmsg-window.c (create_info_pane): use combined list.

 ChangeLog            |   12 ++++++++++++
 src/balsa-app.c      |    3 +--
 src/balsa-app.h      |    1 -
 src/save-restore.c   |    6 +-----
 src/sendmsg-window.c |   16 ++++++++--------
 5 files changed, 22 insertions(+), 16 deletions(-)
---
diff --git a/ChangeLog b/ChangeLog
index 28d01c8..8032106 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,17 @@
 2012-03-27  Peter Bloomfield
 
+	Use a single MRU folder list
+
+	* src/balsa-app.h: drop separate Fcc list.
+	* src/balsa-app.c (balsa_app_init): ditto.
+	* src/save-restore.c (config_mailbox_set_as_special): use
+	combined list;
+	(config_global_load), (config_save): do not save and restore
+	separate Fcc list.
+	* src/sendmsg-window.c (create_info_pane): use combined list.
+
+2012-03-27  Peter Bloomfield
+
 	Remember geometry of MRU mailbox tree
 
 	* src/balsa-app.h: new members mru_tree_{width,height}
diff --git a/src/balsa-app.c b/src/balsa-app.c
index bab3bb0..88556e7 100644
--- a/src/balsa-app.c
+++ b/src/balsa-app.c
@@ -418,8 +418,7 @@ balsa_app_init(void)
 #endif
 
     /* Message filing */
-    balsa_app.folder_mru=NULL;
-    balsa_app.fcc_mru=NULL;
+    balsa_app.folder_mru = NULL;
 
     g_object_set(gtk_settings_get_for_screen(gdk_screen_get_default()),
                  "gtk-fallback-icon-theme", "gnome", NULL);
diff --git a/src/balsa-app.h b/src/balsa-app.h
index 8a2af60..068a0b4 100644
--- a/src/balsa-app.h
+++ b/src/balsa-app.h
@@ -380,7 +380,6 @@ extern struct BalsaApplication {
 
     /* Most recently used lists */
     GList *folder_mru;
-    GList *fcc_mru;
     GList *pipe_cmds;
 
     gboolean expunge_on_close;
diff --git a/src/save-restore.c b/src/save-restore.c
index 96bfd4a..75cfaca 100644
--- a/src/save-restore.c
+++ b/src/save-restore.c
@@ -244,7 +244,7 @@ config_mailbox_set_as_special(LibBalsaMailbox * mailbox, specialType which)
 
     switch(which) {
     case SPECIAL_SENT: 
-	balsa_mblist_mru_add(&balsa_app.fcc_mru, mailbox->url); break;
+	balsa_mblist_mru_add(&balsa_app.folder_mru, mailbox->url); break;
     case SPECIAL_TRASH:
         libbalsa_filters_set_trash(balsa_app.trash); break;
     default: break;
@@ -1107,9 +1107,6 @@ config_global_load(void)
 	/* Folder MRU */
     load_mru(&balsa_app.folder_mru, "FolderMRU");
 
-	/* FCC MRU */
-    load_mru(&balsa_app.fcc_mru, "FccMRU");
-
     /* Pipe commands */
     load_mru(&balsa_app.pipe_cmds, "PipeCommands");
     if (!balsa_app.pipe_cmds)
@@ -1511,7 +1508,6 @@ config_save(void)
     libbalsa_conf_pop_group();
 
     save_mru(balsa_app.folder_mru, "FolderMRU");
-    save_mru(balsa_app.fcc_mru,    "FccMRU");
     save_mru(balsa_app.pipe_cmds,  "PipeCommands");
 
     libbalsa_conf_sync();
diff --git a/src/sendmsg-window.c b/src/sendmsg-window.c
index 620bded..618b366 100644
--- a/src/sendmsg-window.c
+++ b/src/sendmsg-window.c
@@ -2954,22 +2954,22 @@ create_info_pane(BalsaSendmsg * bsmsg)
     ++row;
     gtk_grid_attach(GTK_GRID(grid), bsmsg->fcc[0], 0, row, 1, 1);
 
-    if (!balsa_app.fcc_mru)
-        balsa_mblist_mru_add(&balsa_app.fcc_mru, balsa_app.sentbox->url);
-    balsa_mblist_mru_add(&balsa_app.fcc_mru, "");
+    if (!balsa_app.folder_mru)
+        balsa_mblist_mru_add(&balsa_app.folder_mru, balsa_app.sentbox->url);
+    balsa_mblist_mru_add(&balsa_app.folder_mru, "");
     if (balsa_app.copy_to_sentbox) {
         /* move the NULL option to the bottom */
-        balsa_app.fcc_mru = g_list_reverse(balsa_app.fcc_mru);
-        balsa_mblist_mru_add(&balsa_app.fcc_mru, "");
-        balsa_app.fcc_mru = g_list_reverse(balsa_app.fcc_mru);
+        balsa_app.folder_mru = g_list_reverse(balsa_app.folder_mru);
+        balsa_mblist_mru_add(&balsa_app.folder_mru, "");
+        balsa_app.folder_mru = g_list_reverse(balsa_app.folder_mru);
     }
     if (bsmsg->draft_message && bsmsg->draft_message->headers &&
 	bsmsg->draft_message->headers->fcc_url)
-        balsa_mblist_mru_add(&balsa_app.fcc_mru,
+        balsa_mblist_mru_add(&balsa_app.folder_mru,
                              bsmsg->draft_message->headers->fcc_url);
     bsmsg->fcc[1] =
         balsa_mblist_mru_option_menu(GTK_WINDOW(bsmsg->window),
-                                     &balsa_app.fcc_mru);
+                                     &balsa_app.folder_mru);
     gtk_label_set_mnemonic_widget(GTK_LABEL(bsmsg->fcc[0]), bsmsg->fcc[1]);
     gtk_grid_attach(GTK_GRID(grid), bsmsg->fcc[1] , 1, row, 1, 1);