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 7d3172fb22fc172fc326629df2ff27dab35721e9..e93de8f055603580e7ecde2fbab026e24454e928 100644 (file)
--- 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 e2c36a66e91ecf8a7abb73848db86af086f290af..3d6ba16e881cce290feb26cc729c0427b8079eab 100644 (file)
--- 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))