r13329 - in /desktop/unstable/gtk+2.0/debian: changelog patches/040_filechooser_single-click.patch rules

[joss at users.alioth.debian.org]

Author: joss
Date: Wed Oct 31 21:49:15 2007
New Revision: 13329

URL: http://svn.debian.org/wsvn/pkg-gnome/?sc=1&rev=13329
Log:
* Keep --enable-explicit-deps in the directfb build; otherwise this 
  breaks any binary linking against it because the rpath isn't passed.
* 031_gtksearchenginetracker_fixes.patch: added back, only the name
* 040_filechooser_single-click.patch: allow a situation where no
  shortcut is selected, to avoid issues for keyboard users.
  Closes: #448674.

Modified:
    desktop/unstable/gtk+2.0/debian/changelog
    desktop/unstable/gtk+2.0/debian/patches/040_filechooser_single-click.patch
    desktop/unstable/gtk+2.0/debian/rules

Modified: desktop/unstable/gtk+2.0/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gtk%2B2.0/debian/changelog?rev=13329&op=diff
==============================================================================
--- desktop/unstable/gtk+2.0/debian/changelog (original)
+++ desktop/unstable/gtk+2.0/debian/changelog Wed Oct 31 21:49:15 2007
@@ -4,11 +4,16 @@
   * Remove the --enable-explicit-deps flag. Closes: #343711, thanks Tom
     Parker. If some other packages still rely on having explicit X11
     dependencies, they are buggy and need to be fixed anyway.
+  * Keep --enable-explicit-deps in the directfb build; otherwise this 
+    breaks any binary linking against it because the rpath isn't passed.
   * 033_treeview_resizing.patch: updated patch from Kristian Rietveld.
-  * 031_gtksearchenginetracker_fixes.patch: added back, only the name 
+  * 031_gtksearchenginetracker_fixes.patch: added back, only the name
     change was fixed upstream.
-
- -- Josselin Mouette <joss at debian.org>  Wed, 31 Oct 2007 19:39:47 +0100
+  * 040_filechooser_single-click.patch: allow a situation where no
+    shortcut is selected, to avoid issues for keyboard users.
+    Closes: #448674.
+
+ -- Josselin Mouette <joss at debian.org>  Wed, 31 Oct 2007 21:56:52 +0100
 
 gtk+2.0 (2.12.1-1) unstable; urgency=low
 

Modified: desktop/unstable/gtk+2.0/debian/patches/040_filechooser_single-click.patch
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gtk%2B2.0/debian/patches/040_filechooser_single-click.patch?rev=13329&op=diff
==============================================================================
--- desktop/unstable/gtk+2.0/debian/patches/040_filechooser_single-click.patch (original)
+++ desktop/unstable/gtk+2.0/debian/patches/040_filechooser_single-click.patch Wed Oct 31 21:49:15 2007
@@ -1,8 +1,10 @@
 Debian #405296; GNOME #148828; permit single click in filechooser instead of
 requiring double-click.
 
---- gtk+2.0-2.12.1.orig/gtk/gtkfilechooserdefault.c	2007-10-16 15:20:39.000000000 +0200
-+++ gtk+2.0-2.12.1/gtk/gtkfilechooserdefault.c	2007-10-18 16:30:37.000000000 +0200
+Index: gtk+-2.12.1/gtk/gtkfilechooserdefault.c
+===================================================================
+--- gtk+-2.12.1.orig/gtk/gtkfilechooserdefault.c	2007-10-31 19:42:02.854882096 +0100
++++ gtk+-2.12.1/gtk/gtkfilechooserdefault.c	2007-10-31 20:16:17.995997914 +0100
 @@ -390,10 +390,6 @@
  
  static void filter_combo_changed       (GtkComboBox           *combo_box,
@@ -37,6 +39,15 @@
  }
  
  static gboolean
+@@ -3930,7 +3940,7 @@
+ 		     GDK_ACTION_COPY | GDK_ACTION_MOVE);
+ 
+   selection = gtk_tree_view_get_selection (GTK_TREE_VIEW (impl->browse_shortcuts_tree_view));
+-  gtk_tree_selection_set_mode (selection, GTK_SELECTION_BROWSE);
++  gtk_tree_selection_set_mode (selection, GTK_SELECTION_SINGLE);
+   gtk_tree_selection_set_select_function (selection,
+ 					  shortcuts_select_func,
+ 					  impl, NULL);
 @@ -3938,9 +3948,6 @@
    g_signal_connect (selection, "changed",
  		    G_CALLBACK (shortcuts_selection_changed_cb), impl);

Modified: desktop/unstable/gtk+2.0/debian/rules
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gtk%2B2.0/debian/rules?rev=13329&op=diff
==============================================================================
--- desktop/unstable/gtk+2.0/debian/rules (original)
+++ desktop/unstable/gtk+2.0/debian/rules Wed Oct 31 21:49:15 2007
@@ -131,6 +131,7 @@
 			--with-xinput=no \
 			--enable-shared \
 			--disable-static \
+			--enable-explicit-deps=yes \
 			--with-gdktarget=directfb
 
 # macro computing the list of 'debian/<pkg>.*" files which have a corresponding