[balsa/gtk3] Do not load stale toolbar options

[Peter Bloomfield <PeterB src gnome org>]

commit 1c78729c5ffbff858729c83d68e1e97f2acf69dc
Author: Peter Bloomfield <PeterBloomfield bellsouth net>
Date:   Mon Jul 22 22:59:18 2013 -0400

    Do not load stale toolbar options
    
        * src/toolbar-factory.c (tm_load_model): do not load stale
        options.

 ChangeLog             |    5 +++++
 src/toolbar-factory.c |    4 ++++
 2 files changed, 9 insertions(+), 0 deletions(-)
---
diff --git a/ChangeLog b/ChangeLog
index 707cc69..5be16c0 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,10 @@
 2013-07-22  Peter Bloomfield
 
+       * src/toolbar-factory.c (tm_load_model): do not load stale
+       options.
+
+2013-07-22  Peter Bloomfield
+
        * src/main-window.c (bw_set_menus): use installed ui file.
        * ui/Makefile.am: install it.
        * ui/main-window.ui: new file.
diff --git a/src/toolbar-factory.c b/src/toolbar-factory.c
index bb03cdf..e5b1dc4 100644
--- a/src/toolbar-factory.c
+++ b/src/toolbar-factory.c
@@ -217,7 +217,9 @@ static void
 tm_load_model(BalsaToolbarModel * model)
 {
     gchar *key;
+#ifdef LOADING_MODEL_IS_FIXED
     guint j;
+#endif
 
     key = g_strconcat("toolbar-", balsa_toolbar_names[model->type], NULL);
     libbalsa_conf_push_group(key);
@@ -225,6 +227,7 @@ tm_load_model(BalsaToolbarModel * model)
 
     model->style = libbalsa_conf_get_int_with_default("Style=-1", NULL);
 
+#ifdef LOADING_MODEL_IS_FIXED
     model->current = NULL;
     for (j = 0;; j++) {
         gchar *item;
@@ -239,6 +242,7 @@ tm_load_model(BalsaToolbarModel * model)
         model->current = g_slist_prepend(model->current, item);
     }
     model->current = g_slist_reverse(model->current);
+#endif
 
     libbalsa_conf_pop_group();
 }