Katana_mirror/kde-extraapps
1
0
Fork 0
mirror of https://bitbucket.org/smil3y/kde-extraapps.git synced 2025-02-24 10:52:53 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

improve (somewhat) and enable the build of kdenetwork-filesharing

Browse source
This commit is contained in:
Ivailo Monev 2014-12-02 02:47:25 +00:00
parent 3d88b1dae2
commit dd614afaa1
2 changed files with 10 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
CMakeLists.txt
View file

@ -32,8 +32,9 @@ macro_optional_add_subdirectory (filelight)
macro_optional_add_subdirectory (gwenview) macro_optional_add_subdirectory (gwenview)
macro_optional_add_subdirectory (kcalc) macro_optional_add_subdirectory (kcalc)
macro_optional_add_subdirectory (kcron) macro_optional_add_subdirectory (kcron)
# macro_optional_add_subdirectory (kdenetwork-filesharing) macro_optional_add_subdirectory (kdenetwork-filesharing)
macro_optional_add_subdirectory (kfilemetadata) macro_optional_add_subdirectory (kfilemetadata)
# macro_optional_add_subdirectory (kfilereplace)
macro_optional_add_subdirectory (libkscreen) macro_optional_add_subdirectory (libkscreen)
# FIXME: make kget find libktorrent # FIXME: make kget find libktorrent
macro_optional_add_subdirectory (libktorrent) macro_optional_add_subdirectory (libktorrent)

10
kdenetwork-filesharing/samba/filepropertiesplugin/sambausershareplugin.cpp
View file

@ -31,6 +31,7 @@
#include <ksambashare.h> #include <ksambashare.h>
#include <ksambasharedata.h> #include <ksambasharedata.h>
#include <kmessagebox.h> #include <kmessagebox.h>
#include <kstandarddirs.h>
#include <KDE/KPluginFactory> #include <KDE/KPluginFactory>
#include <KDE/KPluginLoader> #include <KDE/KPluginLoader>
@ -62,8 +63,7 @@ SambaUserSharePlugin::SambaUserSharePlugin(QObject *parent, const QList<QVariant
properties->addPage(vbox, i18n("&Share")); properties->addPage(vbox, i18n("&Share"));
properties->setFileSharingPage(vbox); properties->setFileSharingPage(vbox);
if (!QFile::exists("/sbin/smbd") if (!KStandardDirs::findExe("smbd").isEmpty()) {
&& !QFile::exists("/local/sbin/smbd")) {
QWidget *widget = new QWidget(vbox); QWidget *widget = new QWidget(vbox);
QVBoxLayout *vLayout = new QVBoxLayout(widget); QVBoxLayout *vLayout = new QVBoxLayout(widget);
@ -159,6 +159,12 @@ void SambaUserSharePlugin::applyChanges()
} else if (KSambaShare::instance()->isDirectoryShared(url)) { } else if (KSambaShare::instance()->isDirectoryShared(url)) {
result = shareData.remove(); result = shareData.remove();
} }
#warning "Improve error reporting"
if (!result == KSambaShareData::UserShareOk) {
KMessageBox::sorry(qobject_cast<KPropertiesDialog *>(this),
i18n("<qt>The action did not successed.</qt>"));
}
} }
void SambaUserSharePlugin::toggleShareStatus(bool checked) void SambaUserSharePlugin::toggleShareStatus(bool checked)