rpms/kdebase/F-11 kdebase-4.4.0-konqueror-kde#228593.patch, NONE, 1.1 kdebase.spec, 1.393, 1.394

[Kevin Kofler]

Author: kkofler

Update of /cvs/pkgs/rpms/kdebase/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv29438/F-11

Modified Files:
	kdebase.spec 
Added Files:
	kdebase-4.4.0-konqueror-kde#228593.patch 
Log Message:
Sync from devel:

* Fri Feb 26 2010 Kevin Kofler <Kevin at tigcc.ticalc.org> - 6:4.4.0-5
- fix disabling automatic spell checking in the Konqueror UI (kde#228593)

kdebase-4.4.0-konqueror-kde#228593.patch:
 konqmainwindow.cpp |   10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

--- NEW FILE kdebase-4.4.0-konqueror-kde#228593.patch ---
diff -ur kdebase-4.4.0/apps/konqueror/src/konqmainwindow.cpp kdebase-4.4.0-konqueror-kde#228593/apps/konqueror/src/konqmainwindow.cpp
--- kdebase-4.4.0/apps/konqueror/src/konqmainwindow.cpp	2010-01-20 00:18:15.000000000 +0100
+++ kdebase-4.4.0-konqueror-kde#228593/apps/konqueror/src/konqmainwindow.cpp	2010-02-26 12:04:27.000000000 +0100
@@ -1824,9 +1824,17 @@
 
 void KonqMainWindow::slotConfigureSpellChecking()
 {
-    Sonnet::ConfigDialog dialog( KGlobal::config().data(), this);
+    KSharedConfig::Ptr config = KGlobal::config();
+    KConfigGroup htmlSettings = config->group( "HTML Settings" );
+    KConfigGroup spellingSettings = config->group( "Spelling" );
+    // Copy KHTML setting to Sonnet setting for the dialog
+    spellingSettings.writeEntry( "checkerEnabledByDefault", htmlSettings.readEntry( "AutoSpellCheck", true ) );
+    Sonnet::ConfigDialog dialog( config.data(), this);
     dialog.setWindowIcon( KIcon( "konqueror" ));
     dialog.exec();
+    // Copy Sonnet setting from the dialog to KHTML setting
+    htmlSettings.writeEntry( "AutoSpellCheck", spellingSettings.readEntry( "checkerEnabledByDefault", false ) );
+    reparseConfiguration();
 }
 
 void KonqMainWindow::slotConfigureToolbars()


Index: kdebase.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kdebase/F-11/kdebase.spec,v
retrieving revision 1.393
retrieving revision 1.394
diff -u -p -r1.393 -r1.394
--- kdebase.spec	25 Feb 2010 07:48:19 -0000	1.393
+++ kdebase.spec	26 Feb 2010 12:21:25 -0000	1.394
@@ -3,7 +3,7 @@ Name:    kdebase
 Summary: KDE Core Files
 Epoch:   6
 Version: 4.4.0
-Release: 4%{?dist}
+Release: 5%{?dist}
 
 License: GPLv2
 Group: User Interface/Desktops
@@ -14,6 +14,8 @@ BuildRoot: %{_tmppath}/%{name}-%{version
 Patch0:   kdebase-4.1.80-nsplugins-paths.patch
 Patch1:   kdebase-4.1.70-konsole-session.patch
 Patch2:   kdebase-4.2.1-home-icon.patch
+# fix disabling automatic spell checking in the Konqueror UI (kde#228593)
+Patch3:   kdebase-4.4.0-konqueror-kde#228593.patch
 
 ## upstream patches
 # remove extra spaces from konsole selections, https://bugzilla.redhat.com/560721
@@ -116,6 +118,7 @@ Requires: kdelibs4-devel kdepimlibs4-dev
 %patch0 -p1 -b .nsplugins-paths
 %patch1 -p1 -b .konsole-session
 %patch2 -p1 -b .home-icon
+%patch3 -p1 -b .kde#228593
 
 %patch100 -p1 -b .konsole-extra-spaces
 %patch101 -p0 -b .kde#227157
@@ -237,6 +240,9 @@ fi
 
 
 %changelog
+* Fri Feb 26 2010 Kevin Kofler <Kevin at tigcc.ticalc.org> - 6:4.4.0-5
+- fix disabling automatic spell checking in the Konqueror UI (kde#228593)
+
 * Thu Feb 25 2010 Kevin Kofler <Kevin at tigcc.ticalc.org> - 6:4.4.0-4
 - backport fix for folderview getting resorted on file creation (kde#227157)