summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTimothy Pearson <kb9vqf@pearsoncomputing.net>2014-04-03 03:25:10 -0500
committerTimothy Pearson <kb9vqf@pearsoncomputing.net>2014-04-03 03:25:10 -0500
commitd4181009884b7ec06880a2335e95e6e355c89c93 (patch)
treedcffd326fd98f91c98e2472fa186c3b3586a9c93
parent6b44e844a34561491c6a2e32cb4888a85b1416b9 (diff)
downloadtdebase-d4181009884b7ec06880a2335e95e6e355c89c93.tar.gz
tdebase-d4181009884b7ec06880a2335e95e6e355c89c93.zip
Force redraw of desktop shadows
This resolves Bug 1807 Do not abort DrKonqi if a library file could not be opened for SCM analysis
-rw-r--r--drkonqi/backtrace.cpp6
-rw-r--r--kdesktop/tdefileividesktop.cpp4
2 files changed, 6 insertions, 4 deletions
diff --git a/drkonqi/backtrace.cpp b/drkonqi/backtrace.cpp
index b05c4b418..2acd74df5 100644
--- a/drkonqi/backtrace.cpp
+++ b/drkonqi/backtrace.cpp
@@ -339,7 +339,7 @@ void BackTrace::processBacktrace()
libr_access_t access = LIBR_READ;
if((handle = libr_open(const_cast<char*>(libraryName.ascii()), access)) == NULL) {
- kdWarning() << "failed to open file" << libraryName << endl;
+ kdWarning() << "failed to open file " << libraryName << endl;
}
else {
TQString scmModule = elf_get_resource(handle, ".metadata_scmmodule");
@@ -347,9 +347,9 @@ void BackTrace::processBacktrace()
if (scmRevision != "") {
m_strBt.append(TQString("%1:\t%2:%3\n").arg(TQFileInfo(libraryName).fileName()).arg(scmModule).arg(scmRevision));
}
- }
- libr_close(handle);
+ libr_close(handle);
+ }
}
}
infoSharedLibraryLine = infoSharedLibraryTextStream.readLine();
diff --git a/kdesktop/tdefileividesktop.cpp b/kdesktop/tdefileividesktop.cpp
index 18ba4c156..bf9aa074c 100644
--- a/kdesktop/tdefileividesktop.cpp
+++ b/kdesktop/tdefileividesktop.cpp
@@ -150,7 +150,9 @@ void KFileIVIDesktop::drawShadowedText( TQPainter *p, const TQColorGroup &cg )
int textY = textRect( FALSE ).y();
int align = ((TDEIconView *) iconView())->itemTextPos() == TQIconView::Bottom
? AlignHCenter : AlignAuto;
- bool rebuild = shouldUpdateShadow(isSelected());
+ // FIXME
+ // Work around incorrect shadow position detailed in Bug 1807
+ bool rebuild = true; // shouldUpdateShadow(isSelected());
KDesktopShadowSettings *settings = (KDesktopShadowSettings *) (m_shadow->shadowSettings());