summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBastien Nocera <hadess@hadess.net>2007-10-19 01:57:30 +0000
committerBastien Nocera <hadess@src.gnome.org>2007-10-19 01:57:30 +0000
commit4c1c8297e0ef27e6ea4e801f9aee9b2a8fbdcce2 (patch)
treeca2ed11787d3d85479fcbce4407814f58296f5a3
parente314643f598f2091484d3969845db677cf633fa8 (diff)
Patch from Stephane Loeuillet <leroutier@gmail.com> to fix some warnings
2007-10-19 Bastien Nocera <hadess@hadess.net> * data/mime-type-list.txt: * data/totem.desktop.in.in.in: Patch from Stephane Loeuillet <leroutier@gmail.com> to fix some warnings in the .desktop file (Closes: #481700) svn path=/trunk/; revision=4791
-rw-r--r--ChangeLog7
-rw-r--r--data/mime-type-list.txt1
-rw-r--r--data/totem.desktop.in.in.in1
3 files changed, 7 insertions, 2 deletions
diff --git a/ChangeLog b/ChangeLog
index 87703c20..35fa9329 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,12 @@
2007-10-19 Bastien Nocera <hadess@hadess.net>
+ * data/mime-type-list.txt:
+ * data/totem.desktop.in.in.in: Patch from Stephane Loeuillet
+ <leroutier@gmail.com> to fix some warnings in the .desktop
+ file (Closes: #481700)
+
+2007-10-19 Bastien Nocera <hadess@hadess.net>
+
* configure.in: Fix some confusing error message when
Python was there but not PyGTK (Closes: #479272)
diff --git a/data/mime-type-list.txt b/data/mime-type-list.txt
index 6ac75f24..c8da730e 100644
--- a/data/mime-type-list.txt
+++ b/data/mime-type-list.txt
@@ -51,7 +51,6 @@ audio/x-sbc
audio/x-scpls
audio/x-tta
audio/x-wav
-audio/x-wav
audio/x-wavpack
audio/x-vorbis
image/vnd.rn-realpix
diff --git a/data/totem.desktop.in.in.in b/data/totem.desktop.in.in.in
index ade9ea5d..22ad4022 100644
--- a/data/totem.desktop.in.in.in
+++ b/data/totem.desktop.in.in.in
@@ -1,5 +1,4 @@
[Desktop Entry]
-Encoding=UTF-8
_Name=Movie Player
_Comment=Play movies and songs
Exec=totem %U