rpms/wallpapoz/F-11 wallpapoz-0.4.1-rev92-noitem_selected.patch, NONE, 1.1 wallpapoz-0.4.1-rev92-paste-initialization.patch, NONE, 1.1 wallpapoz.spec, 1.26, 1.27
Mamoru Tasaka
mtasaka at fedoraproject.org
Sun Feb 7 19:50:30 UTC 2010
- Previous message: rpms/wallpapoz wallpapoz-0.4.1-rev92-noitem_selected.patch, NONE, 1.1 wallpapoz-0.4.1-rev92-paste-initialization.patch, NONE, 1.1
- Next message: rpms/wallpapoz/F-12 wallpapoz-0.4.1-rev92-noitem_selected.patch, NONE, 1.1 wallpapoz-0.4.1-rev92-paste-initialization.patch, NONE, 1.1 wallpapoz.spec, 1.29, 1.30
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
Author: mtasaka
Update of /cvs/extras/rpms/wallpapoz/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv23549/F-11
Modified Files:
wallpapoz.spec
Added Files:
wallpapoz-0.4.1-rev92-noitem_selected.patch
wallpapoz-0.4.1-rev92-paste-initialization.patch
Log Message:
* Mon Feb 8 2010 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 0.4.1-14.svn92_trunk
- Check if the selected item is really a directory on directory
chooser dialog (bug 549219)
- Avoid backtrace in case no item is selected yet (bug 555181)
- Avoid backtrace when trying to paste when no item is copyed yet
wallpapoz-0.4.1-rev92-noitem_selected.patch:
wallpapoz | 6 ++++++
1 file changed, 6 insertions(+)
--- NEW FILE wallpapoz-0.4.1-rev92-noitem_selected.patch ---
--- wallpapoz-0.4.1-svn92_trunk/src/wallpapoz.noselect 2010-02-08 02:51:56.000000000 +0900
+++ wallpapoz-0.4.1-svn92_trunk/src/wallpapoz 2010-02-08 03:57:03.000000000 +0900
@@ -213,6 +213,12 @@
# how many of selection do we have
length_of_path_list = len(pathlist)
+ # Well, it seems that in some cases no item is selected...
+ # (RedHat bug 555181)
+ if (not pathlist) or (not length_of_path_list) :
+ # simply ignore
+ return None
+
# add wallpapers, paste operation
# multiple selection are okay as long as in one workspace, parent and child node togeter are okay, these multiple selection
if type_selection == "wallpaper" or type_selection == "paste":
wallpapoz-0.4.1-rev92-paste-initialization.patch:
wallpapoz | 6 ++++++
1 file changed, 6 insertions(+)
--- NEW FILE wallpapoz-0.4.1-rev92-paste-initialization.patch ---
--- wallpapoz-0.4.1-svn92_trunk/src/wallpapoz.paste_init 2010-02-08 04:32:34.000000000 +0900
+++ wallpapoz-0.4.1-svn92_trunk/src/wallpapoz 2010-02-08 04:21:17.000000000 +0900
@@ -94,6 +94,9 @@
# create the pop up menu when we right click the treeview widget
self.set_up_popup_menu()
+ # initially no item is pasted
+ self.selected_iter = None
+
# our signal and who handle that signal
dic = { "on_wallpapoz_window_destroy" : self.destroy,
"on_treeview_cursor_changed" : self.treeview_selection_changed,
@@ -903,6 +906,9 @@
if position_iter == None:
return
+ # At first self.selected_iter is None
+ if not self.selected_iter:
+ return
# check first. User can not cut all wallpapers in workspace. Every workspace must have at least one wallpaper
temp_iter_list = []
Index: wallpapoz.spec
===================================================================
RCS file: /cvs/extras/rpms/wallpapoz/F-11/wallpapoz.spec,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -p -r1.26 -r1.27
--- wallpapoz.spec 7 Feb 2010 18:03:29 -0000 1.26
+++ wallpapoz.spec 7 Feb 2010 19:50:30 -0000 1.27
@@ -8,7 +8,7 @@
%define mainver 0.4.1
%undefine betaver
%define svnver svn92_trunk
-%define fedorarel 13
+%define fedorarel 14
%define rel %{?betaver:0.}%{fedorarel}%{?svnver:.%svnver}%{?betaver:.%betaver}
@@ -36,6 +36,10 @@ Patch1: wallpapoz-0.4.1-rev92-pa
# Check if selected item is really a directory when adding directory
# bug 549219
Patch2: wallpapoz-0.4.1-rev92-dircheck.patch
+# Avoid backtrace in case no item is selected yet (bug 555181)
+Patch3: wallpapoz-0.4.1-rev92-noitem_selected.patch
+# Intialization for pasting selected items
+Patch4: wallpapoz-0.4.1-rev92-paste-initialization.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildArch: noarch
@@ -70,6 +74,8 @@ wallpapers for different workspaces or v
%patch0 -p1 -b .compiz
%patch1 -p1 -b .path
%patch2 -p1 -b .dircheck
+%patch3 -p1 -b .noitem
+%patch4 -p1 -b .patch_init
%build
@@ -135,9 +141,11 @@ desktop-file-install \
%{_datadir}/applications/fedora-%{name}.desktop
%changelog
-* Mon Feb 8 2010 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 0.4.1-13.svn92_trunk
+* Mon Feb 8 2010 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 0.4.1-14.svn92_trunk
- Check if the selected item is really a directory on directory
chooser dialog (bug 549219)
+- Avoid backtrace in case no item is selected yet (bug 555181)
+- Avoid backtrace when trying to paste when no item is copyed yet
* Thu Feb 4 2010 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 0.4.1-12.svn92_trunk
- Some fixes for daemon_wallpapoz under compiz
- Previous message: rpms/wallpapoz wallpapoz-0.4.1-rev92-noitem_selected.patch, NONE, 1.1 wallpapoz-0.4.1-rev92-paste-initialization.patch, NONE, 1.1
- Next message: rpms/wallpapoz/F-12 wallpapoz-0.4.1-rev92-noitem_selected.patch, NONE, 1.1 wallpapoz-0.4.1-rev92-paste-initialization.patch, NONE, 1.1 wallpapoz.spec, 1.29, 1.30
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
More information about the scm-commits
mailing list