From 493b5ce964515e6c84a8fcaaee65d13457a143db Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tim-Philipp=20M=C3=BCller?= Date: Mon, 6 Feb 2006 19:09:26 +0000 Subject: [PATCH] ext/gnomevfs/gstgnomevfs.c: Return FALSE from plugin_init() when GnomeVFS can't be initialised for some reason (#3284... Original commit message from CVS: * ext/gnomevfs/gstgnomevfs.c: (plugin_init): Return FALSE from plugin_init() when GnomeVFS can't be initialised for some reason (#328423). --- ChangeLog | 6 ++++++ common | 2 +- ext/gnomevfs/gstgnomevfs.c | 8 ++++++-- 3 files changed, 13 insertions(+), 3 deletions(-) diff --git a/ChangeLog b/ChangeLog index 92a0c0b38f..ae67ac8b4a 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,9 @@ +2006-02-06 Tim-Philipp Müller + + * ext/gnomevfs/gstgnomevfs.c: (plugin_init): + Return FALSE from plugin_init() when GnomeVFS can't + be initialised for some reason (#328423). + 2006-02-06 Julien MOUTTE * ext/pango/gsttextoverlay.c: (gst_text_overlay_src_event): diff --git a/common b/common index 79d67fe009..58567e5519 160000 --- a/common +++ b/common @@ -1 +1 @@ -Subproject commit 79d67fe009b6120b82d51df860c78e8361f02aea +Subproject commit 58567e5519f2d00a4592491db1a6e8302993279e diff --git a/ext/gnomevfs/gstgnomevfs.c b/ext/gnomevfs/gstgnomevfs.c index 6eb5a46a91..b6b12599c0 100644 --- a/ext/gnomevfs/gstgnomevfs.c +++ b/ext/gnomevfs/gstgnomevfs.c @@ -77,8 +77,12 @@ static gboolean plugin_init (GstPlugin * plugin) { /* gnome vfs engine init */ - if (!gnome_vfs_initialized ()) - gnome_vfs_init (); + if (!gnome_vfs_initialized ()) { + if (!gnome_vfs_init ()) { + GST_WARNING ("Failed to initialize GnomeVFS - not registering plugin!"); + return FALSE; + } + } if (!gst_element_register (plugin, "gnomevfssrc", GST_RANK_SECONDARY, gst_gnome_vfs_src_get_type ()))