r24969 - in /desktop/unstable/nautilus/debian: changelog patches/13_shortcuts.patch patches/series

[joss at users.alioth.debian.org]

Author: joss
Date: Mon Aug 16 07:52:25 2010
New Revision: 24969

URL: http://svn.debian.org/wsvn/pkg-gnome/?sc=1&rev=24969
Log:
13_shortcuts.patch: stolen from upstream git. Fix an annoying bug 
that makes a number of keyboard shortcuts inoperant the first time.
Closes: #592016.

Added:
    desktop/unstable/nautilus/debian/patches/13_shortcuts.patch
Modified:
    desktop/unstable/nautilus/debian/changelog
    desktop/unstable/nautilus/debian/patches/series

Modified: desktop/unstable/nautilus/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/nautilus/debian/changelog?rev=24969&op=diff
==============================================================================
--- desktop/unstable/nautilus/debian/changelog [utf-8] (original)
+++ desktop/unstable/nautilus/debian/changelog [utf-8] Mon Aug 16 07:52:25 2010
@@ -2,6 +2,9 @@
 
   * Drop type-handling usage. Closes: #587872.
   * Bump standards version accordingly.
+  * 13_shortcuts.patch: stolen from upstream git. Fix an annoying bug 
+    that makes a number of keyboard shortcuts inoperant the first time.
+    Closes: #592016.
 
  -- Josselin Mouette <joss at debian.org>  Fri, 02 Jul 2010 18:30:53 +0200
 

Added: desktop/unstable/nautilus/debian/patches/13_shortcuts.patch
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/nautilus/debian/patches/13_shortcuts.patch?rev=24969&op=file
==============================================================================
--- desktop/unstable/nautilus/debian/patches/13_shortcuts.patch (added)
+++ desktop/unstable/nautilus/debian/patches/13_shortcuts.patch [utf-8] Mon Aug 16 07:52:25 2010
@@ -1,0 +1,25 @@
+From 8e597d4b4426fb74ee8eb2442ecb43a65c9c8db5 Mon Sep 17 00:00:00 2001
+From: Thomas Karpiniec <arctanx at arctanx.id.au>
+Date: Tue, 8 Jun 2010 20:57:53 +1000
+Subject: [PATCH] Use correct logic for delaying updates while loading
+
+---
+ src/file-manager/fm-directory-view.c |    2 +-
+ 1 files changed, 1 insertions(+), 1 deletions(-)
+
+diff --git a/src/file-manager/fm-directory-view.c b/src/file-manager/fm-directory-view.c
+index 24b24a9..171be04 100644
+--- a/src/file-manager/fm-directory-view.c
++++ b/src/file-manager/fm-directory-view.c
+@@ -3107,7 +3107,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;
+ 		}
+-- 
+1.7.1
+

Modified: desktop/unstable/nautilus/debian/patches/series
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/nautilus/debian/patches/series?rev=24969&op=diff
==============================================================================
--- desktop/unstable/nautilus/debian/patches/series [utf-8] (original)
+++ desktop/unstable/nautilus/debian/patches/series [utf-8] Mon Aug 16 07:52:25 2010
@@ -2,6 +2,7 @@
 03_deprecated.patch
 10_load_session.patch
 12_list-view_expand.patch
+13_shortcuts.patch
 20_open-with_install.patch
 90_relibtoolize.patch
 99_ltmain_as-needed.patch