From 1db894f8865bfc8eacfccf623f8d8c458bf87fd8 Mon Sep 17 00:00:00 2001
From: Tim Mayberry <mojofunk@gmail.com>
Date: Fri, 9 Aug 2013 22:13:50 +1000
Subject: [PATCH] Call Gio::init from PBD::init instead of ARDOUR::init

PBD needs Gio for PBD::copy_file and perhaps others
---
 libs/ardour/globals.cc | 5 -----
 libs/pbd/pbd.cc        | 4 ++++
 2 files changed, 4 insertions(+), 5 deletions(-)

diff --git a/libs/ardour/globals.cc b/libs/ardour/globals.cc
index 0941b72de8..986d320aef 100644
--- a/libs/ardour/globals.cc
+++ b/libs/ardour/globals.cc
@@ -50,8 +50,6 @@
 #undef check /* stupid Apple and their un-namespaced, generic Carbon macros */
 #endif 
 
-#include <giomm.h>
-
 #include <glibmm/fileutils.h>
 #include <glibmm/miscutils.h>
 
@@ -227,9 +225,6 @@ ARDOUR::init (bool use_windows_vst, bool try_optimization, const char* localedir
 
 	if (!PBD::init()) return false;
 
-	// this really should be in PBD::init..if there was one
-	Gio::init ();
-
 #ifdef ENABLE_NLS
 	(void) bindtextdomain(PACKAGE, localedir);
 #endif
diff --git a/libs/pbd/pbd.cc b/libs/pbd/pbd.cc
index 58c8440a0f..dd33f3103b 100644
--- a/libs/pbd/pbd.cc
+++ b/libs/pbd/pbd.cc
@@ -20,6 +20,8 @@
 #include <iostream>
 #include <cstdlib>
 
+#include <giomm.h>
+
 #include <glibmm/thread.h>
 
 #include "pbd/pbd.h"
@@ -46,6 +48,8 @@ PBD::init ()
 		Glib::thread_init();
 	}
 
+	Gio::init ();
+
 	PBD::ID::init ();
 
 	libpbd_initialized = true;
-- 
2.30.2