r49367 - in /desktop/unstable/gnome-terminal/debian: changelog patches/git_notebook-avoid-crash-on-tab-DND.patch patches/series

[ah at users.alioth.debian.org]

Author: ah
Date: Mon Jul 25 18:51:00 2016
New Revision: 49367

URL: http://svn.debian.org/wsvn/pkg-gnome/?sc=1&rev=49367
Log:
Add debian/patches/git_notebook-avoid-crash-on-tab-DND.patch
from upstream git. (Closes: #825818)

Added:
    desktop/unstable/gnome-terminal/debian/patches/git_notebook-avoid-crash-on-tab-DND.patch
Modified:
    desktop/unstable/gnome-terminal/debian/changelog
    desktop/unstable/gnome-terminal/debian/patches/series

Modified: desktop/unstable/gnome-terminal/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gnome-terminal/debian/changelog?rev=49367&op=diff
==============================================================================
--- desktop/unstable/gnome-terminal/debian/changelog	[utf-8] (original)
+++ desktop/unstable/gnome-terminal/debian/changelog	[utf-8] Mon Jul 25 18:51:00 2016
@@ -1,3 +1,10 @@
+gnome-terminal (3.20.2-2) unstable; urgency=medium
+
+  * Add debian/patches/git_notebook-avoid-crash-on-tab-DND.patch
+    from upstream git. (Closes: #825818)
+
+ -- Andreas Henriksson <andreas at fatal.se>  Mon, 25 Jul 2016 20:47:13 +0200
+
 gnome-terminal (3.20.2-1) unstable; urgency=medium
 
   * New upstream release.

Added: desktop/unstable/gnome-terminal/debian/patches/git_notebook-avoid-crash-on-tab-DND.patch
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gnome-terminal/debian/patches/git_notebook-avoid-crash-on-tab-DND.patch?rev=49367&op=file
==============================================================================
--- desktop/unstable/gnome-terminal/debian/patches/git_notebook-avoid-crash-on-tab-DND.patch	(added)
+++ desktop/unstable/gnome-terminal/debian/patches/git_notebook-avoid-crash-on-tab-DND.patch	[utf-8] Mon Jul 25 18:51:00 2016
@@ -0,0 +1,38 @@
+From 85b448f7c9e219e82d4d8abafe405d73349c08c1 Mon Sep 17 00:00:00 2001
+From: Andreas Henriksson <andreas at fatal.se>
+Date: Mon, 25 Jul 2016 19:38:18 +0200
+Subject: [PATCH] notebook: avoid crash on tab DND
+
+See "gtk_notebook_detach_tab" API documentation. Using it instead
+of gtk_container_remove avoids an assertion crash in gtk+ when
+dragging and dropping a tab between terminal windows.
+
+See also original bug report at
+https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=825818
+
+https://bugzilla.gnome.org/show_bug.cgi?id=769161
+---
+ src/terminal-notebook.c | 5 +++++
+ 1 file changed, 5 insertions(+)
+
+diff --git a/src/terminal-notebook.c b/src/terminal-notebook.c
+index 9d488fc..b054676 100644
+--- a/src/terminal-notebook.c
++++ b/src/terminal-notebook.c
+@@ -152,8 +152,13 @@ terminal_notebook_remove_screen (TerminalMdiContainer *container,
+   update_tab_visibility (notebook, -1);
+ 
+   screen_container = terminal_screen_container_get_from_screen (screen);
++#if GTK_CHECK_VERSION(3, 16, 0)
++  gtk_notebook_detach_tab (GTK_NOTEBOOK (notebook),
++                           GTK_WIDGET (screen_container));
++#else
+   gtk_container_remove (GTK_CONTAINER (notebook),
+                         GTK_WIDGET (screen_container));
++#endif
+ }
+ 
+ static TerminalScreen *
+-- 
+2.8.1
+

Modified: desktop/unstable/gnome-terminal/debian/patches/series
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gnome-terminal/debian/patches/series?rev=49367&op=diff
==============================================================================
--- desktop/unstable/gnome-terminal/debian/patches/series	[utf-8] (original)
+++ desktop/unstable/gnome-terminal/debian/patches/series	[utf-8] Mon Jul 25 18:51:00 2016
@@ -5,3 +5,4 @@
 Provide-fallback-for-reading-current-directory-if-OS.patch
 Fix-chunked-resize-and-geometry-option.patch
 Replace-no-op-gtk_window_resize_to_geometry-by-calcu.patch
+git_notebook-avoid-crash-on-tab-DND.patch