rpms/kdeutils/devel kdeutils-3.5.4-kde#132420.patch, NONE, 1.1 kdeutils.spec, 1.62, 1.63

[fedora-cvs-commits at redhat.com]

Author: than

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

Modified Files:
	kdeutils.spec 
Added Files:
	kdeutils-3.5.4-kde#132420.patch 
Log Message:
apply upstream patch to fix kgpg crashes, kde#132420


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

--- NEW FILE kdeutils-3.5.4-kde#132420.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.62
retrieving revision 1.63
diff -u -r1.62 -r1.63
--- kdeutils.spec	23 Aug 2006 12:04:57 -0000	1.62
+++ kdeutils.spec	23 Aug 2006 12:42:46 -0000	1.63
@@ -26,6 +26,7 @@
 
 # upstream patches
 Patch100: kdeutils-3.5.4-kde#127341.patch
+Patch101: kdeutils-3.5.4-kde#132420.patch
 
 Requires: kdelibs >= %{kdelibs_epoch}:%{version}
 Requires: kdebase >= %{kdebase_epoch}:%{version}
@@ -87,6 +88,7 @@
 
 #upstream patches
 %patch100 -p0 -b .kde#127341
+%patch101 -p0 -b .kde#132420
 
 %build
 unset QTDIR || : ; . /etc/profile.d/qt.sh
@@ -180,6 +182,7 @@
 %changelog
 * Wed Aug 23 2006 Than Ngo <than at redhat.com> 6:3.5.4-2
 - apply upstream patch to fix ark crashes, kde#127341
+- apply upstream patch to fix kgpg crashes, kde#132420
 
 * Thu Aug 10 2006 Than Ngo <than at redhat.com> 6:3.5.4-1
 - rebuild