1
0
mirror of https://git.FreeBSD.org/ports.git synced 2024-11-23 00:43:28 +00:00

Update to 2.16.3

This commit is contained in:
Michael Johnson 2006-11-20 14:26:41 +00:00
parent 7e035d537f
commit 97939ddce7
Notes: svn2git 2021-03-31 03:12:20 +00:00
svn path=/head/; revision=177662
3 changed files with 4 additions and 30 deletions

View File

@ -7,8 +7,7 @@
#
PORTNAME= nautilus
PORTVERSION= 2.16.2
PORTREVISION= 1
PORTVERSION= 2.16.3
CATEGORIES= x11-fm gnome
MASTER_SITES= ${MASTER_SITE_GNOME}
MASTER_SITE_SUBDIR= sources/${PORTNAME}/${PORTVERSION:C/^([0-9]+\.[0-9]+).*/\1/}

View File

@ -1,3 +1,3 @@
MD5 (gnome2/nautilus-2.16.2.tar.bz2) = d6354ad96efcd0f89ed4c13ad940d5f5
SHA256 (gnome2/nautilus-2.16.2.tar.bz2) = 6306fe9ee0371da309a870627a94fba88c3848a5fa83b863d28688ed57d9ba11
SIZE (gnome2/nautilus-2.16.2.tar.bz2) = 4266971
MD5 (gnome2/nautilus-2.16.3.tar.bz2) = 05a0fe98d524ca5287da21845ab8490c
SHA256 (gnome2/nautilus-2.16.3.tar.bz2) = af2ff5ad922e28cc831b4ac3d83f0f35eedcf7a3230d3df76aa9f91c3ffbc36c
SIZE (gnome2/nautilus-2.16.3.tar.bz2) = 4268274

View File

@ -1,25 +0,0 @@
--- src/file-manager/fm-icon-view.c.orig 2006-11-14 16:35:04.304162544 +0000
+++ src/file-manager/fm-icon-view.c 2006-11-14 16:51:02.820445920 +0000
@@ -531,12 +531,20 @@
file_has_lazy_position (FMDirectoryView *view,
NautilusFile *file)
{
+ gboolean lazy_position;
+
/* For volumes (i.e. cdrom icon) we use lazy positioning so that when
* an old cdrom gets re-mounted in a place that now has another
* icon we don't overlap that one.
*/
-
- return NAUTILUS_IS_DESKTOP_ICON_FILE (file);
+ lazy_position = nautilus_file_has_volume (file);
+ if (lazy_position && fm_directory_view_get_loading (view)) {
+ /* if volumes are loaded during directory load, don't mark them
+ * as lazy. This is wrong for files that were mounted during user
+ * log-off, but it is right for files that were mounted during login. */
+ lazy_position = FALSE;
+ }
+ return lazy_position;
}
static void