rpms/manedit/devel manedit-0.8.1-segv-when-press-new.patch, NONE, 1.1 manedit.spec, 1.18, 1.19

[Mamoru Tasaka (mtasaka)]

Author: mtasaka

Update of /cvs/extras/rpms/manedit/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19416/devel

Modified Files:
	manedit.spec 
Added Files:
	manedit-0.8.1-segv-when-press-new.patch 
Log Message:
* Mon Dec 17 2007 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 0.8.1-2
- Revert change from 0.7.1 to fix segv when pushed new button
  (bug 356171)


manedit-0.8.1-segv-when-press-new.patch:

--- NEW FILE manedit-0.8.1-segv-when-press-new.patch ---
--- manedit-0.8.1/manedit/editorcb.c.segv	2007-12-17 13:51:25.000000000 +0900
+++ manedit-0.8.1/manedit/editorcb.c	2007-12-17 14:37:59.000000000 +0900
@@ -4597,11 +4597,16 @@
  */
 void EditorButtonMenuMapCB(GtkButton *button, gpointer data)
 {
+	static gboolean reenterant = FALSE;
 	GtkWidget *w;
 	editor_struct *editor = EDITOR(data);
 	if((button == NULL) || (editor == NULL))
 	    return;
 
+	if(reenterant)
+		return;
+	else
+		reenterant = TRUE;
 #define DO_BUTTON_PRESSED	\
 { \
  if(button != NULL) \
@@ -4666,6 +4671,8 @@
 	}
 
 #undef DO_BUTTON_PRESSED
+
+	reenterant = FALSE;
 }
 
 /*


Index: manedit.spec
===================================================================
RCS file: /cvs/extras/rpms/manedit/devel/manedit.spec,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- manedit.spec	21 Aug 2007 18:34:02 -0000	1.18
+++ manedit.spec	17 Dec 2007 05:49:06 -0000	1.19
@@ -1,6 +1,6 @@
 Name:           manedit
 Version:        0.8.1
-Release:        1%{?dist}.3
+Release:        2%{?dist}
 Summary:        UNIX Manual Page Editor
 
 Group:          Development/Tools
@@ -12,6 +12,7 @@
 Patch0:         manedit-0.7.1-makefile.patch
 Patch1:         manedit-0.8.1-allow-more_section.patch
 Patch2:         manedit-0.7.1-manbase.patch
+Patch3:		manedit-0.8.1-segv-when-press-new.patch
 
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 # This is gtk+ package
@@ -37,6 +38,7 @@
 %patch0 -p1 -b .fedora
 %patch1 -p1 -b .section
 %patch2 -p1 -b .manbase
+%patch3 -p1 -b .segv_pressed_new
 
 %build
 # I cannot understand this configure!!
@@ -108,6 +110,10 @@
 %{_mandir}/man1/%{name}.1*
 
 %changelog
+* Mon Dec 17 2007 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 0.8.1-2
+- Revert change from 0.7.1 to fix segv when pushed new button
+  (bug 356171)
+
 * Wed Aug 22 2007 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 0.8.1-1.dist.3
 - Mass rebuild (buildID or binutils issue)