luc14n0/glib
1
0
Fork 0
mirror of https://gitlab.gnome.org/GNOME/glib.git synced 2025-08-20 07:38:54 +02:00
Code Issues Packages Projects Releases Wiki Activity

Remove legacy icon name support

Browse Source 
https://bugzilla.gnome.org/show_bug.cgi?id=684327
This commit is contained in:
William Jon McCann
2013-01-16 15:07:54 -05:00
committed by Matthias Clasen
parent 6ed46cd2a4
commit b0e6a38d95
1 changed files with 9 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
gio/gcontenttype.c
View File

@@ -402,9 +402,8 @@ g_content_type_get_icon_internal (const gchar *type,
char *generic_mimetype_icon = NULL; char *generic_mimetype_icon = NULL;
char *q; char *q;
char *xdg_mimetype_icon = NULL; char *xdg_mimetype_icon = NULL;
char *legacy_mimetype_icon;
char *xdg_mimetype_generic_icon; char *xdg_mimetype_generic_icon;
char *icon_names[5]; char *icon_names[3];
int n = 0; int n = 0;
GIcon *themed_icon; GIcon *themed_icon;
const char *file_template; const char *file_template;
@@ -426,24 +425,19 @@ g_content_type_get_icon_internal (const gchar *type,
G_UNLOCK (gio_xdgmime); G_UNLOCK (gio_xdgmime);
if (xdg_icon != NULL) if (xdg_icon != NULL)
xdg_mimetype_icon = g_strdup_printf (file_template, xdg_icon); xdg_mimetype_icon = g_strdup_printf (file_template, xdg_icon);
xdg_mimetype_generic_icon = g_content_type_get_generic_icon_name (type);
mimetype_icon = g_strdup_printf (file_template, type);
if (xdg_mimetype_generic_icon)
generic_mimetype_icon = g_strdup_printf (file_template, xdg_mimetype_generic_icon);
while ((q = strchr (mimetype_icon, '/')) != NULL)
*q = '-';
/* Not all icons have migrated to the new icon theme spec, look for old names too */
legacy_mimetype_icon = g_strconcat ("gnome-mime-", mimetype_icon, NULL);
if (xdg_mimetype_icon) if (xdg_mimetype_icon)
icon_names[n++] = xdg_mimetype_icon; icon_names[n++] = xdg_mimetype_icon;
icon_names[n++] = mimetype_icon; mimetype_icon = g_strdup_printf (file_template, type);
icon_names[n++] = legacy_mimetype_icon; while ((q = strchr (mimetype_icon, '/')) != NULL)
*q = '-';
icon_names[n++] = mimetype_icon;
xdg_mimetype_generic_icon = g_content_type_get_generic_icon_name (type);
if (xdg_mimetype_generic_icon)
generic_mimetype_icon = g_strdup_printf (file_template, xdg_mimetype_generic_icon);
if (generic_mimetype_icon) if (generic_mimetype_icon)
icon_names[n++] = generic_mimetype_icon; icon_names[n++] = generic_mimetype_icon;
@@ -452,7 +446,6 @@ g_content_type_get_icon_internal (const gchar *type,
g_free (xdg_mimetype_icon); g_free (xdg_mimetype_icon);
g_free (xdg_mimetype_generic_icon); g_free (xdg_mimetype_generic_icon);
g_free (mimetype_icon); g_free (mimetype_icon);
g_free (legacy_mimetype_icon);
g_free (generic_mimetype_icon); g_free (generic_mimetype_icon);
return themed_icon; return themed_icon;