get rid of old mime stuff.

2004-11-27  James Henstridge  <james@jamesh.id.au>

	* Makefile.am: get rid of old mime stuff.

	* gnome-font-viewer.desktop.in.in (Exec): add a "%U" to the
	command line, so Nautilus will run gnome-font-viewer for stuff
	under the fonts:/// URI.

2004-11-27  James Henstridge  <james@jamesh.id.au>

	* themus.applications, themus.keys: remove.

	* themus-theme-applier.desktop.in.in: new file to hook up
	themus-apply-theme, since the old .applications file isn't used by
	the new MIME system.

14 files changed, 39 insertions, 77 deletions

diff --git a/configure.in b/configure.in
index 2115688c0..c3c1ff5f6 100644
--- a/configure.in
+++ b/configure.in
@@ -564,6 +564,7 @@ vfs-methods/themus/Makefile
 vfs-methods/fontilus/Makefile
 control-center.spec
 vfs-methods/fontilus/gnome-font-viewer.desktop.in
+vfs-methods/themus/themus-theme-applier.desktop.in
 capplets/font/font-properties.desktop.in
 capplets/keybindings/keybinding.desktop.in
 capplets/display/display-properties.desktop.in
diff --git a/po/POTFILES.in b/po/POTFILES.in
index eed66e39f..962d13842 100644
--- a/po/POTFILES.in
+++ b/po/POTFILES.in
@@ -101,7 +101,6 @@ typing-break/drwright.c
 typing-break/main.c
 vfs-methods/fontilus/fontilus-context-menu.c
 vfs-methods/fontilus/fontilus.schemas.in
-vfs-methods/fontilus/fontilus.server.in.in
 vfs-methods/fontilus/font-view.c
 vfs-methods/fontilus/gnome-font-viewer.desktop.in.in
 vfs-methods/themus/apply-font.glade
@@ -109,6 +108,6 @@ vfs-methods/themus/theme-method.c
 vfs-methods/themus/theme-method.directory.in
 vfs-methods/themus/themus-properties-main.c
 vfs-methods/themus/themus-properties-view.c
-vfs-methods/themus/Themus_Properties_View.server.in.in
 vfs-methods/themus/themus.schemas.in
 vfs-methods/themus/themus-theme-applier.c
+vfs-methods/themus/themus-theme-applier.desktop.in.in
diff --git a/vfs-methods/fontilus/ChangeLog b/vfs-methods/fontilus/ChangeLog
index 55695f6e9..b162a6438 100644
--- a/vfs-methods/fontilus/ChangeLog
+++ b/vfs-methods/fontilus/ChangeLog
@@ -1,5 +1,11 @@
 2004-11-27  James Henstridge  <james@jamesh.id.au>
 
+	* Makefile.am: get rid of old mime stuff.
+
+	* gnome-font-viewer.desktop.in.in (Exec): add a "%U" to the
+	command line, so Nautilus will run gnome-font-viewer for stuff
+	under the fonts:/// URI.
+
 	* Makefile.am: fix build rules for Nautilus stuff.
 
 	* fontilus-context-menu.c: convert to a Nautilus extension.
diff --git a/vfs-methods/fontilus/Makefile.am b/vfs-methods/fontilus/Makefile.am
index 0e6bfcb7b..f5a9f4445 100644
--- a/vfs-methods/fontilus/Makefile.am
+++ b/vfs-methods/fontilus/Makefile.am
@@ -31,12 +31,6 @@ vfsmoduleconf_DATA = font-method.conf
 vfsdirectorydir = $(datadir)/gnome/vfolders
 vfsdirectory_DATA = font-method.directory
 
-mimeinfodir = $(datadir)/mime-info
-mimeinfo_DATA = fontilus.keys fontilus.mime
-
-appregdir = $(datadir)/application-registry
-appreg_DATA = fontilus.applications
-
 schemasdir = $(GCONF_SCHEMA_FILE_DIR)
 schemas_DATA = fontilus.schemas
 
diff --git a/vfs-methods/fontilus/fontilus.applications b/vfs-methods/fontilus/fontilus.applications
deleted file mode 100644
index ac153465b..000000000
--- a/vfs-methods/fontilus/fontilus.applications
+++ /dev/null
@@ -1,8 +0,0 @@
-gnome-font-viewer
-	command=gnome-font-viewer
-	name=GNOME Font Viewer
-	can_open_multiple_files=false
-	expects_uris=true
-	requires_terminal=false
-	supported_uri_schemes=file,fonts
-	mime_types=application/x-font-pcf,application/x-font-ttf,application/x-font-type1,application/x-font-otf
diff --git a/vfs-methods/fontilus/fontilus.keys b/vfs-methods/fontilus/fontilus.keys
deleted file mode 100644
index 5d8f729de..000000000
--- a/vfs-methods/fontilus/fontilus.keys
+++ /dev/null
@@ -1,26 +0,0 @@
-application/x-font-type1
-	default_action_type=application
-	default_application_id=gnome-font-viewer
-	short_list_application_ids_for_novice_user_level=gnome-font-viewer
-	short_list_application_ids_for_intermediate_user_level=gnome-font-viewer
-	short_list_application_ids_for_advanced_user_level=gnome-font-viewer
-
-application/x-font-ttf
-	default_action_type=application
-	default_application_id=gnome-font-viewer
-	short_list_application_ids_for_novice_user_level=gnome-font-viewer
-	short_list_application_ids_for_intermediate_user_level=gnome-font-viewer
-	short_list_application_ids_for_advanced_user_level=gnome-font-viewer
-
-application/x-font-pcf
-	default_action_type=application
-	default_application_id=gnome-font-viewer
-	short_list_application_ids_for_novice_user_level=gnome-font-viewer
-	short_list_application_ids_for_intermediate_user_level=gnome-font-viewer
-	short_list_application_ids_for_advanced_user_level=gnome-font-viewer
-
-application/x-font-otf
-        default_action_type=application
-        default_application_id=gnome-font-viewer
-        short_list_application_ids_for_novice_user_level=gnome-font-viewer
-        short_list_application_ids_for_intermediate_user_level=gnome-font-viewer        short_list_application_ids_for_advanced_user_level=gnome-font-viewer
diff --git a/vfs-methods/fontilus/fontilus.mime b/vfs-methods/fontilus/fontilus.mime
deleted file mode 100644
index bb3570785..000000000
--- a/vfs-methods/fontilus/fontilus.mime
+++ /dev/null
@@ -1,5 +0,0 @@
-application/x-font-pcf:
-	regex,2: pcf\.gz$
-
-application/x-font-ttf:
-	ext: ttc TTC
diff --git a/vfs-methods/fontilus/gnome-font-viewer.desktop.in.in b/vfs-methods/fontilus/gnome-font-viewer.desktop.in.in
index 85de2b88b..19f6eff6f 100644
--- a/vfs-methods/fontilus/gnome-font-viewer.desktop.in.in
+++ b/vfs-methods/fontilus/gnome-font-viewer.desktop.in.in
@@ -3,13 +3,13 @@ Encoding=UTF-8
 _Name=GNOME Font Viewer
 _Comment=The GNOME configuration tool
 Icon=gnome-settings-font
-Exec=gnome-font-viewer
+Exec=gnome-font-viewer %U
 Terminal=false
 Type=Application
 StartupNotify=true
 NoDisplay=true
+MimeType=application/x-font-ttf;application/x-font-pcf;application/x-font-type1;application/x-font-otf;
 X-GNOME-Bugzilla-Bugzilla=GNOME
 X-GNOME-Bugzilla-Product=control-center
 X-GNOME-Bugzilla-Component=font properties
-MimeType=application/x-font-ttf;application/x-font-pcf;application/x-font-type1;application/x-font-otf;
 X-GNOME-Bugzilla-Version=@VERSION@
diff --git a/vfs-methods/themus/.cvsignore b/vfs-methods/themus/.cvsignore
index 4f7173944..a6b421d34 100644
--- a/vfs-methods/themus/.cvsignore
+++ b/vfs-methods/themus/.cvsignore
@@ -1,10 +1,8 @@
 Makefile
 Makefile.in
-Themus_Component.server
-Themus_Component.server.in
-Themus_Properties_View.server
-Themus_Properties_View.server.in
 gnome-theme-thumbnailer
 theme-method.directory
 themus.schemas
 themus-theme-applier
+themus-theme-applier.desktop
+themus-theme-applier.desktop.in
diff --git a/vfs-methods/themus/ChangeLog b/vfs-methods/themus/ChangeLog
index 5fc689587..2e9fc86f0 100644
--- a/vfs-methods/themus/ChangeLog
+++ b/vfs-methods/themus/ChangeLog
@@ -1,5 +1,11 @@
 2004-11-27  James Henstridge  <james@jamesh.id.au>
 
+	* themus.applications, themus.keys: remove.
+
+	* themus-theme-applier.desktop.in.in: new file to hook up
+	themus-apply-theme, since the old .applications file isn't used by
+	the new MIME system.
+
 	* themus-theme-applier.c: get rid of the bonobo includes.
 
 	* Makefile.am: update to install Nautilus extension.
diff --git a/vfs-methods/themus/Makefile.am b/vfs-methods/themus/Makefile.am
index d460ab159..fba8b2ba4 100644
--- a/vfs-methods/themus/Makefile.am
+++ b/vfs-methods/themus/Makefile.am
@@ -55,13 +55,11 @@ schemasdir       = $(GCONF_SCHEMA_FILE_DIR)
 schemas_in_files = themus.schemas.in
 schemas_DATA     = $(schemas_in_files:.schemas.in=.schemas)
 
-mimeinfodir = $(datadir)/mime-info
-mimeinfo_DATA = themus.keys
+desktopdir = $(datadir)/applications
+desktop_in_files = themus-theme-applier.desktop.in
+desktop_DATA = $(desktop_in_files:.desktop.in=.desktop)
 
-appregdir = $(datadir)/application-registry
-appreg_DATA = themus.applications
-
-CLEANFILES = Themus_Properties_View.server Themus_Properties_View.server.in
+CLEANFILES = themus-theme-applier.desktop themus-theme-applier.desktop.in
 
 if GCONF_SCHEMAS_INSTALL
 install-data-local:
@@ -72,7 +70,7 @@ else
 install-data-local:
 endif
 
-@INTLTOOL_KEYS_RULE@
+@INTLTOOL_DESKTOP_RULE@
 @INTLTOOL_SCHEMAS_RULE@
 
 EXTRA_DIST = \
@@ -82,9 +80,7 @@ EXTRA_DIST = \
   theme-method.conf \
   $(schemas_DATA)	\
   $(schemas_in_files)	\
-  themus.applications \
-  themus.keys \
-  ChangeLog
+  themus-theme-applier.desktop.in.in
 
 DISTCLEANFILES = \
   theme-method.directory \
diff --git a/vfs-methods/themus/themus-theme-applier.desktop.in.in b/vfs-methods/themus/themus-theme-applier.desktop.in.in
new file mode 100644
index 000000000..e7cfce84e
--- /dev/null
+++ b/vfs-methods/themus/themus-theme-applier.desktop.in.in
@@ -0,0 +1,15 @@
+[Desktop Entry]
+Encoding=UTF-8
+_Name=Apply theme
+_Comment=Sets the default theme
+Icon=gnome-settings-theme
+Exec=themus-theme-applier %U
+Terminal=false
+Type=Application
+StartupNotification=false
+NoDisplay=true
+MimeType=application/x-gnome-theme-installed;
+X-GNOME-Bugzilla-Bugzilla=GNOME
+X-GNOME-Bugzilla-Product=control-center
+X-GNOME-Bugzilla-Component=themes:///
+X-GNOME-Bugzilla-Version=@VERSION@
diff --git a/vfs-methods/themus/themus.applications b/vfs-methods/themus/themus.applications
deleted file mode 100644
index 123bb95f4..000000000
--- a/vfs-methods/themus/themus.applications
+++ /dev/null
@@ -1,8 +0,0 @@
-themus-theme-applier
-	command=themus-theme-applier
-	name=Apply theme
-	can_open_multiple_files=false
-	expects_uris=true
-	requires_terminal=false
-	supported_uri_schemes=themes
-	mime_types=application/x-gnome-theme-installed
diff --git a/vfs-methods/themus/themus.keys b/vfs-methods/themus/themus.keys
deleted file mode 100644
index 211004614..000000000
--- a/vfs-methods/themus/themus.keys
+++ /dev/null
@@ -1,6 +0,0 @@
-application/x-gnome-theme-installed
-	default_action_type=application
-	default_application_id=themus-theme-applier
-	short_list_application_ids_for_novice_user_level=themus-theme-applier
-	short_list_application_ids_for_intermediate_user_level=themus-theme-applier
-	short_list_application_ids_for_advanced_user_level=themus-theme-applier