[gentoo-commits] gentoo-x86 commit in kde-base/kontact/files/4.4: 0002-kontact-Only-start-akonadi-asynchronously-on-KDE-4.6.2.patch

[Andreas HAttel (dilfridge)]

dilfridge    12/08/01 22:46:30

  Added:               
                        0002-kontact-Only-start-akonadi-asynchronously-on-KDE-4.6.2.patch
  Log:
  Add upstream bugfixes
  
  (Portage version: 2.2.0_alpha120/cvs/Linux x86_64)

Revision  Changes    Path
1.1                  kde-base/kontact/files/4.4/0002-kontact-Only-start-akonadi-asynchronously-on-KDE-4.6.2.patch

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/kde-base/kontact/files/4.4/0002-kontact-Only-start-akonadi-asynchronously-on-KDE-4.6.2.patch?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/kde-base/kontact/files/4.4/0002-kontact-Only-start-akonadi-asynchronously-on-KDE-4.6.2.patch?rev=1.1&content-type=text/plain

Index: 0002-kontact-Only-start-akonadi-asynchronously-on-KDE-4.6.2.patch
===================================================================
From 0b44b1aa3d66f974e3d255c6e027947f1375b685 Mon Sep 17 00:00:00 2001
From: Stephen Kelly <steveire@×××××.com>
Date: Mon, 25 Apr 2011 22:09:08 +0200
Subject: [PATCH 2/6] Only start akonadi asynchronously on KDE 4.6.2.

Revises cfa404b7188e4c26bddbc9579728f6d25f8cd214 to hopefully fix
the bug seen on fedora.

Please re-test this on 4.6.2 on fedora too. Unfortunately that's the
best I can do because I can't reproduce the issue.

BUG: 268120
---
 kaddressbook/main.cpp  |    2 +-
 kmail/kmmainwidget.cpp |    2 +-
 kmail/main.cpp         |    2 +-
 kontact/src/main.cpp   |    2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/kontact/src/main.cpp b/kontact/src/main.cpp
index cb4a235..ae460be 100644
--- a/kontact/src/main.cpp
+++ b/kontact/src/main.cpp
@@ -199,7 +199,7 @@ int main( int argc, char **argv )
 
   KontactApp app;
 
-#if !KDE_IS_VERSION(4,6,0)
+#if !KDE_IS_VERSION(4,6,2)
   // KDE 4.4: do akonadi startup before creating any window, since creating
   // the window loads kmail. In 4.5 we'll do this startup async instead.
   Akonadi::Control::start( 0 );
-- 
1.7.9.2