From 17837139ac368996409cde9422c40536a2202027 Mon Sep 17 00:00:00 2001
From: JosephMcc <mccullarjoseph@gmail.com>
Date: Thu, 9 Feb 2017 03:47:08 -0800
Subject: [PATCH] xed-app: Shutdown metadata-manager after GTK+

---
 xed/xed-app.c | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/xed/xed-app.c b/xed/xed-app.c
index 291e434..c70a422 100644
--- a/xed/xed-app.c
+++ b/xed/xed-app.c
@@ -785,13 +785,17 @@ xed_app_shutdown (GApplication *app)
     save_page_setup (XED_APP (app));
     save_print_settings (XED_APP (app));
 
+    /* GTK+ can still hold references to some xed objects, for example
+     * XedDocument for the clipboard. So the metadata-manager should be
+     * shutdown after.
+     */
+    G_APPLICATION_CLASS (xed_app_parent_class)->shutdown (app);
+
 #ifndef ENABLE_GVFS_METADATA
     xed_metadata_manager_shutdown ();
 #endif
 
     xed_dirs_shutdown ();
-
-    G_APPLICATION_CLASS (xed_app_parent_class)->shutdown (app);
 }
 
 static void