From 46641fd41886964c0e88293bb7e94873d985cff2 Mon Sep 17 00:00:00 2001
From: Tomeu Vizoso <tomeu@sugarlabs.org>
Date: Sat, 28 Feb 2009 17:02:17 +0000
Subject: Show a generic icon for clippings, if available #454

---
(limited to 'src')

diff --git a/src/jarabe/frame/clipboardobject.py b/src/jarabe/frame/clipboardobject.py
index ccbaf8e..38da151 100644
--- a/src/jarabe/frame/clipboardobject.py
+++ b/src/jarabe/frame/clipboardobject.py
@@ -51,7 +51,14 @@ class ClipboardObject(object):
         return name
 
     def get_icon(self):
-        icons = gio.content_type_get_icon(self.get_mime_type())
+        mime_type = self.get_mime_type()
+
+        generic_types = mime.get_all_generic_types()
+        for generic_type in generic_types:
+            if mime_type in generic_type.mime_types:
+                return generic_type.icon
+
+        icons = gio.content_type_get_icon(mime_type)
         icon_name = None
         if icons is not None:
             icon_theme = gtk.icon_theme_get_default()
@@ -60,12 +67,9 @@ class ClipboardObject(object):
                                                 gtk.ICON_SIZE_LARGE_TOOLBAR, 0)
                 if icon_info is not None:
                     icon_info.free()
-                    break
-
-        if icon_name is None:
-            icon_name = 'application-octet-stream'
+                    return icon_name
 
-        return icon_name
+        return 'application-octet-stream'
 
     def get_preview(self):
         for mime_type in ['text/plain']:
--
cgit v0.9.1