diff -u kde4libs-4.4.2/debian/copyright kde4libs-4.4.2/debian/copyright --- kde4libs-4.4.2/debian/copyright +++ kde4libs-4.4.2/debian/copyright @@ -10,7 +10,7 @@ Copyright: Unless something else is mentioned, copyright is -Copyright 1996-2009, The K Desktop Enviroment project http://www.kde.org +Copyright 1996-2010, The KDE SC project http://www.kde.org License: @@ -113,7 +113,7 @@ Copyright: © 2008 Patrick Spendrin Copyright: © 2006 Michael Larouche Copyright: © 2006 Egon Willighagen -Copyright: © 2007 Jakub Stachowski +Copyright: © 2007-2008 Jakub Stachowski Copyright: © 2006-2008 Andreas Schneider Copyright: © 2006 Benjamin Reed Copyright: © 2007 Mike Jackson @@ -220,7 +220,13 @@ Copyright: © 2002 Dominique Devriese Copyright: © 2002 Simon Hausmann Copyright: © 2002 Jesper K. Pedersen - +Copyright: © 1998 +Copyright: © 2009 by Jeremy Whiting +Copyright: © 2007 Philippe Fremy (phil at freehackers dot org) +Copyright: © 2009 Bernhard Beschow +Copyright: © 2009 Milian Wolff +Copyright: © 2009 by Rahman Duran +Copyright: © 2009 Michel Ludwig (michel.ludwig@kdemail.net) License for all components unless stated otherwise: -- @@ -268,7 +274,9 @@ GNU Lesser General Public License, version 2.1 or later (LGPL-2.1+) 1 file(s) are licensed under this license: - terminal/* + terminal/* excluding + -+ terminal/kde_terminal_interface_v2.h + On Debian systems, the complete text of the GNU Lesser General Public License version 2.1 can be found in @@ -282,13 +290,13 @@ Copyright: © 2001-2005, 2008 Christoph Cullmann Copyright: © 2002-2007 Hamish Rodda -Copyright: © 2001-2002, 2004-2006, 2008 Joseph Wenninger +Copyright: © 2001-2002, 2004-2006, 2008-2009 Joseph Wenninger Copyright: © 2001-2005 Anders Lund Copyright: © 1999 Jochen Wilhelmy -Copyright: © 2008 Erlend Hamberg +Copyright: © 2008-2009 Erlend Hamberg Copyright: © 2007-2008 David Nolden Copyright: © 2007-2008 Mirko Stocker -Copyright: © 2005-2008 Dominik Haumann +Copyright: © 2005-2009 Dominik Haumann Copyright: © 2002 John Firebaugh Copyright: © 2008 Paul Giannaros Copyright: © 2007 Sebastian Pipping @@ -318,7 +326,11 @@ Copyright: © 2003 Clarence Dang Copyright: © 2007 Thomas Friedrichsmeier Copyright: © 2003-2004 Stephan Kulow - +Copyright: © 2009-2010 Michel Ludwig +Copyright: © 2008 Jakob Petsovits +Copyright: © 2009 Milian Wolff +Copyright: © 2009 Paul Gideon Dann +Copyright: © 2009 Bernhard Beschow License for all components unless stated otherwise: -- @@ -427,7 +439,7 @@ Copyright: © 1998 Daniel Grana Copyright: © 2002 Hamish Rodda Copyright: © 2005 You!") - +Copyright: © 2009 Milian Wolff License for all components unless stated otherwise: -- @@ -567,11 +579,11 @@ Copyright: © 2007 Bernhard Loos Copyright: © 1997-2007 Stephan Kulow Copyright: © 2003, 2007 Matthias Kretz -Copyright: © 2005-2008 David Jarvie +Copyright: © 2005-2009 David Jarvie Copyright: © 2006-2008 Chusslove Illich Copyright: © 2006-2007 Kevin Ottens Copyright: © 1999-2003 Hans Petter Bieker -Copyright: © 2007 John Layt +Copyright: © 2007-2009 John Layt Copyright: © 1998-1999 Sirtaj Singh Kang Copyright: © 2002-2003 Carlos Moro Copyright: © 2006-2008 Christian Ehrlicher @@ -635,11 +647,19 @@ Copyright: © 2008 Benjamin Reed Copyright: © 2006 Peter Kümmel Copyright: © 2007 Rafael Fernández López -Copyright: © 2002 Marc Mutz +Copyright: © 2002, 2008 Marc Mutz Copyright: © 2006 Laurent Montel - +Copyright: © 2008 Nicola Gigante +Copyright: © 2009 Radek Novacek +Copyright: © 2009 Dario Freddi +Copyright: © 2007-2008 Per Øyvind Karlsen +Copyright: © 2008 Hamish Rodda +Copyright: © 2009 Germain Garand +Copyright: © 2008-2009s Michael Leupold +Copyright: © 2006 by Dominic Battre License for all components unless stated otherwise: + -- GNU Library General Public License, version 2 or later (LGPL-2+) @@ -1010,15 +1030,15 @@ Copyright: © 2003-2004, 2007 Zack Rusin Copyright: © 1997-2000 Matthias Ettrich Copyright: © 2000-2003, 2006-2007 Tobias Koenig -Copyright: © 2001-2003, 2007-2008 Lubos Lunak +Copyright: © 2001-2003, 2007-2009 Lubos Lunak Copyright: © 2008 Michael Jansen Copyright: © 1997 Martin Jones -Copyright: © 2006-2008 Urs Wolfer +Copyright: © 2006-2009 Urs Wolfer Copyright: © 1999-2000, 2005-2006 Espen Sand Copyright: © 1997-2000 Sven Radej -Copyright: © 2007-2008 John Layt +Copyright: © 2007-2009 John Layt Copyright: © 2001, 2005 S.R.Haque -Copyright: © 2008 Stephen Kelly +Copyright: © 2008-2009 Stephen Kelly Copyright: © 1997-1998 Mark Donohoe Copyright: © 2000-2004 Dawit Alemayehu Copyright: © 1997-1998, 2000 Stephan Kulow @@ -1028,7 +1048,7 @@ Copyright: © 2006-2007 Michaël Larouche Copyright: © 2000, 2004 Antonio Larrosa Copyright: © 1999 Preston Brown -Copyright: © 2006-2008 Pino Toscano +Copyright: © 2006-2009 Pino Toscano Copyright: © 2007 Roberto Raggi Copyright: © 1997 Matthias Kalle Dalheimer Copyright: © 2000 Matej Koss @@ -1042,7 +1062,7 @@ Copyright: © 2003 Nadeem Hasan Copyright: © 1999 Chris Schlaeger Copyright: © 1998-2000 KDE Team -Copyright: © 2007-2008 Thomas McGuire +Copyright: © 2007-2009 Thomas McGuire Copyright: © 2000-2003 Cornelius Schumacher Copyright: © 2006, 2008 Marijn Kruisselbrink Copyright: © 2000 Stefan Schimanski <1Stein@gmx.de> @@ -1114,7 +1134,7 @@ Copyright: © 1997 Patrick Dowler Copyright: © 2008 Tom Albers Copyright: © 2007 Torsten Rahn -Copyright: © 2000 Timo Hummel +Copyright: © 2000, 2007 Timo Hummel Copyright: © 2006 Peter Simonsson Copyright: © 1998-2000 TrollTech AS Copyright: © 2002 Anders Lund @@ -1143,7 +1163,14 @@ Copyright: © 1999 Cristian Tibirna Copyright: © 2002 Matthias H�zer-Klpfel Copyright: © 2007 Christian Ehrlicher - +Copyright: © 2009 Jonathan Schmidt-Dominé +Copyright: © 2009 Christoph Feck +Copyright: © 2009 Chani Armitage +Copyright: © 2009 Shaun Reich +Copyright: © 2009 Maciej Mrozowski +Copyright: © 2008 Aurélien Gâteau +Copyright: © 2009 KDE e.V. +Copyright: © 2009 Dario Freddi License for all components unless stated otherwise: -- @@ -1372,8 +1399,22 @@ AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. +------ +kdewebkit/ +------ +Copyright: © 2009 Dawit Alemayehu +Copyright: © 2009 Urs Wolfer +License for all components is: +-- + + GNU Library General Public License, version 2 or later (LGPL-2+) + + On Debian systems, the complete text of the + GNU Library General Public License version 2 can be found in + /usr/share/common-licenses/LGPL-2 +-- ------ kdewidgets/ @@ -1385,7 +1426,8 @@ License for all components is: -- - GNU Library General Public License, version 2 or later (LGPL-2+) + + GNU Library General Public License, version 2 or later (LGPL-2+) However, the license of 1 file(s) was not explicitly specified: ? makekdewidgets.cpp @@ -1445,11 +1487,11 @@ kfile/ ------ -Copyright: © 2006-2008 Peter Penz +Copyright: © 2006-2009 Peter Penz Copyright: © 2007 Kevin Ottens Copyright: © 1999-2003 Carsten Pfeiffer Copyright: © 2006 Aaron J. Seigo -Copyright: © 2007 David Faure +Copyright: © 2007-2009 David Faure Copyright: © 1998-2000 Stephan Kulow Copyright: © 2007 Tobias Koenig Copyright: © 2008 Rafael Fernández López @@ -1465,7 +1507,8 @@ Copyright: © 2001 Christoph Cullmann Copyright: © 2003 Clarence Dang Copyright: © 2001 Frerich Raabe - +Copyright: © 2009 by Rahman Duran +Copyright: © 2009 Shaun Reich License for all components unless stated otherwise: -- @@ -1542,10 +1585,10 @@ Copyright: © 1999-2003 Antti Koivisto Copyright: © 2000-2004, 2006 Dirk Mueller Copyright: © 2003-2008 Apple Inc. All Rights Reserved. -Copyright: © 2004-2005, 2007-2008 Maks Orlovich -Copyright: © 2004-2008 Allan Sandfeld Jensen +Copyright: © 2004-2005, 2007-2009 Maks Orlovich +Copyright: © 2004-2009 Allan Sandfeld Jensen Copyright: © 2000-2001, 2003 Peter Kelly -Copyright: © 2003-2008 Germain Garand +Copyright: © 2003-2009 Germain Garand Copyright: © 2005-2006 Oliver Hunt Copyright: © 2004-2008 Maksim Orlovich Copyright: © 1999-2003, 2007-2008 Harri Porten @@ -1565,7 +1608,7 @@ Copyright: © 2001-2006 George Staikos Copyright: © 2005-2006 Alexander Kellett Copyright: © 2000 Stefan Schimanski <1Stein@gmx.de> -Copyright: © 2008 Vyacheslav Tokarev +Copyright: © 2008-2009 Vyacheslav Tokarev Copyright: © 2000 All Rights Reserved. Copyright: © 1998-2000 Netscape Communications Corporation. Copyright: © 2005 Nokia. All Rights Reserved. @@ -1612,6 +1655,9 @@ Copyright: © David Baron Copyright: © 2000 Daniel Molkentin Copyright: © Josh Soref +Copyright: © 2009 Michael Howell +Copyright: © 2009 Carlos Licea (carlos.licea@kdemail.net) +Copyright: © 2009 Eduardo Robles Elvira License for all components unless stated otherwise: @@ -1862,6 +1908,7 @@ Copyright: © 2006-2007 Ralf Habacker Copyright: © 2006-2007 Thiago Macieira Copyright: © 2007 Alex Merry +Copyright: © 2009 Patrick Spendrin License for all components unless stated otherwise: @@ -1922,7 +1969,7 @@ Copyright: © 1997-2000 Torben Weis Copyright: © 2000-2001, 2003 Malte Starostik Copyright: © 2002-2003 Alexander Kellett -Copyright: © 2007-2008 Andreas Hartmetz +Copyright: © 2007-2009 Andreas Hartmetz Copyright: © 2000, 2000-, 2001, 2003 Dawit Alemayehu Copyright: © 2003, 2006-2007 Thiago Macieira Copyright: © 2002-2003 Leo Savernik @@ -1950,7 +1997,7 @@ Copyright: © 2000 Bernd Johannes Wuebben Copyright: © 1998 Daniel Grana Copyright: © 2008 Rafael Fernández López -Copyright: © 2008 Sebastian Trug +Copyright: © 2008-2009 Sebastian Trug Copyright: © 2005 Sean Harmer Copyright: © 2001 Frerich Raabe Copyright: © 2008 Roland Harnau @@ -1958,7 +2005,7 @@ Copyright: © 2004 Szombathelyi Gy�gy Copyright: © 2003 Joseph Wenninger Copyright: © 1998 Matthias Ettrich -Copyright: © 2007 Pino Toscano +Copyright: © 2007-2009 Pino Toscano Copyright: © 2008 Peter Penz Copyright: © 2002 Jan-Pascal van Best Copyright: © 1988-1991 Phil Karn @@ -1997,7 +2044,10 @@ Copyright: © Ariel Glenn Copyright: © 1995-1998 Mark Adler Copyright: © 2008 Rafal Rzepecki - +Copyright: © 2009 David Jarvie +Copyright: © 2009 Michael Pyne +Copyright: © 2009 Michael Leupold +Copyright: © 2008 - 2009 Urs Wolfer License for all components unless stated otherwise: -- @@ -2228,7 +2278,7 @@ Copyright: © 1998, 1998-, 1999-2000, 2000-, 2001-2004 Waldo Bastian Copyright: © 2000-2008 David Faure -Copyright: © 2008 Andreas Hartmetz +Copyright: © 2008-2009 Andreas Hartmetz Copyright: © 2000, 2000-, 2001-2002 Dawit Alemayehu Copyright: © 2000-2002 Stephan Kulow Copyright: © 2006 Allan Sandfeld Jensen @@ -2312,7 +2362,7 @@ Copyright: © 2003-2008 Apple Inc. All Rights Reserved. Copyright: © 2001, 2003 Peter Kelly Copyright: © 2006-2008 Maksim Orlovich -Copyright: © 2006-2008 Maks Orlovich +Copyright: © 2006-2009 Maks Orlovich Copyright: © 2006 Alexey Proskuryakov Copyright: © 2006 George Staikos Copyright: © 2007 Cameron Zwarich @@ -2430,12 +2480,12 @@ Copyright: © 2003-2007 Josef Spillner Copyright: © 2002 Cornelius Schumacher -Copyright: © 2007-2008 Jeremy Whiting +Copyright: © 2007-2009 Jeremy Whiting Copyright: © 2007 Dirk Mueller Copyright: © 2005 Enrico Ros Copyright: © 2004-2005 Andras Mantia Copyright: © 2004 Aaron J. Seigo -Copyright: © 2007 Frederik Gladhorn +Copyright: © 2007, 2009 Frederik Gladhorn Copyright: © 2007 David Faure @@ -2482,7 +2532,7 @@ kparts/ ------ -Copyright: © 1999-2007 David Faure +Copyright: © 1999-2009 David Faure Copyright: © 1999, 2001 Simon Hausmann Copyright: © 2001 Carsten Pfeiffer Copyright: © 2003 Daniel Molkentin @@ -2582,6 +2632,23 @@ /usr/share/common-licenses/LGPL-2 -- +------ +kunitconversion/ +------ + +Copyright: © 2007-2009 Petri Damstén +Copyright: © 2008 Kristof Bal +Copyright: © 2008 Kashyap R Puranik +Copyright: © 2007 David Faure + +License for all components unless stated otherwise: +-- + GNU Library General Public License, version 2 or later (LGPL-2+) + + On Debian systems, the complete text of the + GNU Library General Public License version 2 can be found in + /usr/share/common-licenses/LGPL-2 +-- ------ kutils/ @@ -2604,6 +2671,8 @@ Copyright: © 2007 David Faure Copyright: © 2008 Montel Laurent Copyright: © 2006 Michael Larouche +Copyright: © 2008 Roman Jarosz +Copyright: © 2009 Dario Freddi License for all components unless stated otherwise: @@ -2670,7 +2739,7 @@ nepomuk/ ------ -Copyright: © 2006-2008 Sebastian Trueg +Copyright: © 2006-2009 Sebastian Trueg Copyright: © 2004-2006 Trolltech ASA. All Rights Reserved. Copyright: © 2007 David Faure @@ -2718,12 +2787,12 @@ plasma/ ------ -Copyright: © 2005-2008 Aaron Seigo -Copyright: © 2007-2008 Marco Martin +Copyright: © 2005-2009 Aaron Seigo +Copyright: © 2007-2009 Marco Martin Copyright: © 2007-2008 Alexis Ménard Copyright: © 2007 Riccardo Iaconelli -Copyright: © 2008 Rob Scheepmaker -Copyright: © 2006-2008 Fredrik Höglund +Copyright: © 2008-2009 Rob Scheepmaker +Copyright: © 2006-2009 Fredrik Höglund Copyright: © 2008 Ménard Alexis Copyright: © 2007 Dan Meltzer Copyright: © 2007 Matt Broadstone @@ -2731,21 +2800,26 @@ Copyright: © 2007 Bertjan Broeksema Copyright: © 2007 Robert Knight Copyright: © 2008 Montel Laurent -Copyright: © 2007 Kevin Ottens +Copyright: © 2007, 2009 Kevin Ottens Copyright: © 1999-2002 Chris Schlaeger Copyright: © 2007 Sebastian Kuegler -Copyright: © 2007 Ryan P. Bitanga +Copyright: © 2007, 2009 Ryan P. Bitanga Copyright: © 2008 Jordi Polo Copyright: © 2008 Gilles CHAUVIN -Copyright: © 2008 Davide Bettio -Copyright: © 2008 Alessandro Diaferia +Copyright: © 2008-2009 Davide Bettio +Copyright: © 2008-2009 Alessandro Diaferia Copyright: © 2008 Andrew Lake Copyright: © 2007 André Duffeck Copyright: © 2007 Zack Rusin Copyright: © 2007 Siraj Razick Copyright: © 2006 John Tapsell Copyright: © 2007 Jani Huhtanen - +Copyright: © 2009 Mehmet Ali Akmanalp +Copyright © 2009 Igor Trindade Oliveira +Copyright: © 2009 Adenilson Cavalcanti +Copyright: © 2009 Fabrizio Montesi +Copyright: © 2009 Chani Armitage +Copyright: © 2009 Dario Freddi License for all components unless stated otherwise: -- @@ -2845,10 +2919,10 @@ Copyright: © 2006 Davide Bettio Copyright: © 2006-2007 Will Stephenson Copyright: © 2007-2008 Jeff Mitchell -Copyright: © 2007 Christopher Blauvelt +Copyright: © 2007, 2009 Christopher Blauvelt Copyright: © 2006 Michaël Larouche Copyright: © 1984, 1989-1990, 2000-2006 Free Software Foundation Inc. - +Copyright: © 2009 Harald Fernengel License for all components unless stated otherwise: -- @@ -2884,8 +2958,8 @@ Copyright: © 2003, 2006 Zack Rusin Copyright: © 2005 Mashrab Kuvatov -Copyright: © 2006 Jacob Rideout - +Copyright: © 2006 Jacob Rideout +Copyright: © 2009 Montel Laurent License for all components is: -- @@ -2901,9 +2975,7 @@ ------ Copyright: © 2004-2007 Mirko Boehm -Copyright: © 2004-2007 Contact: Copyright: © 2005 Matt Rogers -Copyright: © 2005 2006Mirko Boehm Copyright: © 2006 David Faure @@ -2978,5 +3050,5 @@ -The Debian packaging is Copyright 2007-2009, Debian Qt/KDE Maintainers and +The Debian packaging is Copyright 2007-2010, Debian Qt/KDE Maintainers and is licensed under the GPL, see `/usr/share/common-licenses/GPL'. diff -u kde4libs-4.4.2/debian/changelog kde4libs-4.4.2/debian/changelog --- kde4libs-4.4.2/debian/changelog +++ kde4libs-4.4.2/debian/changelog @@ -1,3 +1,10 @@ +kde4libs (4:4.4.2-0ubuntu4) lucid; urgency=low + + * Add kubuntu_75_kauth_authentication_fix.diff from upstream to address + B.K.O #227117. + + -- Jonathan Thomas Wed, 14 Apr 2010 11:49:42 -0400 + kde4libs (4:4.4.2-0ubuntu3) lucid; urgency=low * Add kubuntu_01_kubuntu_useragent.diff to add Kubuntu to the default KDE diff -u kde4libs-4.4.2/debian/patches/series kde4libs-4.4.2/debian/patches/series --- kde4libs-4.4.2/debian/patches/series +++ kde4libs-4.4.2/debian/patches/series @@ -22,0 +23 @@ +kubuntu_75_kauth_authentication_fix.diff only in patch2: unchanged: --- kde4libs-4.4.2.orig/debian/patches/kubuntu_75_kauth_authentication_fix.diff +++ kde4libs-4.4.2/debian/patches/kubuntu_75_kauth_authentication_fix.diff @@ -0,0 +1,228 @@ +Index: kde4libs-4.4.2/kdecore/auth/backends/dbus/DBusHelperProxy.cpp +=================================================================== +--- kde4libs-4.4.2.orig/kdecore/auth/backends/dbus/DBusHelperProxy.cpp 2010-04-14 10:01:43.241147300 -0400 ++++ kde4libs-4.4.2/kdecore/auth/backends/dbus/DBusHelperProxy.cpp 2010-04-14 10:03:17.044132135 -0400 +@@ -1,6 +1,6 @@ + /* + * Copyright (C) 2008 Nicola Gigante +-* Copyright (C) 2009 Dario Freddi ++* Copyright (C) 2009-2010 Dario Freddi + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU Lesser General Public License as published by +@@ -213,18 +213,18 @@ + void DBusHelperProxy::performActions(QByteArray blob, const QByteArray &callerID) + { + QDataStream stream(&blob, QIODevice::ReadOnly); +- QList > actions; ++ QList< QPair< QString, QVariantMap > > actions; + + stream >> actions; + +- QList >::const_iterator i = actions.constBegin(); ++ QList< QPair< QString, QVariantMap > >::const_iterator i = actions.constBegin(); + while (i != actions.constEnd()) { + QByteArray blob; + QDataStream stream(&blob, QIODevice::WriteOnly); + + stream << i->second; + +- emit remoteSignal(ActionPerformed, i->first, performAction(i->first, callerID, blob)); ++ performAction(i->first, callerID, blob); + + i++; + } +@@ -244,10 +244,17 @@ + QDataStream s(&arguments, QIODevice::ReadOnly); + s >> args; + +- if (BackendsManager::authBackend()->isCallerAuthorized(action, callerID)) { +- QTimer *timer = responder->property("__KAuth_Helper_Shutdown_Timer").value(); +- timer->stop(); ++ m_currentAction = action; ++ emit remoteSignal(ActionStarted, action, QByteArray()); ++ QEventLoop e; ++ e.processEvents(QEventLoop::AllEvents); ++ ++ ActionReply retVal; ++ ++ QTimer *timer = responder->property("__KAuth_Helper_Shutdown_Timer").value(); ++ timer->stop(); + ++ if (BackendsManager::authBackend()->isCallerAuthorized(action, callerID)) { + QString slotname = action; + if (slotname.startsWith(m_name + '.')) { + slotname = slotname.right(slotname.length() - m_name.length() - 1); +@@ -255,26 +262,25 @@ + + slotname.replace('.', '_'); + +- ActionReply retVal; ++ bool success = QMetaObject::invokeMethod(responder, slotname.toAscii(), Qt::DirectConnection, ++ Q_RETURN_ARG(ActionReply, retVal), Q_ARG(QVariantMap, args)); + +- m_currentAction = action; +- emit remoteSignal(ActionStarted, action, QByteArray()); +- bool success = QMetaObject::invokeMethod(responder, slotname.toAscii(), Qt::DirectConnection, Q_RETURN_ARG(ActionReply, retVal), Q_ARG(QVariantMap, args)); +- emit remoteSignal(ActionPerformed, action, retVal.serialized()); +- m_currentAction = ""; +- m_stopRequest = false; +- +- timer->start(); +- +- if (success) { +- return retVal.serialized(); +- } else { +- return ActionReply::NoSuchActionReply.serialized(); ++ if (!success) { ++ retVal = ActionReply::NoSuchActionReply; + } + + } else { +- return ActionReply::AuthorizationDeniedReply.serialized(); ++ retVal = ActionReply::AuthorizationDeniedReply; + } ++ ++ timer->start(); ++ ++ emit remoteSignal(ActionPerformed, action, retVal.serialized()); ++ e.processEvents(QEventLoop::AllEvents); ++ m_currentAction = ""; ++ m_stopRequest = false; ++ ++ return retVal.serialized(); + } + + void DBusHelperProxy::sendDebugMessage(int level, const char *msg) +Index: kde4libs-4.4.2/kdecore/auth/backends/polkit-1/Polkit1Backend.cpp +=================================================================== +--- kde4libs-4.4.2.orig/kdecore/auth/backends/polkit-1/Polkit1Backend.cpp 2010-04-14 10:02:23.457684890 -0400 ++++ kde4libs-4.4.2/kdecore/auth/backends/polkit-1/Polkit1Backend.cpp 2010-04-14 10:03:33.280128452 -0400 +@@ -1,7 +1,7 @@ + /* + * Copyright (C) 2008 Nicola Gigante +-* Copyright (C) 2009 Dario Freddi + * Copyright (C) 2009 Radek Novacek ++* Copyright (C) 2009-2010 Dario Freddi + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU Lesser General Public License as published by +@@ -30,11 +30,38 @@ + namespace KAuth + { + ++PolkitResultEventLoop::PolkitResultEventLoop(QObject* parent) ++ : QEventLoop(parent) ++{ ++ ++} ++ ++PolkitResultEventLoop::~PolkitResultEventLoop() ++{ ++ ++} ++ ++void PolkitResultEventLoop::requestQuit(const PolkitQt1::Authority::Result& result) ++{ ++ m_result = result; ++ quit(); ++} ++ ++PolkitQt1::Authority::Result PolkitResultEventLoop::result() const ++{ ++ return m_result; ++} ++ + Polkit1Backend::Polkit1Backend() + { + // Nothing to do here... + } + ++Polkit1Backend::~Polkit1Backend() ++{ ++ ++} ++ + Action::AuthStatus Polkit1Backend::authorizeAction(const QString &action) + { + Q_UNUSED(action) +@@ -87,7 +114,13 @@ + PolkitQt1::UnixProcessSubject subject(pid); + PolkitQt1::Authority *authority = PolkitQt1::Authority::instance(); + +- switch (authority->checkAuthorizationSync(action, &subject, PolkitQt1::Authority::AllowUserInteraction)) { ++ PolkitResultEventLoop e; ++ connect(authority, SIGNAL(checkAuthorizationFinished(PolkitQt1::Authority::Result)), ++ &e, SLOT(requestQuit(PolkitQt1::Authority::Result))); ++ authority->checkAuthorization(action, &subject, PolkitQt1::Authority::AllowUserInteraction); ++ e.exec(); ++ ++ switch (e.result()) { + case PolkitQt1::Authority::Yes: + return true; + default: +Index: kde4libs-4.4.2/kdecore/auth/backends/polkit-1/Polkit1Backend.h +=================================================================== +--- kde4libs-4.4.2.orig/kdecore/auth/backends/polkit-1/Polkit1Backend.h 2010-04-14 10:02:23.492129844 -0400 ++++ kde4libs-4.4.2/kdecore/auth/backends/polkit-1/Polkit1Backend.h 2010-04-14 10:04:17.844131084 -0400 +@@ -1,7 +1,7 @@ + /* + * Copyright (C) 2008 Nicola Gigante +-* Copyright (C) 2009 Dario Freddi + * Copyright (C) 2009 Radek Novacek ++* Copyright (C) 2009-2010 Dario Freddi + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU Lesser General Public License as published by +@@ -23,7 +23,11 @@ + #define POLKIT1BACKEND_H + + #include "AuthBackend.h" ++ + #include ++#include ++ ++#include + + class QByteArray; + +@@ -37,15 +41,13 @@ + + public: + Polkit1Backend(); ++ virtual ~Polkit1Backend(); + virtual void setupAction(const QString&); + virtual Action::AuthStatus authorizeAction(const QString&); + virtual Action::AuthStatus actionStatus(const QString&); + virtual QByteArray callerID() const; + virtual bool isCallerAuthorized(const QString &action, QByteArray callerID); + +-Q_SIGNALS: +- void actionStatusChanged(const QString &action, Action::AuthStatus status); +- + private Q_SLOTS: + void checkForResultChanged(); + +@@ -53,6 +55,22 @@ + QHash m_cachedResults; + }; + ++class PolkitResultEventLoop : public QEventLoop ++{ ++ Q_OBJECT ++public: ++ PolkitResultEventLoop(QObject* parent = 0); ++ virtual ~PolkitResultEventLoop(); ++ ++ PolkitQt1::Authority::Result result() const; ++ ++public Q_SLOTS: ++ void requestQuit(const PolkitQt1::Authority::Result &result); ++ ++private: ++ PolkitQt1::Authority::Result m_result; ++}; ++ + } // namespace Auth + + #endif