* 040_filechooser_single-click.patch: fix the patch to apply cleanly

again, and enable it. (Untested yet; use at your own risk!)

debian/changelog

@@ -1,3 +1,10 @@
+gtk+2.0 (2.11.2-2) UNRELEASED; urgency=low
+
+  * 040_filechooser_single-click.patch: fix the patch to apply cleanly 
+    again, and enable it. (Untested yet; use at your own risk!)
+
+ -- Josselin Mouette <joss@debian.org>  Wed, 13 Jun 2007 20:37:07 +0200
+
 gtk+2.0 (2.11.2-1) experimental; urgency=low
 
   * New upstream release series; these are development releases, the new API

debian/patches/040_filechooser_single-click.patch

@@ -1,11 +1,22 @@
 Debian #405296; GNOME #148828; permit single click in filechooser instead of
 requiring double-click.
 
-Index: gtk+-2.10.12/gtk/gtkfilechooserdefault.c
+Index: gtk+-2.11.2/gtk/gtkfilechooserdefault.c
 ===================================================================
---- gtk+-2.10.12.orig/gtk/gtkfilechooserdefault.c	2007-05-18 18:33:08.711978750 +0200
-+++ gtk+-2.10.12/gtk/gtkfilechooserdefault.c	2007-05-18 18:33:18.636599000 +0200
-@@ -3250,8 +3250,22 @@
+--- gtk+-2.11.2.orig/gtk/gtkfilechooserdefault.c	2007-06-06 13:43:08.000000000 +0200
++++ gtk+-2.11.2/gtk/gtkfilechooserdefault.c	2007-06-13 20:35:28.276504667 +0200
+@@ -389,10 +389,6 @@
+ 
+ static void filter_combo_changed       (GtkComboBox           *combo_box,
+ 					GtkFileChooserDefault *impl);
+-static void     shortcuts_row_activated_cb (GtkTreeView           *tree_view,
+-					    GtkTreePath           *path,
+-					    GtkTreeViewColumn     *column,
+-					    GtkFileChooserDefault *impl);
+ 
+ static gboolean shortcuts_key_press_event_cb (GtkWidget             *widget,
+ 					      GdkEventKey           *event,
+@@ -3624,8 +3620,22 @@
  shortcuts_selection_changed_cb (GtkTreeSelection      *selection,
  				GtkFileChooserDefault *impl)
  {
@@ -28,7 +39,17 @@ Index: gtk+-2.10.12/gtk/gtkfilechooserdefault.c
  }
  
  static gboolean
-@@ -7920,25 +7934,6 @@
+@@ -3905,9 +3915,6 @@
+   g_signal_connect (selection, "changed",
+ 		    G_CALLBACK (shortcuts_selection_changed_cb), impl);
+ 
+-  g_signal_connect (impl->browse_shortcuts_tree_view, "row_activated",
+-		    G_CALLBACK (shortcuts_row_activated_cb), impl);
+-
+   g_signal_connect (impl->browse_shortcuts_tree_view, "key_press_event",
+ 		    G_CALLBACK (shortcuts_key_press_event_cb), impl);
+ 
+@@ -8506,25 +8513,6 @@
        gtk_file_path_free (path);
        return retval;
      }
@@ -44,7 +65,7 @@ Index: gtk+-2.10.12/gtk/gtkfilechooserdefault.c
 -	{
 -	  shortcuts_activate_iter (impl, &iter);
 -	  
--	  gtk_widget_grab_focus (impl->browse_files_tree_view);
+-	  focus_browse_tree_view_if_possible (impl);
 -	}
 -      else
 -	goto file_list;
@@ -54,21 +75,29 @@ Index: gtk+-2.10.12/gtk/gtkfilechooserdefault.c
    else if (impl->toplevel_last_focus_widget == impl->browse_files_tree_view)
      {
        /* The focus is on a dialog's action area button, *and* the widget that
-@@ -8267,17 +8262,6 @@
- 			    GtkTreeViewColumn     *column,
- 			    GtkFileChooserDefault *impl)
- {
+@@ -10312,25 +10300,6 @@
+     }
+ }
+ 
+-/* Callback used when a row in the shortcuts list is activated */
+-static void
+-shortcuts_row_activated_cb (GtkTreeView           *tree_view,
+-			    GtkTreePath           *path,
+-			    GtkTreeViewColumn     *column,
+-			    GtkFileChooserDefault *impl)
+-{
 -  GtkTreeIter iter;
 -  GtkTreeIter child_iter;
 -
--  if (!gtk_tree_model_get_iter (impl->shortcuts_filter_model, &iter, path))
+-  if (!gtk_tree_model_get_iter (impl->shortcuts_pane_filter_model, &iter, path))
 -    return;
 -
--  gtk_tree_model_filter_convert_iter_to_child_iter (GTK_TREE_MODEL_FILTER (impl->shortcuts_filter_model),
+-  gtk_tree_model_filter_convert_iter_to_child_iter (GTK_TREE_MODEL_FILTER (impl->shortcuts_pane_filter_model),
 -						    &child_iter,
 -						    &iter);
 -  shortcuts_activate_iter (impl, &child_iter);
+-}
 -
-   gtk_widget_grab_focus (impl->browse_files_tree_view);
- }
- 
+ /* Handler for GtkWidget::key-press-event on the shortcuts list */
+ static gboolean
+ shortcuts_key_press_event_cb (GtkWidget             *widget,

debian/patches/series

@@ -11,6 +11,6 @@
 021_loader-files-d.patch
 030_gtkentry_password-char-circle.patch
 033_treeview_resizing.patch
-#040_filechooser_single-click.patch
+040_filechooser_single-click.patch
 041_ia32-libs.patch
 070_mandatory-relibtoolize.patch