if you can't write to the registry (ie it is root-owned and you are user) and it is out of date, just ignore it; plug...

Original commit message from CVS:
if you can't write to the registry (ie it is root-owned and you are user) and it
is out of date, just ignore it; plugin state will get written to the user reg
This commit is contained in:
Andy Wingo 2002-07-05 16:18:18 +00:00
parent 7bac41b4aa
commit 160f5b168d
4 changed files with 11 additions and 6 deletions

2
common

@ -1 +1 @@
Subproject commit c6bd62c43f01b2012d81dfa61dd58777c41de07a
Subproject commit 1a826743b023d38a14e16cf1b3fb85eabdbb65d6

View file

@ -1147,7 +1147,7 @@ gst_element_get_compatible_pad_template (GstElement *element, GstPadTemplate *co
GstPadTemplate *newtempl = NULL;
GList *padlist;
GST_DEBUG(GST_CAT_ELEMENT_PADS,"gst_element_get_pad_template_by_compatible()");
GST_DEBUG(GST_CAT_ELEMENT_PADS,"gst_element_get_compatible_pad_template()");
g_return_val_if_fail (element != NULL, NULL);
g_return_val_if_fail (GST_IS_ELEMENT (element), NULL);

View file

@ -312,6 +312,7 @@ gst_pad_new (const gchar *name,
{
return gst_pad_custom_new (gst_real_pad_get_type (), name, direction);
}
/**
* gst_pad_custom_new_from_template:
* @type: the custom GType for this pad

View file

@ -467,16 +467,20 @@ gst_xml_registry_open_func (GstXMLRegistry *registry, GstXMLRegistryMode mode)
g_return_val_if_fail (gst_registry->flags & GST_REGISTRY_READABLE, FALSE);
if (!plugin_times_older_than (paths, get_time (registry->location))) {
GST_INFO (GST_CAT_GST_INIT, "Registry out of date, rebuilding...");
gst_registry_rebuild (gst_registry);
if (gst_registry->flags & GST_REGISTRY_WRITABLE) {
GST_INFO (GST_CAT_GST_INIT, "Registry out of date, rebuilding...");
gst_registry_rebuild (gst_registry);
gst_registry_save (gst_registry);
if (!plugin_times_older_than (paths, get_time (registry->location))) {
GST_INFO (GST_CAT_GST_INIT, "Registry still out of date, something is wrong...");
return FALSE;
}
} else {
GST_INFO (GST_CAT_PLUGIN_LOADING, "Can't write to this registry and it's out of date, ignoring it");
return FALSE;
}
}