rpms/geeqie/F-10 geeqie-1.0alpha2-vf_notify_cb.patch, NONE, 1.1 geeqie.spec, 1.6, 1.7

[Michael Schwendt]

Author: mschwendt

Update of /cvs/pkgs/rpms/geeqie/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv17108

Modified Files:
	geeqie.spec 
Added Files:
	geeqie-1.0alpha2-vf_notify_cb.patch 
Log Message:
* Tue Feb 10 2009 Michael Schwendt <mschwendt at fedoraproject.org> - 1.0-0.9.alpha2
- fix vf_notify_cb crash (#484912)


geeqie-1.0alpha2-vf_notify_cb.patch:

--- NEW FILE geeqie-1.0alpha2-vf_notify_cb.patch ---
diff -Nur geeqie-1.0alpha2-orig/src/view_file.c geeqie-1.0alpha2/src/view_file.c
--- geeqie-1.0alpha2-orig/src/view_file.c	2008-07-30 22:01:32.000000000 +0200
+++ geeqie-1.0alpha2/src/view_file.c	2009-02-10 21:56:21.000000000 +0100
@@ -771,6 +771,14 @@
 }
 
 
+void vf_refresh_idle(ViewFile *vf)
+{
+	if (vf->refresh_idle_id == -1)
+		{
+		vf->refresh_idle_id = g_idle_add(vf_refresh_idle_cb, vf);
+		}
+}
+
 void vf_notify_cb(FileData *fd, NotifyType type, gpointer data)
 {
 	ViewFile *vf = data;
@@ -778,6 +786,8 @@
 
 	if (vf->refresh_idle_id != -1) return;
 	
+	if (!vf->dir_fd) return;
+
 	refresh = (fd == vf->dir_fd);
 
 	if (!refresh)
@@ -804,9 +814,9 @@
 			}
 		}
 	
-	if (refresh && vf->refresh_idle_id == -1)
+	if (refresh)
 		{
-		vf->refresh_idle_id = g_idle_add(vf_refresh_idle_cb, vf);
+		vf_refresh_idle(vf);
 		}
 }
 


Index: geeqie.spec
===================================================================
RCS file: /cvs/pkgs/rpms/geeqie/F-10/geeqie.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- geeqie.spec	15 Aug 2008 07:51:49 -0000	1.6
+++ geeqie.spec	10 Feb 2009 21:10:46 -0000	1.7
@@ -3,7 +3,7 @@
 Summary: Image browser and viewer
 Name: geeqie
 Version: 1.0
-Release: 0.8.alpha2%{?dist}
+Release: 0.9.alpha2%{?dist}
 License: GPLv3
 Group: User Interface/X
 Source: http://dl.sf.net/sourceforge/geeqie/%{name}-%{upstreamversion}.tar.gz
@@ -16,6 +16,7 @@
 Patch5: geeqie-1.0alpha2-remote-blank.patch
 # on version upgrade: remove this!
 Patch6: geeqie-1.0alpha2-float-layout.patch
+Patch7: geeqie-1.0alpha2-vf_notify_cb.patch
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-buildroot-%(%{__id_u} -n)
 URL: http://geeqie.sourceforge.net/
 BuildRequires: gtk2-devel >= 2.4.0
@@ -48,6 +49,7 @@
 %patch4 -p1 -b .gcc-warn
 %patch5 -p1 -b .remote-blank
 %patch6 -p1 -b .float-layout
+%patch7 -p1 -b .vf_notify_cb
 
 
 %build
@@ -96,6 +98,9 @@
 
 
 %changelog
+* Tue Feb 10 2009 Michael Schwendt <mschwendt at fedoraproject.org> - 1.0-0.9.alpha2
+- fix vf_notify_cb crash (#484912)
+
 * Tue Aug 12 2008 Michael Schwendt <mschwendt at fedoraproject.org> - 1.0-0.8.alpha2
 - fix float layout for --blank mode