summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorThomas Vander Stichele <thomas@apestaart.org>2002-04-12 18:50:48 +0000
committerThomas Vander Stichele <thomas@apestaart.org>2002-04-12 18:50:48 +0000
commit98611ba214c71ce881dd2453ecda2265dc052632 (patch)
treec1d4efb35616da779d243b6c3cf201707e4c4f58
parent4013bb45d6e5e0e6e21390f729c8d7f204d1acd3 (diff)
more registry fixesBRANCH-RELEASE-0_3_3-ROOT
Original commit message from CVS: more registry fixes
-rw-r--r--DEVEL14
-rw-r--r--gst/gstplugin.c10
-rw-r--r--gst/gstregistry.c5
3 files changed, 21 insertions, 8 deletions
diff --git a/DEVEL b/DEVEL
index 7d7e584ee..065f905a3 100644
--- a/DEVEL
+++ b/DEVEL
@@ -1,9 +1,11 @@
Development Notes and Random Wisdom
* in libs like dparams, include the respective dparam headers with
-#include "dparams.h"
-instead of
-#include <gst/libs/control/dparams.h>
-because the latter will, if the include flags are set that way, first look
-for the installed headers instead of the newest one, which is in your source
-dir.
+ #include "dparams.h"
+ instead of
+ #include <gst/libs/control/dparams.h>
+ because the latter will, if the include flags are set that way, first look
+ for the installed headers instead of the newest one, which is in your source
+ dir.
+
+* When doing releases, please follow the guidelines in docs
diff --git a/gst/gstplugin.c b/gst/gstplugin.c
index 761d9239f..8bdd97a53 100644
--- a/gst/gstplugin.c
+++ b/gst/gstplugin.c
@@ -64,7 +64,6 @@ void
_gst_plugin_initialize (void)
{
GList *gst_plugin_default_paths = NULL;
- struct stat stat_buf;
#ifndef GST_DISABLE_REGISTRY
GstRegistryRead *gst_reg;
gchar *gst_registry;
@@ -107,12 +106,19 @@ _gst_plugin_initialize (void)
if (_gst_init_registry_write)
{
/* delete it before writing */
+ GST_INFO (GST_CAT_PLUGIN_LOADING, " Removing registry %s if it exists", gst_registry);
unlink (gst_registry);
}
- if (stat (gst_registry, &stat_buf) == 0)
+ if (g_file_test (gst_registry, G_FILE_TEST_EXISTS))
+ {
doc = xmlParseFile (gst_registry);
+ GST_INFO (GST_CAT_PLUGIN_LOADING, " Reading registry from %s", gst_registry);
+ }
else
+ {
+ GST_INFO (GST_CAT_PLUGIN_LOADING, " Not reading registry", gst_registry);
doc = NULL;
+ }
if (!doc ||
!doc->xmlRootNode ||
diff --git a/gst/gstregistry.c b/gst/gstregistry.c
index 0b13f7fa9..5c67d8d5c 100644
--- a/gst/gstregistry.c
+++ b/gst/gstregistry.c
@@ -124,6 +124,11 @@ gst_registry_read_get ()
{
gchar *homedir = (gchar *) g_get_home_dir ();
gst_reg->local_reg = g_strjoin ("/", homedir, LOCAL_REGISTRY_FILE, NULL);
+ if (g_file_test (gst_reg->local_reg, G_FILE_TEST_EXISTS) == FALSE)
+ {
+ /* it does not exist, so don't read from it */
+ g_free (gst_reg->local_reg);
+ }
gst_reg->global_reg = g_strdup (GLOBAL_REGISTRY_FILE);
}
return gst_reg;