diff options
author | Kristian Rietveld <kris@imendio.com> | 2006-04-30 19:38:11 +0000 |
---|---|---|
committer | Kristian Rietveld <kristian@src.gnome.org> | 2006-04-30 19:38:11 +0000 |
commit | 65bdb7ca9a5003b0c519bc5980a40859367b8db2 (patch) | |
tree | 85fdd2896a9cb0136d4e2507a46e049ef035ca41 /gtk/gtkfilesystem.h | |
parent | c0d773526052c9861546c26f47b03f2ac93898c8 (diff) | |
download | gtk+-kris-async-branch.tar.gz |
remove the caching code, (gtk_file_info_get_icon_name): new function,kris-async-branch
2006-04-30 Kristian Rietveld <kris@imendio.com>
* gtk/gtkfilesystem.[ch] (gtk_file_info_render_icon): remove the
caching code,
(gtk_file_info_get_icon_name): new function,
(gtk_file_system_volume_get_icon_name): new function,
(gtk_file_system_volume_render_icon): refactor to use
get_icon_name() and render the icon on the fly.
* gtk/gtkfilesystemunix.c (gtk_file_system_unix_volume_render_icon),
(gtk_file_system_unix_volume_get_icon_name): reflect updates in
file system interface,
(get_fallback_icon): remove, along with icon caching code.
* gtk/gtk.symbols: updated.
Diffstat (limited to 'gtk/gtkfilesystem.h')
-rw-r--r-- | gtk/gtkfilesystem.h | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/gtk/gtkfilesystem.h b/gtk/gtkfilesystem.h index 6145bc706e..57c458a028 100644 --- a/gtk/gtkfilesystem.h +++ b/gtk/gtkfilesystem.h @@ -109,6 +109,7 @@ void gtk_file_info_set_size (GtkFileInfo *in void gtk_file_info_set_icon_name (GtkFileInfo *info, const gchar *con_name); +G_CONST_RETURN gchar *gtk_file_info_get_icon_name (const GtkFileInfo *info); GdkPixbuf *gtk_file_info_render_icon (const GtkFileInfo *info, GtkWidget *widget, gint pixel_size, @@ -214,10 +215,8 @@ struct _GtkFileSystemIface gpointer data); char * (*volume_get_display_name) (GtkFileSystem *file_system, GtkFileSystemVolume *volume); - GdkPixbuf * (*volume_render_icon) (GtkFileSystem *file_system, + gchar * (*volume_get_icon_name) (GtkFileSystem *file_system, GtkFileSystemVolume *volume, - GtkWidget *widget, - gint pixel_size, GError **error); /* Path Manipulation @@ -294,6 +293,9 @@ GdkPixbuf * gtk_file_system_volume_render_icon (GtkFileSystem GtkWidget *widget, gint pixel_size, GError **error); +gchar * gtk_file_system_volume_get_icon_name (GtkFileSystem *file_system, + GtkFileSystemVolume *volume, + GError **error); gboolean gtk_file_system_get_parent (GtkFileSystem *file_system, const GtkFilePath *path, |