[arch-commits] Commit in gtk2/trunk (PKGBUILD gtk2-dont-ellipsize-filters.diff)

[Ionut Biru]

    Date: Thursday, September 1, 2011 @ 15:02:40
  Author: ibiru
Revision: 136809

fix filters in file chooser

Added:
  gtk2/trunk/gtk2-dont-ellipsize-filters.diff
Modified:
  gtk2/trunk/PKGBUILD

----------------------------------+
 PKGBUILD                         |   11 ++++++++---
 gtk2-dont-ellipsize-filters.diff |   28 ++++++++++++++++++++++++++++
 2 files changed, 36 insertions(+), 3 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2011-09-01 18:48:52 UTC (rev 136808)
+++ PKGBUILD	2011-09-01 19:02:40 UTC (rev 136809)
@@ -4,7 +4,7 @@
 pkgbase=gtk2
 pkgname=('gtk2' 'gtk-update-icon-cache')
 pkgver=2.24.6
-pkgrel=1
+pkgrel=2
 arch=('i686' 'x86_64')
 url="http://www.gtk.org/"
 makedepends=('atk' 'pango' 'libxcursor' 'libxinerama' 'libxrandr' 'libxi' 'libxcomposite' 'libxdamage'
@@ -12,13 +12,17 @@
 options=('!libtool' '!docs')
 license=('LGPL')
 source=(http://ftp.gnome.org/pub/gnome/sources/gtk+/2.24/gtk+-${pkgver}.tar.xz
-        xid-collision-debug.patch)
+        xid-collision-debug.patch
+        gtk2-dont-ellipsize-filters.diff)
 sha256sums=('8a026b545dc1fa0c1a69b395232ad7c8ee8fa260be5f7d9a2f2ffcd799efefca'
-            'd758bb93e59df15a4ea7732cf984d1c3c19dff67c94b957575efea132b8fe558')
+            'd758bb93e59df15a4ea7732cf984d1c3c19dff67c94b957575efea132b8fe558'
+            '90a9d50c1407ab87f6fa9ae131c2663477540419955b0ba39520a18882afceb8')
 
 build() {
     cd "${srcdir}/gtk+-${pkgver}"
     patch -Np1 -i "${srcdir}/xid-collision-debug.patch"
+    #https://bugzilla.gnome.org/show_bug.cgi?id=657949
+    patch -Np1 -i "${srcdir}/gtk2-dont-ellipsize-filters.diff"
 
     CXX=/bin/false ./configure --prefix=/usr \
         --sysconfdir=/etc \
@@ -30,6 +34,7 @@
 
     make
 }
+
 package_gtk2() {
     pkgdesc="The GTK+ Toolkit (v2)"
     install=gtk2.install

Added: gtk2-dont-ellipsize-filters.diff
===================================================================
--- gtk2-dont-ellipsize-filters.diff	                        (rev 0)
+++ gtk2-dont-ellipsize-filters.diff	2011-09-01 19:02:40 UTC (rev 136809)
@@ -0,0 +1,28 @@
+diff --git a/gtk/gtkfilechooserdefault.c b/gtk/gtkfilechooserdefault.c
+index 2ee7903..37d9e8d 100644
+--- a/gtk/gtkfilechooserdefault.c
++++ b/gtk/gtkfilechooserdefault.c
+@@ -2322,23 +2322,9 @@ renderer_editing_canceled_cb (GtkCellRendererText   *cell_renderer_text,
+ static GtkWidget *
+ filter_create (GtkFileChooserDefault *impl)
+ {
+-  GtkCellRenderer *cell;
+-  GList           *cells;
+-
+   impl->filter_combo = gtk_combo_box_text_new ();
+   gtk_combo_box_set_focus_on_click (GTK_COMBO_BOX (impl->filter_combo), FALSE);
+ 
+-  /* Get the combo's text renderer and set ellipsize parameters */
+-  cells = gtk_cell_layout_get_cells (GTK_CELL_LAYOUT (impl->filter_combo));
+-  g_assert (cells);
+-  cell = cells->data;
+-
+-  g_object_set (G_OBJECT (cell),
+-		"ellipsize", PANGO_ELLIPSIZE_END,
+-		NULL);
+-
+-  g_list_free (cells);
+-
+   g_signal_connect (impl->filter_combo, "changed",
+ 		    G_CALLBACK (filter_combo_changed), impl);
+