[Xfce4-commits] [apps/catfish] 01/01: Reenable Wayland support, adjust desktop entry and WM class for Wayland and GNOME Shell detection (bug #16293)

[noreply at xfce.org]

This is an automated email from the git hooks/post-receive script.

b   l   u   e   s   a   b   r   e       p   u   s   h   e   d       a       c   o   m   m   i   t       t   o       b   r   a   n   c   h       m   a   s   t   e   r   
   in repository apps/catfish.

commit 4d826a35a13ed2e99f63c60c1e4ec9b5666e156d
Author: Sean Davis <smd.seandavis at gmail.com>
Date:   Tue Dec 24 14:04:57 2019 -0500

    Reenable Wayland support, adjust desktop entry and WM class for Wayland and GNOME Shell detection (bug #16293)
---
 catfish/CatfishWindow.py    | 2 +-
 catfish/__init__.py         | 4 ----
 org.xfce.Catfish.desktop.in | 1 +
 po/catfish.pot              | 7 +------
 4 files changed, 3 insertions(+), 11 deletions(-)

diff --git a/catfish/CatfishWindow.py b/catfish/CatfishWindow.py
index f2d103a..8183a39 100644
--- a/catfish/CatfishWindow.py
+++ b/catfish/CatfishWindow.py
@@ -127,7 +127,7 @@ class CatfishWindow(Window):
     def finish_initializing(self, builder):
         """Set up the main window"""
         super(CatfishWindow, self).finish_initializing(builder)
-        self.set_wmclass("Catfish", "Catfish")
+        self.set_wmclass("catfish", "Catfish")
 
         self.AboutDialog = AboutCatfishDialog
 
diff --git a/catfish/__init__.py b/catfish/__init__.py
index 66f42b9..4e3881b 100644
--- a/catfish/__init__.py
+++ b/catfish/__init__.py
@@ -73,10 +73,6 @@ def main():
     'constructor for your class instances'
     options, args = parse_options()
 
-    if not check_x11_session():
-        sys.stderr.write(_('Try GDK_BACKEND=x11 {0}\n'.format(sys.argv[0])))
-        sys.exit(0)
-
     # Run the application.
     window = CatfishWindow.CatfishWindow()
     window.parse_options(options, args)
diff --git a/org.xfce.Catfish.desktop.in b/org.xfce.Catfish.desktop.in
index 740e34c..4546ead 100644
--- a/org.xfce.Catfish.desktop.in
+++ b/org.xfce.Catfish.desktop.in
@@ -10,3 +10,4 @@ Icon=catfish
 Terminal=false
 Type=Application
 MimeType=inode/directory;
+StartupWMClass=catfish
diff --git a/po/catfish.pot b/po/catfish.pot
index 09745c1..0ffeae5 100644
--- a/po/catfish.pot
+++ b/po/catfish.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2019-12-21 07:01-0500\n"
+"POT-Creation-Date: 2019-12-24 14:01-0500\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL at ADDRESS>\n"
 "Language-Team: LANGUAGE <LL at li.org>\n"
@@ -334,11 +334,6 @@ msgid ""
 "displayed."
 msgstr ""
 
-#: ../catfish/__init__.py:77
-#, python-brace-format
-msgid "Try GDK_BACKEND=x11 {0}\n"
-msgstr ""
-
 #: ../catfish/AboutCatfishDialog.py:37
 msgid "translator-credits"
 msgstr ""

-- 
To stop receiving notification emails like this one, please contact
the administrator of this repository.