rpms/jabbim/devel jabbim-0.4-stringlists-in-QVariants.diff, 1.1, 1.2 jabbim.spec, 1.23, 1.24
Michal Schmidt
michich at fedoraproject.org
Mon Sep 15 20:35:36 UTC 2008
Author: michich
Update of /cvs/pkgs/rpms/jabbim/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv15297
Modified Files:
jabbim-0.4-stringlists-in-QVariants.diff jabbim.spec
Log Message:
* Mon Sep 15 2008 Michal Schmidt <mschmidt at redhat.com> - 0.4.3-3
- Fix mistaken parentheses in the previous patch.
jabbim-0.4-stringlists-in-QVariants.diff:
Index: jabbim-0.4-stringlists-in-QVariants.diff
===================================================================
RCS file: /cvs/pkgs/rpms/jabbim/devel/jabbim-0.4-stringlists-in-QVariants.diff,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- jabbim-0.4-stringlists-in-QVariants.diff 15 Sep 2008 20:17:01 -0000 1.1
+++ jabbim-0.4-stringlists-in-QVariants.diff 15 Sep 2008 20:35:06 -0000 1.2
@@ -6,6 +6,7 @@
Patch created using:
find . -name '*.py' | while read f; do sed -i -e 's/QVariant(\(\[[^]]*\]\)/QVariant(QtCore.QStringList(\1)/' $f; done
+with just one hand-made fix where the regexp did the wrong thing.
diff -Nurp jabbim-0.4.3.orig/jabbim.py jabbim-0.4.3/jabbim.py
--- jabbim-0.4.3.orig/jabbim.py 2008-07-02 15:02:20.000000000 +0200
@@ -84,7 +85,7 @@
action=self.submenu.addAction(command["name"])
action.setObjectName("ad_hoc_command")
- action.setData(QtCore.QVariant([command['node'], command['name']]))
-+ action.setData(QtCore.QVariant(QtCore.QStringList([command['node']), command['name']]))
++ action.setData(QtCore.QVariant(QtCore.QStringList([command['node'], command['name']])))
button = QtGui.QPushButton(self.dialog)
button.setText(unicode(command["name"]))
#button.setObjectName(unicode(command["node"])) # ? + jid
Index: jabbim.spec
===================================================================
RCS file: /cvs/pkgs/rpms/jabbim/devel/jabbim.spec,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -r1.23 -r1.24
--- jabbim.spec 15 Sep 2008 20:17:02 -0000 1.23
+++ jabbim.spec 15 Sep 2008 20:35:06 -0000 1.24
@@ -1,6 +1,6 @@
Name: jabbim
Version: 0.4.3
-Release: 2%{?dist}
+Release: 3%{?dist}
Summary: Jabber client for mere mortals
Group: Applications/Internet
@@ -114,6 +114,9 @@
%changelog
+* Mon Sep 15 2008 Michal Schmidt <mschmidt at redhat.com> - 0.4.3-3
+- Fix mistaken parentheses in the previous patch.
+
* Mon Sep 15 2008 Michal Schmidt <mschmidt at redhat.com> - 0.4.3-2
- Doubleclicking on bookmarks did not open the chat window.
Caused by a change in PyQt in constructing QVariants from lists of strings.
More information about the fedora-extras-commits
mailing list