rpms/Terminal/devel Terminal-0.2.12-alwaysshowtabs.patch, NONE, 1.1 Terminal.spec, 1.25, 1.26

[Kevin Fenzi]

Author: kevin

Update of /cvs/extras/rpms/Terminal/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv10488

Modified Files:
	Terminal.spec 
Added Files:
	Terminal-0.2.12-alwaysshowtabs.patch 
Log Message:
Add patch for MiscAlwaysShowTabs segfault (fixes bug 502135)


Terminal-0.2.12-alwaysshowtabs.patch:

--- NEW FILE Terminal-0.2.12-alwaysshowtabs.patch ---
--- terminal.orig/terminal-window.c	2009/06/27 19:21:52	30083
+++ terminal/terminal-window.c	2009/06/27 19:22:23	30084
@@ -914,18 +914,21 @@
   /* 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);
     }


Index: Terminal.spec
===================================================================
RCS file: /cvs/extras/rpms/Terminal/devel/Terminal.spec,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -p -r1.25 -r1.26
--- Terminal.spec	20 Apr 2009 03:06:54 -0000	1.25
+++ Terminal.spec	29 Jun 2009 15:21:50 -0000	1.26
@@ -1,10 +1,11 @@
 Summary: X Terminal Emulator
 Name: Terminal
 Version: 0.2.12
-Release: 1%{?dist}
+Release: 2%{?dist}
 License: GPLv2+
 URL: http://www.xfce.org/projects/terminal/
 Source0: http://www.xfce.org/archive/xfce-4.6.1/src/Terminal-%{version}.tar.bz2
+Patch0: Terminal-0.2.12-alwaysshowtabs.patch
 Group: User Interface/Desktops
 Buildroot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires: vte-devel
@@ -21,6 +22,7 @@ it unique among X terminal emulators. 
 
 %prep
 %setup -q
+%patch0 -p1
 
 %build
 %configure
@@ -62,6 +64,9 @@ fi
 %{_libexecdir}/TerminalHelp
 
 %changelog
+* Sun Apr 28 2009 Kevin Fenzi <kevin at tummy.com> - 0.2.12-2
+- Add patch for MiscAlwaysShowTabs segfault (fixes bug 502135)
+
 * Sun Apr 19 2009 Kevin Fenzi <kevin at tummy.com> - 0.2.12-1
 - Update to 0.2.12