summaryrefslogtreecommitdiff
authorsandman <sandman>2002-09-25 23:24:31 (UTC)
committer sandman <sandman>2002-09-25 23:24:31 (UTC)
commitc73cc2b7f4417b7cb168b3d801b00f34f3c3b7eb (patch) (unidiff)
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
@@ -71,25 +71,29 @@ void SysTray::clearApplets()
71 appletList.clear(); 71 appletList.clear();
72 if ( layout ) 72 if ( layout )
73 delete layout; 73 delete layout;
74 layout = new QHBoxLayout( this, 0, 1 ); 74 layout = new QHBoxLayout( this, 0, 1 );
75 layout->setAutoAdd(TRUE); 75 layout->setAutoAdd(TRUE);
76} 76}
77 77
78void SysTray::addApplets() 78void SysTray::addApplets()
79{ 79{
80#ifndef SINGLE_APP 80#ifndef SINGLE_APP
81 Config cfg( "Taskbar" ); 81 Config cfg( "Taskbar" );
82 cfg.setGroup( "Applets" ); 82 cfg.setGroup( "Applets" );
83 bool safe = cfg.readBoolEntry("SafeMode",FALSE); 83
84 // SafeMode causes too much problems, so we disable it for now --
85 // maybe we should reenable it for OPIE 1.0 - sandman 26.09.02
86
87 bool safe = false; //cfg.readBoolEntry("SafeMode",FALSE);
84 if ( safe && !safety_tid ) 88 if ( safe && !safety_tid )
85 return; 89 return;
86 cfg.writeEntry("SafeMode",TRUE); 90 cfg.writeEntry("SafeMode",TRUE);
87 cfg.write(); 91 cfg.write();
88 QStringList exclude = cfg.readListEntry( "ExcludeApplets", ',' ); 92 QStringList exclude = cfg.readListEntry( "ExcludeApplets", ',' );
89 93
90 QString path = QPEApplication::qpeDir() + "/plugins/applets"; 94 QString path = QPEApplication::qpeDir() + "/plugins/applets";
91 QDir dir( path, "lib*.so" ); 95 QDir dir( path, "lib*.so" );
92 QStringList list = dir.entryList(); 96 QStringList list = dir.entryList();
93 QStringList::Iterator it; 97 QStringList::Iterator it;
94 int napplets=0; 98 int napplets=0;
95 TaskbarApplet* *applets = new TaskbarApplet*[list.count()]; 99 TaskbarApplet* *applets = new TaskbarApplet*[list.count()];