Bug 559633 – gtk_image_new_from_gicon does not always work for .desktop

2008-11-28  Matthias Clasen  <mclasen@redhat.com>

        Bug 559633 – gtk_image_new_from_gicon does not always work for
        .desktop files

        * gdesktopappinfo.c (g_desktop_app_info_new_from_keyfile): Ignore
        extensions on icon names.  Proposed by Axel von Bertoldi.

svn path=/trunk/; revision=7698

diff --git a/gio/ChangeLog b/gio/ChangeLog
index bbb87a06bf5b141e9176a870ca7224082ed184c3..8b10920ab75b670c9a88435316495d3c81707c53 100644 (file)
--- a/gio/ChangeLog
+++ b/gio/ChangeLog
@@ -1,3 +1,11 @@
+2008-11-28  Matthias Clasen  <mclasen@redhat.com>
+
+       Bug 559633 – gtk_image_new_from_gicon does not always work for
+       .desktop files
+
+       * gdesktopappinfo.c (g_desktop_app_info_new_from_keyfile): Ignore
+       extensions on icon names.  Proposed by Axel von Bertoldi.
+
 2008-11-28  Matthias Clasen  <mclasen@redhat.com>
 
        Bug 548163 – Nautilus displays wrong error message for too long file

diff --git a/gio/gdesktopappinfo.c b/gio/gdesktopappinfo.c
index ec85744a3fc7f7b5dab59e1f32236c2302190580..c9dadc272655f9f282d9e57b8ffb78fe60bc6e50 100644 (file)
--- a/gio/gdesktopappinfo.c
+++ b/gio/gdesktopappinfo.c
@@ -267,7 +267,18 @@ g_desktop_app_info_new_from_keyfile (GKeyFile *key_file)
          g_object_unref (file);
        }
       else
-       info->icon = g_themed_icon_new (info->icon_name);
+        {
+          char *p;
+
+          /* Work around a common mistake in desktop files */    
+          if ((p = strrchr (info->icon_name, '.')) != NULL &&
+              (strcmp (p, ".png") == 0 ||
+               strcmp (p, ".xpm") == 0 ||
+               strcmp (p, ".svg") == 0)) 
+            *p = 0;
+
+         info->icon = g_themed_icon_new (info->icon_name);
+        }
     }
   
   if (info->exec)