completions: remove last unnamespaced symbols.

https://bugzilla.gnome.org/show_bug.cgi?id=744877

diff --git a/data/completions/gst-inspect-1.0 b/data/completions/gst-inspect-1.0
index 47c78af..980e140 100644 (file)
--- a/data/completions/gst-inspect-1.0
+++ b/data/completions/gst-inspect-1.0
@@ -18,18 +18,18 @@
 # Free Software Foundation, Inc., 51 Franklin St, Fifth Floor,
 # Boston, MA 02110-1301, USA.
 
-HELPERDIR="${BASH_SOURCE[0]%/*}/../helpers"
+_GST_HELPERDIR="${BASH_SOURCE[0]%/*}/../helpers"
 
-if [[ ! -d "$HELPERDIR"  ]]; then
-       HELPERDIR="$(pkg-config --variable=helpersdir gstreamer-1.0)"
+if [[ ! -d "$_GST_HELPERDIR"  ]]; then
+       _GST_HELPERDIR="$(pkg-config --variable=helpersdir gstreamer-1.0)"
 else
-       HELPERDIR=`cd "$HELPERDIR"; pwd`
+       _GST_HELPERDIR=`cd "$_GST_HELPERDIR"; pwd`
 fi
 
 # Common definitions
-. "$HELPERDIR"/gst
+. "$_GST_HELPERDIR"/gst
 
-HELPER="$HELPERDIR/gst-completion-helper-1.0"
+_GST_HELPER="$_GST_HELPERDIR/gst-completion-helper-1.0"
 
 _gst_inspect_all_arguments ()
 {
@@ -38,10 +38,10 @@ _gst_inspect_all_arguments ()
 
 _gst_inspect_all_elements ()
 {
-       COMPREPLY=( $(compgen -W "$($HELPER -l)" -- $cur) )
+       COMPREPLY=( $(compgen -W "$($_GST_HELPER -l)" -- $cur) )
 }
 
-_gstinspect___atleast_version () { _mandatory__argument; }
+_gstinspect___atleast_version () { _gst_mandatory_argument; }
 
 _gstinspect___exists ()
 {

diff --git a/data/completions/gst-launch-1.0 b/data/completions/gst-launch-1.0
index bb0dfe5..941cf84 100644 (file)
--- a/data/completions/gst-launch-1.0
+++ b/data/completions/gst-launch-1.0
@@ -18,18 +18,18 @@
 # Free Software Foundation, Inc., 51 Franklin St, Fifth Floor,
 # Boston, MA 02110-1301, USA.
 
-HELPERDIR="${BASH_SOURCE[0]%/*}/../helpers"
+_GST_HELPERDIR="${BASH_SOURCE[0]%/*}/../helpers"
 
-if [[ ! -d "$HELPERDIR" ]]; then
-       HELPERDIR="$(pkg-config --variable=helpersdir gstreamer-1.0)"
+if [[ ! -d "$_GST_HELPERDIR" ]]; then
+       _GST_HELPERDIR="$(pkg-config --variable=helpersdir gstreamer-1.0)"
 else
-       HELPERDIR=`cd "$HELPERDIR"; pwd`
+       _GST_HELPERDIR=`cd "$_GST_HELPERDIR"; pwd`
 fi
 
 # Common definitions
-. "$HELPERDIR"/gst
+. "$_GST_HELPERDIR"/gst
 
-HELPER="$HELPERDIR/gst-completion-helper-1.0"
+_GST_HELPER="$_GST_HELPERDIR/gst-completion-helper-1.0"
 
 _gst_launch_all_arguments ()
 {
@@ -38,20 +38,20 @@ _gst_launch_all_arguments ()
 
 _gst_complete_compatible_elements ()
 {
-       COMPREPLY=( $(compgen -W "$($HELPER --compatible-with $previous_element)" -- $cur) )
+       COMPREPLY=( $(compgen -W "$($_GST_HELPER --compatible-with $previous_element)" -- $cur) )
 }
 
 _gst_complete_all_elements ()
 {
-       COMPREPLY=( $(compgen -W "$($HELPER -l)" -- $cur) )
+       COMPREPLY=( $(compgen -W "$($_GST_HELPER -l)" -- $cur) )
 }
 
 _gst_complete_element_properties ()
 {
-       COMPREPLY=( $(compgen -W "$($HELPER --element-properties $previous_element)" -- $cur) )
+       COMPREPLY=( $(compgen -W "$($_GST_HELPER --element-properties $previous_element)" -- $cur) )
 }
 
-_gstlaunch___exclude_ () { _mandatory__argument; }
+_gstlaunch___exclude_ () { _gst_mandatory_argument; }
 
 _gst_launch_main ()
 {

diff --git a/libs/gst/helpers/gst b/libs/gst/helpers/gst
index 76275e6..c8bcee8 100644 (file)
--- a/libs/gst/helpers/gst
+++ b/libs/gst/helpers/gst
@@ -18,13 +18,13 @@
 # Free Software Foundation, Inc., 51 Franklin St, Fifth Floor,
 # Boston, MA 02110-1301, USA.
 
-___gst_debug_level () { _mandatory__argument; }
-___gst_debug () { _mandatory__argument; }
-___gst_debug_color_mode () { _mandatory__argument; }
-___gst_plugin_path () { _mandatory__argument; }
-___gst_plugin_load () { _mandatory__argument; }
+___gst_debug_level () { _gst_mandatory_argument; }
+___gst_debug () { _gst_mandatory_argument; }
+___gst_debug_color_mode () { _gst_mandatory_argument; }
+___gst_plugin_path () { _gst_mandatory_argument; }
+___gst_plugin_load () { _gst_mandatory_argument; }
 
-_mandatory__argument ()
+_gst_mandatory_argument ()
 {
        if [[ "$prev" != "$command" ]]
        then