rpms/comix/devel comix-4.0.3-filechooser.patch, 1.1, 1.2 comix.spec, 1.24, 1.25

[Mamoru Tasaka]

Author: mtasaka

Update of /cvs/extras/rpms/comix/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv10029

Modified Files:
	comix-4.0.3-filechooser.patch comix.spec 
Log Message:
* Sat Feb 28 2009 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 4.0.3-3
- Use upstreamed patch for filechooser issue


comix-4.0.3-filechooser.patch:

Index: comix-4.0.3-filechooser.patch
===================================================================
RCS file: /cvs/extras/rpms/comix/devel/comix-4.0.3-filechooser.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- comix-4.0.3-filechooser.patch	23 Feb 2009 06:54:54 -0000	1.1
+++ comix-4.0.3-filechooser.patch	28 Feb 2009 15:24:42 -0000	1.2
@@ -1,21 +1,39 @@
---- src/filechooser.py.debug	2009-02-16 01:44:39.000000000 +0900
-+++ src/filechooser.py	2009-02-23 15:29:36.000000000 +0900
-@@ -195,9 +195,12 @@
+Index: src/filechooser.py
+===================================================================
+--- src/filechooser.py	(revision 307)
++++ src/filechooser.py	(revision 309)
+@@ -191,13 +191,16 @@
+             self.filechooser.set_filter(filters[
+                 prefs['last filter in main filechooser']])
+         except:
+-            pass
++            self.filechooser.set_filter(filters[0])
  
      def files_chosen(self, paths):
          if paths:
 -            current_filter_index = self.filechooser.list_filters().index(
 -                self.filechooser.get_filter())
 -            prefs['last filter in main filechooser'] = current_filter_index
-+            try:
-+                current_filter_index = self.filechooser.list_filters().index(
++            try: # For some reason this fails sometimes (GTK+ bug?)
++                filter_index = self.filechooser.list_filters().index(
 +                    self.filechooser.get_filter())
-+                prefs['last filter in main filechooser'] = current_filter_index
++                prefs['last filter in main filechooser'] = filter_index
 +            except:
 +                pass
              _close_main_filechooser_dialog()
              self._window.file_handler.open_file(paths[0])
          else:
+@@ -235,8 +238,8 @@
+         try:
+             self.filechooser.set_filter(filters[
+                 prefs['last filter in library filechooser']])
+-        except:
+-            pass
++        except Exception:
++            self.filechooser.set_filter(filters[1])
+     
+     def _set_collection_name(self, *args):
+         """Set the text in the ComboBoxEntry to the name of the current
 @@ -255,9 +258,12 @@
              else:
                  prefs['auto add books into collections'] = False
@@ -23,11 +41,11 @@
 -            current_filter_index = self.filechooser.list_filters().index(
 -                self.filechooser.get_filter())
 -            prefs['last filter in library filechooser'] = current_filter_index
-+            try:
-+                current_filter_index = self.filechooser.list_filters().index(
++            try: # For some reason this fails sometimes (GTK+ bug?)
++                filter_index = self.filechooser.list_filters().index(
 +                    self.filechooser.get_filter())
-+                prefs['last filter in library filechooser'] = current_filter_index
-+            except:
++                prefs['last filter in library filechooser'] = filter_index
++            except Exception:
 +                pass
              close_library_filechooser_dialog()
              self._library.add_books(paths, collection_name)


Index: comix.spec
===================================================================
RCS file: /cvs/extras/rpms/comix/devel/comix.spec,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -r1.24 -r1.25
--- comix.spec	23 Feb 2009 22:10:58 -0000	1.24
+++ comix.spec	28 Feb 2009 15:24:42 -0000	1.25
@@ -8,7 +8,7 @@
 %define		comix4		1
 
 %undefine		ifalpha		
-%define		fedorarel	2
+%define		fedorarel	3
 
 Name:		comix
 Version:	%{mainver}
@@ -23,7 +23,7 @@
 %else
 Source0:	http://downloads.sourceforge.net/%{name}/%{name}-%{version}.tar.gz
 %endif
-# Need contact with upstream
+# Use upstreamed patch
 Patch0:		comix-4.0.3-filechooser.patch
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
@@ -182,6 +182,9 @@
 
 
 %changelog
+* Sat Feb 28 2009 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 4.0.3-3
+- Use upstreamed patch for filechooser issue
+
 * Tue Feb 24 2009 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 4.0.3-2
 - F-11: Mass rebuild