[evolution/gnome-3-10] Bug #721639 - Cannot overwrite builtin mail view definitions

[Milan Crha <mcrha src gnome org>]

commit c376bb04cdf011044bf99b629c15c5f38ab603a2
Author: Milan Crha <mcrha redhat com>
Date:   Tue Feb 4 14:30:09 2014 +0100

    Bug #721639 - Cannot overwrite builtin mail view definitions

 e-util/gal-view-etable.c |   10 ++++++++++
 1 files changed, 10 insertions(+), 0 deletions(-)
---
diff --git a/e-util/gal-view-etable.c b/e-util/gal-view-etable.c
index 9d54148..f90aa1d 100644
--- a/e-util/gal-view-etable.c
+++ b/e-util/gal-view-etable.c
@@ -98,6 +98,9 @@ gal_view_etable_save (GalView *view,
                e_table_state_save_to_file (state, filename);
                g_object_unref (state);
        }
+
+       /* Remember the filename, it may eventually change */
+       gal_view_etable_load (view, filename);
 }
 
 static GalView *
@@ -111,6 +114,13 @@ gal_view_etable_clone (GalView *view)
 
        gve = GAL_VIEW_ETABLE (view);
 
+       /* do this before setting state_filename, to not overwrite current
+          state changes in the 'attach' function */
+       if (gve->priv->table)
+               gal_view_etable_attach_table (GAL_VIEW_ETABLE (clone), gve->priv->table);
+       else if (gve->priv->tree)
+               gal_view_etable_attach_tree (GAL_VIEW_ETABLE (clone), gve->priv->tree);
+
        GAL_VIEW_ETABLE (clone)->priv->state_filename =
                g_strdup (gve->priv->state_filename);