Cleanup of mime support

Removed old mime support files.  Renamed mime icon file.

diff --git a/.gitignore b/.gitignore
index d23fe3284f348a49e0276daa44cf023cd22e84b0..b9f9a4f9abbc6fc9013088d461e63406a54b536a 100644 (file)
--- a/.gitignore
+++ b/.gitignore
@@ -53,8 +53,7 @@ glabels-*.tar.gz
 
 /data/desktop/glabels*.desktop
 
-/data/mime/glabels.keys
-/data/mime/glabels.xml
+/data/mime/glabels*.xml
 
 /po/.intltool-merge-cache
 /po/*.gmo

diff --git a/Makefile.am b/Makefile.am
index 0b8683634a57135e4f63bf8f134fbea0240f23c0..efc7f290df679f72bc759c0e02f3bdbce35c95ce 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -11,6 +11,7 @@ SUBDIRS = \
 
 EXTRA_DIST = \
        README \
+       COPYING.README_FIRST \
        COPYING \
        COPYING-DOCS \
        COPYING-LIBGLABELS \

diff --git a/data/mime/Makefile.am b/data/mime/Makefile.am
index 282e1842f20607953a1d091a355d73dc884614ed..94f2431e384594085bc581771fb36c0ef68b2a22 100644 (file)
--- a/data/mime/Makefile.am
+++ b/data/mime/Makefile.am
@@ -1,30 +1,17 @@
 ## Process this file with automake to produce Makefile.in
 
-keys_in_files=glabels.keys.in
-keys_files = $(keys_in_files:.keys.in=.keys)
-@INTLTOOL_KEYS_RULE@
-
-xml_in_files=glabels.xml.in
+xml_in_files=$(GLABELS_BRANCH).xml.in
 xml_files = $(xml_in_files:.xml.in=.xml)
 @INTLTOOL_XML_RULE@
 
-mimedir = $(datadir)/mime-info
-mime_DATA = $(keys_files) glabels.mime
-
-appdir = $(datadir)/application-registry
-app_DATA = glabels.applications
-
-newmimedir = $(datadir)/mime/packages
-newmime_DATA = $(xml_files)
+mimedir = $(datadir)/mime/packages
+mime_DATA = $(xml_files)
 
 EXTRA_DIST = \
-       $(keys_in_files)        \
-       $(mime_DATA)            \
-       $(app_DATA)             \
-       $(xml_in_files)         \
-       $(newmime_DATA)
+       $(xml_in_files)
 
-CLEANFILES = $(keys_files) $(xml_files)
+CLEANFILES = \
+       $(xml_files)
 
 
 install-data-hook:

diff --git a/data/mime/glabels-3.0.xml.in b/data/mime/glabels-3.0.xml.in
new file mode 100644 (file)
index 0000000..70f0e2f
--- /dev/null
+++ b/data/mime/glabels-3.0.xml.in
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<mime-info xmlns="http://www.freedesktop.org/standards/shared-mime-info">
+   <mime-type type="application/x-glabels">
+     <_comment>gLabels Project File</_comment>
+     <glob pattern="*.glabels"/>
+   </mime-type>
+</mime-info>
+

diff --git a/data/mime/glabels.applications b/data/mime/glabels.applications
deleted file mode 100644 (file)
index 1391018..0000000
--- a/data/mime/glabels.applications
+++ /dev/null
@@ -1,9 +0,0 @@
-glabels
-       command=glabels
-       name=gLabels
-       can_open_multiple_files=true
-       expects_uris=false
-       requires_terminal=false
-       mime_types=application/x-glabels
-       uses_gnomevfs=false
-

diff --git a/data/mime/glabels.keys.in b/data/mime/glabels.keys.in
deleted file mode 100644 (file)
index 9eae515..0000000
--- a/data/mime/glabels.keys.in
+++ /dev/null
@@ -1,9 +0,0 @@
-application/x-glabels:
-       open=glabels %f
-       _description=gLabels Project File
-        icon_filename=glabels-3.0-application-x-glabels.png
-        default_action_type=application
-       category=Documents
-        short_list_application_ids_for_novice_user_level=glabels
-        short_list_application_ids_for_intermediate_user_level=glabels
-        short_list_application_ids_for_advanced_user_level=glabels

diff --git a/data/mime/glabels.mime b/data/mime/glabels.mime
deleted file mode 100644 (file)
index ab2f8cd..0000000
--- a/data/mime/glabels.mime
+++ /dev/null
@@ -1,2 +0,0 @@
-application/x-glabels
-        ext: glabels

diff --git a/data/mime/glabels.xml.in b/data/mime/glabels.xml.in
deleted file mode 100644 (file)
index 70f0e2f..0000000
--- a/data/mime/glabels.xml.in
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<mime-info xmlns="http://www.freedesktop.org/standards/shared-mime-info">
-   <mime-type type="application/x-glabels">
-     <_comment>gLabels Project File</_comment>
-     <glob pattern="*.glabels"/>
-   </mime-type>
-</mime-info>
-

diff --git a/data/pixmaps/Makefile.am b/data/pixmaps/Makefile.am
index ed28b9be3f7cbfbd60ab0319b3975aadcdbd0be0..1e370f45fde02b2d67e1a6163f58f33bf755ddf0 100644 (file)
--- a/data/pixmaps/Makefile.am
+++ b/data/pixmaps/Makefile.am
@@ -19,7 +19,7 @@ glabels_app_icon_DATA = \
 glabels_mime_icondir = $(datadir)/icons/hicolor/48x48/mimetypes
 
 glabels_mime_icon_DATA = \
-       $(GLABELS_BRANCH)-application-x-glabels.png
+       application-x-glabels.png
 
 EXTRA_DIST = $(glabels_pixmaps_DATA)   \
             $(glabels_app_icon_DATA)  \

diff --git a/data/pixmaps/application-x-glabels.png b/data/pixmaps/application-x-glabels.png
new file mode 100644 (file)
index 0000000..9f300f3
Binary files /dev/null and b/data/pixmaps/application-x-glabels.png differ

diff --git a/data/pixmaps/glabels-3.0-application-x-glabels.png b/data/pixmaps/glabels-3.0-application-x-glabels.png
deleted file mode 100644 (file)
index 9f300f3..0000000
Binary files a/data/pixmaps/glabels-3.0-application-x-glabels.png and /dev/null differ