summaryrefslogtreecommitdiff
authorsandman <sandman>2002-12-01 22:23:22 (UTC)
committer sandman <sandman>2002-12-01 22:23:22 (UTC)
commit184ab086906979cdb9c2cc8b601bcd0ecc095576 (patch) (unidiff)
tree5e5ac0e6051529253bf28d5a58ae74680a47b776
parent5a550802680d32ccb0ea0d596f514de7e13c45dc (diff)
downloadopie-184ab086906979cdb9c2cc8b601bcd0ecc095576.zip
opie-184ab086906979cdb9c2cc8b601bcd0ecc095576.tar.gz
opie-184ab086906979cdb9c2cc8b601bcd0ecc095576.tar.bz2
The new preload library has to be used always, because of some binary
incompatibility between apps built with older tcs and shared libs built with newer tcs. (see cvs comment for core/launcher/libpreload/preload.cpp)
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--library/global.cpp4
1 files changed, 1 insertions, 3 deletions
diff --git a/library/global.cpp b/library/global.cpp
index 42c2729..2162e02 100644
--- a/library/global.cpp
+++ b/library/global.cpp
@@ -606,10 +606,8 @@ void Global::invoke(const QString &c)
606 { 606 {
607 char *oldpre = ::getenv ( "LD_PRELOAD" ); 607 char *oldpre = ::getenv ( "LD_PRELOAD" );
608 608
609 extern bool opie_block_style;
610
611 QString newpre = QPEApplication::qpeDir ( ) + "/lib/libpreload.so"; 609 QString newpre = QPEApplication::qpeDir ( ) + "/lib/libpreload.so";
612 if ( opie_block_style && QFile::exists ( newpre )) { 610 if ( QFile::exists ( newpre )) {
613 if ( oldpre && oldpre [0] ) 611 if ( oldpre && oldpre [0] )
614 newpre = newpre + ":" + oldpre; 612 newpre = newpre + ":" + oldpre;
615 ::setenv ( "LD_PRELOAD", newpre. latin1( ), 1 ); 613 ::setenv ( "LD_PRELOAD", newpre. latin1( ), 1 );