diff -u gtk+2.0-2.20.1/debian/changelog gtk+2.0-2.20.1/debian/changelog
--- gtk+2.0-2.20.1/debian/changelog
+++ gtk+2.0-2.20.1/debian/changelog
@@ -1,3 +1,13 @@
+gtk+2.0 (2.20.1-0ubuntu2.1) lucid-proposed; urgency=low
+
+  * Added two patches from git to fix filechooser issue (LP: #558674)
+    - debian/patches/033_filechooser_sort.patch: fix new_order index in
+      gtk/gtkfilesystemmodel.c.
+    - debian/patches/035_filechooser_crash.patch: properly update Node IDs
+      in gtk/gtkfilesystemmodel.c.
+
+ -- Marc Deslauriers <marc.deslauriers@ubuntu.com>  Fri, 28 Oct 2011 19:28:58 -0400
+
 gtk+2.0 (2.20.1-0ubuntu2) lucid-proposed; urgency=low
 
   * debian/control.in:
diff -u gtk+2.0-2.20.1/debian/patches/series gtk+2.0-2.20.1/debian/patches/series
--- gtk+2.0-2.20.1/debian/patches/series
+++ gtk+2.0-2.20.1/debian/patches/series
@@ -23,0 +24,2 @@
+033_filechooser_sort.patch
+035_filechooser_crash.patch
only in patch2:
unchanged:
--- gtk+2.0-2.20.1.orig/debian/patches/035_filechooser_crash.patch
+++ gtk+2.0-2.20.1/debian/patches/035_filechooser_crash.patch
@@ -0,0 +1,28 @@
+From 7868c0b58855b61717454bb85f62caf720b8f623 Mon Sep 17 00:00:00 2001
+From: Sergey Orlov <wasp82@bk.ru>
+Date: Tue, 24 Aug 2010 18:17:15 +0000
+Subject: bgo#614006 - GtkFileSystemModel - Make sure to generate node IDs are valid for new files
+
+When a file was inserted during the period that the editable row was
+active, the node IDs would not get updated correctly.
+
+Signed-off-by: Federico Mena Quintero <federico@novell.com>
+---
+diff --git a/gtk/gtkfilesystemmodel.c b/gtk/gtkfilesystemmodel.c
+index 7c9e1dc..933420c 100644
+--- a/gtk/gtkfilesystemmodel.c
++++ b/gtk/gtkfilesystemmodel.c
+@@ -1778,7 +1778,10 @@ _gtk_file_system_model_update_file (GtkFileSystemModel *model,
+ 
+   id = node_get_for_file (model, file);
+   if (id == 0)
+-    add_file (model, file, info);
++    {
++      add_file (model, file, info);
++      id = node_get_for_file (model, file);
++    }
+ 
+   node = get_node (model, id);
+ 
+--
+cgit v0.8.3.1
only in patch2:
unchanged:
--- gtk+2.0-2.20.1.orig/debian/patches/033_filechooser_sort.patch
+++ gtk+2.0-2.20.1/debian/patches/033_filechooser_sort.patch
@@ -0,0 +1,26 @@
+From ac3797dfc1a0290cedfb35a883af1d171ab22be0 Mon Sep 17 00:00:00 2001
+From: Benjamin Otte <otte@redhat.com>
+Date: Wed, 16 Jun 2010 10:41:40 +0000
+Subject: Can't select file on file browser after changing sort order
+
+The row values are 1-indexed not 0-indexed, this has to be taken into
+account when producing the new_order array.
+
+https://bugzilla.gnome.org/show_bug.cgi?id=621414
+(cherry picked from commit a8e3ce6bb486a4c89799a77abe153d647fea1a69)
+---
+diff --git a/gtk/gtkfilesystemmodel.c b/gtk/gtkfilesystemmodel.c
+index 738b061..7c9e1dc 100644
+--- a/gtk/gtkfilesystemmodel.c
++++ b/gtk/gtkfilesystemmodel.c
+@@ -739,7 +739,7 @@ gtk_file_system_model_sort (GtkFileSystemModel *model)
+                   continue;
+                 }
+ 
+-              new_order[r] = node->row;
++              new_order[r] = node->row - 1;
+               r++;
+               node->row = r;
+             }
+--
+cgit v0.8.3.1