r17258 - in /desktop/unstable/vte/debian: changelog patches/01_anjuta_hang.patch

[joss at users.alioth.debian.org]

Author: joss
Date: Mon Oct 13 08:49:21 2008
New Revision: 17258

URL: http://svn.debian.org/wsvn/pkg-gnome/?sc=1&rev=17258
Log:
01_anjuta_hang.patch: new patch, stolen from upstream. Fix hangs in 
Geany and Anjuta. Closes: #498295.

Added:
    desktop/unstable/vte/debian/patches/01_anjuta_hang.patch
Modified:
    desktop/unstable/vte/debian/changelog

Modified: desktop/unstable/vte/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/vte/debian/changelog?rev=17258&op=diff
==============================================================================
--- desktop/unstable/vte/debian/changelog (original)
+++ desktop/unstable/vte/debian/changelog Mon Oct 13 08:49:21 2008
@@ -6,6 +6,10 @@
 
   [ Loic Minier ]
   * Don't overwrite DEB_FIXPERMS_EXCLUDE and DEB_DH_MAKESHLIBS_ARGS_ALL.
+
+  [ Josselin Mouette ]
+  * 01_anjuta_hang.patch: new patch, stolen from upstream. Fix hangs in 
+    Geany and Anjuta. Closes: #498295.
 
  -- Josselin Mouette <joss at debian.org>  Wed, 20 Aug 2008 14:16:39 +0200
 

Added: desktop/unstable/vte/debian/patches/01_anjuta_hang.patch
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/vte/debian/patches/01_anjuta_hang.patch?rev=17258&op=file
==============================================================================
--- desktop/unstable/vte/debian/patches/01_anjuta_hang.patch (added)
+++ desktop/unstable/vte/debian/patches/01_anjuta_hang.patch Mon Oct 13 08:49:21 2008
@@ -1,0 +1,29 @@
+Debian #498295
+GNOME #538344
+Upstream commit r2090
+
+--- trunk/src/vte.c	2008/08/25 14:57:20	2089
++++ trunk/src/vte.c	2008/09/01 11:14:44	2090
+@@ -3171,7 +3171,8 @@
+ _vte_terminal_connect_pty_write(VteTerminal *terminal)
+ {
+ 	if (terminal->pvt->pty_channel == NULL) {
+-		return;
++		terminal->pvt->pty_channel =
++			g_io_channel_unix_new(terminal->pvt->pty_master);
+ 	}
+ 
+ 	if (terminal->pvt->pty_output_source == VTE_INVALID_SOURCE) {
+@@ -3238,10 +3239,12 @@
+ 	/* Close any existing ptys. */
+ 	if (terminal->pvt->pty_channel != NULL) {
+ 		g_io_channel_unref (terminal->pvt->pty_channel);
++		terminal->pvt->pty_channel = NULL;
+ 	}
+ 	if (terminal->pvt->pty_master != -1) {
+ 		_vte_pty_close(terminal->pvt->pty_master);
+ 		close(terminal->pvt->pty_master);
++		terminal->pvt->pty_master = -1;
+ 	}
+ 
+ 	/* Open the new pty. */