luc14n0/glib
1
0
Fork 0
mirror of https://gitlab.gnome.org/GNOME/glib.git synced 2025-03-03 22:52:09 +01:00
Code Issues Packages Projects Releases Wiki Activity

Look at old-style gnome mime icon names too, as many have not moved to the

Browse Source 
2008-02-22  Alexander Larsson  <alexl@redhat.com>

	* gcontenttype.c (g_content_type_get_icon):
	Look at old-style gnome mime icon names too, as many
	have not moved to the new style.


svn path=/trunk/; revision=6557
This commit is contained in:
Alexander Larsson 2008-02-22 14:56:50 +00:00 committed by Alexander Larsson
parent e1a9179b0f
commit 5f6ccf9a3f
2 changed files with 12 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
gio/ChangeLog
View File

@ -1,3 +1,9 @@
2008-02-22 Alexander Larsson <alexl@redhat.com>
* gcontenttype.c (g_content_type_get_icon):
Look at old-style gnome mime icon names too, as many
have not moved to the new style.
2008-02-21 Matthias Clasen <mclasen@redhat.com> 2008-02-21 Matthias Clasen <mclasen@redhat.com>
* *.c: Correct the @include in for section docs. * *.c: Correct the @include in for section docs.

9
gio/gcontenttype.c
View File

@ -645,7 +645,7 @@ GIcon *
g_content_type_get_icon (const char *type) g_content_type_get_icon (const char *type)
{ {
char *mimetype_icon, *generic_mimetype_icon, *p; char *mimetype_icon, *generic_mimetype_icon, *p;
char *icon_names[2]; char *icon_names[3];
GThemedIcon *themed_icon; GThemedIcon *themed_icon;
g_return_val_if_fail (type != NULL, NULL); g_return_val_if_fail (type != NULL, NULL);
@ -665,11 +665,14 @@ g_content_type_get_icon (const char *type)
generic_mimetype_icon[(p - type) + strlen ("-x-generic")] = 0; generic_mimetype_icon[(p - type) + strlen ("-x-generic")] = 0;
icon_names[0] = mimetype_icon; icon_names[0] = mimetype_icon;
icon_names[1] = generic_mimetype_icon; /* Not all icons have migrated to the new icon theme spec, look for old names too */
icon_names[1] = g_strconcat ("gnome-mime-", mimetype_icon, NULL);
icon_names[2] = generic_mimetype_icon;
themed_icon = g_themed_icon_new_from_names (icon_names, 2); themed_icon = g_themed_icon_new_from_names (icon_names, 3);
g_free (mimetype_icon); g_free (mimetype_icon);
g_free (icon_names[1]);
g_free (generic_mimetype_icon); g_free (generic_mimetype_icon);
return G_ICON (themed_icon); return G_ICON (themed_icon);