diff -u nautilus-2.30.1/debian/changelog nautilus-2.30.1/debian/changelog --- nautilus-2.30.1/debian/changelog +++ nautilus-2.30.1/debian/changelog @@ -1,3 +1,12 @@ +nautilus (1:2.30.1-0ubuntu1.1) lucid-proposed; urgency=low + + * debian/patches/92_git_correct_delay_logic.patch: + - git change to fix a logic error in the directory loading code which + create a delay to have some shortcut actions to work after loading + directory (lp: #390662) + + -- Sebastien Bacher Tue, 06 Jul 2010 12:59:17 +0200 + nautilus (1:2.30.1-0ubuntu1) lucid-proposed; urgency=low * New upstream version: diff -u nautilus-2.30.1/debian/patches/series nautilus-2.30.1/debian/patches/series --- nautilus-2.30.1/debian/patches/series +++ nautilus-2.30.1/debian/patches/series @@ -13,6 +13,7 @@ 89_use_application_indicator.patch 90_relibtoolize.patch #91_correct_rgba_use.patch +92_git_correct_delay_logic.patch 95_no-initial-fade.patch 99_ltmain_as-needed.patch only in patch2: unchanged: --- nautilus-2.30.1.orig/debian/patches/92_git_correct_delay_logic.patch +++ nautilus-2.30.1/debian/patches/92_git_correct_delay_logic.patch @@ -0,0 +1,24 @@ +From cfc72ae3ea86b63660e1bf153a9e33844e5b2281 Mon Sep 17 00:00:00 2001 +From: Thomas Karpiniec +Date: Tue, 08 Jun 2010 10:57:53 +0000 +Subject: Use correct logic for delaying updates while loading + +See http://mail.gnome.org/archives/nautilus-list/2010-June/msg00023.html +and https://bugzilla.gnome.org/show_bug.cgi?id=599680 for details. +--- +diff --git a/src/file-manager/fm-directory-view.c b/src/file-manager/fm-directory-view.c +index fa9f6b7..dd8252e 100644 +--- a/src/file-manager/fm-directory-view.c ++++ b/src/file-manager/fm-directory-view.c +@@ -3106,7 +3106,7 @@ changes_timeout_callback (gpointer data) + + if (time_delta < UPDATE_INTERVAL_RESET*1000) { + if (view->details->update_interval < UPDATE_INTERVAL_MAX && +- !view->details->loading) { ++ view->details->loading) { + /* Increase */ + view->details->update_interval += UPDATE_INTERVAL_INC; + } +-- +cgit v0.8.3.1 +