gtranslator r3940 - in trunk: . data data/desktop data/mime

[psanxiao svn gnome org]

Author: psanxiao
Date: Sat Feb 14 12:11:17 2009
New Revision: 3940
URL: http://svn.gnome.org/viewvc/gtranslator?rev=3940&view=rev

Log:
	Patch by Luca Ferretti.

	* configure.ac:
        * data/Makefile.am:
        * data/desktop/Makefile.am:
        * data/desktop/gtranslator.desktop.in.in:
        * data/mime/Makefile.am:
        * data/mime/gtranslator.keys_template.in:
        * data/mime/gtranslator.mime:
        Migrated from gnome-mime-data to freedesktop.org
        specs for MIME handling. (Fixes bug #150834)

Modified:
   trunk/ChangeLog
   trunk/configure.ac
   trunk/data/Makefile.am
   trunk/data/desktop/Makefile.am
   trunk/data/desktop/gtranslator.desktop.in.in
   trunk/data/mime/Makefile.am
   trunk/data/mime/gtranslator.keys_template.in
   trunk/data/mime/gtranslator.mime

Modified: trunk/configure.ac
==============================================================================
--- trunk/configure.ac	(original)
+++ trunk/configure.ac	Sat Feb 14 12:11:17 2009
@@ -449,8 +449,6 @@
 data/gtranslator.pc
 data/desktop/Makefile
 data/desktop/gtranslator.desktop.in
-data/mime/Makefile
-data/mime/gtranslator.keys_template
 data/pixmaps/Makefile
 doc/Makefile
 doc/reference/Makefile

Modified: trunk/data/Makefile.am
==============================================================================
--- trunk/data/Makefile.am	(original)
+++ trunk/data/Makefile.am	Sat Feb 14 12:11:17 2009
@@ -2,7 +2,6 @@
 
 SUBDIRS = \
 	desktop \
-	mime \
 	pixmaps
 
 schemasdir	 = $(GCONF_SCHEMA_FILE_DIR)

Modified: trunk/data/desktop/Makefile.am
==============================================================================
--- trunk/data/desktop/Makefile.am	(original)
+++ trunk/data/desktop/Makefile.am	Sat Feb 14 12:11:17 2009
@@ -20,3 +20,16 @@
 	$(Application_predata)
 
 CLEANFILES = $(Application_DATA)
+
+UPDATE_DESKTOP = \
+	if [ -f $(Applicationdir)/defaults.list ] ; then \
+		if which update-desktop-database>/dev/null 2>&1 ; then \
+			update-desktop-database $(Applicationdir); \
+		fi \
+	fi
+
+install-data-hook:
+	$(UPDATE_DESKTOP)
+
+uninstall-hook:
+	$(UPDATE_DESKTOP) 
\ No newline at end of file

Modified: trunk/data/desktop/gtranslator.desktop.in.in
==============================================================================
--- trunk/data/desktop/gtranslator.desktop.in.in	(original)
+++ trunk/data/desktop/gtranslator.desktop.in.in	Sat Feb 14 12:11:17 2009
@@ -1,12 +1,13 @@
 [Desktop Entry]
 _Name=Gtranslator PO Editor
 _Comment=Translate and localize applications and libraries
-Icon=gtranslator.png
+Icon=gtranslator
 Exec=gtranslator
 Terminal=false
 Type=Application
 StartupNotify=true
-Categories=Application;Development;
+MimeType=text/x-gettext-translation;text/x-gettext-translation-template;
+Categories=GNOME;GTK;Development;Translation;
 X-GNOME-Bugzilla-Bugzilla=GNOME
 X-GNOME-Bugzilla-Product=gtranslator
 X-GNOME-Bugzilla-Component=general

Modified: trunk/data/mime/Makefile.am
==============================================================================
--- trunk/data/mime/Makefile.am	(original)
+++ trunk/data/mime/Makefile.am	Sat Feb 14 12:11:17 2009
@@ -1,29 +0,0 @@
-## ./data/mime/Makefile.am of gtranslator
-
-##
-## The mime dirs
-## 
-icondir = $(datadir)/pixmaps
-mimedir = $(datadir)/mime-info
-keysdir = $(datadir)/mime-info
-
-##
-## And the mime-files
-##
-icon_DATA = gnome-application-x-gmo.png gnome-application-x-po.png
-keys_predata = gtranslator.keys_template.in
-keys_DATA = gtranslator.keys
-mime_DATA = gtranslator.mime
-
-gtranslator.keys: gtranslator.keys_template
-	$(INTLTOOL_MERGE) -k $(top_srcdir)/po gtranslator.keys_template \
-		gtranslator.keys
-
-##
-## HACK -- overread this please..
-##
-all-am: gtranslator.keys
-
-EXTRA_DIST = $(icon_DATA) $(mime_DATA) $(keys_predata)
-
-CLEANFILES = $(keys_DATA)

Modified: trunk/data/mime/gtranslator.keys_template.in
==============================================================================
--- trunk/data/mime/gtranslator.keys_template.in	(original)
+++ trunk/data/mime/gtranslator.keys_template.in	Sat Feb 14 12:11:17 2009
@@ -1,20 +0,0 @@
-text/x-gettext-translation
-	open=gtranslator %f
-	view=gtranslator %f
-	edit=gtranslator %f
-	_description=Translation
-	icon-filename= PIXMAP_DIR@/gnome-application-x-po.png
-
-text/x-gettext-translation-template
-	open=gtranslator %f
-	view=gtranslator %f
-	edit=gtranslator %f
-	_description=Translation template
-	icon-filename= PIXMAP_DIR@/gnome-application-x-po.png
-
-application/x-gettext-translation
-	open=gtranslator %f
-	view=gtranslator %f
-	edit=gtranslator %f
-	_description=Translated messages (machine-readable)
-	icon-filename= PIXMAP_DIR@/gnome-application-x-gmo.png

Modified: trunk/data/mime/gtranslator.mime
==============================================================================
--- trunk/data/mime/gtranslator.mime	(original)
+++ trunk/data/mime/gtranslator.mime	Sat Feb 14 12:11:17 2009
@@ -1,9 +0,0 @@
-text/x-gettext-translation
-	ext: po PO
-
-text/x-gettext-translation-template
-	ext: pot POT
-
-application/x-gettext-translation
-	ext: gmo mo GMO MO
-