diff options
| author | Daniel Nicoletti <mirttex85-pk@yahoo.com.br> | 2008-07-22 18:24:17 -0300 |
|---|---|---|
| committer | Daniel Nicoletti <mirttex85-pk@yahoo.com.br> | 2008-07-22 18:24:17 -0300 |
| commit | 9446ceac4eb1ca2b2716d0d93377541e430209f8 (patch) | |
| tree | c370df0580f9ce9d838d725d7432b1f09c254e57 | |
| parent | 0c39ced95c29a83a895d95b760e96043b627cdbb (diff) | |
| parent | bd0e89e8b574fd30528f9d3ec72a8976d37a771b (diff) | |
Merge branch 'master' of git+ssh://mirttex@git.packagekit.org/srv/git/QPackageKit
| -rw-r--r-- | gui/CMakeLists.txt | 2 | ||||
| -rw-r--r-- | gui/KPackageKitD/kpackagekitd.cpp | 4 | ||||
| -rwxr-xr-x | gui/Settings/PkSettings.cpp | 6 | ||||
| -rw-r--r-- | lib/CMakeLists.txt | 2 | ||||
| -rw-r--r-- | lib/PolkitClient.cpp | 2 |
5 files changed, 9 insertions, 7 deletions
diff --git a/gui/CMakeLists.txt b/gui/CMakeLists.txt index 3bb3a18..5830de3 100644 --- a/gui/CMakeLists.txt +++ b/gui/CMakeLists.txt @@ -9,7 +9,7 @@ include(KDE4Defaults) add_definitions(${QT_DEFINITIONS} ${KDE_DEFINITIONS}) include_directories( ${CMAKE_SOURCE_DIR} ${CMAKE_BINARY_DIR} ${KDE4_INCLUDES} ${QPACKAGEKIT_INCLUDE_DIR} ) -#${KDE4_KIO_INCLUDES} +#${KDE4_KIO_INCLUDES} add_subdirectory( AddRm ) add_subdirectory( Settings ) add_subdirectory( Updater ) diff --git a/gui/KPackageKitD/kpackagekitd.cpp b/gui/KPackageKitD/kpackagekitd.cpp index 605ed05..06d3b04 100644 --- a/gui/KPackageKitD/kpackagekitd.cpp +++ b/gui/KPackageKitD/kpackagekitd.cpp @@ -64,9 +64,9 @@ void KPackageKitD::init() m_pkClient_updates = m_daemon->newTransaction(); // connect( m_pkClient_updates, SIGNAL(GotPackage(Package *)), m_pkg_model_updates, SLOT(addPackage(Package *)) ); connect( m_pkClient_updates, SIGNAL( Finished(Exit::Value, uint)), this, SLOT( Finished(Exit::Value, uint) ) ); - + read(); - + //check if any changes to the file occour //this also prevents from reading when a checkUpdate happens m_confWatch = new KDirWatch(this); diff --git a/gui/Settings/PkSettings.cpp b/gui/Settings/PkSettings.cpp index 2df53ec..6cdbaa6 100755 --- a/gui/Settings/PkSettings.cpp +++ b/gui/Settings/PkSettings.cpp @@ -32,17 +32,17 @@ PkSettings::PkSettings( QWidget *parent ) : QWidget( parent ) { setupUi( this ); - + // Create a new daemon m_daemon = new Daemon(this); - + uint actions = m_daemon->getActions(); if ( !(actions & Actions::Refresh_cache) ) { intervalL->setEnabled(false); intervalCB->setEnabled(false); } - + intervalCB->addItem(i18n("Hourly"), HOURLY ); intervalCB->addItem(i18n("Daily"), DAILY ); intervalCB->addItem(i18n("Weekly"), WEEKLY ); diff --git a/lib/CMakeLists.txt b/lib/CMakeLists.txt index 59acc59..318d6ab 100644 --- a/lib/CMakeLists.txt +++ b/lib/CMakeLists.txt @@ -53,7 +53,9 @@ set_target_properties( packagekit-qt PROPERTIES VERSION 0.1 SOVERSION 0 ) target_link_libraries(packagekit-qt ${QT_QTCORE_LIBRARY} + ${QT_QTDBUS_LIBRARY} polkit-dbus + dbus-1 ) install(TARGETS diff --git a/lib/PolkitClient.cpp b/lib/PolkitClient.cpp index c386580..f20e694 100644 --- a/lib/PolkitClient.cpp +++ b/lib/PolkitClient.cpp @@ -16,7 +16,7 @@ bool PolkitClient::getAuth(const QString &action) { if(!auth) { qDebug() << "Authentification error :" << e.name << ":" << e.message; } - + return auth; } |