Attachment #2324 for bug #2110

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 2110
Collapse All | Expand All

Lines 12-18 Link Here

(-)a/ConfigureChecks.cmake (-7 / +22 lines)
12	#	12	#
13	#################################################	13	#################################################
14		14
		15	# required stuff
15	tde_setup_architecture_flags( )	16	tde_setup_architecture_flags( )
		17	find_package( TQt )
		18	find_package( TDE )
16		19
17		20
18	##### check for libdl ###########################	21	##### check for libdl ###########################
Lines 63-68 if( WITH_HAL ) Link Here
63	endif( )	63	endif( )
64		64
65		65
		66	# tdehwlib (drkonqi, kcontrol, kicker, ksmserver, tdeioslaves, tdm)
		67	if( WITH_TDEHWLIB )
		68	tde_save_and_set( CMAKE_REQUIRED_INCLUDES "${TDE_INCLUDE_DIR}" )
		69	check_cxx_source_compiles( "
		70	#include <kdemacros.h>
		71	#ifndef __TDE_HAVE_TDEHWLIB
		72	#error tdecore is not build with tdehwlib
		73	#endif
		74	int main() { return 0; } "
		75	HAVE_TDEHWLIB
		76	)
		77	tde_restore( CMAKE_REQUIRED_INCLUDES )
		78	if( NOT HAVE_TDEHWLIB )
		79	tde_message_fatal( "tdehwlib is required, but not built in tdecore" )
		80	endif( NOT HAVE_TDEHWLIB )
		81	endif( )
		82
		83
66	# udev (tsak)	84	# udev (tsak)
67	if( BUILD_TSAK )	85	if( BUILD_TSAK )
68	pkg_search_module( UDEV udev )	86	pkg_search_module( UDEV udev )
Lines 322-329 else( ) Link Here
322	set( WITHOUT_ARTS 1 )	338	set( WITHOUT_ARTS 1 )
323	endif( )	339	endif( )
324		340
325	# libart
326		341
		342	# libart
327	if( WITH_LIBART )	343	if( WITH_LIBART )
328	pkg_search_module( LIBART libart-2.0 )	344	pkg_search_module( LIBART libart-2.0 )
329	if( NOT LIBART_FOUND )	345	if( NOT LIBART_FOUND )
Lines 333-344 if( WITH_LIBART ) Link Here
333	endif( WITH_LIBART )	349	endif( WITH_LIBART )
334		350
335		351
336	# required stuff
337	find_package( TQt )
338	find_package( TDE )
339
340
341
342	# dbus (tdm, kdesktop, twin/compton-tde.c)	352	# dbus (tdm, kdesktop, twin/compton-tde.c)
343	if( BUILD_TDM OR BUILD_KDESKTOP OR (BUILD_TWIN AND WITH_XCOMPOSITE) )	353	if( BUILD_TDM OR BUILD_KDESKTOP OR (BUILD_TWIN AND WITH_XCOMPOSITE) )
344		354




#include <tdemessagebox.h>
#include <tdelocale.h>
#include <tdetempfile.h>
#ifdef __TDE_HAVE_TDEHWLIB
#include <tdehardwaredevices.h>
#endif

#ifdef HAVE_ELFICON
	// Elven things

	}
#endif // HAVE_ELFICON

#ifdef __TDE_HAVE_TDEHWLIB
	// Append potentially important hardware information
	m_strBt.append("\n==== (tdehwlib) hardware information ====\n");
	TDEHardwareDevices *hwdevices = TDEGlobal::hardwareDevices();

			m_strBt.append("\n");
		}
	}
#endif

	{
		// Clean up hard to read debug blocks

Lines 64-72 if( BUILD_KCONTROL ) Link Here

(-)a/kcontrol/CMakeLists.txt (-1 / +1 lines)
64	add_subdirectory( kthememanager )	64	add_subdirectory( kthememanager )
65	add_subdirectory( tdefontinst )	65	add_subdirectory( tdefontinst )
66	add_subdirectory( access )	66	add_subdirectory( access )
67	add_subdirectory( hwmanager )
68		67
69	tde_conditional_add_subdirectory( WITH_XRANDR displayconfig )	68	tde_conditional_add_subdirectory( WITH_XRANDR displayconfig )
		69	tde_conditional_add_subdirectory( WITH_TDEHWLIB hwmanager )
70	tde_conditional_add_subdirectory( WITH_SAMBA samba )	70	tde_conditional_add_subdirectory( WITH_SAMBA samba )
71	tde_conditional_add_subdirectory( WITH_XRANDR randr )	71	tde_conditional_add_subdirectory( WITH_XRANDR randr )
72	tde_conditional_add_subdirectory( WITH_LIBRAW1394 view1394 )	72	tde_conditional_add_subdirectory( WITH_LIBRAW1394 view1394 )




KDisplayConfig::KDisplayConfig(TQWidget *parent, const char *name, const TQStringList &)
  : TDECModule(KDisplayCFactory::instance(), parent, name), iccTab(0), numberOfProfiles(0), numberOfScreens(0), m_randrsimple(0), activeProfileName(""), m_gammaApplyTimer(0)
{
#ifdef __TDE_HAVE_TDEHWLIB
	TDEHardwareDevices *hwdevices = TDEGlobal::hardwareDevices();
	connect(hwdevices, TQT_SIGNAL(hardwareUpdated(TDEGenericDevice*)), this, TQT_SLOT(deviceChanged(TDEGenericDevice*)));
#endif

	m_randrsimple = new KRandrSimpleAPI();


}

void KDisplayConfig::deviceChanged (TDEGenericDevice* device) {
#ifdef __TDE_HAVE_TDEHWLIB
	if (device->type() == TDEGenericDeviceType::Monitor) {
		if (base->rescanHardware->isEnabled()) {
			base->rescanHardware->setEnabled(false);

			base->rescanHardware->setEnabled(true);
		}
	}
#endif
}

void KDisplayConfig::updateExtendedMonitorInformation () {

Lines 35-41 Link Here

(-)a/kcontrol/displayconfig/displayconfig.h (+4 lines)
35	#include <dcopobject.h>	35	#include <dcopobject.h>
36		36
37	#include <libtderandr/libtderandr.h>	37	#include <libtderandr/libtderandr.h>
		38	#ifdef __TDE_HAVE_TDEHWLIB
38	#include <tdehardwaredevices.h>	39	#include <tdehardwaredevices.h>
		40	#else
		41	#define TDEGenericDevice void
		42	#endif
39		43
40	#include "monitorworkspace.h"	44	#include "monitorworkspace.h"
41	#include "displayconfigbase.h"	45	#include "displayconfigbase.h"




		applyIccConfiguration(cur_profile, NULL);
	}

#ifdef __TDE_HAVE_TDEHWLIB
	TDEHardwareDevices *hwdevices = TDEGlobal::hardwareDevices();
	connect(hwdevices, TQT_SIGNAL(hardwareUpdated(TDEGenericDevice*)), this, TQT_SLOT(deviceChanged(TDEGenericDevice*)));
#endif
}

/*!

}

void KRandRSystemTray::deviceChanged (TDEGenericDevice* device) {
#ifdef __TDE_HAVE_TDEHWLIB
	if (device->type() == TDEGenericDeviceType::Monitor) {
		KRandrPassivePopup::message(
		i18n("New display output options are available!"),

		reloadDisplayConfiguration();
		applyHotplugRules(locateLocal("config", "/", true));
	}
#endif
}

void KRandRSystemTray::slotHelpContents()

Lines 25-31 Link Here

(-)a/kcontrol/randr/tderandrtray.h (+4 lines)
25	#include <kglobalaccel.h>	25	#include <kglobalaccel.h>
26		26
27	#include <libtderandr/libtderandr.h>	27	#include <libtderandr/libtderandr.h>
		28	#ifdef __TDE_HAVE_TDEHWLIB
28	#include <tdehardwaredevices.h>	29	#include <tdehardwaredevices.h>
		30	#else
		31	#define TDEGenericDevice void
		32	#endif
29		33
30	class KHelpMenu;	34	class KHelpMenu;
31	class TDEPopupMenu;	35	class TDEPopupMenu;




#include <kdebug.h>
#include <tdeglobal.h>
#include <tdeglobalsettings.h>
#ifdef __TDE_HAVE_TDEHWLIB
#include <tdehardwaredevices.h>
#endif
#include <kiconloader.h>
#include <klineedit.h>
#include <tdelocale.h>

    }

    bool maysd = false;
#if defined(COMPILE_HALBACKEND)
    if (ksmserver.readBoolEntry( "offerShutdown", true ) && DM().canShutdown())
        maysd = true;
#elif defined(__TDE_HAVE_TDEHWLIB)
    TDERootSystemDevice* rootDevice = TDEGlobal::hardwareDevices()->rootSystemDevice();
    if( rootDevice ) {
        maysd = rootDevice->canPowerOff();

    bool suspend_freeze = false;
    bool standby = false;
    bool suspend_disk = false;
#if defined(COMPILE_HALBACKEND)
    suspend_ram = libhal_device_get_property_bool(m_halCtx,
        "/org/freedesktop/Hal/devices/computer",
        "power_management.can_suspend",

        "/org/freedesktop/Hal/devices/computer",
        "power_management.can_hibernate",
        NULL);
#elif defined(__TDE_HAVE_TDEHWLIB) // COMPILE_HALBACKEND
    TDERootSystemDevice* rootDevice = TDEGlobal::hardwareDevices()->rootSystemDevice();
    if (rootDevice) {
        suspend_ram = rootDevice->canSuspend();

        DCOPRef("kdesktop", "KScreensaverIface").call("lock()");
    }

#if defined(COMPILE_HALBACKEND)
    DBusMessage* msg = NULL;

    if (m_dbusConn) {

        }
        dbus_message_unref(msg);
    }
#elif defined(__TDE_HAVE_TDEHWLIB) // COMPILE_HALBACKEND
    TDERootSystemDevice* rootDevice = TDEGlobal::hardwareDevices()->rootSystemDevice();
    if (rootDevice) {
        if (id == 1) {

            return;
        }
    }
#else
    error = false;
#endif
    if (error) {
        KMessageBox::error(this, i18n("Suspend failed"));
    }
}

void KMenu::runUserCommand()




    clientInteracting = 0;
    xonCommand = config->readEntry( "xonCommand", "xon" );

#ifdef __TDE_HAVE_TDEHWLIB
    hwDevices = TDEGlobal::hardwareDevices();
#endif

    connect( &knotifyTimeoutTimer, TQT_SIGNAL( timeout()), TQT_SLOT( knotifyTimeout()));
    connect( &startupSuspendTimeoutTimer, TQT_SIGNAL( timeout()), TQT_SLOT( startupSuspendTimeout()));

        DM().shutdown( shutdownType, shutdownMode, bootOption );
    }
    else {
#ifdef __TDE_HAVE_TDEHWLIB
        TDERootSystemDevice* rootDevice = hwDevices->rootSystemDevice();
        if (rootDevice) {
            if (shutdownType == TDEApplication::ShutdownTypeHalt) {

                rootDevice->setPowerState(TDESystemPowerState::Reboot);
            }
        }
#endif
    }
}





#include <tqtimer.h>
#include <dcopobject.h>

#ifdef __TDE_HAVE_TDEHWLIB
#include <tdehardwaredevices.h>
#endif

#include "server2.h"



    WindowMap legacyWindows;

#ifdef __TDE_HAVE_TDEHWLIB
    TDEHardwareDevices* hwDevices;
#endif
    int initialClientCount;
    int phase2ClientCount;
    int protectionTimerCounter;




            mayrb = true;
        }
        else {
#ifdef __TDE_HAVE_TDEHWLIB
            TDERootSystemDevice* rootDevice = hwDevices->rootSystemDevice();
            if (rootDevice) {
                if (rootDevice->canPowerOff()) {

                    mayrb = true;
                }
            }
#endif
        }
    }
    if (!maysd) {

			// If this is not done the desktop of the locked session will be shown after suspend/hibernate until the lock fully engages!
			kapp->dcopClient()->call("kdesktop", "KScreensaverIface", "lock()", TQCString(""), replyType, replyData);
		}
#ifdef __TDE_HAVE_TDEHWLIB
		TDERootSystemDevice* rootDevice = hwDevices->rootSystemDevice();
		if (rootDevice) {
			if (selection == 1) {	// Suspend

				rootDevice->setPowerState(TDESystemPowerState::Freeze);
			}
		}
#endif
        }
    }





#include <tdelocale.h>
#include <tdeconfig.h>
#include <tdeapplication.h>
#ifdef __TDE_HAVE_TDEHWLIB
#include <tdehardwaredevices.h>
#endif
#include <kdebug.h>
#include <kpushbutton.h>
#include <kstdguiitem.h>

		bool canSuspend = false;
		bool canHibernate = false;

#if defined(COMPILE_HALBACKEND)
		// Query HAL for suspend/resume support
		m_halCtx = libhal_ctx_new();


				canHibernate = true;
			}
		}
#elif defined(__TDE_HAVE_TDEHWLIB) // COMPILE_HALBACKEND
		TDERootSystemDevice* rootDevice = TDEGlobal::hardwareDevices()->rootSystemDevice();
		if (rootDevice) {
			canFreeze = rootDevice->canFreeze();




set( target kded_mediamanager )

if( WITH_HAL )
  set( HAL_MEDIA_BACKEND halbackend.cpp linuxcdpolling.cpp )
  set( HAL_MEDIA_LIBRARIES ${HAL_LIBRARIES} -lhal-storage ${DBUS_TQT_LIBRARIES} )
endif( )
    mediadirnotify.cpp mediadirnotify.skel
    decryptdialog.ui dialog.cpp
    halbackend.cpp linuxcdpolling.cpp tdehardwarebackend.cpp
  )

if( WITH_TDEHWLIB )
  set( TDEHWBACKEND tdehardwarebackend.cpp )
endif( WITH_TDEHWLIB )

tde_add_kpart( ${target} AUTOMOC
  SOURCES
  set( ${target}_SRCS
    mediamanager.cpp mediamanager.skel medialist.cpp
    backendbase.cpp fstabbackend.cpp removablebackend.cpp
    decryptdialog.ui dialog.cpp
    mediadirnotify.cpp mediadirnotify.skel
    ${HAL_MEDIA_BACKEND} ${TDEHWBACKEND}
  LINK mediacommon-static tdeinit_kded-shared ${HAL_MEDIA_LIBRARIES}
  DESTINATION ${PLUGIN_INSTALL_DIR}
)
    LINK mediacommon-static tdeinit_kded-shared
    DESTINATION ${PLUGIN_INSTALL_DIR}
  )
endif( )

Lines 28-34 Link Here

(-)a/tdeioslave/media/medianotifier/notificationdialog.cpp (+2 lines)
28	#include <tqlabel.h>	28	#include <tqlabel.h>
29	#include <tqcheckbox.h>	29	#include <tqcheckbox.h>
30	#include <tqpushbutton.h>	30	#include <tqpushbutton.h>
		31	#ifdef __TDE_HAVE_TDEHWLIB
31	#include <tdehardwaredevices.h>	32	#include <tdehardwaredevices.h>
		33	#endif
32		34
33	#include "actionlistboxitem.h"	35	#include "actionlistboxitem.h"
34	#include "notificationdialogview.h"	36	#include "notificationdialogview.h"




#include <kprocess.h>
#include <tdestartupinfo.h>
#include <kmimetype.h>
#ifdef __TDE_HAVE_TDEHWLIB
#include <tdehardwaredevices.h>
#endif

#include "dialog.h"
#include "tdeio_media_mounthelper.h"


void MountHelper::invokeEject(const TQString &device, bool quiet)
{
#ifdef __TDE_HAVE_TDEHWLIB
	// Try TDE HW library eject first...
	TDEHardwareDevices *hwdevices = TDEGlobal::hardwareDevices();
	TDEGenericDevice *hwdevice = hwdevices->findByDeviceNode(device);

			::exit(0);
		}
	}
#endif

	// Then fall back to tdeeject if needed
	TDEProcess *proc = new TDEProcess(TQT_TQOBJECT(this));




		startTimer( pingInterval * 60000 );
	}

#ifdef __TDE_HAVE_TDEHWLIB
	TDEHardwareDevices *hwdevices = TDEGlobal::hardwareDevices();
	connect(hwdevices, TQT_SIGNAL(hardwareUpdated(TDEGenericDevice*)), this, TQT_SLOT(deviceChanged(TDEGenericDevice*)));
#endif
}

void GreeterApp::deviceChanged(TDEGenericDevice* device) {
#ifdef __TDE_HAVE_TDEHWLIB
#ifdef WITH_XRANDR
	if (device->type() == TDEGenericDeviceType::Monitor) {
		KRandrSimpleAPI *randrsimple = new KRandrSimpleAPI();

		delete randrsimple;
	}
#endif // WITH_XRANDR
#endif // __TDE_HAVE_TDEHWLIB
}

void

Lines 27-33 Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. Link Here

(-)a/tdm/kfrontend/kgapp.h (+4 lines)
27	#define KGAPP_H	27	#define KGAPP_H
28		28
29	#include <tdeapplication.h>	29	#include <tdeapplication.h>
		30	#ifdef __TDE_HAVE_TDEHWLIB
30	#include <tdehardwaredevices.h>	31	#include <tdehardwaredevices.h>
		32	#else
		33	#define TDEGenericDevice void
		34	#endif
31		35
32	class GreeterApp : public TDEApplication {	36	class GreeterApp : public TDEApplication {
33	Q_OBJECT	37	Q_OBJECT

Return to bug 2110

Lines 92-99 KRandRSystemTray::KRandRSystemTray(TQWidget* parent, const char *name) Link Here

(-)a/kcontrol/randr/tderandrtray.cpp (+4 lines)
92	applyIccConfiguration(cur_profile, NULL);	92	applyIccConfiguration(cur_profile, NULL);
93	}	93	}
94		94
		95	#ifdef __TDE_HAVE_TDEHWLIB
95	TDEHardwareDevices *hwdevices = TDEGlobal::hardwareDevices();	96	TDEHardwareDevices *hwdevices = TDEGlobal::hardwareDevices();
96	connect(hwdevices, TQT_SIGNAL(hardwareUpdated(TDEGenericDevice)), this, TQT_SLOT(deviceChanged(TDEGenericDevice)));	97	connect(hwdevices, TQT_SIGNAL(hardwareUpdated(TDEGenericDevice)), this, TQT_SLOT(deviceChanged(TDEGenericDevice)));
		98	#endif
97	}	99	}
98		100
99	/*!	101	/*!
Lines 886-891 void KRandRSystemTray::slotOutputChanged(int parameter) Link Here
886	}	888	}
887		889
888	void KRandRSystemTray::deviceChanged (TDEGenericDevice* device) {	890	void KRandRSystemTray::deviceChanged (TDEGenericDevice* device) {
		891	#ifdef __TDE_HAVE_TDEHWLIB
889	if (device->type() == TDEGenericDeviceType::Monitor) {	892	if (device->type() == TDEGenericDeviceType::Monitor) {
890	KRandrPassivePopup::message(	893	KRandrPassivePopup::message(
891	i18n("New display output options are available!"),	894	i18n("New display output options are available!"),
Lines 895-900 void KRandRSystemTray::deviceChanged (TDEGenericDevice* device) { Link Here
895	reloadDisplayConfiguration();	898	reloadDisplayConfiguration();
896	applyHotplugRules(locateLocal("config", "/", true));	899	applyHotplugRules(locateLocal("config", "/", true));
897	}	900	}
		901	#endif
898	}	902	}
899		903
900	void KRandRSystemTray::slotHelpContents()	904	void KRandRSystemTray::slotHelpContents()

Lines 52-58 Link Here

(-)a/kicker/kicker/ui/k_new_mnu.cpp (-8 / +12 lines)
52	#include <kdebug.h>	52	#include <kdebug.h>
53	#include <tdeglobal.h>	53	#include <tdeglobal.h>
54	#include <tdeglobalsettings.h>	54	#include <tdeglobalsettings.h>
		55	#ifdef __TDE_HAVE_TDEHWLIB
55	#include <tdehardwaredevices.h>	56	#include <tdehardwaredevices.h>
		57	#endif
56	#include <kiconloader.h>	58	#include <kiconloader.h>
57	#include <klineedit.h>	59	#include <klineedit.h>
58	#include <tdelocale.h>	60	#include <tdelocale.h>
Lines 1359-1368 void KMenu::insertStaticExitItems() Link Here
1359	}	1361	}
1360		1362
1361	bool maysd = false;	1363	bool maysd = false;
1362	#ifdef COMPILE_HALBACKEND	1364	#if defined(COMPILE_HALBACKEND)
1363	if (ksmserver.readBoolEntry( "offerShutdown", true ) && DM().canShutdown())	1365	if (ksmserver.readBoolEntry( "offerShutdown", true ) && DM().canShutdown())
1364	maysd = true;	1366	maysd = true;
1365	#else	1367	#elif defined(__TDE_HAVE_TDEHWLIB)
1366	TDERootSystemDevice* rootDevice = TDEGlobal::hardwareDevices()->rootSystemDevice();	1368	TDERootSystemDevice* rootDevice = TDEGlobal::hardwareDevices()->rootSystemDevice();
1367	if( rootDevice ) {	1369	if( rootDevice ) {
1368	maysd = rootDevice->canPowerOff();	1370	maysd = rootDevice->canPowerOff();
Lines 3792-3798 void KMenu::insertSuspendOption( int &nId, int &index ) Link Here
3792	bool suspend_freeze = false;	3794	bool suspend_freeze = false;
3793	bool standby = false;	3795	bool standby = false;
3794	bool suspend_disk = false;	3796	bool suspend_disk = false;
3795	#ifdef COMPILE_HALBACKEND	3797	#if defined(COMPILE_HALBACKEND)
3796	suspend_ram = libhal_device_get_property_bool(m_halCtx,	3798	suspend_ram = libhal_device_get_property_bool(m_halCtx,
3797	"/org/freedesktop/Hal/devices/computer",	3799	"/org/freedesktop/Hal/devices/computer",
3798	"power_management.can_suspend",	3800	"power_management.can_suspend",
Lines 3807-3813 void KMenu::insertSuspendOption( int &nId, int &index ) Link Here
3807	"/org/freedesktop/Hal/devices/computer",	3809	"/org/freedesktop/Hal/devices/computer",
3808	"power_management.can_hibernate",	3810	"power_management.can_hibernate",
3809	NULL);	3811	NULL);
3810	#else // COMPILE_HALBACKEND	3812	#elif defined(__TDE_HAVE_TDEHWLIB) // COMPILE_HALBACKEND
3811	TDERootSystemDevice* rootDevice = TDEGlobal::hardwareDevices()->rootSystemDevice();	3813	TDERootSystemDevice* rootDevice = TDEGlobal::hardwareDevices()->rootSystemDevice();
3812	if (rootDevice) {	3814	if (rootDevice) {
3813	suspend_ram = rootDevice->canSuspend();	3815	suspend_ram = rootDevice->canSuspend();
Lines 3868-3874 void KMenu::slotSuspend(int id) Link Here
3868	DCOPRef("kdesktop", "KScreensaverIface").call("lock()");	3870	DCOPRef("kdesktop", "KScreensaverIface").call("lock()");
3869	}	3871	}
3870		3872
3871	#ifdef COMPILE_HALBACKEND	3873	#if defined(COMPILE_HALBACKEND)
3872	DBusMessage* msg = NULL;	3874	DBusMessage* msg = NULL;
3873		3875
3874	if (m_dbusConn) {	3876	if (m_dbusConn) {
Lines 3901-3907 void KMenu::slotSuspend(int id) Link Here
3901	}	3903	}
3902	dbus_message_unref(msg);	3904	dbus_message_unref(msg);
3903	}	3905	}
3904	#else // COMPILE_HALBACKEND	3906	#elif defined(__TDE_HAVE_TDEHWLIB) // COMPILE_HALBACKEND
3905	TDERootSystemDevice* rootDevice = TDEGlobal::hardwareDevices()->rootSystemDevice();	3907	TDERootSystemDevice* rootDevice = TDEGlobal::hardwareDevices()->rootSystemDevice();
3906	if (rootDevice) {	3908	if (rootDevice) {
3907	if (id == 1) {	3909	if (id == 1) {
Lines 3916-3925 void KMenu::slotSuspend(int id) Link Here
3916	return;	3918	return;
3917	}	3919	}
3918	}	3920	}
		3921	#else
		3922	error = false;
3919	#endif	3923	#endif
3920	if (error)	3924	if (error) {
3921	KMessageBox::error(this, i18n("Suspend failed"));	3925	KMessageBox::error(this, i18n("Suspend failed"));
3922		3926	}
3923	}	3927	}
3924		3928
3925	void KMenu::runUserCommand()	3929	void KMenu::runUserCommand()

Lines 598-604 KSMServer::KSMServer( const TQString& windowManager, const TQString& windowManag Link Here

(-)a/ksmserver/server.cpp (+4 lines)
598	clientInteracting = 0;	598	clientInteracting = 0;
599	xonCommand = config->readEntry( "xonCommand", "xon" );	599	xonCommand = config->readEntry( "xonCommand", "xon" );
600		600
		601	#ifdef __TDE_HAVE_TDEHWLIB
601	hwDevices = TDEGlobal::hardwareDevices();	602	hwDevices = TDEGlobal::hardwareDevices();
		603	#endif
602		604
603	connect( &knotifyTimeoutTimer, TQT_SIGNAL( timeout()), TQT_SLOT( knotifyTimeout()));	605	connect( &knotifyTimeoutTimer, TQT_SIGNAL( timeout()), TQT_SLOT( knotifyTimeout()));
604	connect( &startupSuspendTimeoutTimer, TQT_SIGNAL( timeout()), TQT_SLOT( startupSuspendTimeout()));	606	connect( &startupSuspendTimeoutTimer, TQT_SIGNAL( timeout()), TQT_SLOT( startupSuspendTimeout()));
Lines 720-725 void KSMServer::cleanUp() Link Here
720	DM().shutdown( shutdownType, shutdownMode, bootOption );	722	DM().shutdown( shutdownType, shutdownMode, bootOption );
721	}	723	}
722	else {	724	else {
		725	#ifdef __TDE_HAVE_TDEHWLIB
723	TDERootSystemDevice* rootDevice = hwDevices->rootSystemDevice();	726	TDERootSystemDevice* rootDevice = hwDevices->rootSystemDevice();
724	if (rootDevice) {	727	if (rootDevice) {
725	if (shutdownType == TDEApplication::ShutdownTypeHalt) {	728	if (shutdownType == TDEApplication::ShutdownTypeHalt) {
Lines 729-734 void KSMServer::cleanUp() Link Here
729	rootDevice->setPowerState(TDESystemPowerState::Reboot);	732	rootDevice->setPowerState(TDESystemPowerState::Reboot);
730	}	733	}
731	}	734	}
		735	#endif
732	}	736	}
733	}	737	}
734		738

Lines 152-157 bool KSMServer::checkStatus( bool &logoutConfirmed, bool &maysd, bool &mayrb, Link Here

(-)a/ksmserver/shutdown.cpp (+4 lines)
152	mayrb = true;	152	mayrb = true;
153	}	153	}
154	else {	154	else {
		155	#ifdef __TDE_HAVE_TDEHWLIB
155	TDERootSystemDevice* rootDevice = hwDevices->rootSystemDevice();	156	TDERootSystemDevice* rootDevice = hwDevices->rootSystemDevice();
156	if (rootDevice) {	157	if (rootDevice) {
157	if (rootDevice->canPowerOff()) {	158	if (rootDevice->canPowerOff()) {
Lines 161-166 bool KSMServer::checkStatus( bool &logoutConfirmed, bool &maysd, bool &mayrb, Link Here
161	mayrb = true;	162	mayrb = true;
162	}	163	}
163	}	164	}
		165	#endif
164	}	166	}
165	}	167	}
166	if (!maysd) {	168	if (!maysd) {
Lines 239-244 void KSMServer::shutdownInternal( TDEApplication::ShutdownConfirm confirm, Link Here
239	// If this is not done the desktop of the locked session will be shown after suspend/hibernate until the lock fully engages!	241	// If this is not done the desktop of the locked session will be shown after suspend/hibernate until the lock fully engages!
240	kapp->dcopClient()->call("kdesktop", "KScreensaverIface", "lock()", TQCString(""), replyType, replyData);	242	kapp->dcopClient()->call("kdesktop", "KScreensaverIface", "lock()", TQCString(""), replyType, replyData);
241	}	243	}
		244	#ifdef __TDE_HAVE_TDEHWLIB
242	TDERootSystemDevice* rootDevice = hwDevices->rootSystemDevice();	245	TDERootSystemDevice* rootDevice = hwDevices->rootSystemDevice();
243	if (rootDevice) {	246	if (rootDevice) {
244	if (selection == 1) { // Suspend	247	if (selection == 1) { // Suspend
Lines 251-256 void KSMServer::shutdownInternal( TDEApplication::ShutdownConfirm confirm, Link Here
251	rootDevice->setPowerState(TDESystemPowerState::Freeze);	254	rootDevice->setPowerState(TDESystemPowerState::Freeze);
252	}	255	}
253	}	256	}
		257	#endif
254	}	258	}
255	}	259	}
256		260

Lines 36-42 Link Here

(-)a/drkonqi/backtrace.cpp (+4 lines)
36	#include <tdemessagebox.h>	36	#include <tdemessagebox.h>
37	#include <tdelocale.h>	37	#include <tdelocale.h>
38	#include <tdetempfile.h>	38	#include <tdetempfile.h>
		39	#ifdef __TDE_HAVE_TDEHWLIB
39	#include <tdehardwaredevices.h>	40	#include <tdehardwaredevices.h>
		41	#endif
40		42
41	#ifdef HAVE_ELFICON	43	#ifdef HAVE_ELFICON
42	// Elven things	44	// Elven things
Lines 356-361 void BackTrace::processBacktrace() Link Here
356	}	358	}
357	#endif // HAVE_ELFICON	359	#endif // HAVE_ELFICON
358		360
		361	#ifdef __TDE_HAVE_TDEHWLIB
359	// Append potentially important hardware information	362	// Append potentially important hardware information
360	m_strBt.append("\n==== (tdehwlib) hardware information ====\n");	363	m_strBt.append("\n==== (tdehwlib) hardware information ====\n");
361	TDEHardwareDevices *hwdevices = TDEGlobal::hardwareDevices();	364	TDEHardwareDevices *hwdevices = TDEGlobal::hardwareDevices();
Lines 374-379 void BackTrace::processBacktrace() Link Here
374	m_strBt.append("\n");	377	m_strBt.append("\n");
375	}	378	}
376	}	379	}
		380	#endif
377		381
378	{	382	{
379	// Clean up hard to read debug blocks	383	// Clean up hard to read debug blocks

Lines 742-749 void KDisplayConfig::setRealResolutionSliderValue(int index) { Link Here

(-)a/kcontrol/displayconfig/displayconfig.cpp (+4 lines)
742	KDisplayConfig::KDisplayConfig(TQWidget parent, const char name, const TQStringList &)	742	KDisplayConfig::KDisplayConfig(TQWidget parent, const char name, const TQStringList &)
743	: TDECModule(KDisplayCFactory::instance(), parent, name), iccTab(0), numberOfProfiles(0), numberOfScreens(0), m_randrsimple(0), activeProfileName(""), m_gammaApplyTimer(0)	743	: TDECModule(KDisplayCFactory::instance(), parent, name), iccTab(0), numberOfProfiles(0), numberOfScreens(0), m_randrsimple(0), activeProfileName(""), m_gammaApplyTimer(0)
744	{	744	{
		745	#ifdef __TDE_HAVE_TDEHWLIB
745	TDEHardwareDevices *hwdevices = TDEGlobal::hardwareDevices();	746	TDEHardwareDevices *hwdevices = TDEGlobal::hardwareDevices();
746	connect(hwdevices, TQT_SIGNAL(hardwareUpdated(TDEGenericDevice)), this, TQT_SLOT(deviceChanged(TDEGenericDevice)));	747	connect(hwdevices, TQT_SIGNAL(hardwareUpdated(TDEGenericDevice)), this, TQT_SLOT(deviceChanged(TDEGenericDevice)));
		748	#endif
747		749
748	m_randrsimple = new KRandrSimpleAPI();	750	m_randrsimple = new KRandrSimpleAPI();
749		751
Lines 859-864 KDisplayConfig::~KDisplayConfig() Link Here
859	}	861	}
860		862
861	void KDisplayConfig::deviceChanged (TDEGenericDevice* device) {	863	void KDisplayConfig::deviceChanged (TDEGenericDevice* device) {
		864	#ifdef __TDE_HAVE_TDEHWLIB
862	if (device->type() == TDEGenericDeviceType::Monitor) {	865	if (device->type() == TDEGenericDeviceType::Monitor) {
863	if (base->rescanHardware->isEnabled()) {	866	if (base->rescanHardware->isEnabled()) {
864	base->rescanHardware->setEnabled(false);	867	base->rescanHardware->setEnabled(false);
Lines 866-871 void KDisplayConfig::deviceChanged (TDEGenericDevice* device) { Link Here
866	base->rescanHardware->setEnabled(true);	869	base->rescanHardware->setEnabled(true);
867	}	870	}
868	}	871	}
		872	#endif
869	}	873	}
870		874
871	void KDisplayConfig::updateExtendedMonitorInformation () {	875	void KDisplayConfig::updateExtendedMonitorInformation () {

Lines 23-29 Copyright (C) 2000 Matthias Ettrich <ettrich@kde.org> Link Here

(-)a/ksmserver/server.h (+4 lines)
23	#include <tqtimer.h>	23	#include <tqtimer.h>
24	#include <dcopobject.h>	24	#include <dcopobject.h>
25		25
		26	#ifdef __TDE_HAVE_TDEHWLIB
26	#include <tdehardwaredevices.h>	27	#include <tdehardwaredevices.h>
		28	#endif
27		29
28	#include "server2.h"	30	#include "server2.h"
29		31
Lines 251-257 private: Link Here
251		253
252	WindowMap legacyWindows;	254	WindowMap legacyWindows;
253		255
		256	#ifdef __TDE_HAVE_TDEHWLIB
254	TDEHardwareDevices* hwDevices;	257	TDEHardwareDevices* hwDevices;
		258	#endif
255	int initialClientCount;	259	int initialClientCount;
256	int phase2ClientCount;	260	int phase2ClientCount;
257	int protectionTimerCounter;	261	int protectionTimerCounter;

Lines 33-39 Copyright (C) 2000 Matthias Ettrich <ettrich@kde.org> Link Here

(-)a/ksmserver/shutdowndlg.cpp (-2 / +4 lines)
33	#include <tdelocale.h>	33	#include <tdelocale.h>
34	#include <tdeconfig.h>	34	#include <tdeconfig.h>
35	#include <tdeapplication.h>	35	#include <tdeapplication.h>
		36	#ifdef __TDE_HAVE_TDEHWLIB
36	#include <tdehardwaredevices.h>	37	#include <tdehardwaredevices.h>
		38	#endif
37	#include <kdebug.h>	39	#include <kdebug.h>
38	#include <kpushbutton.h>	40	#include <kpushbutton.h>
39	#include <kstdguiitem.h>	41	#include <kstdguiitem.h>
Lines 805-811 KSMShutdownDlg::KSMShutdownDlg( TQWidget* parent, Link Here
805	bool canSuspend = false;	807	bool canSuspend = false;
806	bool canHibernate = false;	808	bool canHibernate = false;
807		809
808	#ifdef COMPILE_HALBACKEND	810	#if defined(COMPILE_HALBACKEND)
809	// Query HAL for suspend/resume support	811	// Query HAL for suspend/resume support
810	m_halCtx = libhal_ctx_new();	812	m_halCtx = libhal_ctx_new();
811		813
Lines 860-866 KSMShutdownDlg::KSMShutdownDlg( TQWidget* parent, Link Here
860	canHibernate = true;	862	canHibernate = true;
861	}	863	}
862	}	864	}
863	#else // COMPILE_HALBACKEND	865	#elif defined(__TDE_HAVE_TDEHWLIB) // COMPILE_HALBACKEND
864	TDERootSystemDevice* rootDevice = TDEGlobal::hardwareDevices()->rootSystemDevice();	866	TDERootSystemDevice* rootDevice = TDEGlobal::hardwareDevices()->rootSystemDevice();
865	if (rootDevice) {	867	if (rootDevice) {
866	canFreeze = rootDevice->canFreeze();	868	canFreeze = rootDevice->canFreeze();

Lines 36-65 install( FILES mediamanager.desktop DESTINATION ${SERVICES_INSTALL_DIR}/kded ) Link Here

(-)a/tdeioslave/media/mediamanager/CMakeLists.txt (-23 / +14 lines)
36	set( target kded_mediamanager )	36	set( target kded_mediamanager )
37		37
38	if( WITH_HAL )	38	if( WITH_HAL )
39	set( ${target}_SRCS	39	set( HAL_MEDIA_BACKEND halbackend.cpp linuxcdpolling.cpp )
40	mediamanager.cpp mediamanager.skel medialist.cpp	40	set( HAL_MEDIA_LIBRARIES ${HAL_LIBRARIES} -lhal-storage ${DBUS_TQT_LIBRARIES} )
41	backendbase.cpp fstabbackend.cpp removablebackend.cpp	41	endif( )
42	mediadirnotify.cpp mediadirnotify.skel
43	decryptdialog.ui dialog.cpp
44	halbackend.cpp linuxcdpolling.cpp tdehardwarebackend.cpp
45	)
46		42
47	tde_add_kpart( ${target} AUTOMOC	43	if( WITH_TDEHWLIB )
48	SOURCES ${${target}_SRCS}	44	set( TDEHWBACKEND tdehardwarebackend.cpp )
49	LINK mediacommon-static tdeinit_kded-shared ${HAL_LIBRARIES} -lhal-storage ${DBUS_TQT_LIBRARIES}	45	endif( WITH_TDEHWLIB )
50	DESTINATION ${PLUGIN_INSTALL_DIR}	46
51	)	47	tde_add_kpart( ${target} AUTOMOC
52	else( )	48	SOURCES
53	set( ${target}_SRCS
54	mediamanager.cpp mediamanager.skel medialist.cpp	49	mediamanager.cpp mediamanager.skel medialist.cpp
55	backendbase.cpp fstabbackend.cpp removablebackend.cpp	50	backendbase.cpp fstabbackend.cpp removablebackend.cpp
56	decryptdialog.ui dialog.cpp	51	decryptdialog.ui dialog.cpp
57	mediadirnotify.cpp mediadirnotify.skel tdehardwarebackend.cpp	52	mediadirnotify.cpp mediadirnotify.skel
58	)	53	${HAL_MEDIA_BACKEND} ${TDEHWBACKEND}
59		54	LINK mediacommon-static tdeinit_kded-shared ${HAL_MEDIA_LIBRARIES}
60	tde_add_kpart( ${target} AUTOMOC	55	DESTINATION ${PLUGIN_INSTALL_DIR}
61	SOURCES ${${target}_SRCS}	56	)
62	LINK mediacommon-static tdeinit_kded-shared
63	DESTINATION ${PLUGIN_INSTALL_DIR}
64	)
65	endif( )

Lines 33-39 Link Here

(-)a/tdeioslave/media/mounthelper/tdeio_media_mounthelper.cpp (+4 lines)
33	#include <kprocess.h>	33	#include <kprocess.h>
34	#include <tdestartupinfo.h>	34	#include <tdestartupinfo.h>
35	#include <kmimetype.h>	35	#include <kmimetype.h>
		36	#ifdef __TDE_HAVE_TDEHWLIB
36	#include <tdehardwaredevices.h>	37	#include <tdehardwaredevices.h>
		38	#endif
37		39
38	#include "dialog.h"	40	#include "dialog.h"
39	#include "tdeio_media_mounthelper.h"	41	#include "tdeio_media_mounthelper.h"
Lines 187-192 MountHelper::MountHelper() : TDEApplication() Link Here
187		189
188	void MountHelper::invokeEject(const TQString &device, bool quiet)	190	void MountHelper::invokeEject(const TQString &device, bool quiet)
189	{	191	{
		192	#ifdef __TDE_HAVE_TDEHWLIB
190	// Try TDE HW library eject first...	193	// Try TDE HW library eject first...
191	TDEHardwareDevices *hwdevices = TDEGlobal::hardwareDevices();	194	TDEHardwareDevices *hwdevices = TDEGlobal::hardwareDevices();
192	TDEGenericDevice *hwdevice = hwdevices->findByDeviceNode(device);	195	TDEGenericDevice *hwdevice = hwdevices->findByDeviceNode(device);
Lines 197-202 void MountHelper::invokeEject(const TQString &device, bool quiet) Link Here
197	::exit(0);	200	::exit(0);
198	}	201	}
199	}	202	}
		203	#endif
200		204
201	// Then fall back to tdeeject if needed	205	// Then fall back to tdeeject if needed
202	TDEProcess *proc = new TDEProcess(TQT_TQOBJECT(this));	206	TDEProcess *proc = new TDEProcess(TQT_TQOBJECT(this));

Lines 123-133 void GreeterApp::init() Link Here

(-)a/tdm/kfrontend/kgapp.cpp (+4 lines)
123	startTimer( pingInterval * 60000 );	123	startTimer( pingInterval * 60000 );
124	}	124	}
125		125
		126	#ifdef __TDE_HAVE_TDEHWLIB
126	TDEHardwareDevices *hwdevices = TDEGlobal::hardwareDevices();	127	TDEHardwareDevices *hwdevices = TDEGlobal::hardwareDevices();
127	connect(hwdevices, TQT_SIGNAL(hardwareUpdated(TDEGenericDevice)), this, TQT_SLOT(deviceChanged(TDEGenericDevice)));	128	connect(hwdevices, TQT_SIGNAL(hardwareUpdated(TDEGenericDevice)), this, TQT_SLOT(deviceChanged(TDEGenericDevice)));
		129	#endif
128	}	130	}
129		131
130	void GreeterApp::deviceChanged(TDEGenericDevice* device) {	132	void GreeterApp::deviceChanged(TDEGenericDevice* device) {
		133	#ifdef __TDE_HAVE_TDEHWLIB
131	#ifdef WITH_XRANDR	134	#ifdef WITH_XRANDR
132	if (device->type() == TDEGenericDeviceType::Monitor) {	135	if (device->type() == TDEGenericDeviceType::Monitor) {
133	KRandrSimpleAPI *randrsimple = new KRandrSimpleAPI();	136	KRandrSimpleAPI *randrsimple = new KRandrSimpleAPI();
Lines 135-140 void GreeterApp::deviceChanged(TDEGenericDevice* device) { Link Here
135	delete randrsimple;	138	delete randrsimple;
136	}	139	}
137	#endif // WITH_XRANDR	140	#endif // WITH_XRANDR
		141	#endif // __TDE_HAVE_TDEHWLIB
138	}	142	}
139		143
140	void	144	void