From: Matt Birkholz <matt@birchwood-abbey.net>
Date: Sun, 5 Nov 2017 09:36:06 +0000 (-0700)
Subject: x11-screen: Use new window class to avoid confusion with Emacs.
X-Git-Tag: mit-scheme-pucked-9.2.12~36
X-Git-Url: https://birchwood-abbey.net/git?a=commitdiff_plain;h=a512021cfeac820cb58d0c2d91d2af644c5466b2;p=mit-scheme.git

x11-screen: Use new window class to avoid confusion with Emacs.

Borrow .desktop and icon files from core.  Specify new window class
when creating x11-screens, and in the StartupWMClass key in the
.desktop file.  Also fixed the .desktop file per complaints from
desktop-file-validate, deciding on one main category.
---

diff --git a/debian/mit-scheme-pucked.install b/src/x11-screen/debian/mit-scheme-pucked-x11-screen.install
similarity index 100%
rename from debian/mit-scheme-pucked.install
rename to src/x11-screen/debian/mit-scheme-pucked-x11-screen.install
diff --git a/debian/mit-scheme-pucked.desktop b/src/x11-screen/debian/mit-scheme-pucked.desktop
similarity index 77%
rename from debian/mit-scheme-pucked.desktop
rename to src/x11-screen/debian/mit-scheme-pucked.desktop
index 7d3172fb2..e93de8f05 100644
--- a/debian/mit-scheme-pucked.desktop
+++ b/src/x11-screen/debian/mit-scheme-pucked.desktop
@@ -6,4 +6,5 @@ TryExec=mit-scheme-pucked
 Icon=/usr/share/icons/mit-scheme-pucked.svg
 Terminal=false
 Type=Application
-Categories=Development;IDE;Utility;TextEditor;Application;
+StartupWMClass=Pucked
+Categories=Development;IDE;
diff --git a/debian/mit-scheme-pucked.svg b/src/x11-screen/debian/mit-scheme-pucked.svg
similarity index 100%
rename from debian/mit-scheme-pucked.svg
rename to src/x11-screen/debian/mit-scheme-pucked.svg
diff --git a/src/x11-screen/x11-screen.scm b/src/x11-screen/x11-screen.scm
index e2c36a66e..3d6ba16e8 100644
--- a/src/x11-screen/x11-screen.scm
+++ b/src/x11-screen/x11-screen.scm
@@ -97,7 +97,7 @@ USA.
 (define (open-window primary? geometry)
   (let ((display (or (get-x-display) (error "Unable to open display.")))
 	(instance (if primary? "edwin" "edwinSecondary"))
-	(class "Emacs"))
+	(class "Pucked"))
     (xterm-open-window display
 		       (or geometry
 			   (get-geometry display primary? instance class))