[Pkg-xfce-commits] r3232 - in desktop/trunk/xfce4-terminal/debian: . patches

[Yves-Alexis Perez]

Author: corsac
Date: 2009-05-14 05:48:09 +0000 (Thu, 14 May 2009)
New Revision: 3232

Added:
   desktop/trunk/xfce4-terminal/debian/patches/03_terminal-nil-value-fix+always_show_tabs-fix.patch
Modified:
   desktop/trunk/xfce4-terminal/debian/changelog
Log:
* debian/patches:
  - 03_terminal-nil-value-fix+always_show_tabs-fix added, fix segfault
    when using MiscAlwaysShowTab=TRUE.                        closes: #528318

Modified: desktop/trunk/xfce4-terminal/debian/changelog
===================================================================
--- desktop/trunk/xfce4-terminal/debian/changelog	2009-05-10 19:56:57 UTC (rev 3231)
+++ desktop/trunk/xfce4-terminal/debian/changelog	2009-05-14 05:48:09 UTC (rev 3232)
@@ -1,3 +1,11 @@
+xfce4-terminal (0.2.12-2) UNRELEASED; urgency=low
+
+  * debian/patches:
+    - 03_terminal-nil-value-fix+always_show_tabs-fix added, fix segfault
+      when using MiscAlwaysShowTab=TRUE.                        closes: #528318
+
+ -- Yves-Alexis Perez <corsac at debian.org>  Thu, 14 May 2009 07:38:44 +0200
+
 xfce4-terminal (0.2.12-1) unstable; urgency=low
 
   * New upstream release.

Added: desktop/trunk/xfce4-terminal/debian/patches/03_terminal-nil-value-fix+always_show_tabs-fix.patch
===================================================================
--- desktop/trunk/xfce4-terminal/debian/patches/03_terminal-nil-value-fix+always_show_tabs-fix.patch	                        (rev 0)
+++ desktop/trunk/xfce4-terminal/debian/patches/03_terminal-nil-value-fix+always_show_tabs-fix.patch	2009-05-14 05:48:09 UTC (rev 3232)
@@ -0,0 +1,31 @@
+Index: terminal/terminal-window.c
+===================================================================
+--- terminal/terminal-window.c	(révision 26581)
++++ terminal/terminal-window.c	(copie de travail)
+@@ -914,18 +914,20 @@
+   /* change the visibility if the new status differs */
+   if (((npages > 1) != tabs_shown) || (always_show_tabs && !tabs_shown))
+     {
++      /* show or hide the tabs */
++      gtk_notebook_set_show_tabs (GTK_NOTEBOOK (window->notebook), always_show_tabs | !tabs_shown);
++
++      /* don't focus the notebook */
++      GTK_WIDGET_UNSET_FLAGS (window->notebook, GTK_CAN_FOCUS);
++
+       /* get active screen */
+       active = terminal_window_get_active (window);
++	  if (G_UNLIKELY (active == NULL))
++		return;
+ 
+       /* get screen grid size */
+       terminal_screen_get_size (active, &grid_width, &grid_height);
+ 
+-      /* show or hide the tabs */
+-      gtk_notebook_set_show_tabs (GTK_NOTEBOOK (window->notebook), !tabs_shown);
+-
+-      /* don't focus the notebook */
+-      GTK_WIDGET_UNSET_FLAGS (window->notebook, GTK_CAN_FOCUS);
+-
+       /* resize the window */
+       terminal_screen_force_resize_window (active, GTK_WINDOW (window), grid_width, grid_height);
+     }