Merge lp:~om26er/ubuntu/natty/nautilus/nautilus-fix-649993 into lp:~ubuntu-desktop/nautilus/ubuntu

[Omer Akram]

backported the fix for bug 649993. builds clean and the fix works fine.

[lp:~om26er/ubuntu/natty/nautilus/nautilus-fix-649993]

125. By Omer Akram on 2011-02-28

forgot to add the patch :/

[Omer Akram (om26er)]

the patch was left behind, now pushed the patch too.

[Luke Yelavich (themuso)]

Thanks for your work. As commented in the bug, I have sent this patch to Debian, and upstream. Hopefully the Debian maintainer will release an updated package revision with the patch in short order, so we can sync the package to Ubuntu.

Thanks again for your work.

review: Abstain

[Luke Yelavich (themuso)]

Whoops, sorry, that last comment was meant for another merge proposal. I got my browser tabs mixed up.

Almost ready to approve this, once I've test built.

review: Needs Resubmitting

[Luke Yelavich (themuso)]

Thanks for your work, uploaded to natty.

review: Approve

=== modified file 'debian/changelog'
--- debian/changelog	2011-02-24 21:31:22 +0000
+++ debian/changelog	2011-02-28 07:55:42 +0000
@@ -8,7 +8,11 @@
   * debian/patches/96_no-null-in-g-str-hash.patch:
     - Updated with the correct upstream patch (LP: #718098)
 
- -- Sebastien Bacher <[e-mail]>  Thu, 24 Feb 2011 15:48:26 +0100
+  [ Omer Akram ]
+  * debian/patches/97_keyboard_nav_in_sidebar.patch
+    - Allow keyboard navigation in sidebar with Enter/Space. (LP: #649993)
+
+ -- Omer Akram <[e-mail]>  Mon, 28 Feb 2011 12:38:32 +0500
 
 nautilus (1:2.32.2.1-0ubuntu7) natty; urgency=low
 

=== added file 'debian/patches/97_keyboard_nav_in_sidebar.patch'
--- debian/patches/97_keyboard_nav_in_sidebar.patch	1970-01-01 00:00:00 +0000
+++ debian/patches/97_keyboard_nav_in_sidebar.patch	2011-02-28 07:55:42 +0000
@@ -0,0 +1,40 @@
+From: Omer Akram <[e-mail]>
+Author: Stefano Teso <[e-mail]>
+Subject: Places-sidebar: allow keyboard navigation with Enter/Space.
+Origin: http://git.gnome.org/browse/nautilus/commit/?id=fd03c910a73ba18459e68baaf15e8dd295acd5c1
+Bug: https://bugs.gnome.org/637768
+Bug-Ubuntu: https://launchpad.net/bugs/649993
+
+--- a//src/nautilus-places-sidebar.c	2010-12-28 20:54:38.000000000 +0500
++++ b//src/nautilus-places-sidebar.c	2011-02-28 12:15:11.096777018 +0500
+@@ -2198,6 +2198,30 @@
+ 
+   modifiers = gtk_accelerator_get_default_mod_mask ();
+ 
++  if ((event->keyval == GDK_KEY_Return ||
++       event->keyval == GDK_KEY_KP_Enter ||
++       event->keyval == GDK_KEY_ISO_Enter ||
++       event->keyval == GDK_KEY_space)) {
++
++      GtkTreeModel *model;
++      GtkTreePath *path;
++      NautilusWindowOpenFlags flags = 0;
++
++      if ((event->state & modifiers) == GDK_SHIFT_MASK) {
++          flags = NAUTILUS_WINDOW_OPEN_FLAG_NEW_TAB;
++      } else if ((event->state & modifiers) == GDK_CONTROL_MASK) {
++          flags = NAUTILUS_WINDOW_OPEN_FLAG_NEW_WINDOW;
++      }
++
++      model = gtk_tree_view_get_model (sidebar->tree_view);
++      gtk_tree_view_get_cursor (sidebar->tree_view, &path, NULL);
++
++      open_selected_bookmark (sidebar, model, path, flags);
++
++      gtk_tree_path_free (path);
++      return TRUE;
++  }
++
+   if (event->keyval == GDK_Down &&
+       (event->state & modifiers) == GDK_MOD1_MASK) {
+       return eject_or_unmount_selection (sidebar);

=== modified file 'debian/patches/series'
--- debian/patches/series	2011-02-22 13:32:11 +0000
+++ debian/patches/series	2011-02-28 07:55:42 +0000
@@ -15,3 +15,4 @@
 #91_correct_rgba_use.patch
 95_no-initial-fade.patch
 96_no-null-in-g-str-hash.patch
+97_keyboard_nav_in_sidebar.patch