rpms/wallpapoz/F-12 wallpapoz-0.4.1-rev92-nonutf8-directory.patch, NONE, 1.1 wallpapoz.spec, 1.37, 1.38

[Mamoru Tasaka]

Author: mtasaka

Update of /cvs/extras/rpms/wallpapoz/F-12
In directory cvs01.phx2.fedoraproject.org:/tmp/cvs-serv1458/F-12

Modified Files:
	wallpapoz.spec 
Added Files:
	wallpapoz-0.4.1-rev92-nonutf8-directory.patch 
Log Message:
* Sun Jun 13 2010 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 0.4.1-22.svn92_trunk
- Make wallpapoz gui ignore non-utf8 directory correctly
  (filechooser_widget.get_filename can return NoneType, bug 603351)


wallpapoz-0.4.1-rev92-nonutf8-directory.patch:
 wallpapoz |    6 ++++++
 1 file changed, 6 insertions(+)

--- NEW FILE wallpapoz-0.4.1-rev92-nonutf8-directory.patch ---
--- wallpapoz-0.4.1-svn92_trunk/src/wallpapoz.nonutf8	2010-06-13 01:21:08.000000000 +0900
+++ wallpapoz-0.4.1-svn92_trunk/src/wallpapoz	2010-06-13 01:39:08.000000000 +0900
@@ -543,6 +543,9 @@
 	num_of_child = self.store.iter_n_children(iter)
 	# what is the directory?
 	cur_dir = filechooser_widget.get_filename()
+	# get_filename can return NoneType (for non-UTF8 directory)
+	if not cur_dir:
+	  return
         # if recursive, we use walktree
 	if recursive_widget.get_active():
 	  # looping with walktree method
@@ -587,6 +590,9 @@
 	new_index = self.store.get_value(next_iter, 0) + 1
 	# what is the directory?
 	cur_dir = filechooser_widget.get_filename()
+	# get_filename can return NoneType (for non-UTF8 directory)
+	if not cur_dir:
+	  return
         # if recursive, we use walktree
 	if recursive_widget.get_active():
 	  # looping with walktree method


Index: wallpapoz.spec
===================================================================
RCS file: /cvs/extras/rpms/wallpapoz/F-12/wallpapoz.spec,v
retrieving revision 1.37
retrieving revision 1.38
diff -u -p -r1.37 -r1.38
--- wallpapoz.spec	11 Jun 2010 19:44:36 -0000	1.37
+++ wallpapoz.spec	12 Jun 2010 17:17:47 -0000	1.38
@@ -8,7 +8,7 @@
 %define         mainver         0.4.1
 %undefine         betaver
 %define         svnver          svn92_trunk
-%define         fedorarel       21
+%define         fedorarel       22
 
 %define         rel             %{?betaver:0.}%{fedorarel}%{?svnver:.%svnver}%{?betaver:.%betaver}
 
@@ -40,8 +40,12 @@ Patch4:         wallpapoz-0.4.1-rev92-pa
 Patch5:         wallpapoz-0.4.1-rev92-kill-daemon-without-x.patch
 # Kill other daemon_wallpapoz if running
 Patch6:         wallpapoz-0.4.1-rev92-kill-multiple-daemon.patch
-# bug 602921, handle animated image file
+# Make wallpapoz gui handle animated image file
+# bug 602921
 Patch7:		wallpapoz-0.4.1-rev92-animated-image.patch
+# Non-utf8 directory can return NoneType with filechooser_widget.get_filename
+# bug 603351
+Patch8:		wallpapoz-0.4.1-rev92-nonutf8-directory.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildArch:      noarch
@@ -78,6 +82,7 @@ wallpapers for different workspaces or v
 %patch5 -p1 -b .kill_nox
 %patch6 -p1 -b .kill_multi
 %patch7 -p1 -b .anime
+%patch8 -p1 -b .nonutf8
 
 %build
 
@@ -124,8 +129,12 @@ desktop-file-install \
 %{_datadir}/applications/fedora-%{name}.desktop
 
 %changelog
+* Sun Jun 13 2010 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 0.4.1-22.svn92_trunk
+- Make wallpapoz gui ignore non-utf8 directory correctly
+  (filechooser_widget.get_filename can return NoneType, bug 603351)
+
 * Sat Jun 12 2010 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 0.4.1-21.svn92_trunk
-- Handle animated image file (bug 602921)
+- Make wallpapoz gui handle animated image file (bug 602921)
 
 * Thu Mar 18 2010 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 0.4.1-20.svn92_trunk
 - Handle another potentially race condition under compiz (may fix 573642)