1 |
dilfridge 12/08/01 22:52:27 |
2 |
|
3 |
Added: |
4 |
0002-kaddressbook-Only-start-akonadi-asynchronously-on-KDE-4.6.2.patch |
5 |
Log: |
6 |
Add upstream bugfixes |
7 |
|
8 |
(Portage version: 2.2.0_alpha120/cvs/Linux x86_64) |
9 |
|
10 |
Revision Changes Path |
11 |
1.1 kde-base/kaddressbook/files/4.4/0002-kaddressbook-Only-start-akonadi-asynchronously-on-KDE-4.6.2.patch |
12 |
|
13 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/kde-base/kaddressbook/files/4.4/0002-kaddressbook-Only-start-akonadi-asynchronously-on-KDE-4.6.2.patch?rev=1.1&view=markup |
14 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/kde-base/kaddressbook/files/4.4/0002-kaddressbook-Only-start-akonadi-asynchronously-on-KDE-4.6.2.patch?rev=1.1&content-type=text/plain |
15 |
|
16 |
Index: 0002-kaddressbook-Only-start-akonadi-asynchronously-on-KDE-4.6.2.patch |
17 |
=================================================================== |
18 |
From 0b44b1aa3d66f974e3d255c6e027947f1375b685 Mon Sep 17 00:00:00 2001 |
19 |
From: Stephen Kelly <steveire@×××××.com> |
20 |
Date: Mon, 25 Apr 2011 22:09:08 +0200 |
21 |
Subject: [PATCH 2/6] Only start akonadi asynchronously on KDE 4.6.2. |
22 |
|
23 |
Revises cfa404b7188e4c26bddbc9579728f6d25f8cd214 to hopefully fix |
24 |
the bug seen on fedora. |
25 |
|
26 |
Please re-test this on 4.6.2 on fedora too. Unfortunately that's the |
27 |
best I can do because I can't reproduce the issue. |
28 |
|
29 |
BUG: 268120 |
30 |
--- |
31 |
kaddressbook/main.cpp | 2 +- |
32 |
kmail/kmmainwidget.cpp | 2 +- |
33 |
kmail/main.cpp | 2 +- |
34 |
kontact/src/main.cpp | 2 +- |
35 |
4 files changed, 4 insertions(+), 4 deletions(-) |
36 |
|
37 |
diff --git a/kaddressbook/main.cpp b/kaddressbook/main.cpp |
38 |
index 200f8ec..e4cb3f7 100644 |
39 |
--- a/kaddressbook/main.cpp |
40 |
+++ b/kaddressbook/main.cpp |
41 |
@@ -49,7 +49,7 @@ int main( int argc, char **argv ) |
42 |
MainWindow *window = new MainWindow; |
43 |
window->show(); |
44 |
|
45 |
-#if !KDE_IS_VERSION(4,6,0) |
46 |
+#if !KDE_IS_VERSION(4,6,2) |
47 |
if ( !Akonadi::Control::start( window ) ) { |
48 |
//TODO: add message box after string freeze |
49 |
kWarning() << "Unable to start Akonadi server, exit application"; |
50 |
-- |
51 |
1.7.9.2 |