Merge branch 'master' of http://scm.trinitydesktop.org/scm/git/tdelibs

CMakeLists.txt

@@ -83,6 +83,7 @@ OPTION( WITH_PCRE "Enable pcre regex support for kjs" ON )
 OPTION( WITH_GCC_VISIBILITY "Enable fvisibility and fvisibility-inlines-hidden" ${WITH_ALL_OPTIONS} )
 OPTION( WITH_INOTIFY "Enable inotify support for kio" ON )
 OPTION( WITH_GAMIN "Enable FAM/GAMIN support" ${WITH_ALL_OPTIONS} )
+option( WITH_UPOWER "Enable UPOWER support" ${WITH_ALL_OPTIONS} )
 OPTION( WITH_NETWORK_MANAGER_BACKEND "Enable network-manager support" OFF )
 OPTION( WITH_SUDO_TDESU_BACKEND "Use sudo as backend for tdesu (default is su)" OFF )
 

tdecore/CMakeLists.txt

@@ -14,6 +14,13 @@ add_subdirectory( network )
 add_subdirectory( kconfig_compiler )
 add_subdirectory( hwlibdata )
 
+if( NOT DBUS_SYSTEM_BUS )
+  set( DBUS_SYSTEM_BUS "unix:path=/var/run/dbus/system_bus_socket" CACHE INTERNAL "" FORCE )
+endif()
+
+if( WITH_UPOWER )
+  add_definitions( -DWITH_UPOWER )
+endif( )
 
 if( WITH_LIBART )
   add_subdirectory( svgicons )

tdecore/tdehardwaredevices.cpp

@@ -63,7 +63,16 @@
 #include "config.h"
 
 #ifdef WITH_NETWORK_MANAGER_BACKEND
-#include "networkbackends/network-manager/network-manager.h"
+	#include "networkbackends/network-manager/network-manager.h"
+#endif // WITH_NETWORK_MANAGER_BACKEND
+
+// uPower integration
+#ifdef WITH_UPOWER
+	#include <tqdbusdata.h>
+	#include <tqdbusmessage.h>
+	#include <tqdbusproxy.h>
+	#include <tqdbusvariant.h>
+	#include <tqdbusconnection.h>
 #endif // WITH_NETWORK_MANAGER_BACKEND
 
 // BEGIN BLOCK
@@ -1113,7 +1122,25 @@ bool TDERootSystemDevice::canSuspend() {
 		}
 	}
 	else {
+#ifdef WITH_UPOWER
+		TQT_DBusConnection dbusConn = TQT_DBusConnection::addConnection(TQT_DBusConnection::SystemBus);
+		if (dbusConn.isConnected()) {
+			TQT_DBusProxy upowerProperties("org.freedesktop.UPower", "/org/freedesktop/UPower", "org.freedesktop.DBus.Properties", dbusConn);
+	
+			// can suspend?
+			TQValueList<TQT_DBusData> params;
+			params << TQT_DBusData::fromString(upowerProperties.interface()) << TQT_DBusData::fromString("CanSuspend");
+			TQT_DBusMessage reply = upowerProperties.sendWithReply("Get", params);
+			if (reply.type() == TQT_DBusMessage::ReplyMessage && reply.count() == 1) {
+				return reply[0].toVariant().value.toBool();
+			}
+		}
+		else {
+			return FALSE;
+		}
+#else // WITH_UPOWER
 		return FALSE;
+#endif// WITH_UPOWER
 	}
 }
 
@@ -1128,9 +1155,27 @@ bool TDERootSystemDevice::canHibernate() {
 			return FALSE;
 		}
 	}
+	else {
+#ifdef WITH_UPOWER
+		TQT_DBusConnection dbusConn = TQT_DBusConnection::addConnection(TQT_DBusConnection::SystemBus);
+		if (dbusConn.isConnected()) {
+			TQT_DBusProxy upowerProperties("org.freedesktop.UPower", "/org/freedesktop/UPower", "org.freedesktop.DBus.Properties", dbusConn);
+	
+			// can hibernate?
+			TQValueList<TQT_DBusData> params;
+			params << TQT_DBusData::fromString(upowerProperties.interface()) << TQT_DBusData::fromString("CanHibernate");
+			TQT_DBusMessage reply = upowerProperties.sendWithReply("Get", params);
+			if (reply.type() == TQT_DBusMessage::ReplyMessage && reply.count() == 1) {
+				return reply[0].toVariant().value.toBool();
+			}
+		}
 		else {
 			return FALSE;
 		}
+#else // WITH_UPOWER
+		return FALSE;
+#endif// WITH_UPOWER
+	}
 }
 
 bool TDERootSystemDevice::canPowerOff() {
@@ -1196,6 +1241,40 @@ bool TDERootSystemDevice::setPowerState(TDESystemPowerState::TDESystemPowerState
 			file.close();
 			return true;
 		}
+		else {
+#ifdef WITH_UPOWER
+			TQT_DBusConnection dbusConn;
+			dbusConn = TQT_DBusConnection::addConnection(TQT_DBusConnection::SystemBus);
+			if ( dbusConn.isConnected() ) {
+				if (ps == TDESystemPowerState::Suspend) {
+					TQT_DBusMessage msg = TQT_DBusMessage::methodCall(
+								"org.freedesktop.UPower",
+								"/org/freedesktop/UPower",
+								"org.freedesktop.UPower",
+								"Suspend");
+					dbusConn.sendWithReply(msg);
+					return true;
+				}
+				else if (ps == TDESystemPowerState::Hibernate) {
+					TQT_DBusMessage msg = TQT_DBusMessage::methodCall(
+								"org.freedesktop.UPower",
+								"/org/freedesktop/UPower",
+								"org.freedesktop.UPower",
+								"Hibernate");
+					dbusConn.sendWithReply(msg);
+					return true;
+				}
+				else {
+					return false;
+				}
+			}
+			else {
+				return false;
+			}
+#else // WITH_UPOWER
+			return false;
+#endif // WITH_UPOWER
+		}
 	}
 	else if (ps == TDESystemPowerState::PowerOff) {
 		// Power down the system using a DCOP command

tdeui/knuminput.cpp

@@ -1099,7 +1099,6 @@ double KDoubleSpinBox::minValue() const {
 void KDoubleSpinBox::setMinValue( double value ) {
   bool ok = false;
   int min = d->mapToInt( value, &ok );
-  if ( !ok ) return;
   base::setMinValue( min );
   updateValidator();
 }
@@ -1112,7 +1111,6 @@ double KDoubleSpinBox::maxValue() const {
 void KDoubleSpinBox::setMaxValue( double value ) {
   bool ok = false;
   int max = d->mapToInt( value, &ok );
-  if ( !ok ) return;
   base::setMaxValue( max );
   updateValidator();
 }