Commit 5e6aea1b authored by Matthias Clasen's avatar Matthias Clasen Committed by Matthias Clasen

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
parent d4d87684
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
......
......@@ -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)
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment