diff --git a/CMakeLists.txt b/CMakeLists.txt index 8988b1c9..63211a72 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -166,15 +166,6 @@ set_package_properties(Perl PROPERTIES TYPE REQUIRED ) -set(POLKITQT-1_MIN_VERSION "0.99.0") -macro_optional_find_package(PolkitQt-1) -set_package_properties(PolkitQt-1 PROPERTIES - DESCRIPTION "Qt wrapper around polkit-1 client libraries" - URL "https://cgit.kde.org/polkit-qt-1.git/" - PURPOSE "polkit-1 agent" - TYPE OPTIONAL -) - macro_optional_find_package(LibAttica 0.1.4) set_package_properties(LibAttica PROPERTIES DESCRIPTION "Attica Library" @@ -267,9 +258,6 @@ macro_optional_add_subdirectory(kquitapp) if (Q_WS_X11) macro_optional_add_subdirectory(kstart) endif (Q_WS_X11) -if (POLKITQT-1_FOUND) - macro_optional_add_subdirectory(polkit-kde-agent) -endif(POLKITQT-1_FOUND) # Background processes macro_optional_add_subdirectory(kpasswdserver) macro_optional_add_subdirectory(kdontchangethehostname) diff --git a/polkit-kde-agent/AuthDialog.cpp b/polkit-kde-agent/AuthDialog.cpp deleted file mode 100644 index ef9b37cd..00000000 --- a/polkit-kde-agent/AuthDialog.cpp +++ /dev/null @@ -1,368 +0,0 @@ -/* This file is part of the KDE project - Copyright (C) 2007-2008 Gökçen Eraslan - Copyright (C) 2008 Dirk Mueller - Copyright (C) 2008 Daniel Nicoletti - Copyright (C) 2008-2010 Dario Freddi - - This program is free software; you can redistribute it and/or - modify it under the terms of the GNU General Public - License as published by the Free Software Foundation; either - version 2 of the License, or (at your option) any later version. - - This library is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - Library General Public License for more details. - - You should have received a copy of the GNU Library General Public License - along with this library; see the file COPYING.LIB. If not, write to - the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, - Boston, MA 02110-1301, USA. - -*/ - -#include "AuthDialog.h" - -#include -#include -#include - -#include -#include -#include -#include - -#include -#include - -#include -#include - -AuthDialog::AuthDialog(const QString &actionId, - const QString &message, - const QString &iconName, - const PolkitQt1::Details &details, - const PolkitQt1::Identity::List &identities, - WId parent) - : KDialog(0) -{ - // KAuth is able to circumvent polkit's limitations, and manages to send the wId to the auth agent. - // If we received it, we use KWindowSystem to associate this dialog correctly. - if (parent > 0) { - kDebug() << "Associating the dialog with " << parent << " this dialog is " << winId(); - - // Set the parent - KWindowSystem::setMainWindow(this, parent); - - // Set modal - KWindowSystem::setState(winId(), NET::Modal); - } - - setupUi(mainWidget()); - setButtons(Ok | Cancel | Details); - - if (message.isEmpty()) { - kWarning() << "Could not get action message for action."; - lblHeader->hide(); - } else { - kDebug() << "Message of action: " << message; - lblHeader->setText("

" + message + "

"); - setCaption(message); - m_message = message; - } - - // loads the standard key icon - QPixmap icon = KIconLoader::global()->loadIcon("dialog-password", - KIconLoader::NoGroup, - KIconLoader::SizeHuge, - KIconLoader::DefaultState); - // create a painter to paint the action icon over the key icon - QPainter painter(&icon); - const int iconSize = icon.size().width(); - // the the emblem icon to size 32 - int overlaySize = 32; - // try to load the action icon - const QPixmap pixmap = KIconLoader::global()->loadIcon(iconName, - KIconLoader::NoGroup, - overlaySize, - KIconLoader::DefaultState, - QStringList(), - 0, - true); - // if we're able to load the action icon paint it over the - // key icon. - if (!pixmap.isNull()) { - QPoint startPoint; - // bottom right corner - startPoint = QPoint(iconSize - overlaySize - 2, - iconSize - overlaySize - 2); - painter.drawPixmap(startPoint, pixmap); - } - - setWindowIcon(icon); - lblPixmap->setPixmap(icon); - - // find action description for actionId - foreach(const PolkitQt1::ActionDescription &desc, PolkitQt1::Authority::instance()->enumerateActionsSync()) { - if (actionId == desc.actionId()) { - m_actionDescription = desc; - kDebug() << "Action description has been found" ; - break; - } - } - - AuthDetails *detailsDialog = new AuthDetails(details, m_actionDescription, m_appname, this); - setDetailsWidget(detailsDialog); - - userCB->hide(); - lePassword->setFocus(); - - errorMessageKTW->hide(); - - // If there is more than 1 identity we will show the combobox for user selection - if (identities.size() > 1) { - connect(userCB, SIGNAL(currentIndexChanged(int)), - this, SLOT(on_userCB_currentIndexChanged(int))); - - createUserCB(identities); - } else { - userCB->addItem("", QVariant(identities[0].toString())); - userCB->setCurrentIndex(0); - } -} - -AuthDialog::~AuthDialog() -{ -} - -void AuthDialog::accept() -{ - // Do nothing, do not close the dialog. This is needed so that the dialog stays - lePassword->setEnabled(false); - return; -} - -void AuthDialog::setRequest(const QString &request, bool requiresAdmin) -{ - kDebug() << request; - PolkitQt1::Identity identity = adminUserSelected(); - if (request.startsWith(QLatin1String("password:"), Qt::CaseInsensitive)) { - if (requiresAdmin) { - if (!identity.isValid()) { - lblPassword->setText(i18n("Password for root:")); - } else { - lblPassword->setText(i18n("Password for %1:", - identity.toString().remove("unix-user:"))); - } - } else { - lblPassword->setText(i18n("Password:")); - } - } else if (request.startsWith(QLatin1String("password or swipe finger:"), - Qt::CaseInsensitive)) { - if (requiresAdmin) { - if (!identity.isValid()) { - lblPassword->setText(i18n("Password or swipe finger for root:")); - } else { - lblPassword->setText(i18n("Password or swipe finger for %1:", - identity.toString().remove("unix-user:"))); - } - } else { - lblPassword->setText(i18n("Password or swipe finger:")); - } - } else { - lblPassword->setText(request); - } - -} - -void AuthDialog::setOptions() -{ - lblContent->setText(i18n("An application is attempting to perform an action that requires privileges." - " Authentication is required to perform this action.")); -} - -void AuthDialog::createUserCB(const PolkitQt1::Identity::List &identities) -{ - /* if we've already built the list of admin users once, then avoid - * doing it again.. (this is mainly used when the user entered the - * wrong password and the dialog is recycled) - */ - if (identities.count() && (userCB->count() - 1) != identities.count()) { - // Clears the combobox in the case some user be added - userCB->clear(); - - // Adds a Dummy user - userCB->addItem(i18n("Select User"), qVariantFromValue (QString())); - qobject_cast(userCB->model())->item(userCB->count()-1)->setEnabled(false); - - // For each user - foreach(const PolkitQt1::Identity &identity, identities) { - // First check to see if the user is valid - kDebug() << "User: " << identity.toString(); - KUser user(identity.toString().remove("unix-user:")); - if (!user.isValid()) { - kWarning() << "User invalid: " << user.loginName(); - continue; - } - - // Display user Full Name IF available - QString display; - if (!user.property(KUser::FullName).toString().isEmpty()) { - display = user.property(KUser::FullName).toString() + " (" + user.loginName() + ')'; - } else { - display = user.loginName(); - } - - KIcon icon; - // load user icon face - if (!user.faceIconPath().isEmpty()) { - icon = KIcon(user.faceIconPath()); - } else { - icon = KIcon("user-identity"); - } - // appends the user item - userCB->addItem(icon, display, qVariantFromValue (identity.toString())); - } - - // Show the widget and set focus - userCB->show(); - userCB->setFocus(); - } -} - -PolkitQt1::Identity AuthDialog::adminUserSelected() const -{ - if (userCB->currentIndex() == -1) - return PolkitQt1::Identity(); - - QString id = userCB->itemData(userCB->currentIndex()).toString(); - if (id.isEmpty()) - return PolkitQt1::Identity(); - return PolkitQt1::Identity::fromString(id); -} - -void AuthDialog::on_userCB_currentIndexChanged(int /*index*/) -{ - PolkitQt1::Identity identity = adminUserSelected(); - // itemData is Null when "Select user" is selected - if (!identity.isValid()) { - lePassword->setEnabled(false); - lblPassword->setEnabled(false); - enableButtonOk(false); - } else { - lePassword->setEnabled(true); - lblPassword->setEnabled(true); - enableButtonOk(true); - // We need this to restart the auth with the new user - emit adminUserSelected(identity); - // git password label focus - lePassword->setFocus(); - } -} - -QString AuthDialog::password() const -{ - return lePassword->text(); -} - -void AuthDialog::authenticationFailure() -{ - errorMessageKTW->setText(i18n("Authentication failure, please try again."), KTitleWidget::ErrorMessage); - QFont bold = font(); - bold.setBold(true); - lblPassword->setFont(bold); - lePassword->setEnabled(true); - lePassword->clear(); - lePassword->setFocus(); -} - -void AuthDialog::showEvent(QShowEvent *event) -{ - KDialog::showEvent(event); - if (winId() != KWindowSystem::activeWindow()) - { - KNotification *notification = new KNotification("authenticate", this, - KNotification::Persistent | KNotification::CloseWhenWidgetActivated); - kDebug() << "Notificate: " << notification->eventId(); - notification->setText(m_message); - QPixmap icon = KIconLoader::global()->loadIcon("dialog-password", - KIconLoader::NoGroup, - KIconLoader::SizeHuge, - KIconLoader::DefaultState); - notification->setPixmap(icon); - notification->setActions(QStringList() << i18n("Switch to dialog") << i18n("Cancel")); - - connect(notification, SIGNAL(activated(unsigned int)), this, SLOT(notificationActivated(unsigned int))); - notification->sendEvent(); - } - -} - -void AuthDialog::notificationActivated(unsigned int action) -{ - kDebug() << "notificationActivated: " << action; - if (action == 1) - { - KWindowSystem::forceActiveWindow(winId()); - } -} - -AuthDetails::AuthDetails(const PolkitQt1::Details &details, - const PolkitQt1::ActionDescription &actionDescription, - const QString &appname, - QWidget *parent) - : QWidget(parent) -{ - setupUi(this); - - app_label->setText(appname); - - foreach(const QString &key, details.keys()) { //krazy:exclude=foreach (Details is not a map/hash, but rather a method) - int row = gridLayout->rowCount() + 1; - - QLabel *keyLabel = new QLabel(this); - keyLabel->setText(i18nc("%1 is the name of a detail about the current action " - "provided by polkit", "%1:", key)); - gridLayout->addWidget(keyLabel, row, 0); - - QLabel *valueLabel = new QLabel(this); - valueLabel->setText(details.lookup(key)); - gridLayout->addWidget(valueLabel, row, 1); - } - - action_label->setText(actionDescription.description()); - - action_label->setTipText(i18n("Click to edit %1", actionDescription.actionId())); - action_label->setUrl(actionDescription.actionId()); - - QString vendor = actionDescription.vendorName(); - QString vendorUrl = actionDescription.vendorUrl(); - - if (!vendor.isEmpty()) { - vendorUL->setText(vendor); - vendorUL->setTipText(i18n("Click to open %1", vendorUrl)); - vendorUL->setUrl(vendorUrl); - } else if (!vendorUrl.isEmpty()) { - vendorUL->setText(vendorUrl); - vendorUL->setTipText(i18n("Click to open %1", vendorUrl)); - vendorUL->setUrl(vendorUrl); - } else { - vendorL->hide(); - vendorUL->hide(); - } - - connect(vendorUL, SIGNAL(leftClickedUrl(const QString&)), SLOT(openUrl(const QString&))); - connect(action_label, SIGNAL(leftClickedUrl(const QString&)), SLOT(openAction(const QString&))); -} - -void AuthDetails::openUrl(const QString& url) -{ - KToolInvocation::invokeBrowser(url); -} - -void AuthDetails::openAction(const QString &url) -{ - QProcess::startDetached("polkit-kde-authorization", QStringList() << url); -} - -#include "moc_AuthDialog.cpp" diff --git a/polkit-kde-agent/AuthDialog.h b/polkit-kde-agent/AuthDialog.h deleted file mode 100644 index 594690a2..00000000 --- a/polkit-kde-agent/AuthDialog.h +++ /dev/null @@ -1,92 +0,0 @@ -/* This file is part of the KDE project - Copyright (C) 2007-2008 Gökçen Eraslan - Copyright (C) 2008 Daniel Nicoletti - Copyright (C) 2010 Dario Freddi - - This program is free software; you can redistribute it and/or - modify it under the terms of the GNU General Public - License as published by the Free Software Foundation; either - version 2 of the License, or (at your option) any later version. - - This library is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - Library General Public License for more details. - - You should have received a copy of the GNU Library General Public License - along with this library; see the file COPYING.LIB. If not, write to - the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, - Boston, MA 02110-1301, USA. - -*/ - -#ifndef AUTHDIALOG_H -#define AUTHDIALOG_H - -#include "ui_AuthDialog.h" -#include "ui_authdetails.h" - -#include - -#include -#include - -namespace PolkitQt1 -{ -class Details; -} - -class AuthDialog : public KDialog, private Ui::AuthDialog -{ - Q_OBJECT -public: - AuthDialog(const QString &actionId, - const QString &message, - const QString &iconName, - const PolkitQt1::Details &details, - const PolkitQt1::Identity::List &identities, - WId parent); - ~AuthDialog(); - - void setRequest(const QString &request, bool requiresAdmin); - void setOptions(); - QString password() const; - void authenticationFailure(); - - PolkitQt1::Identity adminUserSelected() const; - - PolkitQt1::ActionDescription m_actionDescription; - -signals: - void adminUserSelected(PolkitQt1::Identity); - -public slots: - virtual void accept(); - -private slots: - void on_userCB_currentIndexChanged(int index); - void notificationActivated(unsigned int action); - -private: - QString m_appname; - QString m_message; - - void createUserCB(const PolkitQt1::Identity::List &identities); - void showEvent(QShowEvent *); -}; - -class AuthDetails : public QWidget, private Ui::AuthDetails -{ - Q_OBJECT -public: - AuthDetails(const PolkitQt1::Details &details, - const PolkitQt1::ActionDescription &actionDescription, - const QString &appname, - QWidget *parent); - -private slots: - void openUrl(const QString&); - void openAction(const QString&); -}; - -#endif // AUTHDIALOG_H diff --git a/polkit-kde-agent/AuthDialog.ui b/polkit-kde-agent/AuthDialog.ui deleted file mode 100644 index 27480ff6..00000000 --- a/polkit-kde-agent/AuthDialog.ui +++ /dev/null @@ -1,204 +0,0 @@ - - AuthDialog - - - - 0 - 0 - 335 - 193 - - - - - 0 - 0 - - - - - - - - - - 0 - 0 - - - - Lock Icon here - - - false - - - lePassword - - - - - - - Qt::Vertical - - - - 20 - 92 - - - - - - - - - - - - - 0 - 0 - - - - <b>Header is here!</b> - - - true - - - lePassword - - - - - - - - 0 - 0 - - - - <i>Content</i> - - - true - - - - - - - - - - - - Password: - - - lePassword - - - - - - - QLineEdit::Password - - - true - - - - - - - Remember authorization - - - true - - - - - - - For this session only - - - - - - - Qt::Horizontal - - - QSizePolicy::Fixed - - - - 15 - 10 - - - - - - - - - errorMessageKTW - lblPassword - lePassword - cbRemember - cbSessionOnly - horizontalSpacer - userCB - - - - KComboBox - QComboBox -
kcombobox.h
- - - KLineEdit - QLineEdit -
klineedit.h
- - - KTitleWidget - QWidget -
ktitlewidget.h
- - - - userCB - lePassword - cbRemember - cbSessionOnly - - - - - cbRemember - toggled(bool) - cbSessionOnly - setEnabled(bool) - - - 259 - 161 - - - 161 - 169 - - - - - diff --git a/polkit-kde-agent/CMakeLists.txt b/polkit-kde-agent/CMakeLists.txt deleted file mode 100644 index 586b0563..00000000 --- a/polkit-kde-agent/CMakeLists.txt +++ /dev/null @@ -1,48 +0,0 @@ -project(polkit-kde-agent-1) - -include_directories( - ${KDE4_INCLUDES} - ${POLKITQT-1_INCLUDE_DIR} - ${CMAKE_CURRENT_SOURCE_DIR} - ${CMAKE_CURRENT_BINARY_DIR} -) - -set(policykit_SRCS - policykitkde.cpp - policykitlistener.cpp - main.cpp - AuthDialog.cpp -) - -qt4_add_dbus_adaptor(policykit_SRCS - org.kde.Polkit1AuthAgent.xml - policykitlistener.h - PolicyKitListener -) - -add_executable(polkit-kde-authentication-agent-1 ${policykit_SRCS}) - -target_link_libraries(polkit-kde-authentication-agent-1 - ${KDE4_KDEUI_LIBS} - ${POLKITQT-1_LIBRARIES} -) - -configure_file( - polkit-kde-authentication-agent-1.desktop.in - ${CMAKE_BINARY_DIR}/polkit-kde-authentication-agent-1.desktop -) - -install( - TARGETS polkit-kde-authentication-agent-1 - DESTINATION ${KDE4_LIBEXEC_INSTALL_DIR} -) - -install( - FILES ${CMAKE_BINARY_DIR}/polkit-kde-authentication-agent-1.desktop - DESTINATION ${KDE4_AUTOSTART_INSTALL_DIR} -) - -install( - FILES policykit1-kde.notifyrc - DESTINATION ${KDE4_DATA_INSTALL_DIR}/policykit1-kde -) diff --git a/polkit-kde-agent/COPYING b/polkit-kde-agent/COPYING deleted file mode 100644 index 5185fd3f..00000000 --- a/polkit-kde-agent/COPYING +++ /dev/null @@ -1,346 +0,0 @@ -NOTE! The GPL below is copyrighted by the Free Software Foundation, but -the instance of code that it refers to (the kde programs) are copyrighted -by the authors who actually wrote it. - ---------------------------------------------------------------------------- - - GNU GENERAL PUBLIC LICENSE - Version 2, June 1991 - - Copyright (C) 1989, 1991 Free Software Foundation, Inc. - 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA - Everyone is permitted to copy and distribute verbatim copies - of this license document, but changing it is not allowed. - - Preamble - - The licenses for most software are designed to take away your -freedom to share and change it. By contrast, the GNU General Public -License is intended to guarantee your freedom to share and change free -software--to make sure the software is free for all its users. This -General Public License applies to most of the Free Software -Foundation's software and to any other program whose authors commit to -using it. (Some other Free Software Foundation software is covered by -the GNU Library General Public License instead.) You can apply it to -your programs, too. - - When we speak of free software, we are referring to freedom, not -price. Our General Public Licenses are designed to make sure that you -have the freedom to distribute copies of free software (and charge for -this service if you wish), that you receive source code or can get it -if you want it, that you can change the software or use pieces of it -in new free programs; and that you know you can do these things. - - To protect your rights, we need to make restrictions that forbid -anyone to deny you these rights or to ask you to surrender the rights. -These restrictions translate to certain responsibilities for you if you -distribute copies of the software, or if you modify it. - - For example, if you distribute copies of such a program, whether -gratis or for a fee, you must give the recipients all the rights that -you have. You must make sure that they, too, receive or can get the -source code. And you must show them these terms so they know their -rights. - - We protect your rights with two steps: (1) copyright the software, and -(2) offer you this license which gives you legal permission to copy, -distribute and/or modify the software. - - Also, for each author's protection and ours, we want to make certain -that everyone understands that there is no warranty for this free -software. If the software is modified by someone else and passed on, we -want its recipients to know that what they have is not the original, so -that any problems introduced by others will not reflect on the original -authors' reputations. - - Finally, any free program is threatened constantly by software -patents. We wish to avoid the danger that redistributors of a free -program will individually obtain patent licenses, in effect making the -program proprietary. To prevent this, we have made it clear that any -patent must be licensed for everyone's free use or not licensed at all. - - The precise terms and conditions for copying, distribution and -modification follow. - - GNU GENERAL PUBLIC LICENSE - TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION - - 0. This License applies to any program or other work which contains -a notice placed by the copyright holder saying it may be distributed -under the terms of this General Public License. The "Program", below, -refers to any such program or work, and a "work based on the Program" -means either the Program or any derivative work under copyright law: -that is to say, a work containing the Program or a portion of it, -either verbatim or with modifications and/or translated into another -language. (Hereinafter, translation is included without limitation in -the term "modification".) Each licensee is addressed as "you". - -Activities other than copying, distribution and modification are not -covered by this License; they are outside its scope. The act of -running the Program is not restricted, and the output from the Program -is covered only if its contents constitute a work based on the -Program (independent of having been made by running the Program). -Whether that is true depends on what the Program does. - - 1. You may copy and distribute verbatim copies of the Program's -source code as you receive it, in any medium, provided that you -conspicuously and appropriately publish on each copy an appropriate -copyright notice and disclaimer of warranty; keep intact all the -notices that refer to this License and to the absence of any warranty; -and give any other recipients of the Program a copy of this License -along with the Program. - -You may charge a fee for the physical act of transferring a copy, and -you may at your option offer warranty protection in exchange for a fee. - - 2. You may modify your copy or copies of the Program or any portion -of it, thus forming a work based on the Program, and copy and -distribute such modifications or work under the terms of Section 1 -above, provided that you also meet all of these conditions: - - a) You must cause the modified files to carry prominent notices - stating that you changed the files and the date of any change. - - b) You must cause any work that you distribute or publish, that in - whole or in part contains or is derived from the Program or any - part thereof, to be licensed as a whole at no charge to all third - parties under the terms of this License. - - c) If the modified program normally reads commands interactively - when run, you must cause it, when started running for such - interactive use in the most ordinary way, to print or display an - announcement including an appropriate copyright notice and a - notice that there is no warranty (or else, saying that you provide - a warranty) and that users may redistribute the program under - these conditions, and telling the user how to view a copy of this - License. (Exception: if the Program itself is interactive but - does not normally print such an announcement, your work based on - the Program is not required to print an announcement.) - -These requirements apply to the modified work as a whole. If -identifiable sections of that work are not derived from the Program, -and can be reasonably considered independent and separate works in -themselves, then this License, and its terms, do not apply to those -sections when you distribute them as separate works. But when you -distribute the same sections as part of a whole which is a work based -on the Program, the distribution of the whole must be on the terms of -this License, whose permissions for other licensees extend to the -entire whole, and thus to each and every part regardless of who wrote it. - -Thus, it is not the intent of this section to claim rights or contest -your rights to work written entirely by you; rather, the intent is to -exercise the right to control the distribution of derivative or -collective works based on the Program. - -In addition, mere aggregation of another work not based on the Program -with the Program (or with a work based on the Program) on a volume of -a storage or distribution medium does not bring the other work under -the scope of this License. - - 3. You may copy and distribute the Program (or a work based on it, -under Section 2) in object code or executable form under the terms of -Sections 1 and 2 above provided that you also do one of the following: - - a) Accompany it with the complete corresponding machine-readable - source code, which must be distributed under the terms of Sections - 1 and 2 above on a medium customarily used for software interchange; or, - - b) Accompany it with a written offer, valid for at least three - years, to give any third party, for a charge no more than your - cost of physically performing source distribution, a complete - machine-readable copy of the corresponding source code, to be - distributed under the terms of Sections 1 and 2 above on a medium - customarily used for software interchange; or, - - c) Accompany it with the information you received as to the offer - to distribute corresponding source code. (This alternative is - allowed only for noncommercial distribution and only if you - received the program in object code or executable form with such - an offer, in accord with Subsection b above.) - -The source code for a work means the preferred form of the work for -making modifications to it. For an executable work, complete source -code means all the source code for all modules it contains, plus any -associated interface definition files, plus the scripts used to -control compilation and installation of the executable. However, as a -special exception, the source code distributed need not include -anything that is normally distributed (in either source or binary -form) with the major components (compiler, kernel, and so on) of the -operating system on which the executable runs, unless that component -itself accompanies the executable. - -If distribution of executable or object code is made by offering -access to copy from a designated place, then offering equivalent -access to copy the source code from the same place counts as -distribution of the source code, even though third parties are not -compelled to copy the source along with the object code. - - 4. You may not copy, modify, sublicense, or distribute the Program -except as expressly provided under this License. Any attempt -otherwise to copy, modify, sublicense or distribute the Program is -void, and will automatically terminate your rights under this License. -However, parties who have received copies, or rights, from you under -this License will not have their licenses terminated so long as such -parties remain in full compliance. - - 5. You are not required to accept this License, since you have not -signed it. However, nothing else grants you permission to modify or -distribute the Program or its derivative works. These actions are -prohibited by law if you do not accept this License. Therefore, by -modifying or distributing the Program (or any work based on the -Program), you indicate your acceptance of this License to do so, and -all its terms and conditions for copying, distributing or modifying -the Program or works based on it. - - 6. Each time you redistribute the Program (or any work based on the -Program), the recipient automatically receives a license from the -original licensor to copy, distribute or modify the Program subject to -these terms and conditions. You may not impose any further -restrictions on the recipients' exercise of the rights granted herein. -You are not responsible for enforcing compliance by third parties to -this License. - - 7. If, as a consequence of a court judgment or allegation of patent -infringement or for any other reason (not limited to patent issues), -conditions are imposed on you (whether by court order, agreement or -otherwise) that contradict the conditions of this License, they do not -excuse you from the conditions of this License. If you cannot -distribute so as to satisfy simultaneously your obligations under this -License and any other pertinent obligations, then as a consequence you -may not distribute the Program at all. For example, if a patent -license would not permit royalty-free redistribution of the Program by -all those who receive copies directly or indirectly through you, then -the only way you could satisfy both it and this License would be to -refrain entirely from distribution of the Program. - -If any portion of this section is held invalid or unenforceable under -any particular circumstance, the balance of the section is intended to -apply and the section as a whole is intended to apply in other -circumstances. - -It is not the purpose of this section to induce you to infringe any -patents or other property right claims or to contest validity of any -such claims; this section has the sole purpose of protecting the -integrity of the free software distribution system, which is -implemented by public license practices. Many people have made -generous contributions to the wide range of software distributed -through that system in reliance on consistent application of that -system; it is up to the author/donor to decide if he or she is willing -to distribute software through any other system and a licensee cannot -impose that choice. - -This section is intended to make thoroughly clear what is believed to -be a consequence of the rest of this License. - - 8. If the distribution and/or use of the Program is restricted in -certain countries either by patents or by copyrighted interfaces, the -original copyright holder who places the Program under this License -may add an explicit geographical distribution limitation excluding -those countries, so that distribution is permitted only in or among -countries not thus excluded. In such case, this License incorporates -the limitation as if written in the body of this License. - - 9. The Free Software Foundation may publish revised and/or new versions -of the General Public License from time to time. Such new versions will -be similar in spirit to the present version, but may differ in detail to -address new problems or concerns. - -Each version is given a distinguishing version number. If the Program -specifies a version number of this License which applies to it and "any -later version", you have the option of following the terms and conditions -either of that version or of any later version published by the Free -Software Foundation. If the Program does not specify a version number of -this License, you may choose any version ever published by the Free Software -Foundation. - - 10. If you wish to incorporate parts of the Program into other free -programs whose distribution conditions are different, write to the author -to ask for permission. For software which is copyrighted by the Free -Software Foundation, write to the Free Software Foundation; we sometimes -make exceptions for this. Our decision will be guided by the two goals -of preserving the free status of all derivatives of our free software and -of promoting the sharing and reuse of software generally. - - NO WARRANTY - - 11. BECAUSE THE PROGRAM IS LICENSED FREE OF CHARGE, THERE IS NO WARRANTY -FOR THE PROGRAM, TO THE EXTENT PERMITTED BY APPLICABLE LAW. EXCEPT WHEN -OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR OTHER PARTIES -PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED -OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF -MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. THE ENTIRE RISK AS -TO THE QUALITY AND PERFORMANCE OF THE PROGRAM IS WITH YOU. SHOULD THE -PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF ALL NECESSARY SERVICING, -REPAIR OR CORRECTION. - - 12. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING -WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY AND/OR -REDISTRIBUTE THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, -INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING -OUT OF THE USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED -TO LOSS OF DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY -YOU OR THIRD PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER -PROGRAMS), EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE -POSSIBILITY OF SUCH DAMAGES. - - END OF TERMS AND CONDITIONS - - How to Apply These Terms to Your New Programs - - If you develop a new program, and you want it to be of the greatest -possible use to the public, the best way to achieve this is to make it -free software which everyone can redistribute and change under these terms. - - To do so, attach the following notices to the program. It is safest -to attach them to the start of each source file to most effectively -convey the exclusion of warranty; and each file should have at least -the "copyright" line and a pointer to where the full notice is found. - - - Copyright (C) 19yy - - This program is free software; you can redistribute it and/or modify - it under the terms of the GNU General Public License as published by - the Free Software Foundation; either version 2 of the License, or - (at your option) any later version. - - This program is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - GNU General Public License for more details. - - You should have received a copy of the GNU General Public License - along with this program; if not, write to the Free Software - Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA - - -Also add information on how to contact you by electronic and paper mail. - -If the program is interactive, make it output a short notice like this -when it starts in an interactive mode: - - Gnomovision version 69, Copyright (C) 19yy name of author - Gnomovision comes with ABSOLUTELY NO WARRANTY; for details type `show w'. - This is free software, and you are welcome to redistribute it - under certain conditions; type `show c' for details. - -The hypothetical commands `show w' and `show c' should show the appropriate -parts of the General Public License. Of course, the commands you use may -be called something other than `show w' and `show c'; they could even be -mouse-clicks or menu items--whatever suits your program. - -You should also get your employer (if you work as a programmer) or your -school, if any, to sign a "copyright disclaimer" for the program, if -necessary. Here is a sample; alter the names: - - Yoyodyne, Inc., hereby disclaims all copyright interest in the program - `Gnomovision' (which makes passes at compilers) written by James Hacker. - - , 1 April 1989 - Ty Coon, President of Vice - -This General Public License does not permit incorporating your program into -proprietary programs. If your program is a subroutine library, you may -consider it more useful to permit linking proprietary applications with the -library. If this is what you want to do, use the GNU Library General -Public License instead of this License. diff --git a/polkit-kde-agent/Messages.sh b/polkit-kde-agent/Messages.sh deleted file mode 100644 index c21b0b09..00000000 --- a/polkit-kde-agent/Messages.sh +++ /dev/null @@ -1,4 +0,0 @@ -#! /bin/sh -$EXTRACTRC `find -name \*.ui -o -name \*.rc -o -name \*.kcfg` >> rc.cpp || exit 11 -$XGETTEXT `find -name \*.cpp -o -name \*.h` -o $podir/polkit-kde-authentication-agent-1.pot -rm -f rc.cpp diff --git a/polkit-kde-agent/authdetails.ui b/polkit-kde-agent/authdetails.ui deleted file mode 100644 index 6dda5da2..00000000 --- a/polkit-kde-agent/authdetails.ui +++ /dev/null @@ -1,91 +0,0 @@ - - AuthDetails - - - - 0 - 0 - 273 - 80 - - - - - 0 - 0 - - - - - - - Application: - - - - - - - Action: - - - - - - - Vendor: - - - - - - - Vendor: - - - - - - true - - - - - - - Action: - - - - - - true - - - - - - - Qt::Horizontal - - - - - - - Application: - - - - - - - - KUrlLabel - QLabel -
kurllabel.h
- - - - - diff --git a/polkit-kde-agent/main.cpp b/polkit-kde-agent/main.cpp deleted file mode 100644 index 03086049..00000000 --- a/polkit-kde-agent/main.cpp +++ /dev/null @@ -1,44 +0,0 @@ -/* This file is part of the KDE project - Copyright (C) 2009 Jaroslav Reznik - - This program is free software; you can redistribute it and/or - modify it under the terms of the GNU General Public - License as published by the Free Software Foundation; either - version 2 of the License, or (at your option) any later version. - - This library is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - Library General Public License for more details. - - You should have received a copy of the GNU Library General Public License - along with this library; see the file COPYING.LIB. If not, write to - the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, - Boston, MA 02110-1301, USA. - -*/ - -#include -#include -#include - -#include "policykitkde.h" - -int main(int argc, char *argv[]) -{ - KAboutData aboutData("Polkit1AuthAgent", "polkit-kde-authentication-agent-1", ki18n("PolicyKit1-KDE"), "0.99.0", - ki18n("PolicyKit1-KDE"), KAboutData::License_GPL, - ki18n("(c) 2009 Red Hat, Inc.")); - aboutData.addAuthor(ki18n("Jaroslav Reznik"), ki18n("Maintainer"), "jreznik@redhat.com"); - - KCmdLineArgs::init(argc, argv, &aboutData); - - if (!PolicyKitKDE::start()) { - qWarning("PolicyKitKDE is already running!\n"); - return 0; - } - - PolicyKitKDE agent; - agent.disableSessionManagement(); - agent.exec(); -} diff --git a/polkit-kde-agent/org.freedesktop.PolicyKit.AuthenticationAgent.xml b/polkit-kde-agent/org.freedesktop.PolicyKit.AuthenticationAgent.xml deleted file mode 100644 index f5aa8ef4..00000000 --- a/polkit-kde-agent/org.freedesktop.PolicyKit.AuthenticationAgent.xml +++ /dev/null @@ -1,15 +0,0 @@ - - - - - - - - - - - - - - - diff --git a/polkit-kde-agent/org.kde.Polkit1AuthAgent.xml b/polkit-kde-agent/org.kde.Polkit1AuthAgent.xml deleted file mode 100644 index 0aa39dec..00000000 --- a/polkit-kde-agent/org.kde.Polkit1AuthAgent.xml +++ /dev/null @@ -1,10 +0,0 @@ - - - - - - - - - diff --git a/polkit-kde-agent/policykit1-kde.notifyrc b/polkit-kde-agent/policykit1-kde.notifyrc deleted file mode 100644 index 63b0336f..00000000 --- a/polkit-kde-agent/policykit1-kde.notifyrc +++ /dev/null @@ -1,91 +0,0 @@ -[Global] -IconName=dialog-password -Comment=PolicyKit authentication dialog -Comment[cs]=Ověřovací dialog PolicyKitu -Comment[da]=PolicyKit autentificeringsdialog -Comment[de]=PolicyKit-Berechtigungsdialog -Comment[es]=Diálogo de autenticación de PolicyKit -Comment[et]=PolicyKiti autentimisdialoog -Comment[fr]=Boîte de dialogue d'authentification de PolicyKit -Comment[hu]=PolicyKit hitelesítési párbeszédablak -Comment[it]=Finestra di autenticazione di PolicyKit -Comment[km]=ប្រអប់​ផ្ទៀង​ផ្ទាត់​ភាព​ត្រឹមត្រូវ​ PolicyKit ​ -Comment[ms]=Dialog pengesahan PolicyKit -Comment[nb]=PolicyKit autentiseringsdialog -Comment[nds]=Regelsett-Identiteetprööv-Dialoog -Comment[nl]=Authenticatiedialoog van PolicyKit -Comment[pa]=ਪਾਲਸੀਕਿੱਟ ਪਰਮਾਣਕਿਤਾ ਡਾਈਲਾਗ -Comment[pt]=Janela de autenticação do PolicyKit -Comment[pt_BR]=Diálogo de autenticação do PolicyKit -Comment[ru]=Диалоговое окно аутентификации PolicyKit -Comment[sv]=Policykit behörighetsdialogruta -Comment[uk]=Діалогове вікно розпізнавання PolicyKit -Comment[x-test]=xxPolicyKit authentication dialogxx -Comment[zh_TW]=PolicyKit 認證對話框 -Name=policykit1-kde -Name[cs]=policykit1-kde -Name[da]=policykit1-kde -Name[de]=policykit1-kde -Name[es]=policykit1-kde -Name[et]=policykit1-kde -Name[fr]=policykit1-kde -Name[hu]=policykit1-kde -Name[it]=policykit1-kde -Name[km]=policykit1-kde -Name[ms]=policykit1-kde -Name[nb]=policykit1-kde -Name[nds]=Regelsett1-KDE -Name[nl]=policykit1-kde -Name[pa]=policykit1-kde -Name[pt]=policykit1-kde -Name[pt_BR]=policykit1-kde -Name[ru]=policykit1-kde -Name[sv]=policykit1-kde -Name[uk]=policykit1-kde -Name[x-test]=xxpolicykit1-kdexx -Name[zh_TW]=policykit1-kde - -[Event/authenticate] -Name=authenticate -Name[cs]=ověřit -Name[da]=autentificér -Name[de]=Berechtigen -Name[es]=autenticarse -Name[et]=Autentimine -Name[fr]=authentifier -Name[hu]=hitelesítés -Name[it]=autenticazione -Name[km]=ផ្ទៀង​ផ្ទាត់​ភាព​ត្រឹម​ត្រូវ​ -Name[ms]=pengesahan -Name[nb]=autentiser -Name[nds]=Identiteet pröven -Name[nl]=authenticatie -Name[pa]=ਪਰਮਾਣਕਿਤਾ -Name[pt]=autenticar -Name[pt_BR]=autenticar -Name[ru]=аутентификация -Name[sv]=behörighetskontrollera -Name[uk]=розпізнавання -Name[x-test]=xxauthenticatexx -Name[zh_TW]=認證 -Comment=You are required to authenticate -Comment[cs]=Je vyžadováno ověření totožnosti -Comment[da]=Du skal autentificere -Comment[de]=Sie benötigen eine Berechtigung -Comment[es]=Es necesario que se autentique -Comment[et]=Vajalik on autentimine -Comment[fr]=Vous devez vous authentifier -Comment[hu]=Hitelesítés szükséges -Comment[it]=Devi effettuare l'autenticazione -Comment[nb]=Du må autentisere -Comment[nds]=Identiteetprööv deit noot -Comment[nl]=Authenticeren is verplicht -Comment[pa]=ਤੁਹਾਨੂੰ ਪਰਮਾਣਿਤ ਹੋਣ ਦੀ ਲੋੜ ਹੈ -Comment[pt]=É necessária a sua autenticação -Comment[pt_BR]=É necessária a sua autenticação -Comment[ru]=Необходимо выполнить аутентификацию -Comment[sv]=Det krävs att din behörighet kontrolleras -Comment[uk]=Вам слід пройти розпізнавання -Comment[x-test]=xxYou are required to authenticatexx -Comment[zh_TW]=您需要認證 -Action=Popup diff --git a/polkit-kde-agent/policykitkde.cpp b/polkit-kde-agent/policykitkde.cpp deleted file mode 100644 index a8ca0d22..00000000 --- a/polkit-kde-agent/policykitkde.cpp +++ /dev/null @@ -1,43 +0,0 @@ -/* This file is part of the KDE project - Copyright (C) 2009 Jaroslav Reznik - - This program is free software; you can redistribute it and/or - modify it under the terms of the GNU General Public - License as published by the Free Software Foundation; either - version 2 of the License, or (at your option) any later version. - - This library is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - Library General Public License for more details. - - You should have received a copy of the GNU Library General Public License - along with this library; see the file COPYING.LIB. If not, write to - the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, - Boston, MA 02110-1301, USA. - -*/ - -#include "policykitkde.h" - -#include -#include - -PolicyKitKDE::PolicyKitKDE() - : m_listener(new PolicyKitListener(this)) -{ - setQuitOnLastWindowClosed(false); - - PolkitQt1::UnixSessionSubject session(getpid()); - - bool result = m_listener->registerListener(session, "/org/kde/PolicyKit1/AuthenticationAgent"); - if (!result) { - kWarning() << "Couldn't register listener!"; - exit(1); - } -} - -PolicyKitKDE::~PolicyKitKDE() -{ - m_listener->deleteLater(); -} diff --git a/polkit-kde-agent/policykitkde.h b/polkit-kde-agent/policykitkde.h deleted file mode 100644 index 85ce6b26..00000000 --- a/polkit-kde-agent/policykitkde.h +++ /dev/null @@ -1,38 +0,0 @@ -/* This file is part of the KDE project - Copyright (C) 2009 Jaroslav Reznik - - This program is free software; you can redistribute it and/or - modify it under the terms of the GNU General Public - License as published by the Free Software Foundation; either - version 2 of the License, or (at your option) any later version. - - This library is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - Library General Public License for more details. - - You should have received a copy of the GNU Library General Public License - along with this library; see the file COPYING.LIB. If not, write to - the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, - Boston, MA 02110-1301, USA. - -*/ - -#ifndef POLICYKITKDE_H -#define POLICYKITKDE_H - -#include - -#include "policykitlistener.h" - -class PolicyKitKDE : public KUniqueApplication -{ - Q_OBJECT -public: - PolicyKitKDE(); - virtual ~PolicyKitKDE(); -private: - PolicyKitListener *m_listener; -}; - -#endif diff --git a/polkit-kde-agent/policykitlistener.cpp b/polkit-kde-agent/policykitlistener.cpp deleted file mode 100644 index b14be682..00000000 --- a/polkit-kde-agent/policykitlistener.cpp +++ /dev/null @@ -1,233 +0,0 @@ -/* This file is part of the KDE project - Copyright (C) 2009 Jaroslav Reznik - - This program is free software; you can redistribute it and/or - modify it under the terms of the GNU General Public - License as published by the Free Software Foundation; either - version 2 of the License, or (at your option) any later version. - - This library is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - Library General Public License for more details. - - You should have received a copy of the GNU Library General Public License - along with this library; see the file COPYING.LIB. If not, write to - the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, - Boston, MA 02110-1301, USA. - -*/ - -#include "policykitlistener.h" -#include "AuthDialog.h" - -#include -#include - -#include -#include -#include -#include -#include -#include - -#include "polkit1authagentadaptor.h" - -PolicyKitListener::PolicyKitListener(QObject *parent) - : Listener(parent) - , m_inProgress(false) - , m_selectedUser(0) -{ - (void) new Polkit1AuthAgentAdaptor(this); - - if (!QDBusConnection::sessionBus().registerObject("/org/kde/Polkit1AuthAgent", this, - QDBusConnection::ExportScriptableSlots | - QDBusConnection::ExportScriptableProperties | - QDBusConnection::ExportAdaptors)) { - kWarning() << "Could not initiate DBus helper!"; - } - - kDebug() << "Listener online"; -} - -PolicyKitListener::~PolicyKitListener() -{ -} - -void PolicyKitListener::setWIdForAction(const QString& action, qulonglong wID) -{ - kDebug() << "On to the handshake"; - m_actionsToWID[action] = wID; -} - -void PolicyKitListener::initiateAuthentication(const QString &actionId, - const QString &message, - const QString &iconName, - const PolkitQt1::Details &details, - const QString &cookie, - const PolkitQt1::Identity::List &identities, - PolkitQt1::Agent::AsyncResult* result) -{ - kDebug() << "Initiating authentication"; - - if (m_inProgress) { - result->setError(i18n("Another client is already authenticating, please try again later.")); - result->setCompleted(); - kDebug() << "Another client is already authenticating, please try again later."; - return; - } - - m_identities = identities; - m_cookie = cookie; - m_result = result; - m_session.clear(); - if (identities.length() == 1) { - m_selectedUser = identities[0]; - } - - m_inProgress = true; - - WId parentId = 0; - - if (m_actionsToWID.contains(actionId)) { - parentId = m_actionsToWID[actionId]; - } - - m_dialog = new AuthDialog(actionId, message, iconName, details, identities, parentId); - connect(m_dialog.data(), SIGNAL(okClicked()), SLOT(dialogAccepted())); - connect(m_dialog.data(), SIGNAL(cancelClicked()), SLOT(dialogCanceled())); - connect(m_dialog.data(), SIGNAL(adminUserSelected(PolkitQt1::Identity)), SLOT(userSelected(PolkitQt1::Identity))); - - kDebug() << "WinId of the dialog is " << m_dialog.data()->winId() << m_dialog.data()->effectiveWinId(); - m_dialog.data()->setOptions(); - m_dialog.data()->show(); - kDebug() << "WinId of the shown dialog is " << m_dialog.data()->winId() << m_dialog.data()->effectiveWinId(); - - m_numTries = 0; - tryAgain(); -} - -void PolicyKitListener::tryAgain() -{ - kDebug() << "Trying again"; -// test!!! - m_wasCancelled = false; - - // We will create new session only when some user is selected - if (m_selectedUser.isValid()) { - m_session = new Session(m_selectedUser, m_cookie, m_result); - connect(m_session.data(), SIGNAL(request(QString, bool)), this, SLOT(request(QString, bool))); - connect(m_session.data(), SIGNAL(completed(bool)), this, SLOT(completed(bool))); - connect(m_session.data(), SIGNAL(showError(QString)), this, SLOT(showError(QString))); - - m_session.data()->initiate(); - } - -} - -void PolicyKitListener::finishObtainPrivilege() -{ - kDebug() << "Finishing obtaining privileges"; - - // Number of tries increase only when some user is selected - if (m_selectedUser.isValid()) { - m_numTries++; - } - - if (!m_gainedAuthorization && !m_wasCancelled && !m_dialog.isNull()) { - m_dialog.data()->authenticationFailure(); - - if (m_numTries < 3) { - m_session.data()->deleteLater(); - - tryAgain(); - return; - } - } - - if (!m_session.isNull()) { - m_session.data()->result()->setCompleted(); - } else { - m_result->setCompleted(); - } - m_session.data()->deleteLater(); - - if (!m_dialog.isNull()) { - m_dialog.data()->hide(); - m_dialog.data()->deleteLater(); - } - - m_inProgress = false; - - kDebug() << "Finish obtain authorization:" << m_gainedAuthorization; -} - -bool PolicyKitListener::initiateAuthenticationFinish() -{ - kDebug() << "Finishing authentication"; - return true; -} - -void PolicyKitListener::cancelAuthentication() -{ - kDebug() << "Cancelling authentication"; - - m_wasCancelled = true; - finishObtainPrivilege(); -} - -void PolicyKitListener::request(const QString &request, bool echo) -{ - Q_UNUSED(echo); - kDebug() << "Request: " << request; - - if (!m_dialog.isNull()) { - m_dialog.data()->setRequest(request, m_selectedUser.isValid() && - m_selectedUser.toString() == "unix-user:root"); - } -} - -void PolicyKitListener::completed(bool gainedAuthorization) -{ - kDebug() << "Completed: " << gainedAuthorization; - - m_gainedAuthorization = gainedAuthorization; - - finishObtainPrivilege(); -} - -void PolicyKitListener::showError(const QString &text) -{ - kDebug() << "Error: " << text; -} - -void PolicyKitListener::dialogAccepted() -{ - kDebug() << "Dialog accepted"; - - if (!m_dialog.isNull()) { - m_session.data()->setResponse(m_dialog.data()->password()); - } -} - -void PolicyKitListener::dialogCanceled() -{ - kDebug() << "Dialog cancelled"; - - m_wasCancelled = true; - if (!m_session.isNull()) { - m_session.data()->cancel(); - } - - finishObtainPrivilege(); -} - -void PolicyKitListener::userSelected(const PolkitQt1::Identity &identity) -{ - m_selectedUser = identity; - // If some user is selected we must destroy existing session - if (!m_session.isNull()) { - m_session.data()->deleteLater(); - } - tryAgain(); -} diff --git a/polkit-kde-agent/policykitlistener.h b/polkit-kde-agent/policykitlistener.h deleted file mode 100644 index 28b00e10..00000000 --- a/polkit-kde-agent/policykitlistener.h +++ /dev/null @@ -1,80 +0,0 @@ -#ifndef POLICYKITLISTENER_H -#define POLICYKITLISTENER_H - -/* This file is part of the KDE project - Copyright (C) 2009 Jaroslav Reznik - - This program is free software; you can redistribute it and/or - modify it under the terms of the GNU General Public - License as published by the Free Software Foundation; either - version 2 of the License, or (at your option) any later version. - - This library is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - Library General Public License for more details. - - You should have received a copy of the GNU Library General Public License - along with this library; see the file COPYING.LIB. If not, write to - the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, - Boston, MA 02110-1301, USA. - -*/ - -#include - -#include -#include - -class AuthDialog; - -using namespace PolkitQt1::Agent; - -class PolicyKitListener : public Listener -{ - Q_OBJECT - Q_CLASSINFO("D-Bus Interface", "org.kde.Polkit1AuthAgent") -public: - PolicyKitListener(QObject *parent = 0); - virtual ~PolicyKitListener(); - -public slots: - void initiateAuthentication(const QString &actionId, - const QString &message, - const QString &iconName, - const PolkitQt1::Details &details, - const QString &cookie, - const PolkitQt1::Identity::List &identities, - PolkitQt1::Agent::AsyncResult* result); - bool initiateAuthenticationFinish(); - void cancelAuthentication(); - - void tryAgain(); - void finishObtainPrivilege(); - - void request(const QString &request, bool echo); - void completed(bool gainedAuthorization); - void showError(const QString &text); - - void setWIdForAction(const QString &action, qulonglong wID); - /* void showInfo(const QString &text); */ -private: - QWeakPointer m_dialog; - QWeakPointer m_session; - bool m_inProgress; - bool m_gainedAuthorization; - bool m_wasCancelled; - int m_numTries; - PolkitQt1::Identity::List m_identities; - PolkitQt1::Agent::AsyncResult* m_result; - QString m_cookie; - PolkitQt1::Identity m_selectedUser; - QHash< QString, qulonglong > m_actionsToWID; - -private slots: - void dialogAccepted(); - void dialogCanceled(); - void userSelected(const PolkitQt1::Identity &identity); -}; - -#endif diff --git a/polkit-kde-agent/polkit-kde-authentication-agent-1.desktop.in b/polkit-kde-agent/polkit-kde-authentication-agent-1.desktop.in deleted file mode 100644 index 313bf2ee..00000000 --- a/polkit-kde-agent/polkit-kde-authentication-agent-1.desktop.in +++ /dev/null @@ -1,23 +0,0 @@ -[Desktop Entry] -Name=PolicyKit Authentication Agent -Name[da]=PolicyKit autentificeringsagent -Name[en_GB]=PolicyKit Authentication Agent -Name[et]=PolicyKiti autentimisagent -Name[pt]=Agente de Autenticação do PolicyKit -Name[sv]=Policykit behörighetskontrollverktyg -Name[uk]=Агент розпізнавання PolicyKit -Name[x-test]=xxPolicyKit Authentication Agentxx -Comment=PolicyKit Authentication Agent -Comment[da]=PolicyKit autentificeringsagent -Comment[en_GB]=PolicyKit Authentication Agent -Comment[et]=PolicyKiti autentimisagent -Comment[pt]=Agente de Autenticação do PolicyKit -Comment[sv]=Policykit behörighetskontrollverktyg -Comment[uk]=Агент розпізнавання PolicyKit -Comment[x-test]=xxPolicyKit Authentication Agentxx -Exec=${KDE4_LIBEXEC_INSTALL_DIR}/polkit-kde-authentication-agent-1 -Terminal=false -Type=Application -Categories= -X-Desktop-File-Install-Version=0.15 -OnlyShowIn=KDE;