callisto-debian/gtk3
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Add standard icon names, and also fall back to builtin gtk stock icons.

Browse Source 
* gtk/gtkfilesystem.c (get_icon_for_special_directory):
        (gtk_file_system_volume_render_icon): Add standard icon names,
        and also fall back to builtin gtk stock icons.


svn path=/trunk/; revision=20350
This commit is contained in:
Matthias Clasen
2008-06-11 03:17:55 +00:00
parent 7bc5628bbf
commit 3dbfc1935f
2 changed files with 30 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
ChangeLog
View File

@ -1,3 +1,9 @@
2008-06-10 Christian Persch <chpe@gnome.org>
* gtk/gtkfilesystem.c (get_icon_for_special_directory):
(gtk_file_system_volume_render_icon): Add standard icon names,
and also fall back to builtin gtk stock icons.
2008-06-10 Christian Persch <chpe@gnome.org> 2008-06-10 Christian Persch <chpe@gnome.org>
* gtk/gtktreeview.c: (destroy_info), (set_destination_row), * gtk/gtktreeview.c: (destroy_info), (set_destination_row),

28
gtk/gtkfilesystem.c
View File

@ -1649,7 +1649,7 @@ get_pixbuf_from_gicon (GIcon *icon,
icon_info = gtk_icon_theme_lookup_by_gicon (icon_theme, icon_info = gtk_icon_theme_lookup_by_gicon (icon_theme,
icon, icon,
icon_size, icon_size,
0); GTK_ICON_LOOKUP_USE_BUILTIN);
if (!icon_info) if (!icon_info)
return NULL; return NULL;
@ -1671,8 +1671,15 @@ get_icon_for_special_directory (GFile *file)
if (g_file_equal (file, special_file)) if (g_file_equal (file, special_file))
{ {
const char *names[] = {
"user-desktop",
"gnome-fs-desktop",
"folder",
"gtk-directory",
NULL
};
g_object_unref (special_file); g_object_unref (special_file);
return g_themed_icon_new ("gnome-fs-desktop"); return g_themed_icon_new_from_names (names, -1);
} }
g_object_unref (special_file); g_object_unref (special_file);
@ -1681,8 +1688,15 @@ get_icon_for_special_directory (GFile *file)
if (g_file_equal (file, special_file)) if (g_file_equal (file, special_file))
{ {
const char *names[] = {
"user-home",
"gnome-fs-home",
"folder",
"gtk-directory",
NULL
};
g_object_unref (special_file); g_object_unref (special_file);
return g_themed_icon_new ("gnome-fs-home"); return g_themed_icon_new_from_names (names, -1);
} }
g_object_unref (special_file); g_object_unref (special_file);
@ -1698,11 +1712,17 @@ gtk_file_system_volume_render_icon (GtkFileSystemVolume *volume,
{ {
GIcon *icon = NULL; GIcon *icon = NULL;
GdkPixbuf *pixbuf; GdkPixbuf *pixbuf;
const char *harddisk_icons[] = {
"drive-harddisk",
"gnome-dev-harddisk",
"gtk-harddisk",
NULL
};
DEBUG ("volume_get_icon_name"); DEBUG ("volume_get_icon_name");
if (IS_ROOT_VOLUME (volume)) if (IS_ROOT_VOLUME (volume))
icon = g_themed_icon_new ("gnome-dev-harddisk"); icon = g_themed_icon_new_from_names (harddisk_icons, -1);
else if (G_IS_DRIVE (volume)) else if (G_IS_DRIVE (volume))
icon = g_drive_get_icon (G_DRIVE (volume)); icon = g_drive_get_icon (G_DRIVE (volume));
else if (G_IS_VOLUME (volume)) else if (G_IS_VOLUME (volume))