forked from AuroraMiddleware/gtk
Merged from gtk-2-4:
2004-11-20 Federico Mena Quintero <federico@ximian.com> Merged from gtk-2-4: * gtk/gtkfilechooserdefault.c (list_icon_data_func): Set an empty icon if we are on the editable row: if we don't set the cell renderer at all, it will reuse the last thing it painted.
This commit is contained in:
parent
038236d42b
commit
dc478e8647
@ -1,3 +1,11 @@
|
||||
2004-11-20 Federico Mena Quintero <federico@ximian.com>
|
||||
|
||||
Merged from gtk-2-4:
|
||||
|
||||
* gtk/gtkfilechooserdefault.c (list_icon_data_func): Set an empty
|
||||
icon if we are on the editable row: if we don't set the cell
|
||||
renderer at all, it will reuse the last thing it painted.
|
||||
|
||||
2004-11-19 Federico Mena Quintero <federico@ximian.com>
|
||||
|
||||
Merged from gtk-2-4:
|
||||
|
@ -1,3 +1,11 @@
|
||||
2004-11-20 Federico Mena Quintero <federico@ximian.com>
|
||||
|
||||
Merged from gtk-2-4:
|
||||
|
||||
* gtk/gtkfilechooserdefault.c (list_icon_data_func): Set an empty
|
||||
icon if we are on the editable row: if we don't set the cell
|
||||
renderer at all, it will reuse the last thing it painted.
|
||||
|
||||
2004-11-19 Federico Mena Quintero <federico@ximian.com>
|
||||
|
||||
Merged from gtk-2-4:
|
||||
|
@ -1,3 +1,11 @@
|
||||
2004-11-20 Federico Mena Quintero <federico@ximian.com>
|
||||
|
||||
Merged from gtk-2-4:
|
||||
|
||||
* gtk/gtkfilechooserdefault.c (list_icon_data_func): Set an empty
|
||||
icon if we are on the editable row: if we don't set the cell
|
||||
renderer at all, it will reuse the last thing it painted.
|
||||
|
||||
2004-11-19 Federico Mena Quintero <federico@ximian.com>
|
||||
|
||||
Merged from gtk-2-4:
|
||||
|
@ -1,3 +1,11 @@
|
||||
2004-11-20 Federico Mena Quintero <federico@ximian.com>
|
||||
|
||||
Merged from gtk-2-4:
|
||||
|
||||
* gtk/gtkfilechooserdefault.c (list_icon_data_func): Set an empty
|
||||
icon if we are on the editable row: if we don't set the cell
|
||||
renderer at all, it will reuse the last thing it painted.
|
||||
|
||||
2004-11-19 Federico Mena Quintero <federico@ximian.com>
|
||||
|
||||
Merged from gtk-2-4:
|
||||
|
@ -5553,12 +5553,18 @@ list_icon_data_func (GtkTreeViewColumn *tree_column,
|
||||
&child_iter,
|
||||
iter);
|
||||
path = _gtk_file_system_model_get_path (impl->browse_files_model, &child_iter);
|
||||
if (!path)
|
||||
return;
|
||||
|
||||
/* FIXME: NULL GError */
|
||||
pixbuf = gtk_file_system_render_icon (impl->file_system, path, GTK_WIDGET (impl),
|
||||
impl->icon_size, NULL);
|
||||
if (path)
|
||||
{
|
||||
/* FIXME: NULL GError */
|
||||
pixbuf = gtk_file_system_render_icon (impl->file_system, path, GTK_WIDGET (impl),
|
||||
impl->icon_size, NULL);
|
||||
}
|
||||
else
|
||||
{
|
||||
/* We are on the editable row */
|
||||
pixbuf = NULL;
|
||||
}
|
||||
|
||||
if (info && (impl->action == GTK_FILE_CHOOSER_ACTION_SELECT_FOLDER ||
|
||||
impl->action == GTK_FILE_CHOOSER_ACTION_CREATE_FOLDER))
|
||||
|
Loading…
Reference in New Issue
Block a user