diff options
| author | Christian Neumair <cneumair@gnome.org> | 2008-04-03 21:05:47 +0000 |
|---|---|---|
| committer | Christian Neumair <cneumair@src.gnome.org> | 2008-04-03 21:05:47 +0000 |
| commit | d8bf946ebcdb3a6386d68187e13aa6eabf9edb3a (patch) | |
| tree | 236eb736eb19a12a72432481d4ddbd17cfdb4288 | |
| parent | c83db8b561ca8b903d16afc81f03289e6c0129fd (diff) | |
| download | nautilus-d8bf946ebcdb3a6386d68187e13aa6eabf9edb3a.tar.gz | |
Fix icon comparison if icon has not yet been set.
2008-04-03 Christian Neumair <cneumair@gnome.org>
* libnautilus-private/nautilus-bookmark.c
(nautilus_bookmark_icon_is_different):
Fix icon comparison if icon has not yet been set.
* libnautilus-private/nautilus-bookmark.c
(nautilus_bookmark_update_icon):
Never update icon if a file has not yet been confirmed.
svn path=/branches/gnome-2-22/; revision=14032
| -rw-r--r-- | ChangeLog | 10 | ||||
| -rw-r--r-- | libnautilus-private/nautilus-bookmark.c | 5 |
2 files changed, 13 insertions, 2 deletions
@@ -1,5 +1,15 @@ 2008-04-03 Christian Neumair <cneumair@gnome.org> + * libnautilus-private/nautilus-bookmark.c + (nautilus_bookmark_icon_is_different): + Fix icon comparison if icon has not yet been set. + + * libnautilus-private/nautilus-bookmark.c + (nautilus_bookmark_update_icon): + Never update icon if a file has not yet been confirmed. + +2008-04-03 Christian Neumair <cneumair@gnome.org> + * libnautilus-private/nautilus-icon-container.c (nautilus_icon_container_update_scroll_region): Do not make x2/y2 smaller than x1/y2. Fixes flashing scrollbar diff --git a/libnautilus-private/nautilus-bookmark.c b/libnautilus-private/nautilus-bookmark.c index 819f548d5..07ab5f937 100644 --- a/libnautilus-private/nautilus-bookmark.c +++ b/libnautilus-private/nautilus-bookmark.c @@ -329,7 +329,7 @@ nautilus_bookmark_icon_is_different (NautilusBookmark *bookmark, g_assert (new_icon != NULL); if (bookmark->details->icon == NULL) { - return new_icon == NULL; + return TRUE; } return !g_icon_equal (bookmark->details->icon, new_icon) != 0; @@ -350,7 +350,8 @@ nautilus_bookmark_update_icon (NautilusBookmark *bookmark) return FALSE; } - if (nautilus_file_check_if_ready (bookmark->details->file, + if (!nautilus_file_is_not_yet_confirmed (bookmark->details->file) && + nautilus_file_check_if_ready (bookmark->details->file, NAUTILUS_FILE_ATTRIBUTES_FOR_ICON)) { new_icon = nautilus_file_get_gicon (bookmark->details->file, 0); if (nautilus_bookmark_icon_is_different (bookmark, new_icon)) { |