mirror of
https://gitlab.gnome.org/GNOME/nautilus
synced 2024-10-29 03:34:16 +00:00
Only pass TRUE for embedding_text if we actually read a top-left text.
2006-05-16 Alexander Larsson <alexl@redhat.com> * src/file-manager/fm-icon-container.c (fm_icon_container_get_icon_images): Only pass TRUE for embedding_text if we actually read a top-left text. Based on patch from Rene Hausleitner (#335435)
This commit is contained in:
parent
d8bb8481fa
commit
3b4fb90e5d
2 changed files with 10 additions and 1 deletions
|
@ -1,3 +1,9 @@
|
|||
2006-05-16 Alexander Larsson <alexl@redhat.com>
|
||||
|
||||
* src/file-manager/fm-icon-container.c (fm_icon_container_get_icon_images):
|
||||
Only pass TRUE for embedding_text if we actually read a top-left text.
|
||||
Based on patch from Rene Hausleitner (#335435)
|
||||
|
||||
2006-05-16 Alexander Larsson <alexl@redhat.com>
|
||||
|
||||
* src/file-manager/fm-directory-view.c:
|
||||
|
|
|
@ -63,6 +63,7 @@ fm_icon_container_get_icon_images (NautilusIconContainer *container,
|
|||
FMIconView *icon_view;
|
||||
EelStringList *emblems_to_ignore;
|
||||
NautilusFile *file;
|
||||
gboolean use_embedding;
|
||||
|
||||
file = (NautilusFile *) data;
|
||||
|
||||
|
@ -70,8 +71,10 @@ fm_icon_container_get_icon_images (NautilusIconContainer *container,
|
|||
icon_view = get_icon_view (container);
|
||||
g_return_val_if_fail (icon_view != NULL, NULL);
|
||||
|
||||
use_embedding = FALSE;
|
||||
if (embedded_text) {
|
||||
*embedded_text = nautilus_file_peek_top_left_text (file, need_large_embeddded_text, embedded_text_needs_loading);
|
||||
use_embedding = *embedded_text != NULL;
|
||||
}
|
||||
|
||||
if (emblem_icons != NULL) {
|
||||
|
@ -84,7 +87,7 @@ fm_icon_container_get_icon_images (NautilusIconContainer *container,
|
|||
|
||||
*has_window_open = nautilus_file_has_open_window (file);
|
||||
|
||||
return nautilus_icon_factory_get_icon_for_file (file, TRUE);
|
||||
return nautilus_icon_factory_get_icon_for_file (file, use_embedding);
|
||||
}
|
||||
|
||||
static char *
|
||||
|
|
Loading…
Reference in a new issue