1 |
dilfridge 12/08/01 22:38:00 |
2 |
|
3 |
Added: 0004-libkdepim-Make-spell-checking-work-again.patch |
4 |
Log: |
5 |
Add upstream bugfixes |
6 |
|
7 |
(Portage version: 2.2.0_alpha120/cvs/Linux x86_64) |
8 |
|
9 |
Revision Changes Path |
10 |
1.1 kde-base/libkdepim/files/4.4/0004-libkdepim-Make-spell-checking-work-again.patch |
11 |
|
12 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/kde-base/libkdepim/files/4.4/0004-libkdepim-Make-spell-checking-work-again.patch?rev=1.1&view=markup |
13 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/kde-base/libkdepim/files/4.4/0004-libkdepim-Make-spell-checking-work-again.patch?rev=1.1&content-type=text/plain |
14 |
|
15 |
Index: 0004-libkdepim-Make-spell-checking-work-again.patch |
16 |
=================================================================== |
17 |
From 6f62ea1bff318d8efea42f59bdc965ee2ab187a0 Mon Sep 17 00:00:00 2001 |
18 |
From: Thomas McGuire <mcguire@×××.org> |
19 |
Date: Wed, 11 May 2011 18:21:32 +0100 |
20 |
Subject: [PATCH 4/6] Make spell checking work again. The text edit used the |
21 |
wrong config file for loading spell settings. After |
22 |
using the config file, the correct settigns get loaded |
23 |
again, since the Loader from Sonnet is a singleton and |
24 |
therefore shares the settings, so even the textedit |
25 |
with the wrong settings file name gets updated. |
26 |
|
27 |
cherry-picked from d1708effbb68d6eae36ee5177a599c965973725f. |
28 |
|
29 |
BUG: 247486 |
30 |
--- |
31 |
kmail/kmcomposereditor.cpp | 2 +- |
32 |
libkdepim/kmeditor.cpp | 12 ++++++++++++ |
33 |
libkdepim/kmeditor.h | 6 ++++++ |
34 |
3 files changed, 19 insertions(+), 1 deletion(-) |
35 |
|
36 |
diff --git a/libkdepim/kmeditor.cpp b/libkdepim/kmeditor.cpp |
37 |
index e8f0d36..067c781 100644 |
38 |
--- a/libkdepim/kmeditor.cpp |
39 |
+++ b/libkdepim/kmeditor.cpp |
40 |
@@ -28,6 +28,7 @@ |
41 |
#include <KProcess> |
42 |
#include <KPushButton> |
43 |
#include <KTemporaryFile> |
44 |
+#include <kdeversion.h> |
45 |
|
46 |
#include <QApplication> |
47 |
#include <QClipboard> |
48 |
@@ -215,6 +216,17 @@ KMeditor::KMeditor( QWidget *parent ) |
49 |
d->init(); |
50 |
} |
51 |
|
52 |
+KMeditor::KMeditor( QWidget *parent, const QString & configFile ) |
53 |
+#if KDE_IS_VERSION(4,6,0) |
54 |
+ : TextEdit( parent, configFile ), d( new KMeditorPrivate( this ) ) |
55 |
+#else |
56 |
+ : TextEdit( parent ), d( new KMeditorPrivate( this ) ) |
57 |
+#endif |
58 |
+{ |
59 |
+ Q_UNUSED( configFile ) |
60 |
+ d->init(); |
61 |
+} |
62 |
+ |
63 |
KMeditor::~KMeditor() |
64 |
{ |
65 |
delete d; |
66 |
diff --git a/libkdepim/kmeditor.h b/libkdepim/kmeditor.h |
67 |
index 4aab8aa..66ebb4a 100644 |
68 |
--- a/libkdepim/kmeditor.h |
69 |
+++ b/libkdepim/kmeditor.h |
70 |
@@ -61,6 +61,12 @@ class KDEPIM_EXPORT KMeditor : public KPIMTextEdit::TextEdit |
71 |
*/ |
72 |
explicit KMeditor( QWidget *parent = 0 ); |
73 |
|
74 |
+ /** |
75 |
+ * Constructs a KMeditor object. |
76 |
+ */ |
77 |
+ explicit KMeditor( QWidget *parent, const QString& configFile ); |
78 |
+ |
79 |
+ |
80 |
virtual ~KMeditor(); |
81 |
|
82 |
//Redefine it for each apps |
83 |
-- |
84 |
1.7.9.2 |