summaryrefslogtreecommitdiff
authorsandman <sandman>2002-09-25 23:24:31 (UTC)
committer sandman <sandman>2002-09-25 23:24:31 (UTC)
commitc73cc2b7f4417b7cb168b3d801b00f34f3c3b7eb (patch) (side-by-side diff)
treecaf691893d0e59e8e8396ef12a1d2cf774f7c9b0
parent489bc02ad26767dc45b81bf122a09ef55ac20249 (diff)
downloadopie-c73cc2b7f4417b7cb168b3d801b00f34f3c3b7eb.zip
opie-c73cc2b7f4417b7cb168b3d801b00f34f3c3b7eb.tar.gz
opie-c73cc2b7f4417b7cb168b3d801b00f34f3c3b7eb.tar.bz2
Disable SafeMode for now, since it can't be turned off easily once it gets
activated.
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--core/launcher/systray.cpp6
1 files changed, 5 insertions, 1 deletions
diff --git a/core/launcher/systray.cpp b/core/launcher/systray.cpp
index 4767150..697971d 100644
--- a/core/launcher/systray.cpp
+++ b/core/launcher/systray.cpp
@@ -59,49 +59,53 @@ void SysTray::loadApplets()
void SysTray::clearApplets()
{
hide();
#ifndef SINGLE_APP
QValueList<TaskbarApplet>::Iterator mit;
for ( mit = appletList.begin(); mit != appletList.end(); ++mit ) {
(*mit).iface->release();
(*mit).library->unload();
delete (*mit).library;
}
#endif
appletList.clear();
if ( layout )
delete layout;
layout = new QHBoxLayout( this, 0, 1 );
layout->setAutoAdd(TRUE);
}
void SysTray::addApplets()
{
#ifndef SINGLE_APP
Config cfg( "Taskbar" );
cfg.setGroup( "Applets" );
- bool safe = cfg.readBoolEntry("SafeMode",FALSE);
+
+ // SafeMode causes too much problems, so we disable it for now --
+ // maybe we should reenable it for OPIE 1.0 - sandman 26.09.02
+
+ bool safe = false; //cfg.readBoolEntry("SafeMode",FALSE);
if ( safe && !safety_tid )
return;
cfg.writeEntry("SafeMode",TRUE);
cfg.write();
QStringList exclude = cfg.readListEntry( "ExcludeApplets", ',' );
QString path = QPEApplication::qpeDir() + "/plugins/applets";
QDir dir( path, "lib*.so" );
QStringList list = dir.entryList();
QStringList::Iterator it;
int napplets=0;
TaskbarApplet* *applets = new TaskbarApplet*[list.count()];
for ( it = list.begin(); it != list.end(); ++it ) {
if ( exclude.find( *it ) != exclude.end() )
continue;
TaskbarAppletInterface *iface = 0;
QLibrary *lib = new QLibrary( path + "/" + *it );
if ( lib->queryInterface( IID_TaskbarApplet, (QUnknownInterface**)&iface ) == QS_OK ) {
TaskbarApplet *applet = new TaskbarApplet;
applets[napplets++] = applet;
applet->library = lib;
applet->iface = iface;
} else {
exclude += *it;