From 9def80ce057d147d49ba95f9d18f57eab596e29c Mon Sep 17 00:00:00 2001 From: Thomas Vander Stichele Date: Mon, 5 Dec 2005 09:53:54 +0000 Subject: [PATCH] gst/gst.c (init_post): remove hard-coded 0.9 location for registries/plugins with a MAJORMINOR one. Original commit message from CVS: 2005-12-05 Andy Wingo patch by: Thomas Vander Stichele * gst/gst.c (init_post): remove hard-coded 0.9 location for registries/plugins with a MAJORMINOR one. (plugin_desc): Rename library from gstcoreleements to staticelements. Fixes #323222. --- ChangeLog | 9 +++++++++ gst/gst.c | 8 ++++---- 2 files changed, 13 insertions(+), 4 deletions(-) diff --git a/ChangeLog b/ChangeLog index ab837ad733..f4102e19d1 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,12 @@ +2005-12-05 Andy Wingo + + patch by: Thomas Vander Stichele + + * gst/gst.c (init_post): remove hard-coded 0.9 location for + registries/plugins with a MAJORMINOR one. + (plugin_desc): Rename library from gstcoreleements to + staticelements. Fixes #323222. + 2005-12-05 Tim-Philipp Müller * libs/gst/base/gstcollectpads.c: (gst_collect_pads_base_init): diff --git a/gst/gst.c b/gst/gst.c index 660269a23b..b2fca6404b 100644 --- a/gst/gst.c +++ b/gst/gst.c @@ -516,8 +516,8 @@ gst_register_core_elements (GstPlugin * plugin) static GstPluginDesc plugin_desc = { GST_VERSION_MAJOR, GST_VERSION_MINOR, - "gstcoreelements", - "core elements of the GStreamer library", + "staticelements", + "core elements linked into the GStreamer library", gst_register_core_elements, VERSION, GST_LICENSE, @@ -589,7 +589,7 @@ init_post (void) registry_file = g_strdup (g_getenv ("GST_REGISTRY")); if (registry_file == NULL) { registry_file = g_build_filename (g_get_home_dir (), - ".gstreamer-0.9", "registry.xml", NULL); + ".gstreamer-" GST_MAJORMINOR, "registry.xml", NULL); } GST_DEBUG ("Reading registry cache"); gst_registry_xml_read_cache (default_registry, registry_file); @@ -623,7 +623,7 @@ init_post (void) /* plugins in the user's home directory take precedence over * system-installed ones */ home_plugins = g_build_filename (g_get_home_dir (), - ".gstreamer-0.9", "plugins", NULL); + ".gstreamer-" GST_MAJORMINOR, "plugins", NULL); gst_registry_scan_path (default_registry, home_plugins); g_free (home_plugins);