summaryrefslogtreecommitdiff
path: root/recipes/glib/0004-Allow-for-a-second-distro-GIO-module-path-as-used-on.patch
blob: 782c66982b099530d8e5863c8fe73c4366e1e04a (plain)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
From 79921512ccf535a32c1ffb1a31ce9f6b56450af1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Sebastian=20Dr=C3=B6ge?= <sebastian.droege@collabora.co.uk>
Date: Mon, 12 Mar 2012 13:04:41 +0100
Subject: [PATCH 4/8] Allow for a second distro GIO module path as used on
 Ubuntu

...because apparently only half of their packages are multi-arch
capable...
---
 gio/giomodule.c | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/gio/giomodule.c b/gio/giomodule.c
index 61173fb..06bae56 100644
--- a/gio/giomodule.c
+++ b/gio/giomodule.c
@@ -1055,6 +1055,11 @@ _g_io_modules_ensure_loaded (void)
       g_io_modules_scan_all_in_directory_with_scope (GST_SDK_GLIB_GIO_DISTRO_GIO_MODULE_PATH, scope);
 #endif
 
+#ifdef GST_SDK_GLIB_GIO_DISTRO_GIO_MODULE_PATH2
+      /* Now load all modules from the distro, e.g. gvfs */
+      g_io_modules_scan_all_in_directory_with_scope (GST_SDK_GLIB_GIO_DISTRO_GIO_MODULE_PATH2, scope);
+#endif
+
       g_io_module_scope_free (scope);
 
       /* Initialize types from built-in "modules" */
-- 
2.1.0