rpms/geeqie/devel geeqie-1.0alpha2-float-layout.patch, NONE, 1.1 geeqie.spec, 1.4, 1.5

[Michael Schwendt (mschwendt)]

Author: mschwendt

Update of /cvs/pkgs/rpms/geeqie/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13082

Modified Files:
	geeqie.spec 
Added Files:
	geeqie-1.0alpha2-float-layout.patch 
Log Message:
* Tue Aug 12 2008 Michael Schwendt <mschwendt at fedoraproject.org> - 1.0-0.8.alpha2
- fix float layout for --blank mode


geeqie-1.0alpha2-float-layout.patch:

--- NEW FILE geeqie-1.0alpha2-float-layout.patch ---
diff -Nur geeqie-1.0alpha2-orig/src/filedata.c geeqie-1.0alpha2/src/filedata.c
--- geeqie-1.0alpha2-orig/src/filedata.c	2008-07-30 22:01:32.000000000 +0200
+++ geeqie-1.0alpha2/src/filedata.c	2008-08-12 10:45:35.000000000 +0200
@@ -2083,7 +2083,9 @@
 {
 	gint count;
 
-	g_assert(file_data_monitor_pool);
+	if (!file_data_monitor_pool) {
+        return FALSE;
+    }
 	
 	count = GPOINTER_TO_INT(g_hash_table_lookup(file_data_monitor_pool, fd));
 	


Index: geeqie.spec
===================================================================
RCS file: /cvs/pkgs/rpms/geeqie/devel/geeqie.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- geeqie.spec	11 Aug 2008 18:31:06 -0000	1.4
+++ geeqie.spec	12 Aug 2008 08:51:57 -0000	1.5
@@ -3,7 +3,7 @@
 Summary: Image browser and viewer
 Name: geeqie
 Version: 1.0
-Release: 0.7.alpha2%{?dist}
+Release: 0.8.alpha2%{?dist}
 License: GPLv3
 Group: User Interface/X
 Source: http://dl.sf.net/sourceforge/geeqie/%{name}-%{upstreamversion}.tar.gz
@@ -13,6 +13,7 @@
 Patch3: geeqie-1.0alpha1-print-pagesize.patch
 Patch4: geeqie-1.0alpha2-gcc-warn.patch
 Patch5: geeqie-1.0alpha2-remote-blank.patch
+Patch6: geeqie-1.0alpha2-float-layout.patch
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-buildroot-%(%{__id_u} -n)
 URL: http://geeqie.sourceforge.net/
 BuildRequires: gtk2-devel >= 2.4.0
@@ -44,6 +45,7 @@
 %patch3 -p1 -b .print-pagesize
 %patch4 -p1 -b .gcc-warn
 %patch5 -p1 -b .remote-blank
+%patch6 -p1 -b .float-layout
 
 
 %build
@@ -92,6 +94,9 @@
 
 
 %changelog
+* Tue Aug 12 2008 Michael Schwendt <mschwendt at fedoraproject.org> - 1.0-0.8.alpha2
+- fix float layout for --blank mode
+
 * Mon Aug 11 2008 Michael Schwendt <mschwendt at fedoraproject.org> - 1.0-0.7.alpha2
 - fix options --blank and -r file: