docs/faq/gst-uninstalled: don't get empty paths on the PATH variables

Original commit message from CVS:
* docs/faq/gst-uninstalled:
don't get empty paths on the PATH variables
* gst/gstpad.c (gst_pad_is_active, gst_pad_set_blocked_async):
Don't format for the uncommon terminal width of 84 characters.

diff --git a/ChangeLog b/ChangeLog
index 4d9aa9d..5f9916b 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2007-04-12  Thomas Vander Stichele  <thomas at apestaart dot org>
+
+       * docs/faq/gst-uninstalled:
+         don't get empty paths on the PATH variables
+       * gst/gstpad.c (gst_pad_is_active, gst_pad_set_blocked_async):
+         Don't format for the uncommon terminal width of 84 characters.
+
 2007-04-06  Wim Taymans  <wim@fluendo.com>
 
        * gst/gstpipeline.c: (reset_stream_time),

diff --git a/common b/common
index 57d4a15..9097e25 160000 (submodule)
--- a/common
+++ b/common
@@ -1 +1 @@
-Subproject commit 57d4a1587556bd42c850601773c662211694c5a6
+Subproject commit 9097e252e477e18182f08a032d8860bdee9a0416

diff --git a/docs/faq/gst-uninstalled b/docs/faq/gst-uninstalled
index b9293f6..df54cc6 100755 (executable)
--- a/docs/faq/gst-uninstalled
+++ b/docs/faq/gst-uninstalled
@@ -60,11 +60,14 @@ DYLD_LIBRARY_PATH=$GST/gstreamer/gst/.libs:$DYLD_LIBRARY_PATH
 export LD_LIBRARY_PATH
 export DYLD_LIBRARY_PATH
   
-export PKG_CONFIG_PATH=$GST/prefix/lib/pkgconfig:$GST/gstreamer/pkgconfig:$GST/gst-plugins/pkgconfig:$GST/gst-plugins-base/pkgconfig:$GST/gst-plugins-good/pkgconfig:$GST/gst-python/pkgconfig:$PKG_CONFIG_PATH
-export GST_PLUGIN_PATH=$GST/gstreamer:$GST/gst-plugins:$GST/gst-plugins-base:$GST/gst-plugins-good:$GST/gst-plugins-ugly:$GST/gst-plugins-bad:$GST/gst-ffmpeg:$GST/gnonlin:$GST/gst-monkeysaudio:$GST/plugins:$GST_PLUGIN_PATH
+export PKG_CONFIG_PATH=$GST/prefix/lib/pkgconfig:$GST/gstreamer/pkgconfig:$GST/gst-plugins/pkgconfig:$GST/gst-plugins-base/pkgconfig:$GST/gst-plugins-good/pkgconfig:$GST/gst-python/pkgconfig${PKG_CONFIG_PATH:+:$PKG_CONFIG_PATH}
+export GST_PLUGIN_PATH=$GST/gstreamer:$GST/gst-plugins:$GST/gst-plugins-base:$GST/gst-plugins-good:$GST/gst-plugins-ugly:$GST/gst-plugins-bad:$GST/gst-ffmpeg:$GST/gnonlin:$GST/gst-monkeysaudio:$GST/plugins${GST_PLUGIN_PATH:+:$GST_PLUGIN_PATH}
+# don't use any system-installed plug-ins at all
 export GST_PLUGIN_SYSTEM_PATH=
+# set our registry somewhere else so we don't mess up the registry generated
+# by an installed copy
 export GST_REGISTRY=$GST/gstreamer/registry.xml
-export MANPATH=$GST/gstreamer/tools:$GST/prefix/share/man:$MANPATH
+export MANPATH=$GST/gstreamer/tools:$GST/prefix/share/man${MANPATH:+:$MANPATH}
 pythonver=`python -c "import sys; print sys.version[:3]"`
 export PYTHONPATH=$GST/gst-python:$GST/prefix/lib/python$pythonver/site-packages${PYTHONPATH:+:$PYTHONPATH}
 

diff --git a/gst/gstpad.c b/gst/gstpad.c
index 957bc36..54ecdec 100644 (file)
--- a/gst/gstpad.c
+++ b/gst/gstpad.c
@@ -964,9 +964,8 @@ gst_pad_is_active (GstPad * pad)
  * You can pass NULL as the callback to make this call block. Be careful with
  * this blocking call as it might not return for reasons stated above.
  *
- * Returns: TRUE if the pad could be blocked. This function can fail
- *   if wrong parameters were passed or the pad was already in the
- *   requested state.
+ * Returns: TRUE if the pad could be blocked. This function can fail if the
+ * wrong parameters were passed or the pad was already in the requested state.
  *
  * MT safe.
  */
@@ -1035,9 +1034,8 @@ had_right_state:
  * a shortcut for gst_pad_set_blocked_async() with a NULL
  * callback.
  *
- * Returns: TRUE if the pad could be blocked. This function can fail
- *   wrong parameters were passed or the pad was already in the
- *   requested state.
+ * Returns: TRUE if the pad could be blocked. This function can fail if the
+ * wrong parameters were passed or the pad was already in the requested state.
  *
  * MT safe.
  */