rpms/geeqie/devel geeqie-1.0alpha3-metadata-exit.patch, NONE, 1.1 geeqie.spec, 1.14, 1.15

[Michael Schwendt]

Author: mschwendt

Update of /cvs/pkgs/rpms/geeqie/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv32431

Modified Files:
	geeqie.spec 
Added Files:
	geeqie-1.0alpha3-metadata-exit.patch 
Log Message:
* Sat Feb  7 2009 Michael Schwendt <mschwendt at fedoraproject.org> - 1.0-0.14.alpha3
- fetch src/utilops.c change from svn 1385 for metadata crash-fix


geeqie-1.0alpha3-metadata-exit.patch:

--- NEW FILE geeqie-1.0alpha3-metadata-exit.patch ---
diff -Nur geeqie-1.0alpha3-orig/src/utilops.c geeqie-1.0alpha3/src/utilops.c
--- geeqie-1.0alpha3-orig/src/utilops.c	2009-01-25 19:53:32.000000000 +0100
+++ geeqie-1.0alpha3/src/utilops.c	2009-02-08 00:01:10.000000000 +0100
@@ -589,8 +589,16 @@
 {
 	UtilityData *ud = data;
 
-	/* this is removed when ud is destroyed */
-	if (ud->perform_idle_id == -1) ud->perform_idle_id = g_idle_add(file_util_perform_ci_internal, ud);
+	if (ud->perform_idle_id == -1) 
+		{
+		/* this function was called directly
+		   just setup idle callback and wait until we are called again
+		*/
+		
+		/* this is removed when ud is destroyed */
+		ud->perform_idle_id = g_idle_add(file_util_perform_ci_internal, ud);
+		return TRUE;
+		}
 
 	g_assert(ud->flist);
 	


Index: geeqie.spec
===================================================================
RCS file: /cvs/pkgs/rpms/geeqie/devel/geeqie.spec,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- geeqie.spec	28 Jan 2009 10:24:08 -0000	1.14
+++ geeqie.spec	7 Feb 2009 23:09:07 -0000	1.15
@@ -3,7 +3,7 @@
 Summary: Image browser and viewer
 Name: geeqie
 Version: 1.0
-Release: 0.13.alpha3%{?dist}
+Release: 0.14.alpha3%{?dist}
 License: GPLv3
 Group: User Interface/X
 # svn + autogen
@@ -16,6 +16,7 @@
 Patch4: geeqie-1.0alpha2-gcc-warn.patch
 Patch5: geeqie-1.0alpha3-lirc.patch
 Patch6: geeqie-1.0alpha3-docdirs.patch
+Patch7: geeqie-1.0alpha3-metadata-exit.patch
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-buildroot-%(%{__id_u} -n)
 URL: http://geeqie.sourceforge.net/
 BuildRequires: gtk2-devel
@@ -48,6 +49,7 @@
 %patch4 -p1 -b .gcc-warn
 %patch5 -p1 -b .lirc
 %patch6 -p1 -b .docdirs
+%patch7 -p1 -b .metadata-exit
 
 
 %build
@@ -97,6 +99,9 @@
 
 
 %changelog
+* Sat Feb  7 2009 Michael Schwendt <mschwendt at fedoraproject.org> - 1.0-0.14.alpha3
+- fetch src/utilops.c change from svn 1385 for metadata crash-fix
+
 * Wed Jan 28 2009 Michael Schwendt <mschwendt at fedoraproject.org> - 1.0-0.13.alpha3
 - ignore .helpdir/.htmldir values in geeqierc to fix "Help"
 - add --enable-lirc again to build with LIRC