diff options
| author | Martin Wehner <martin.wehner@gmail.com> | 2006-07-31 22:49:55 +0000 |
|---|---|---|
| committer | Martin Wehner <mwehner@src.gnome.org> | 2006-07-31 22:49:55 +0000 |
| commit | 3d195042bfc43fd45a991c03344098b6431c6044 (patch) | |
| tree | 19859ba95df49a1930249d8ebf94ee5176ed53f9 | |
| parent | 756bda2c5661e45cd402b16e3e6483979a7d754b (diff) | |
| download | nautilus-3d195042bfc43fd45a991c03344098b6431c6044.tar.gz | |
Only pass TRUE for embedding_text if we actually read a top-left text.
2006-08-01 Martin Wehner <martin.wehner@gmail.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)
| -rw-r--r-- | ChangeLog | 7 | ||||
| -rw-r--r-- | src/file-manager/fm-icon-container.c | 5 |
2 files changed, 10 insertions, 2 deletions
@@ -1,9 +1,14 @@ +2006-08-01 Martin Wehner <martin.wehner@gmail.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-17 Francisco Javier F. Serrador <serrador@cvs.gnome.org> * nautilus-folder-handler.desktop.in: Add i18n. * po/POTFILES.in: Add new file. - 2006-05-09 Martin Wehner <martin.wehner@gmail.com> * src/nautilus-window-manage-views.c: diff --git a/src/file-manager/fm-icon-container.c b/src/file-manager/fm-icon-container.c index 525059c39..007c0fb95 100644 --- a/src/file-manager/fm-icon-container.c +++ b/src/file-manager/fm-icon-container.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 * |