[gimp/gimp-2-8] Bug 707255 - Open preferences when quitting causes assertion failure

[Jehan Pagès <jehanp src gnome org>]

commit 0f8496d873d05dabdd1f6430b0faa75245f8de88
Author: Jehan <jehan girinstud io>
Date:   Thu Sep 5 23:35:27 2013 +1200

    Bug 707255 - Open preferences when quitting causes assertion failure
    
    When removing the container of a GimpContainerView,
    gimp_container_view_remove_container() must be the last call. It was
    causing a `GIMP_IS_CONTAINER (container)' failure in subsequent
    gimp_container_get_children_type().
    For good practice, unsetting a container works now the exact reversed
    order as the setting of a container.
    (cherry picked from commit 338e0ddf8d1c128e3873d6e9ad9a52577b48b1dd)

 app/widgets/gimpcontainerview.c |    6 +++---
 1 files changed, 3 insertions(+), 3 deletions(-)
---
diff --git a/app/widgets/gimpcontainerview.c b/app/widgets/gimpcontainerview.c
index c1d081e..528e007 100644
--- a/app/widgets/gimpcontainerview.c
+++ b/app/widgets/gimpcontainerview.c
@@ -405,6 +405,9 @@ gimp_container_view_real_set_container (GimpContainerView *view,
 
   if (private->container)
     {
+      if (private->context)
+        gimp_container_view_disconnect_context (view);
+
       gimp_container_view_select_item (view, NULL);
 
       /* freeze/thaw is only supported for the toplevel container */
@@ -417,9 +420,6 @@ gimp_container_view_real_set_container (GimpContainerView *view,
 
       if (! gimp_container_frozen (private->container))
         gimp_container_view_remove_container (view, private->container);
-
-      if (private->context)
-        gimp_container_view_disconnect_context (view);
     }
 
   private->container = container;