diff --git a/kdenetwork-filesharing/CMakeLists.txt b/kdenetwork-filesharing/CMakeLists.txt index f1039f1f..33d9b310 100644 --- a/kdenetwork-filesharing/CMakeLists.txt +++ b/kdenetwork-filesharing/CMakeLists.txt @@ -26,18 +26,6 @@ if(NOT INSIDE_KDENETWORK) include_directories(${CMAKE_SOURCE_DIR} ${CMAKE_BINARY_DIR} ${KDE4_INCLUDES}) endif(NOT INSIDE_KDENETWORK) -option(SAMBA_INSTALL "Offer to install Samba for file sharing with PackageKit if it is not already installed, use -DSAMBA_INSTALL=off to disable, use -DSAMBA_PACKAGE_NAME= to set package name." ON) -if(NOT SAMBA_PACKAGE_NAME) - set(SAMBA_PACKAGE_NAME \\\"samba\\\") -endif(NOT SAMBA_PACKAGE_NAME) -if(SAMBA_INSTALL) - message(STATUS "Samba install feature will be enabled.") - add_definitions(-DSAMBA_INSTALL) - add_definitions(-DSAMBA_PACKAGE_NAME=${SAMBA_PACKAGE_NAME}) -else(SAMBA_INSTALL) - message(STATUS "Samba install feature will NOT be enabled.") -endif(SAMBA_INSTALL) - add_subdirectory(samba) if(NOT INSIDE_KDENETWORK) diff --git a/kdenetwork-filesharing/samba/filepropertiesplugin/sambausershareplugin.cpp b/kdenetwork-filesharing/samba/filepropertiesplugin/sambausershareplugin.cpp index ac15abf5..a1d6826c 100644 --- a/kdenetwork-filesharing/samba/filepropertiesplugin/sambausershareplugin.cpp +++ b/kdenetwork-filesharing/samba/filepropertiesplugin/sambausershareplugin.cpp @@ -73,13 +73,6 @@ SambaUserSharePlugin::SambaUserSharePlugin(QObject *parent, const QListaddWidget(new QLabel(i18n("Samba is not installed on your system."), widget)); -#ifdef SAMBA_INSTALL - KPushButton *btn = new KPushButton(i18n("Install Samba..."), widget); - btn->setDefault(false); - vLayout->addWidget(btn); - connect(btn, SIGNAL(clicked()), SLOT(installSamba())); -#endif - // align items on top vLayout->addStretch(); @@ -115,23 +108,6 @@ SambaUserSharePlugin::~SambaUserSharePlugin() { } -void SambaUserSharePlugin::installSamba() -{ - unsigned int xid = 0; - QStringList packages; - packages << SAMBA_PACKAGE_NAME; - QString interaction("show-confirm-install,show-progress"); - - QDBusInterface device("org.freedesktop.PackageKit", "/org/freedesktop/PackageKit", - "org.freedesktop.PackageKit.Modify"); - if (!device.isValid()) { - KMessageBox::sorry(qobject_cast(this), - i18n("Samba could not be installed.
Please, check if kpackagekit is properly installed
")); - return; - } - QDBusReply reply = device.call("InstallPackageNames", xid, packages, interaction); -} - void SambaUserSharePlugin::setupModel() { model = new UserPermissionModel(shareData, this);