Remove some obsolete code

diff --git a/toolbox b/toolbox
index c392218daa715e93f6c889f1b14f63e8a8960481..97ca9db2a79d1e30f0e800bb38804adb5c1a4d5a 100755 (executable)
--- a/toolbox
+++ b/toolbox
@@ -31,7 +31,6 @@ recognized flags are:
   --update-po             update translation files
   --update-includes       generate various include files
   --update-version        generate src/misc/version.c
-  --update-glade          generate and fix Glade code
   --update-glade2         generate and fix Glade 2 code
   --update-flexml         generate and fix flexml and flex code
   --distclean             "make distclean" on steroids
@@ -82,9 +81,6 @@ case "$1" in
   --update-flexml)
     action=flexml
     ;;
-  --update-glade|--fix-glade)
-    action=glade
-    ;;
   --update-glade2|--update-glade-2|--fix-glade2)
     action=glade2
     ;;
@@ -631,91 +627,35 @@ EOF
   exit 0
 fi
 
-##
-##  Fix glade-generated files
-##
-if test "${action}" = "glade"
-then
-  for file in modules/gui/gtk/gnome.glade modules/gui/gtk/gtk.glade modules/gui/familiar/familiar.glade
-  do
-    echo "generating code from $file"
-    glade -w $file || exit 1
-  done
-
-  for file in modules/gui/gtk/gnome_interface.c modules/gui/gtk/gtk_interface.c modules/gui/familiar/interface.c
-  do
-    echo "fixing $file"
-    if grep "DO NOT EDIT THIS FILE" $file >/dev/null 2>&1
-    then
-      rm -f $file.$$.bak
-      cat > $file.$$.bak << EOF
-/* This file was created automatically by glade and fixed by bootstrap */
-
-#include <vlc/vlc.h>
-EOF
-      sed -e 1,7d \
-          -e 's#_(\(".:..:.."\))#\1#' \
-          -e 's#_(\("[a-z0-9]*://[^"]*"\))#\1#' \
-          -e 's#_("---")#"---"#' \
-          -e 's#_("--")#"--"#' \
-          -e 's#_(\("/dev/[^"]*"\))#"\1"#' \
-          -e 's#_(\("./."\))#\1#' \
-          < $file >> $file.$$.bak
-      mv -f $file.$$.bak $file
-    fi
-  done
-
-  for file in modules/gui/gtk/gtk_support.h modules/gui/familiar/support.h
-  do
-    echo "fixing $file"
-    if grep "DO NOT EDIT THIS FILE" $file >/dev/null 2>&1
-    then
-      rm -f $file.$$.bak
-      sed -e 's/DO NOT EDIT.*/Created by glade, fixed by bootstrap/' \
-          -e 's,<config.h>,<vlc/vlc.h>,' \
-          -e 's,#if.*ENABLE_NLS.*,#if 0 /* Disabled by bootstrap */,' \
-          -e 's,#else,/* & */,' \
-          < $file > $file.$$.bak
-      mv -f $file.$$.bak $file
-    fi
-  done
-
-  exit 0
-fi
-
 ##
 ##  Fix glade2-generated files
 ##
 if test "${action}" = "glade2"
 then
-  for file in modules/gui/gtk2/gnome2.glade modules/gui/gtk2/gtk2.glade modules/gui/pda/pda.glade
-  do
-    echo "generating code from $file"
-    glade-2 -w $file || exit 1
-  done
+  file="modules/gui/pda/pda.glade"
+  echo "generating code from $file"
+  glade-2 -w "$file" || exit 1
 
-  for file in modules/gui/pda/pda_interface.c
-  do
-    echo "fixing $file"
-    if grep "DO NOT EDIT THIS FILE" $file >/dev/null 2>&1
-    then
-      rm -f $file.$$.bak
-      cat > $file.$$.bak << EOF
+  file="modules/gui/pda/pda_interface.c"
+  echo "fixing $file"
+  if grep "DO NOT EDIT THIS FILE" "$file" >/dev/null 2>&1
+  then
+    rm -f -- "$file.$$.bak"
+    cat > "$file.$$.bak" << EOF
 /* This file was created automatically by glade2 and fixed by bootstrap */
 
 #include <vlc/vlc.h>
 EOF
-      sed -e 1,7d \
-          -e 's#_(\(".:..:.."\))#\1#' \
-          -e 's#_(\("[a-z0-9]*://[^"]*"\))#\1#' \
-          -e 's#_("---")#"---"#' \
-          -e 's#_("--")#"--"#' \
-          -e 's#_(\("/dev/[^"]*"\))#\1#' \
-          -e 's#_(\("./."\))#\1#' \
-          < $file >> $file.$$.bak
-      mv -f $file.$$.bak $file
-    fi
-  done
+    sed -e 1,7d \
+        -e 's#_(\(".:..:.."\))#\1#' \
+        -e 's#_(\("[a-z0-9]*://[^"]*"\))#\1#' \
+        -e 's#_("---")#"---"#' \
+        -e 's#_("--")#"--"#' \
+        -e 's#_(\("/dev/[^"]*"\))#\1#' \
+        -e 's#_(\("./."\))#\1#' \
+        < "$file" >> "$file.$$.bak"
+    mv -f "$file.$$.bak" "$file"
+  fi
 
   exit 0
 fi