From 5b9e3cfb6ec787eb9ef6ed6824f8907138ca593b Mon Sep 17 00:00:00 2001
From: B Stack <bgstack15@gmail.com>
Date: Tue, 30 Jun 2020 07:39:41 -0400
Subject: [PATCH] desktop file fixes

   Set icon, and also improve mimetype.
---
 Makefile                      | 2 +-
 Plus/PlusGUI.desktop          | 2 +-
 Plus/chicago95-plus-theme.xml | 5 +++--
 3 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/Makefile b/Makefile
index 9a09797..18d9c4f 100644
--- a/Makefile
+++ b/Makefile
@@ -25,7 +25,7 @@ DOCDIR     = $(SHAREDIR)/doc/$(APPNAME)
 APPDIR     = $(SHAREDIR)/$(APPNAME)
 APPSDIR    = $(SHAREDIR)/applications
 ICONSDIR   = $(SHAREDIR)/icons
-MIMEDIR    = $(SHAREDIR)/mime
+MIMEDIR    = $(SHAREDIR)/mime/packages
 MANDIR     = $(SHAREDIR)/man
 XDGAUTODIR = $(SYSCONFDIR)/xdg/autostart
 FONTDIR    = $(SHAREDIR)/fonts
diff --git a/Plus/PlusGUI.desktop b/Plus/PlusGUI.desktop
index 3cdeab8..e8bb919 100644
--- a/Plus/PlusGUI.desktop
+++ b/Plus/PlusGUI.desktop
@@ -3,7 +3,7 @@ Categories=Settings;DesktopSettings;
 Comment=Import Windows .theme files
 Exec=/usr/bin/PlusGUI %f
 GenericName=Windows theme importer
-Icon=desktop-preferences
+Icon=preferences-desktop-theme
 Keywords=theme;import;
 MimeType=application/x-plus-theme;
 Name=Chicago95 Plus!
diff --git a/Plus/chicago95-plus-theme.xml b/Plus/chicago95-plus-theme.xml
index b143c9e..2b73ba3 100644
--- a/Plus/chicago95-plus-theme.xml
+++ b/Plus/chicago95-plus-theme.xml
@@ -1,11 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <mime-info xmlns="http://www.freedesktop.org/standards/shared-mime-info">
    <mime-type type="application/x-plus-theme">
-      <sub-class-of type="application/x-theme">
+      <sub-class-of type="application/x-theme"/>
       <magic priority="75">
-         <match type="string" value="[Control Panel\Colors]" offset="0"/>
+         <match type="string" value="[Control Panel\Colors]" offset="0:32767"/>
       </magic>
       <comment>Chicago95 Plus! theme</comment>
       <glob pattern="*.theme"/>
+      <generic-icon name="desktop-preferences"/>
    </mime-type>
 </mime-info>