Attachment #1940 for bug #1941

By default, Bugzilla does not search the list of RESOLVED bugs.
You can force it to do so by putting the upper-case word ALL in front of your search query, e.g.: ALL tdelibs
We recommend searching for bugs this way, as you may discover that your bug has already been resolved and fixed in a later release. View | Details | Raw Unified | Return to bug 1941
Collapse All | Expand All

Lines 88-93 Link Here

(-)tdelibs/CMakeLists.txt.ORI (+1 lines)
88	option( WITH_TDEHWLIB_DAEMONS "Enable daemons for TDE hwlib" ${WITH_ALL_OPTIONS} )	88	option( WITH_TDEHWLIB_DAEMONS "Enable daemons for TDE hwlib" ${WITH_ALL_OPTIONS} )
89	option( WITH_HAL "Enable HAL support" OFF )	89	option( WITH_HAL "Enable HAL support" OFF )
90	option( WITH_DEVKITPOWER "Enable DeviceKit Power support" OFF )	90	option( WITH_DEVKITPOWER "Enable DeviceKit Power support" OFF )
		91	option( WITH_LOGINDPOWER "Enable Logind/Systemd Power support" OFF )
91	option( WITH_UPOWER "Enable uPower support" ${WITH_ALL_OPTIONS} )	92	option( WITH_UPOWER "Enable uPower support" ${WITH_ALL_OPTIONS} )
92	option( WITH_UDISKS "Enable uDisks support" ${WITH_ALL_OPTIONS} )	93	option( WITH_UDISKS "Enable uDisks support" ${WITH_ALL_OPTIONS} )
93	option( WITH_UDISKS2 "Enable uDisks2 support" ${WITH_ALL_OPTIONS} )	94	option( WITH_UDISKS2 "Enable uDisks2 support" ${WITH_ALL_OPTIONS} )

Lines 36-41 Link Here

(-)tdelibs/tdecore/tdehw/CMakeLists.txt.ORI (+4 lines)
36	add_definitions( -DWITH_DEVKITPOWER )	36	add_definitions( -DWITH_DEVKITPOWER )
37	endif( )	37	endif( )
38		38
		39	if( WITH_LOGINDPOWER )
		40	add_definitions( -DWITH_LOGINDPOWER )
		41	endif( )
		42
39	if( WITH_UPOWER )	43	if( WITH_UPOWER )
40	add_definitions( -DWITH_UPOWER )	44	add_definitions( -DWITH_UPOWER )
41	endif( )	45	endif( )




		}
	}

#ifdef WITH_LOGINDPOWER
	{
		TQT_DBusConnection dbusConn = TQT_DBusConnection::addConnection(TQT_DBusConnection::SystemBus);
		if (dbusConn.isConnected()) {
			// can freeze?
			TQT_DBusMessage msg = TQT_DBusMessage::methodCall(
						"org.freedesktop.login1",
						"/org/freedesktop/login1",
						"org.freedesktop.login1.Manager",
						"CanHybridSleep");
			TQT_DBusMessage reply = dbusConn.sendWithReply(msg);
			if (reply.type() == TQT_DBusMessage::ReplyMessage && reply.count() == 1) {
				return (reply[0].toString() == "yes");
			}
		}
	}
#endif // WITH_LOGINDPOWER

#ifdef WITH_TDEHWLIB_DAEMONS
	{
		TQT_DBusConnection dbusConn = TQT_DBusConnection::addConnection(TQT_DBusConnection::SystemBus);

		}
	}

#ifdef WITH_LOGINDPOWER
	{
		TQT_DBusConnection dbusConn = TQT_DBusConnection::addConnection(TQT_DBusConnection::SystemBus);
		if (dbusConn.isConnected()) {
			// can suspend?
			TQT_DBusMessage msg = TQT_DBusMessage::methodCall(
						"org.freedesktop.login1",
						"/org/freedesktop/login1",
						"org.freedesktop.login1.Manager",
						"CanSuspend");
			TQT_DBusMessage reply = dbusConn.sendWithReply(msg);
			if (reply.type() == TQT_DBusMessage::ReplyMessage && reply.count() == 1) {
				return (reply[0].toString() == "yes");
			}
		}
	}
#endif // WITH_LOGINDPOWER

#ifdef WITH_UPOWER
	{
		TQT_DBusConnection dbusConn = TQT_DBusConnection::addConnection(TQT_DBusConnection::SystemBus);

		}
	}

#ifdef WITH_LOGINDPOWER
	{
		TQT_DBusConnection dbusConn = TQT_DBusConnection::addConnection(TQT_DBusConnection::SystemBus);
		if (dbusConn.isConnected()) {
			// can hibernate?
			TQT_DBusMessage msg = TQT_DBusMessage::methodCall(
						"org.freedesktop.login1",
						"/org/freedesktop/login1",
						"org.freedesktop.login1.Manager",
						"CanHibernate");
			TQT_DBusMessage reply = dbusConn.sendWithReply(msg);
			if (reply.type() == TQT_DBusMessage::ReplyMessage && reply.count() == 1) {
				return (reply[0].toString() == "yes");
			}
		}
	}
#endif // WITH_LOGINDPOWER

#ifdef WITH_UPOWER
	{
		TQT_DBusConnection dbusConn = TQT_DBusConnection::addConnection(TQT_DBusConnection::SystemBus);


	config->setGroup("General" );
	bool maysd = false;

#ifdef WITH_LOGINDPOWER
	{
		TQT_DBusConnection dbusConn = TQT_DBusConnection::addConnection(TQT_DBusConnection::SystemBus);
		if (dbusConn.isConnected()) {
			// can freeze?
			TQT_DBusMessage msg = TQT_DBusMessage::methodCall(
						"org.freedesktop.login1",
						"/org/freedesktop/login1",
						"org.freedesktop.login1.Manager",
						"CanPowerOff");
			TQT_DBusMessage reply = dbusConn.sendWithReply(msg);
			if (reply.type() == TQT_DBusMessage::ReplyMessage && reply.count() == 1) {
				return (reply[0].toString() == "yes");
			}
		}
	}
#endif // WITH_LOGINDPOWER

#ifdef WITH_CONSOLEKIT
	if (config->readBoolEntry( "offerShutdown", true )) {
		TQT_DBusConnection dbusConn = TQT_DBusConnection::addConnection(TQT_DBusConnection::SystemBus);


	config->setGroup("General" );
	bool mayrb = false;

#ifdef WITH_LOGINDPOWER
	{
		TQT_DBusConnection dbusConn = TQT_DBusConnection::addConnection(TQT_DBusConnection::SystemBus);
		if (dbusConn.isConnected()) {
			// can freeze?
			TQT_DBusMessage msg = TQT_DBusMessage::methodCall(
						"org.freedesktop.login1",
						"/org/freedesktop/login1",
						"org.freedesktop.login1.Manager",
						"CanReboot");
			TQT_DBusMessage reply = dbusConn.sendWithReply(msg);
			if (reply.type() == TQT_DBusMessage::ReplyMessage && reply.count() == 1) {
				return (reply[0].toString() == "yes");
			}
		}
	}
#endif // WITH_LOGINDPOWER

#ifdef WITH_CONSOLEKIT
	if (config->readBoolEntry( "offerShutdown", true )) {
		TQT_DBusConnection dbusConn = TQT_DBusConnection::addConnection(TQT_DBusConnection::SystemBus);

			return true;
		}

#ifdef WITH_LOGINDPOWER
		{
			TQT_DBusConnection dbusConn;
			dbusConn = TQT_DBusConnection::addConnection(TQT_DBusConnection::SystemBus);
			if ( dbusConn.isConnected() ) {
				if (ps == TDESystemPowerState::Freeze) {
					TQT_DBusMessage msg = TQT_DBusMessage::methodCall(
								"org.trinitydesktop.login1",
								"/org/freedesktop/login1",
								"org.freedesktop.login1.Manager",
								"HybridSleep");
					TQT_DBusMessage reply = dbusConn.sendWithReply(msg);
					if (reply.type() == TQT_DBusMessage::ReplyMessage) {
						return true;
					}
				}
				else if (ps == TDESystemPowerState::Suspend) {
					TQT_DBusMessage msg = TQT_DBusMessage::methodCall(
								"org.freedesktop.login1",
								"/org/freedesktop/login1",
								"org.freedesktop.login1.Manager",
								"Suspend");
					TQT_DBusMessage reply = dbusConn.sendWithReply(msg);
					if (reply.type() == TQT_DBusMessage::ReplyMessage) {
						return true;
					}
				}
				else if (ps == TDESystemPowerState::Hibernate) {
					TQT_DBusMessage msg = TQT_DBusMessage::methodCall(
								"org.freedesktop.login1",
								"/org/freedesktop/login1",
								"org.freedesktop.login1.Manager",
								"Hibernate");
					TQT_DBusMessage reply = dbusConn.sendWithReply(msg);
					if (reply.type() == TQT_DBusMessage::ReplyMessage) {
						return true;
					}
				}
			}
		}
#endif // WITH_LOGINDPOWER

#ifdef WITH_UPOWER
		{
			TQT_DBusConnection dbusConn;

		return false;
	}
	else if (ps == TDESystemPowerState::PowerOff) {
#ifdef WITH_CONSOLEKIT
		TDEConfig *config = TDEGlobal::config();
		config->reparseConfiguration(); // config may have changed in the KControl module
		config->setGroup("General" );
#ifdef WITH_LOGINDPOWER
		if (config->readBoolEntry( "offerShutdown", true )) {
			TQT_DBusConnection dbusConn;
			dbusConn = TQT_DBusConnection::addConnection(TQT_DBusConnection::SystemBus);
			if ( dbusConn.isConnected() ) {
				TQT_DBusMessage msg = TQT_DBusMessage::methodCall(
							"org.trinitydesktop.login1",
							"/org/freedesktop/login1",
							"org.freedesktop.login1.Manager",
							"PowerOff");
				dbusConn.sendWithReply(msg);
				return true;
			}
		}
		else {
			return false;
		}
#endif // WITH_LOGINDPOWER
#ifdef WITH_CONSOLEKIT
		if (config->readBoolEntry( "offerShutdown", true )) {
			TQT_DBusConnection dbusConn;
			dbusConn = TQT_DBusConnection::addConnection(TQT_DBusConnection::SystemBus);

#endif // WITH_CONSOLEKIT
	}
	else if (ps == TDESystemPowerState::Reboot) {
#ifdef WITH_CONSOLEKIT
		TDEConfig *config = TDEGlobal::config();
		config->reparseConfiguration(); // config may have changed in the KControl module
		config->setGroup("General" );
#ifdef WITH_LOGINDPOWER
		if (config->readBoolEntry( "offerShutdown", true )) {
			TQT_DBusConnection dbusConn;
			dbusConn = TQT_DBusConnection::addConnection(TQT_DBusConnection::SystemBus);
			if ( dbusConn.isConnected() ) {
				TQT_DBusMessage msg = TQT_DBusMessage::methodCall(
							"org.trinitydesktop.login1",
							"/org/freedesktop/login1",
							"org.freedesktop.login1.Manager",
							"Reboot");
				dbusConn.sendWithReply(msg);
				return true;
			}
		}
		else {
			return false;
		}
#endif // WITH_LOGINDPOWER
#ifdef WITH_CONSOLEKIT
		if (config->readBoolEntry( "offerShutdown", true )) {
			TQT_DBusConnection dbusConn;
			dbusConn = TQT_DBusConnection::addConnection(TQT_DBusConnection::SystemBus);

Return to bug 1941

Lines 182-187 Link Here

(-)tdelibs/tdecore/tdehw/tderootsystemdevice.cpp.ORI (-2 / +172 lines)
182	}	182	}
183	}	183	}
184		184
		185	#ifdef WITH_LOGINDPOWER
		186	{
		187	TQT_DBusConnection dbusConn = TQT_DBusConnection::addConnection(TQT_DBusConnection::SystemBus);
		188	if (dbusConn.isConnected()) {
		189	// can freeze?
		190	TQT_DBusMessage msg = TQT_DBusMessage::methodCall(
		191	"org.freedesktop.login1",
		192	"/org/freedesktop/login1",
		193	"org.freedesktop.login1.Manager",
		194	"CanHybridSleep");
		195	TQT_DBusMessage reply = dbusConn.sendWithReply(msg);
		196	if (reply.type() == TQT_DBusMessage::ReplyMessage && reply.count() == 1) {
		197	return (reply[0].toString() == "yes");
		198	}
		199	}
		200	}
		201	#endif // WITH_LOGINDPOWER
		202
185	#ifdef WITH_TDEHWLIB_DAEMONS	203	#ifdef WITH_TDEHWLIB_DAEMONS
186	{	204	{
187	TQT_DBusConnection dbusConn = TQT_DBusConnection::addConnection(TQT_DBusConnection::SystemBus);	205	TQT_DBusConnection dbusConn = TQT_DBusConnection::addConnection(TQT_DBusConnection::SystemBus);
Lines 221-226 Link Here
221	}	239	}
222	}	240	}
223		241
		242	#ifdef WITH_LOGINDPOWER
		243	{
		244	TQT_DBusConnection dbusConn = TQT_DBusConnection::addConnection(TQT_DBusConnection::SystemBus);
		245	if (dbusConn.isConnected()) {
		246	// can suspend?
		247	TQT_DBusMessage msg = TQT_DBusMessage::methodCall(
		248	"org.freedesktop.login1",
		249	"/org/freedesktop/login1",
		250	"org.freedesktop.login1.Manager",
		251	"CanSuspend");
		252	TQT_DBusMessage reply = dbusConn.sendWithReply(msg);
		253	if (reply.type() == TQT_DBusMessage::ReplyMessage && reply.count() == 1) {
		254	return (reply[0].toString() == "yes");
		255	}
		256	}
		257	}
		258	#endif // WITH_LOGINDPOWER
		259
224	#ifdef WITH_UPOWER	260	#ifdef WITH_UPOWER
225	{	261	{
226	TQT_DBusConnection dbusConn = TQT_DBusConnection::addConnection(TQT_DBusConnection::SystemBus);	262	TQT_DBusConnection dbusConn = TQT_DBusConnection::addConnection(TQT_DBusConnection::SystemBus);
Lines 322-327 Link Here
322	}	358	}
323	}	359	}
324		360
		361	#ifdef WITH_LOGINDPOWER
		362	{
		363	TQT_DBusConnection dbusConn = TQT_DBusConnection::addConnection(TQT_DBusConnection::SystemBus);
		364	if (dbusConn.isConnected()) {
		365	// can hibernate?
		366	TQT_DBusMessage msg = TQT_DBusMessage::methodCall(
		367	"org.freedesktop.login1",
		368	"/org/freedesktop/login1",
		369	"org.freedesktop.login1.Manager",
		370	"CanHibernate");
		371	TQT_DBusMessage reply = dbusConn.sendWithReply(msg);
		372	if (reply.type() == TQT_DBusMessage::ReplyMessage && reply.count() == 1) {
		373	return (reply[0].toString() == "yes");
		374	}
		375	}
		376	}
		377	#endif // WITH_LOGINDPOWER
		378
325	#ifdef WITH_UPOWER	379	#ifdef WITH_UPOWER
326	{	380	{
327	TQT_DBusConnection dbusConn = TQT_DBusConnection::addConnection(TQT_DBusConnection::SystemBus);	381	TQT_DBusConnection dbusConn = TQT_DBusConnection::addConnection(TQT_DBusConnection::SystemBus);
Lines 411-416 Link Here
411		465
412	config->setGroup("General" );	466	config->setGroup("General" );
413	bool maysd = false;	467	bool maysd = false;
		468
		469	#ifdef WITH_LOGINDPOWER
		470	{
		471	TQT_DBusConnection dbusConn = TQT_DBusConnection::addConnection(TQT_DBusConnection::SystemBus);
		472	if (dbusConn.isConnected()) {
		473	// can freeze?
		474	TQT_DBusMessage msg = TQT_DBusMessage::methodCall(
		475	"org.freedesktop.login1",
		476	"/org/freedesktop/login1",
		477	"org.freedesktop.login1.Manager",
		478	"CanPowerOff");
		479	TQT_DBusMessage reply = dbusConn.sendWithReply(msg);
		480	if (reply.type() == TQT_DBusMessage::ReplyMessage && reply.count() == 1) {
		481	return (reply[0].toString() == "yes");
		482	}
		483	}
		484	}
		485	#endif // WITH_LOGINDPOWER
		486
414	#ifdef WITH_CONSOLEKIT	487	#ifdef WITH_CONSOLEKIT
415	if (config->readBoolEntry( "offerShutdown", true )) {	488	if (config->readBoolEntry( "offerShutdown", true )) {
416	TQT_DBusConnection dbusConn = TQT_DBusConnection::addConnection(TQT_DBusConnection::SystemBus);	489	TQT_DBusConnection dbusConn = TQT_DBusConnection::addConnection(TQT_DBusConnection::SystemBus);
Lines 453-458 Link Here
453		526
454	config->setGroup("General" );	527	config->setGroup("General" );
455	bool mayrb = false;	528	bool mayrb = false;
		529
		530	#ifdef WITH_LOGINDPOWER
		531	{
		532	TQT_DBusConnection dbusConn = TQT_DBusConnection::addConnection(TQT_DBusConnection::SystemBus);
		533	if (dbusConn.isConnected()) {
		534	// can freeze?
		535	TQT_DBusMessage msg = TQT_DBusMessage::methodCall(
		536	"org.freedesktop.login1",
		537	"/org/freedesktop/login1",
		538	"org.freedesktop.login1.Manager",
		539	"CanReboot");
		540	TQT_DBusMessage reply = dbusConn.sendWithReply(msg);
		541	if (reply.type() == TQT_DBusMessage::ReplyMessage && reply.count() == 1) {
		542	return (reply[0].toString() == "yes");
		543	}
		544	}
		545	}
		546	#endif // WITH_LOGINDPOWER
		547
456	#ifdef WITH_CONSOLEKIT	548	#ifdef WITH_CONSOLEKIT
457	if (config->readBoolEntry( "offerShutdown", true )) {	549	if (config->readBoolEntry( "offerShutdown", true )) {
458	TQT_DBusConnection dbusConn = TQT_DBusConnection::addConnection(TQT_DBusConnection::SystemBus);	550	TQT_DBusConnection dbusConn = TQT_DBusConnection::addConnection(TQT_DBusConnection::SystemBus);
Lines 575-580 Link Here
575	return true;	667	return true;
576	}	668	}
577		669
		670	#ifdef WITH_LOGINDPOWER
		671	{
		672	TQT_DBusConnection dbusConn;
		673	dbusConn = TQT_DBusConnection::addConnection(TQT_DBusConnection::SystemBus);
		674	if ( dbusConn.isConnected() ) {
		675	if (ps == TDESystemPowerState::Freeze) {
		676	TQT_DBusMessage msg = TQT_DBusMessage::methodCall(
		677	"org.trinitydesktop.login1",
		678	"/org/freedesktop/login1",
		679	"org.freedesktop.login1.Manager",
		680	"HybridSleep");
		681	TQT_DBusMessage reply = dbusConn.sendWithReply(msg);
		682	if (reply.type() == TQT_DBusMessage::ReplyMessage) {
		683	return true;
		684	}
		685	}
		686	else if (ps == TDESystemPowerState::Suspend) {
		687	TQT_DBusMessage msg = TQT_DBusMessage::methodCall(
		688	"org.freedesktop.login1",
		689	"/org/freedesktop/login1",
		690	"org.freedesktop.login1.Manager",
		691	"Suspend");
		692	TQT_DBusMessage reply = dbusConn.sendWithReply(msg);
		693	if (reply.type() == TQT_DBusMessage::ReplyMessage) {
		694	return true;
		695	}
		696	}
		697	else if (ps == TDESystemPowerState::Hibernate) {
		698	TQT_DBusMessage msg = TQT_DBusMessage::methodCall(
		699	"org.freedesktop.login1",
		700	"/org/freedesktop/login1",
		701	"org.freedesktop.login1.Manager",
		702	"Hibernate");
		703	TQT_DBusMessage reply = dbusConn.sendWithReply(msg);
		704	if (reply.type() == TQT_DBusMessage::ReplyMessage) {
		705	return true;
		706	}
		707	}
		708	}
		709	}
		710	#endif // WITH_LOGINDPOWER
		711
578	#ifdef WITH_UPOWER	712	#ifdef WITH_UPOWER
579	{	713	{
580	TQT_DBusConnection dbusConn;	714	TQT_DBusConnection dbusConn;
Lines 726-735 Link Here
726	return false;	860	return false;
727	}	861	}
728	else if (ps == TDESystemPowerState::PowerOff) {	862	else if (ps == TDESystemPowerState::PowerOff) {
729	#ifdef WITH_CONSOLEKIT
730	TDEConfig *config = TDEGlobal::config();	863	TDEConfig *config = TDEGlobal::config();
731	config->reparseConfiguration(); // config may have changed in the KControl module	864	config->reparseConfiguration(); // config may have changed in the KControl module
732	config->setGroup("General" );	865	config->setGroup("General" );
		866	#ifdef WITH_LOGINDPOWER
		867	if (config->readBoolEntry( "offerShutdown", true )) {
		868	TQT_DBusConnection dbusConn;
		869	dbusConn = TQT_DBusConnection::addConnection(TQT_DBusConnection::SystemBus);
		870	if ( dbusConn.isConnected() ) {
		871	TQT_DBusMessage msg = TQT_DBusMessage::methodCall(
		872	"org.trinitydesktop.login1",
		873	"/org/freedesktop/login1",
		874	"org.freedesktop.login1.Manager",
		875	"PowerOff");
		876	dbusConn.sendWithReply(msg);
		877	return true;
		878	}
		879	}
		880	else {
		881	return false;
		882	}
		883	#endif // WITH_LOGINDPOWER
		884	#ifdef WITH_CONSOLEKIT
733	if (config->readBoolEntry( "offerShutdown", true )) {	885	if (config->readBoolEntry( "offerShutdown", true )) {
734	TQT_DBusConnection dbusConn;	886	TQT_DBusConnection dbusConn;
735	dbusConn = TQT_DBusConnection::addConnection(TQT_DBusConnection::SystemBus);	887	dbusConn = TQT_DBusConnection::addConnection(TQT_DBusConnection::SystemBus);
Lines 762-771 Link Here
762	#endif // WITH_CONSOLEKIT	914	#endif // WITH_CONSOLEKIT
763	}	915	}
764	else if (ps == TDESystemPowerState::Reboot) {	916	else if (ps == TDESystemPowerState::Reboot) {
765	#ifdef WITH_CONSOLEKIT
766	TDEConfig *config = TDEGlobal::config();	917	TDEConfig *config = TDEGlobal::config();
767	config->reparseConfiguration(); // config may have changed in the KControl module	918	config->reparseConfiguration(); // config may have changed in the KControl module
768	config->setGroup("General" );	919	config->setGroup("General" );
		920	#ifdef WITH_LOGINDPOWER
		921	if (config->readBoolEntry( "offerShutdown", true )) {
		922	TQT_DBusConnection dbusConn;
		923	dbusConn = TQT_DBusConnection::addConnection(TQT_DBusConnection::SystemBus);
		924	if ( dbusConn.isConnected() ) {
		925	TQT_DBusMessage msg = TQT_DBusMessage::methodCall(
		926	"org.trinitydesktop.login1",
		927	"/org/freedesktop/login1",
		928	"org.freedesktop.login1.Manager",
		929	"Reboot");
		930	dbusConn.sendWithReply(msg);
		931	return true;
		932	}
		933	}
		934	else {
		935	return false;
		936	}
		937	#endif // WITH_LOGINDPOWER
		938	#ifdef WITH_CONSOLEKIT
769	if (config->readBoolEntry( "offerShutdown", true )) {	939	if (config->readBoolEntry( "offerShutdown", true )) {
770	TQT_DBusConnection dbusConn;	940	TQT_DBusConnection dbusConn;
771	dbusConn = TQT_DBusConnection::addConnection(TQT_DBusConnection::SystemBus);	941	dbusConn = TQT_DBusConnection::addConnection(TQT_DBusConnection::SystemBus);