diff options
| author | Tim-Philipp Müller <tim@centricular.com> | 2015-04-14 12:47:07 +0100 |
|---|---|---|
| committer | Tim-Philipp Müller <tim@centricular.com> | 2015-04-14 16:00:42 +0100 |
| commit | dc4e517dc6de54182c81e68e27feb13585a66e8f (patch) | |
| tree | 10f9abc8ef17d5c00bed0f976bb7daeda841533f /gst/gio | |
| parent | 867c864f948cf4a1cb95118b4701573d1ec0cdf1 (diff) | |
| download | gstreamer-plugins-base-dc4e517dc6de54182c81e68e27feb13585a66e8f.tar.gz | |
gio: fix gvfs plugin dependencies
Try harder to look for gvfs backend changes in the right
place, to make sure the plugin gets reloaded when backends
are removed or installed. We watch the gvfs mounts directory
because the files there contain absolute paths to the
backend executables, and those may not be in the usual gio
path.
https://bugzilla.gnome.org/show_bug.cgi?id=747841
Diffstat (limited to 'gst/gio')
| -rw-r--r-- | gst/gio/gstgio.c | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/gst/gio/gstgio.c b/gst/gio/gstgio.c index 9f2f2ba8b..6e45e8066 100644 --- a/gst/gio/gstgio.c +++ b/gst/gio/gstgio.c @@ -231,6 +231,11 @@ gst_gio_uri_handler_do_init (GType type) g_type_add_interface_static (type, GST_TYPE_URI_HANDLER, &uri_handler_info); } +#define GIO_GVFS_MOUNTS_DIR GIO_PREFIX \ + G_DIR_SEPARATOR_S "share" \ + G_DIR_SEPARATOR_S "gvfs" \ + G_DIR_SEPARATOR_S "mounts" + static gboolean plugin_init (GstPlugin * plugin) { @@ -240,8 +245,8 @@ plugin_init (GstPlugin * plugin) gst_plugin_add_dependency_simple (plugin, NULL, GIO_MODULE_DIR, NULL, GST_PLUGIN_DEPENDENCY_FLAG_NONE); - gst_plugin_add_dependency_simple (plugin, "LD_LIBRARY_PATH", GIO_LIBDIR, - "gvfsd", GST_PLUGIN_DEPENDENCY_FLAG_NONE); + gst_plugin_add_dependency_simple (plugin, NULL, GIO_GVFS_MOUNTS_DIR, NULL, + GST_PLUGIN_DEPENDENCY_FLAG_NONE); /* FIXME: Rank is MARGINAL for now, should be at least SECONDARY+1 in the future * to replace gnomevfssink/src. For testing purposes PRIMARY+1 one makes sense |