rpms/kdeutils/devel kdeutils-3.5.4-kde#133122.patch, NONE, 1.1 kdeutils.spec, 1.67, 1.68

fedora-cvs-commits at redhat.com fedora-cvs-commits at redhat.com
Tue Sep 19 12:10:39 UTC 2006


Author: than

Update of /cvs/dist/rpms/kdeutils/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv18329

Modified Files:
	kdeutils.spec 
Added Files:
	kdeutils-3.5.4-kde#133122.patch 
Log Message:
fix #133122, kgpg crashes when signing


kdeutils-3.5.4-kde#133122.patch:
 kgpgeditor.cpp |    8 ++++----
 kgpgeditor.h   |    2 +-
 2 files changed, 5 insertions(+), 5 deletions(-)

--- NEW FILE kdeutils-3.5.4-kde#133122.patch ---
Index: kgpg/kgpgeditor.h
===================================================================
--- kgpg/kgpgeditor.h	(Revision 569318)
+++ kgpg/kgpgeditor.h	(Revision 569319)
@@ -104,7 +104,7 @@
 private:
 
         QStringList customDecrypt;
-	KToggleAction *encodingAction ;
+	//KToggleAction *encodingAction ;
         KURL urlselected;
         KAction* fileSave, *editUndo, *editRedo;
 	KComboBox *fontCombo;
Index: kgpg/kgpgeditor.cpp
===================================================================
--- kgpg/kgpgeditor.cpp	(Revision 569318)
+++ kgpg/kgpgeditor.cpp	(Revision 569319)
@@ -164,9 +164,9 @@
 void KgpgApp::slotSetCharset()
 {
 ////////  work in progress
-if (encodingAction->isChecked())
-view->editor->setText(QString::fromUtf8(view->editor->text().ascii()));
-else
+//if (encodingAction->isChecked())
+//view->editor->setText(QString::fromUtf8(view->editor->text().ascii()));
+//else
 {
 if (checkEncoding(QTextCodec::codecForLocale ())) return;
 view->editor->setText(view->editor->text().utf8());
@@ -196,7 +196,7 @@
 void KgpgApp::slotResetEncoding(bool enc)
 {
 //kdDebug(2100)<<"Resetting encoding--------------------"<<endl;
-encodingAction->setChecked(enc);
+//encodingAction->setChecked(enc);
 //if (enc) slotSetCharset();
 }
 


Index: kdeutils.spec
===================================================================
RCS file: /cvs/dist/rpms/kdeutils/devel/kdeutils.spec,v
retrieving revision 1.67
retrieving revision 1.68
diff -u -r1.67 -r1.68
--- kdeutils.spec	18 Sep 2006 17:37:15 -0000	1.67
+++ kdeutils.spec	19 Sep 2006 12:10:37 -0000	1.68
@@ -29,6 +29,7 @@
 Patch101: kdeutils-3.5.4-kde#132420.patch
 Patch102: kdeutils-3.5.4-kde#128925.patch
 Patch103: kdeutils-3.5.4-kde#134192.patch
+Patch104: kdeutils-3.5.4-kde#133122.patch
 
 Requires: kdelibs >= %{kdelibs_epoch}:%{version}
 Requires: kdebase >= %{kdebase_epoch}:%{version}
@@ -94,6 +95,7 @@
 %patch101 -p0 -b .kde#132420
 %patch102 -p0 -b .kde#128925
 %patch103 -p0 -b .kde#134192
+%patch104 -p0 -b .kde#133122
 
 %build
 unset QTDIR || : ; . /etc/profile.d/qt.sh
@@ -188,6 +190,7 @@
 * Mon Sep 18 2006 Than Ngo <than at redhat.com> 6:3.5.4-4
 - apply upstream patches
    fix #134192, computes negative real raised 0 power equals nan
+   fix #133122, kgpg crashes when signing
 
 * Tue Sep 12 2006 Than Ngo <than at redhat.com> 6:3.5.4-3
 - fix #205553, Printing text with kedit always Bold




More information about the fedora-cvs-commits mailing list