rpms/xsane/F-12 xsane-0.997-no-file-selected.patch, 1.1, 1.2 xsane.spec, 1.82, 1.83

Nils Philippsen nphilipp at fedoraproject.org
Tue Jul 13 08:12:44 UTC 2010


Author: nphilipp

Update of /cvs/pkgs/rpms/xsane/F-12
In directory cvs01.phx2.fedoraproject.org:/tmp/cvs-serv7411

Modified Files:
	xsane-0.997-no-file-selected.patch xsane.spec 
Log Message:
don't crash if no files are selected, take two

xsane-0.997-no-file-selected.patch:
 xsane-back-gtk.c  |   20 ++++++++++++++++----
 xsane-front-gtk.c |    6 +++++-
 2 files changed, 21 insertions(+), 5 deletions(-)

Index: xsane-0.997-no-file-selected.patch
===================================================================
RCS file: /cvs/pkgs/rpms/xsane/F-12/xsane-0.997-no-file-selected.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- xsane-0.997-no-file-selected.patch	28 Jun 2010 09:10:35 -0000	1.1
+++ xsane-0.997-no-file-selected.patch	13 Jul 2010 08:12:44 -0000	1.2
@@ -1,7 +1,19 @@
 diff -up xsane-0.997/src/xsane-back-gtk.c.no-file-selected xsane-0.997/src/xsane-back-gtk.c
 --- xsane-0.997/src/xsane-back-gtk.c.no-file-selected	2002-10-02 13:05:52.000000000 +0200
-+++ xsane-0.997/src/xsane-back-gtk.c	2010-06-28 10:49:29.302391248 +0200
-@@ -1501,12 +1501,19 @@ int xsane_back_gtk_get_filename(const ch
++++ xsane-0.997/src/xsane-back-gtk.c	2010-07-13 10:02:09.468118791 +0200
+@@ -1111,6 +1111,11 @@ static void xsane_back_gtk_filetype2_cal
+ 
+   chooser_filename = gtk_file_chooser_get_filename(GTK_FILE_CHOOSER(filechooser));
+ 
++  if (!chooser_filename)
++  {
++    return;
++  }
++
+   if ((new_filetype) && (*new_filetype))
+   {
+     extension = strrchr(chooser_filename, '.');
+@@ -1501,12 +1506,19 @@ int xsane_back_gtk_get_filename(const ch
  #endif
  
      chooser_filename = gtk_file_chooser_get_filename(GTK_FILE_CHOOSER(filechooser));
@@ -27,7 +39,7 @@ diff -up xsane-0.997/src/xsane-back-gtk.
    gtk_widget_destroy(filechooser);
 diff -up xsane-0.997/src/xsane-front-gtk.c.no-file-selected xsane-0.997/src/xsane-front-gtk.c
 --- xsane-0.997/src/xsane-front-gtk.c.no-file-selected	2002-10-02 13:04:33.000000000 +0200
-+++ xsane-0.997/src/xsane-front-gtk.c	2010-06-28 10:46:31.025142803 +0200
++++ xsane-0.997/src/xsane-front-gtk.c	2010-07-13 09:59:31.005868940 +0200
 @@ -1339,7 +1339,11 @@ static void xsane_browse_filename_callba
    snprintf(windowname, sizeof(windowname), "%s %s %s", xsane.prog_name, WINDOW_OUTPUT_FILENAME, xsane.device_text);
  


Index: xsane.spec
===================================================================
RCS file: /cvs/pkgs/rpms/xsane/F-12/xsane.spec,v
retrieving revision 1.82
retrieving revision 1.83
diff -u -p -r1.82 -r1.83
--- xsane.spec	29 Jun 2010 15:21:26 -0000	1.82
+++ xsane.spec	13 Jul 2010 08:12:44 -0000	1.83
@@ -14,7 +14,7 @@
 Name: xsane
 Summary: X Window System front-end for the SANE scanner interface
 Version: 0.997
-Release: 8%{?dist}
+Release: 10%{?dist}
 Source0: http://www.xsane.org/download/%{name}-%{version}.tar.gz
 Source1: xsane.desktop
 # distro-specific: use "xdg-open" instead of "netscape" to launch help browser
@@ -28,7 +28,7 @@ Patch2: xsane-0.996-no-eula.patch
 # submitted to upstream (Oliver Rauch) via email, 2010-06-23
 Patch3: xsane-0.997-off-root-build.patch
 # https://bugzilla.redhat.com/show_bug.cgi?id=608047
-# submitted to upstream (Oliver Rauch) via email, 2010-06-28
+# submitted to upstream (Oliver Rauch) via email, 2010-07-13
 Patch4: xsane-0.997-no-file-selected.patch
 # https://bugzilla.redhat.com/show_bug.cgi?id=198422
 # submitted to upstream (Oliver Rauch) via email, 2010-06-29
@@ -154,10 +154,17 @@ fi
 
 %files common
 %defattr(-,root,root)
+%doc xsane.AUTHOR xsane.COPYING
 %dir %{_datadir}/sane
 %{_datadir}/sane/xsane
 
 %changelog
+* Tue Jul 13 2010 Nils Philippsen <nils at redhat.com> - 0.997-10
+- don't crash if no files are selected, take two
+
+* Mon Jul 12 2010 Nils Philippsen <nils at redhat.com> - 0.997-9
+- distribute license and other documentation with xsane-common
+
 * Tue Jun 29 2010 Nils Philippsen <nils at redhat.com> 0.997-8
 - support IPv6 (#198422)
 



More information about the scm-commits mailing list