Browse Source

Really get rid of nox dependency in nox mode

adaptive-webui-19844
Christophe Dumez 14 years ago
parent
commit
ab8e35b6b4
  1. 14
      src/misc.cpp
  2. 6
      src/qtlibtorrent/qbtsession.cpp

14
src/misc.cpp

@ -198,18 +198,6 @@ long long misc::freeDiskSpaceOnPath(QString path) { @@ -198,18 +198,6 @@ long long misc::freeDiskSpaceOnPath(QString path) {
#endif
}
void suspendComputer() {
#ifdef Q_WS_X11
// Use dbus to power off the system
// dbus-send --print-reply --system --dest=org.freedesktop.Hal /org/freedesktop/Hal/devices/computer org.freedesktop.Hal.Device.SystemPowerManagement.Shutdown
QDBusInterface computer("org.freedesktop.Hal", "/org/freedesktop/Hal/devices/computer", "org.freedesktop.Hal.Device.SystemPowerManagement", QDBusConnection::systemBus());
computer.call("Suspend", 5);
#endif
#ifdef Q_WS_MAC
#endif
}
#ifndef DISABLE_GUI
void misc::shutdownComputer(bool sleep) {
#ifdef Q_WS_X11
@ -295,6 +283,7 @@ void misc::shutdownComputer(bool sleep) { @@ -295,6 +283,7 @@ void misc::shutdownComputer(bool sleep) {
(PTOKEN_PRIVILEGES) NULL, 0);
#endif
}
#endif // DISABLE_GUI
QString misc::truncateRootFolder(boost::intrusive_ptr<torrent_info> t) {
#if LIBTORRENT_VERSION_MINOR >= 16
@ -328,7 +317,6 @@ QString misc::truncateRootFolder(boost::intrusive_ptr<torrent_info> t) { @@ -328,7 +317,6 @@ QString misc::truncateRootFolder(boost::intrusive_ptr<torrent_info> t) {
}
return root_folder;
}
#endif // DISABLE_GUI
QString misc::truncateRootFolder(libtorrent::torrent_handle h) {
torrent_info t = h.get_torrent_info();

6
src/qtlibtorrent/qbtsession.cpp

@ -1964,16 +1964,21 @@ void QBtSession::readAlerts() { @@ -1964,16 +1964,21 @@ void QBtSession::readAlerts() {
qDebug("Emitting finishedTorrent() signal");
emit finishedTorrent(h);
qDebug("Received finished alert for %s", qPrintable(h.name()));
#ifndef DISABLE_GUI
bool will_shutdown = (pref.shutdownWhenDownloadsComplete() ||
pref.shutdownqBTWhenDownloadsComplete() ||
pref.suspendWhenDownloadsComplete())
&& !hasDownloadingTorrents();
#else
bool will_shutdown = false;
#endif
// AutoRun program
if(pref.isAutoRunEnabled())
autoRunExternalProgram(h, will_shutdown);
// Mail notification
if(pref.isMailNotificationEnabled())
sendNotificationEmail(h);
#ifndef DISABLE_GUI
// Auto-Shutdown
if(will_shutdown) {
bool suspend = pref.suspendWhenDownloadsComplete();
@ -1997,6 +2002,7 @@ void QBtSession::readAlerts() { @@ -1997,6 +2002,7 @@ void QBtSession::readAlerts() {
qApp->exit();
return;
}
#endif // DISABLE_GUI
}
}
}

Loading…
Cancel
Save