[Xfce4-commits] [apps/catfish] 01/01: Replace stock icons, use standard MIME icons (bug #14503)

[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 9700da485005d98996873a8713e784386a69ec23
Author: Sean Davis <smd.seandavis at gmail.com>
Date:   Fri Jun 29 21:44:42 2018 -0400

    Replace stock icons, use standard MIME icons (bug #14503)
---
 catfish/CatfishWindow.py | 14 ++++++++++----
 po/catfish.pot           | 10 +++++-----
 2 files changed, 15 insertions(+), 9 deletions(-)

diff --git a/catfish/CatfishWindow.py b/catfish/CatfishWindow.py
index 2387da1..99d0fe3 100644
--- a/catfish/CatfishWindow.py
+++ b/catfish/CatfishWindow.py
@@ -1496,17 +1496,23 @@ class CatfishWindow(Window):
         """Retrieve the file icon."""
         if mime_type:
             if mime_type == 'inode/directory':
-                return Gtk.STOCK_DIRECTORY
+                return "folder"
             else:
                 mime_type = mime_type.split('/')
                 if mime_type is not None:
                     # Get icon from mimetype
                     media, subtype = mime_type
-                    for icon_name in ['gnome-mime-%s-%s' % (media, subtype),
-                                      'gnome-mime-%s' % media]:
+
+                    variations = ['%s-%s' % (media, subtype),
+                                  '%s-x-%s' % (media, subtype)]
+                    if media == "application":
+                        variations.append('application-x-executable')
+                    variations.append('%s-x-generic' % media)
+
+                    for icon_name in variations:
                         if self.icon_theme.has_icon(icon_name):
                             return icon_name
-        return Gtk.STOCK_FILE
+        return "text-x-generic"
 
     def python_three_size_sort_func(self, model, row1, row2, user_data):
         """Sort function used in Python 3."""
diff --git a/po/catfish.pot b/po/catfish.pot
index a270542..ce14cb3 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: 2018-06-27 22:02-0400\n"
+"POT-Creation-Date: 2018-06-29 21:38-0400\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"
@@ -401,20 +401,20 @@ msgstr ""
 msgid "bytes"
 msgstr ""
 
-#: ../catfish/CatfishWindow.py:1531 ../catfish/CatfishWindow.py:1540
+#: ../catfish/CatfishWindow.py:1537 ../catfish/CatfishWindow.py:1546
 msgid "Searching…"
 msgstr ""
 
-#: ../catfish/CatfishWindow.py:1533
+#: ../catfish/CatfishWindow.py:1539
 msgid "Results will be displayed as soon as they are found."
 msgstr ""
 
-#: ../catfish/CatfishWindow.py:1538
+#: ../catfish/CatfishWindow.py:1544
 #, python-format
 msgid "Searching for \"%s\""
 msgstr ""
 
-#: ../catfish/CatfishWindow.py:1627
+#: ../catfish/CatfishWindow.py:1633
 #, python-format
 msgid "Search results for \"%s\""
 msgstr ""

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