[Pkg-xfce-commits] r3984 - in desktop/trunk/exo/debian: . patches

[Lionel Le Folgoc]

Author: mrpouit-guest
Date: 2010-05-11 20:06:16 +0000 (Tue, 11 May 2010)
New Revision: 3984

Added:
   desktop/trunk/exo/debian/patches/
   desktop/trunk/exo/debian/patches/01_fix-treeview-gtk2.20.patch
   desktop/trunk/exo/debian/patches/series
Modified:
   desktop/trunk/exo/debian/changelog
   desktop/trunk/exo/debian/control
   desktop/trunk/exo/debian/rules
Log:
* debian/patches:
  - 01_fix-treeview-gtk2.20.patch: make the treeview work again with gtk 2.20
    (Xfce #6230, lp: #520118, closes: #576706).
  - series: add this patch.
* debian/control:
  - build-depends on quilt (>= 0.46-7)
  - add myself to Uploaders.
* debian/rules: enable quilt.

Modified: desktop/trunk/exo/debian/changelog
===================================================================
--- desktop/trunk/exo/debian/changelog	2010-05-11 19:49:17 UTC (rev 3983)
+++ desktop/trunk/exo/debian/changelog	2010-05-11 20:06:16 UTC (rev 3984)
@@ -2,11 +2,19 @@
 
   [Lionel Le Folgoc]
   * debian/control: fix typos in exo-utils-dbg and libexo-common long descs.
+  * debian/patches:
+    - 01_fix-treeview-gtk2.20.patch: make the treeview work again with gtk 2.20
+      (Xfce #6230, lp: #520118, closes: #576706).
+    - series: add this patch.
+  * debian/control:
+    - build-depends on quilt (>= 0.46-7)
+    - add myself to Uploaders.
+  * debian/rules: enable quilt.
 
   [Stefan Ott]
   * debian/watch edited to track Xfce archive reorganisation.
 
- -- Lionel Le Folgoc <mrpouit at gmail.com>  Wed, 23 Dec 2009 16:40:47 +0100
+ -- Lionel Le Folgoc <mrpouit at gmail.com>  Tue, 11 May 2010 21:59:02 +0200
 
 exo (0.3.106-1) unstable; urgency=low
 

Modified: desktop/trunk/exo/debian/control
===================================================================
--- desktop/trunk/exo/debian/control	2010-05-11 19:49:17 UTC (rev 3983)
+++ desktop/trunk/exo/debian/control	2010-05-11 20:06:16 UTC (rev 3984)
@@ -2,10 +2,12 @@
 Section: xfce
 Priority: optional
 Maintainer: Debian Xfce Maintainers <pkg-xfce-devel at lists.alioth.debian.org>
-Uploaders: Emanuele Rocca <ema at debian.org>, Simon Huggins <huggie at earth.li>, Yves-Alexis Perez <corsac at debian.org>, Michael Casadevall <sonicmctails at gmail.com>
+Uploaders: Emanuele Rocca <ema at debian.org>, Simon Huggins <huggie at earth.li>,
+ Yves-Alexis Perez <corsac at debian.org>, Michael Casadevall <sonicmctails at gmail.com>,
+ Lionel Le Folgoc <mrpouit at gmail.com>
 Build-Depends: debhelper (>= 5.0.0), libxfcegui4-dev (>= 4.6.0),
  liburi-perl, chrpath, libhal-storage-dev [!hurd-i386], libnotify-dev,
- intltool
+ intltool, quilt (>= 0.46-7)
 Standards-Version: 3.8.3
 Homepage: http://www.xfce.org
 Vcs-Svn: svn://svn.debian.org/pkg-xfce/desktop/trunk/exo/

Added: desktop/trunk/exo/debian/patches/01_fix-treeview-gtk2.20.patch
===================================================================
--- desktop/trunk/exo/debian/patches/01_fix-treeview-gtk2.20.patch	                        (rev 0)
+++ desktop/trunk/exo/debian/patches/01_fix-treeview-gtk2.20.patch	2010-05-11 20:06:16 UTC (rev 3984)
@@ -0,0 +1,44 @@
+From c85fffcfa78dec9ae12251b9d2974927745ba7ce Mon Sep 17 00:00:00 2001
+From: Nick Schermer <nick at xfce.org>
+Date: Tue, 11 May 2010 18:57:11 +0000
+Subject: Make the treeview work again with gtk 2.20 (bug #6230).
+
+---
+diff --git a/exo/exo-tree-view.c b/exo/exo-tree-view.c
+index cfc5b1b..61bafc7 100644
+--- a/exo/exo-tree-view.c
++++ b/exo/exo-tree-view.c
+@@ -378,14 +378,7 @@ exo_tree_view_button_press_event (GtkWidget      *widget,
+       && path != NULL && gtk_tree_selection_path_is_selected (selection, path))
+     {
+       /* check if we have to restore paths */
+-      if (G_LIKELY (selection->user_func == (GtkTreeSelectionFunc) exo_noop_false))
+-        {
+-          /* just reset the select function (previously set to exo_noop_false),
+-           * there's no clean way to do this, so what the heck.
+-           */
+-          selection->user_func = NULL;
+-        }
+-      else
++      if (G_LIKELY (selection->user_func != (GtkTreeSelectionFunc) exo_noop_false))
+         {
+           /* select all previously selected paths */
+           for (lp = selected_paths; lp != NULL; lp = lp->next)
+@@ -393,6 +386,15 @@ exo_tree_view_button_press_event (GtkWidget      *widget,
+         }
+     }
+ 
++  /* see bug http://bugzilla.xfce.org/show_bug.cgi?id=6230 for more information */
++  if (G_LIKELY (selection->user_func == (GtkTreeSelectionFunc) exo_noop_false))
++    {
++      /* just reset the select function (previously set to exo_noop_false),
++       * there's no clean way to do this, so what the heck.
++       */
++      selection->user_func = NULL;
++    }
++
+   /* release the path (if any) */
+   if (G_LIKELY (path != NULL))
+     gtk_tree_path_free (path);
+--
+cgit v0.8.2.1

Added: desktop/trunk/exo/debian/patches/series
===================================================================
--- desktop/trunk/exo/debian/patches/series	                        (rev 0)
+++ desktop/trunk/exo/debian/patches/series	2010-05-11 20:06:16 UTC (rev 3984)
@@ -0,0 +1 @@
+01_fix-treeview-gtk2.20.patch

Modified: desktop/trunk/exo/debian/rules
===================================================================
--- desktop/trunk/exo/debian/rules	2010-05-11 19:49:17 UTC (rev 3983)
+++ desktop/trunk/exo/debian/rules	2010-05-11 20:06:16 UTC (rev 3984)
@@ -10,6 +10,7 @@
 
 config.status: configure
 	dh_testdir
+	dh_quilt_patch
 	# Add here commands to configure the package.
 	 ./configure --host=$(DEB_HOST_GNU_TYPE) --build=$(DEB_BUILD_GNU_TYPE) --prefix=/usr --mandir=\$${prefix}/share/man --infodir=\$${prefix}/share/info --sysconfdir=/etc --libexecdir=/usr/lib/$(EXO_SONAME) --enable-final --disable-gtk-doc --disable-python --enable-notifications
 
@@ -30,6 +31,7 @@
 	# Add here commands to clean up after the build process.
 	[ ! -f Makefile ] || $(MAKE) distclean
 
+	dh_quilt_unpatch
 	dh_clean 
 
 install: build