diff -u gtk+2.0-2.17.5/debian/changelog gtk+2.0-2.17.5/debian/changelog
--- gtk+2.0-2.17.5/debian/changelog
+++ gtk+2.0-2.17.5/debian/changelog
@@ -1,3 +1,11 @@
+gtk+2.0 (2.17.5-0ubuntu3) karmic; urgency=low
+
+  * debian/patches/092_fix_button_focus_behavior.patch:
+    - fix problems where current folder wasn't accepted. (LP: #46626)
+  * Adhere to DebianMaintainerField spec.
+
+ -- Andy Matteson <xt.knight@gmail.com>  Wed, 22 Jul 2009 23:43:41 -0400
+
 gtk+2.0 (2.17.5-0ubuntu2) karmic; urgency=low
 
   * Try a no change upload to see if that fixes the amd64 loader issue
diff -u gtk+2.0-2.17.5/debian/control gtk+2.0-2.17.5/debian/control
--- gtk+2.0-2.17.5/debian/control
+++ gtk+2.0-2.17.5/debian/control
@@ -1,7 +1,8 @@
 Source: gtk+2.0
 Section: libs
 Priority: optional
-Maintainer: Sebastien Bacher <seb128@ubuntu.com>
+Maintainer: Ubuntu Core Developers <ubuntu-devel-discuss@lists.ubuntu.com>
+XSBC-Original-Maintainer: Sebastien Bacher <seb128@ubuntu.com>
 Uploaders: Debian GNOME Maintainers <pkg-gnome-maintainers@lists.alioth.debian.org>, Loic Minier <lool@dooz.org>
 Build-Depends: debhelper (>= 5.0.22),
                gettext,
diff -u gtk+2.0-2.17.5/debian/control.in gtk+2.0-2.17.5/debian/control.in
--- gtk+2.0-2.17.5/debian/control.in
+++ gtk+2.0-2.17.5/debian/control.in
@@ -1,7 +1,8 @@
 Source: gtk+@APIVER@
 Section: libs
 Priority: optional
-Maintainer: Sebastien Bacher <seb128@ubuntu.com>
+Maintainer: Ubuntu Core Developers <ubuntu-devel-discuss@lists.ubuntu.com>
+XSBC-Original-Maintainer: Sebastien Bacher <seb128@ubuntu.com>
 Uploaders: @GNOME_TEAM@
 Build-Depends: debhelper (>= 5.0.22),
                gettext,
diff -u gtk+2.0-2.17.5/debian/patches/series gtk+2.0-2.17.5/debian/patches/series
--- gtk+2.0-2.17.5/debian/patches/series
+++ gtk+2.0-2.17.5/debian/patches/series
@@ -19,0 +20 @@
+092_fix_button_focus_behavior.patch
only in patch2:
unchanged:
--- gtk+2.0-2.17.5.orig/debian/patches/092_fix_button_focus_behavior.patch
+++ gtk+2.0-2.17.5/debian/patches/092_fix_button_focus_behavior.patch
@@ -0,0 +1,52 @@
+Index: gtk+2.0-2.17.5/gtk/gtkfilechooserdefault.c
+===================================================================
+--- gtk+2.0-2.17.5.orig/gtk/gtkfilechooserdefault.c	2009-07-22 23:39:55.879420724 -0400
++++ gtk+2.0-2.17.5/gtk/gtkfilechooserdefault.c	2009-07-22 23:40:00.008227955 -0400
+@@ -7685,7 +7685,19 @@
+       check_save_entry (impl, &info.file_from_entry, &is_well_formed, &is_empty, &is_file_part_empty, &is_folder);
+ 
+       if (is_empty)
+-	goto out;
++        {
++          if ((impl->action == GTK_FILE_CHOOSER_ACTION_OPEN
++                || impl->action == GTK_FILE_CHOOSER_ACTION_SELECT_FOLDER)
++                && impl->location_mode == LOCATION_MODE_FILENAME_ENTRY)
++            {
++              GtkTreeSelection *selection;
++
++              selection = gtk_tree_view_get_selection (GTK_TREE_VIEW (impl->browse_files_tree_view));
++              gtk_tree_selection_selected_foreach (selection, get_files_foreach, &info);
++            }
++
++          goto out;
++        }
+ 
+       if (!is_well_formed)
+ 	return NULL;
+@@ -8699,8 +8711,24 @@
+       entry = GTK_FILE_CHOOSER_ENTRY (impl->location_entry);
+       check_save_entry (impl, &file, &is_well_formed, &is_empty, &is_file_part_empty, &is_folder);
+ 
+-      if (is_empty || !is_well_formed)
+-	return FALSE;
++      if (!is_well_formed)
++        {
++	  return FALSE;
++        }
++      
++      if (is_empty)
++        {
++          if ((impl->action == GTK_FILE_CHOOSER_ACTION_OPEN
++                || impl->action == GTK_FILE_CHOOSER_ACTION_SELECT_FOLDER)
++                && impl->location_mode == LOCATION_MODE_FILENAME_ENTRY)
++            {
++              goto file_list;
++            }
++          else
++            {
++              return FALSE;
++            }
++        }
+ 
+       g_assert (file != NULL);
+