[Spice-devel] [spice-gtk 08/11] Remove spice-mime.xml/spicy.desktop

Christophe Fergeau cfergeau at redhat.com
Thu Oct 30 05:56:41 PDT 2014


They were never translated from .in files to actual files, and now it's
clear we don't want to promote spicy as a first-class desktop
application.
---
 configure.ac             |  1 -
 data/Makefile.am         | 20 --------------------
 data/spice-mime.xml.in   |  8 --------
 data/spicy.desktop.in.in | 10 ----------
 po/POTFILES.in           |  2 --
 5 files changed, 41 deletions(-)
 delete mode 100644 data/spice-mime.xml.in
 delete mode 100644 data/spicy.desktop.in.in

diff --git a/configure.ac b/configure.ac
index 8bec7a1..6b8bff9 100644
--- a/configure.ac
+++ b/configure.ac
@@ -734,7 +734,6 @@ spice-client-gtk-2.0.pc
 spice-client-gtk-3.0.pc
 spice-controller.pc
 data/Makefile
-data/spicy.desktop.in
 data/spicy.nsis
 po/Makefile.in
 gtk/Makefile
diff --git a/data/Makefile.am b/data/Makefile.am
index 71934af..a289c23 100644
--- a/data/Makefile.am
+++ b/data/Makefile.am
@@ -1,33 +1,13 @@
 NULL=
 
-# TODO: not sure if we want to do that
-#desktopdir       = $(datadir)/applications
-#desktop_in_files = spicy.desktop.in
-#desktop_DATA     = $(desktop_in_files:.desktop.in=.desktop)
-#@INTLTOOL_DESKTOP_RULE@
-#
-#MIMEFILES = spice-mime.xml.in
-#mimedir = $(datadir)/mime/packages
-#mime_DATA = spice-mime.xml
-#@INTLTOOL_XML_RULE@
-
 EXTRA_DIST =					\
 	spicy.nsis				\
-	spice-mime.xml.in spicy.desktop.in      \
 	spice-protocol.vapi			\
 	gtkrc					\
 	$(desktop_in_files)			\
 	org.spice-space.lowlevelusbaccess.policy \
 	$(NULL)
 
-CLEANFILES =					\
-	$(desktop_DATA)				\
-	$(NULL)
-
-DISTCLEANFILES =				\
-	$(desktop_DATA)				\
-	$(NULL)
-
 vapidir = $(VAPIDIR)
 vapi_DATA = spice-protocol.vapi
 
diff --git a/data/spice-mime.xml.in b/data/spice-mime.xml.in
deleted file mode 100644
index 3bfd575..0000000
--- a/data/spice-mime.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-spice">
-		<sub-class-of type="text/plain"/>
-		<_comment>Remote Desktop (SPICE) file</_comment>
-		<glob pattern="*.spice"/>
-	</mime-type>
-</mime-info>
diff --git a/data/spicy.desktop.in.in b/data/spicy.desktop.in.in
deleted file mode 100644
index b2e5b30..0000000
--- a/data/spicy.desktop.in.in
+++ /dev/null
@@ -1,10 +0,0 @@
-[Desktop Entry]
-_Name=SPICE Remote Desktop Viewer
-_Comment=Access remote SPICE desktops
-Exec=spicy
-#Icon=spice
-Terminal=false
-MimeType=x-scheme-handler/spice
-Type=Application
-StartupNotify=true
-Categories=GNOME;GTK;Network;RemoteAccess;
diff --git a/po/POTFILES.in b/po/POTFILES.in
index 3375ab5..d7bf614 100644
--- a/po/POTFILES.in
+++ b/po/POTFILES.in
@@ -1,5 +1,3 @@
-data/spice-mime.xml.in
-data/spicy.desktop.in.in
 gtk/channel-usbredir.c
 gtk/desktop-integration.c
 gtk/spice-channel.c
-- 
2.1.0



More information about the Spice-devel mailing list