luc14n0/glib
1
0
Fork 0
mirror of https://gitlab.gnome.org/GNOME/glib.git synced 2024-11-12 20:36:15 +01:00
Code Issues Packages Projects Releases Wiki Activity

Don't do fallback for user-home and user-desktop to avoid problems with

Browse Source 
* glocalfileinfo.c: Don't do fallback for user-home and user-desktop
        to avoid problems with partial icon themes.



svn path=/trunk/; revision=7056
This commit is contained in:
Matthias Clasen 2008-06-19 03:30:17 +00:00
parent b696a978ea
commit f6da8a493c
2 changed files with 15 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
gio/ChangeLog
View File

@ -1,3 +1,8 @@
2008-06-18 Matthias Clasen <mclasen@rdhat.com>
* glocalfileinfo.c: Don't do fallback for user-home and user-desktop
to avoid problems with partial icon themes.
2008-06-17 Hans Breuer <hans@breuer.org> 2008-06-17 Hans Breuer <hans@breuer.org>
* gwin32mount.[ch] gwin32volumemonitor.[ch] : bits and pieces from * gwin32mount.[ch] gwin32volumemonitor.[ch] : bits and pieces from

22
gio/glocalfileinfo.c
View File

@ -1465,7 +1465,6 @@ _g_local_file_info_get (const char *basename,
is_symlink = FALSE; is_symlink = FALSE;
#endif #endif
symlink_broken = FALSE; symlink_broken = FALSE;
#ifdef S_ISLNK #ifdef S_ISLNK
if (is_symlink) if (is_symlink)
{ {
@ -1565,18 +1564,17 @@ _g_local_file_info_get (const char *basename,
{ {
GIcon *icon; GIcon *icon;
icon = g_content_type_get_icon (content_type); if (strcmp (path, g_get_home_dir ()) == 0)
if (icon != NULL) icon = g_themed_icon_new ("user-home");
else if (strcmp (path, g_get_user_special_dir (G_USER_DIRECTORY_DESKTOP)) == 0)
icon = g_themed_icon_new ("user-desktop");
else
{ {
icon = g_content_type_get_icon (content_type);
if (G_IS_THEMED_ICON (icon)) if (G_IS_THEMED_ICON (icon))
{ {
const char *preferred_icon = NULL;
const char *type_icon = NULL; const char *type_icon = NULL;
if (strcmp (path, g_get_home_dir ()) == 0)
preferred_icon = "user-home";
else if (strcmp (path, g_get_user_special_dir (G_USER_DIRECTORY_DESKTOP)) == 0)
preferred_icon = "user-desktop";
if (S_ISDIR (statbuf.st_mode)) if (S_ISDIR (statbuf.st_mode))
type_icon = "folder"; type_icon = "folder";
else if (statbuf.st_mode & S_IXUSR) else if (statbuf.st_mode & S_IXUSR)
@ -1584,12 +1582,12 @@ _g_local_file_info_get (const char *basename,
else else
type_icon = "text-x-generic"; type_icon = "text-x-generic";
if (preferred_icon) g_themed_icon_append_name (G_THEMED_ICON (icon), type_icon);
g_themed_icon_prepend_name (G_THEMED_ICON (icon), preferred_icon);
if (type_icon)
g_themed_icon_append_name (G_THEMED_ICON (icon), type_icon);
} }
}
if (icon != NULL)
{
g_file_info_set_icon (info, icon); g_file_info_set_icon (info, icon);
g_object_unref (icon); g_object_unref (icon);
} }