ensonic gstreamer: gstreamer/ gstreamer/gst/

--===============0131265963947346182==

CVS Root:       /cvs/gstreamer
Module:         gstreamer
Changes by:     ensonic
Date:           Thu Jan 08 2009  13:41:33 UTC

Log message:
	* gst/gst.c:
	  Create a registry if there is none also when the option for
	  gst-disable-registry-update has been selected. Fixes #567002

Modified files:
    .               : ChangeLog
    gst             : gst.c

Links:
http://freedesktop.org/cgi-bin/viewcvs.cgi/gstreamer/gstreamer/ChangeLog.diff?r1=1.4217&r2=1.4218
http://freedesktop.org/cgi-bin/viewcvs.cgi/gstreamer/gstreamer/gst/gst.c.diff?r1=1.268&r2=1.269

====Begin Diffs====
Index: ChangeLog
===================================================================
RCS file: /cvs/gstreamer/gstreamer/ChangeLog,v
retrieving revision 1.4217
retrieving revision 1.4218
diff -u -d -r1.4217 -r1.4218
--- ChangeLog	6 Jan 2009 18:10:19 -0000	1.4217
+++ ChangeLog	8 Jan 2009 13:41:17 -0000	1.4218
@@ -1,3 +1,9 @@
+2009-01-08  Stefan Kost  <[email protected]>
+
+	* gst/gst.c:
+	  Create a registry if there is none also when the option for
+	  gst-disable-registry-update has been selected. Fixes #567002
 2009-01-06  Tim-Philipp Müller  <tim.muller at collabora co uk>
 
 	* gst/gst.c: (init_post):
Index: gst.c
RCS file: /cvs/gstreamer/gstreamer/gst/gst.c,v
retrieving revision 1.268
retrieving revision 1.269
diff -u -d -r1.268 -r1.269
--- gst.c	6 Jan 2009 18:10:22 -0000	1.268
+++ gst.c	8 Jan 2009 13:41:19 -0000	1.269
@@ -903,6 +903,7 @@
   gboolean ret = TRUE;
   gboolean do_fork;
   gboolean do_update;
+  gboolean have_cache;
   default_registry = gst_registry_get_default ();
   registry_file = g_strdup (g_getenv ("GST_REGISTRY"));
@@ -918,19 +919,23 @@
   GST_INFO ("reading registry cache: %s", registry_file);
 #ifdef USE_BINARY_REGISTRY
-  gst_registry_binary_read_cache (default_registry, registry_file);
+  have_cache = gst_registry_binary_read_cache (default_registry, registry_file);
 #else
-  gst_registry_xml_read_cache (default_registry, registry_file);
+  have_cache = gst_registry_xml_read_cache (default_registry, registry_file);
 #endif
-  do_update = !_gst_disable_registry_update;
-  if (do_update) {
-    const gchar *update_env;
+  if (have_cache) {
+    do_update = !_gst_disable_registry_update;
+    if (do_update) {
+      const gchar *update_env;
-    if ((update_env = g_getenv ("GST_REGISTRY_UPDATE"))) {
-      /* do update for any value different from "no" */
-      do_update = (strcmp (update_env, "no") != 0);
+      if ((update_env = g_getenv ("GST_REGISTRY_UPDATE"))) {
+        /* do update for any value different from "no" */
+        do_update = (strcmp (update_env, "no") != 0);
+      }
     }
+  } else {
+    do_update = TRUE;
   }
   if (do_update) {


--===============0131265963947346182==
Content-Type: text/plain; charset="us-ascii"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
Content-Disposition: inline

------------------------------------------------------------------------------
Check out the new SourceForge.net Marketplace.
It is the best place to buy or sell services for
just about anything Open Source.
http://p.sf.net/sfu/Xq1LFB
--===============0131265963947346182==
Content-Type: text/plain; charset="us-ascii"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
Content-Disposition: inline

_______________________________________________
gstreamer-cvs-verbose mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/gstreamer-cvs-verbose

--===============0131265963947346182==--