totem r5605 - in trunk: . data

[hadess svn gnome org]

Author: hadess
Date: Tue Aug 26 14:47:34 2008
New Revision: 5605
URL: http://svn.gnome.org/viewvc/totem?rev=5605&view=rev

Log:
2008-08-26  Bastien Nocera  <hadess hadess net>

	* data/mime-functions.sh: Fix a stupid typo
	* data/schemas.sh: Fix another stupid typo,
	and output to fd 3, so we can see the stderr
	* data/Makefile.am: capture fd 3 for the gconf updater
	script
	* data/mime-type-list.txt: Add audio/x-vorbis+ogg to
	the mime-types (Closes: #549038)



Modified:
   trunk/ChangeLog
   trunk/data/Makefile.am
   trunk/data/mime-functions.sh
   trunk/data/mime-type-list.txt
   trunk/data/schemas.sh

Modified: trunk/data/Makefile.am
==============================================================================
--- trunk/data/Makefile.am	(original)
+++ trunk/data/Makefile.am	Tue Aug 26 14:47:34 2008
@@ -61,7 +61,7 @@
 totem-video-thumbnail.schemas.in: schemas.sh mime-type-list.txt mime-functions.sh
 	$(srcdir)/schemas.sh $(srcdir)/mime-type-list.txt $(bindir)	\
 	> $@								\
-	2> update-gconf.sh
+	3> update-gconf.sh
 
 totem-handlers.schemas.in: handlers.sh
 	$(srcdir)/handlers.sh > $@

Modified: trunk/data/mime-functions.sh
==============================================================================
--- trunk/data/mime-functions.sh	(original)
+++ trunk/data/mime-functions.sh	Tue Aug 26 14:47:34 2008
@@ -3,7 +3,7 @@
 get_audio_mimetypes ()
 {
 	MIMETYPES=`grep -v ^# $1 | grep "\/" | grep audio | grep -v "audio/x-pn-realaudio"`
-	MIMEYPES="$MIMETYPES application/x-flac"
+	MIMETYPES="$MIMETYPES application/x-flac"
 }
 
 get_video_mimetypes ()

Modified: trunk/data/mime-type-list.txt
==============================================================================
--- trunk/data/mime-type-list.txt	(original)
+++ trunk/data/mime-type-list.txt	Tue Aug 26 14:47:34 2008
@@ -56,6 +56,7 @@
 audio/x-wav
 audio/x-wavpack
 audio/x-vorbis
+audio/x-vorbis+ogg
 audio/x-xm
 image/vnd.rn-realpix
 image/x-pict

Modified: trunk/data/schemas.sh
==============================================================================
--- trunk/data/schemas.sh	(original)
+++ trunk/data/schemas.sh	Tue Aug 26 14:47:34 2008
@@ -7,7 +7,7 @@
 
 upd_schema()
 {
-	echo "gconftool-2 --set --type $TYPE /desktop/gnome/thumbnailers/$NAME \"$DEFAULT\"" 1>&2
+	echo "gconftool-2 --set --type $TYPE /desktop/gnome/thumbnailers/$NAME \"$DEFAULT\"" 1>&3
 }
 
 schema()
@@ -52,18 +52,19 @@
 get_audio_mimetypes $1;
 
 for i in $MIMETYPES ; do
-	DIR=`echo $i | sed 's,/,@,' sed 's,+,@,'`
+	DIR=`echo $i | sed 's,/,@,' | sed 's,+,@,'`
+
 	NAME="$DIR/enable";
 	TYPE="bool";
 	DEFAULT="false";
-	upd_schema;
+	schema;
 
 	NAME="$DIR/command";
 	TYPE="string";
 	DEFAULT="$COMMAND";
-	upd_schema;
+	schema;
 done
 
 echo "    </schemalist>";
 echo "</gconfschemafile>"
-    
+