1. Fixed SEGV caused by missing TDE icon loader object. When the

applicationi is transformed in a TDE application, the TDE icon loader
can be used again.
2. Remove catching of SEGV in code, which was causing 100% CPU load. If something is wrong, better the
program terminates and shows an error.

Signed-off-by: Michele Calgaro <michele.calgaro@yahoo.it>
pull/2/head
Michele Calgaro 5 years ago
parent 2135f14eef
commit 70194b269e
Signed by: MicheleC
GPG Key ID: 2A75B7CA8ADED5CF

@ -56,8 +56,9 @@ CustomTrayLabel::CustomTrayLabel(const TQStringList& argv, pid_t pid,
*/ */
void CustomTrayLabel::installMenu() void CustomTrayLabel::installMenu()
{ {
TQPixmap kdocker_png(TDEGlobal::iconLoader()->loadIcon("kdocker", TDEIcon::NoGroup, TDEIcon::SizeSmall)); //TQPixmap kdocker_png(TDEGlobal::iconLoader()->loadIcon("kdocker", TDEIcon::NoGroup, TDEIcon::SizeSmall));
setIcon(kdocker_png); TQPixmap *kdocker_png = new TQPixmap("kdocker");
setIcon(*kdocker_png);
TrayLabelMgr *tlMgr = TrayLabelMgr::instance(); TrayLabelMgr *tlMgr = TrayLabelMgr::instance();
mOptionsMenu = new TQPopupMenu(this); mOptionsMenu = new TQPopupMenu(this);
@ -105,7 +106,7 @@ void CustomTrayLabel::installMenu()
mSkipTaskbar->addTo(mOptionsMenu); mSkipTaskbar->addTo(mOptionsMenu);
mMainMenu = new TQPopupMenu(this); mMainMenu = new TQPopupMenu(this);
mMainMenu->insertItem(TQIconSet(kdocker_png), mMainMenu->insertItem(TQIconSet(*kdocker_png),
i18n("About KDocker"), tlMgr, SLOT(about())); i18n("About KDocker"), tlMgr, SLOT(about()));
mMainMenu->insertSeparator(); mMainMenu->insertSeparator();
mMainMenu->insertItem(i18n("Options"), mOptionsMenu); mMainMenu->insertItem(i18n("Options"), mOptionsMenu);

@ -48,7 +48,6 @@ int main(int argc, char *argv[])
{ {
// setup signal handlers that undock and quit // setup signal handlers that undock and quit
signal(SIGHUP, sighandler); signal(SIGHUP, sighandler);
signal(SIGSEGV, sighandler);
signal(SIGTERM, sighandler); signal(SIGTERM, sighandler);
signal(SIGINT, sighandler); signal(SIGINT, sighandler);
signal(SIGUSR1, sighandler); signal(SIGUSR1, sighandler);

Loading…
Cancel
Save