Branch: master

d4181009 2014-04-03 03:25:10 Timothy Pearson
Force redraw of desktop shadows
This resolves Bug 1807
Do not abort DrKonqi if a library file could not be opened for SCM analysis
M drkonqi/backtrace.cpp
M kdesktop/tdefileividesktop.cpp
diff --git a/drkonqi/backtrace.cpp b/drkonqi/backtrace.cpp
index b05c4b4..2acd74d 100644
--- a/drkonqi/backtrace.cpp
+++ b/drkonqi/backtrace.cpp
@@ -339,7 +339,7 @@
 				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 @@
 					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 18ba4c1..bf9aa07 100644
--- a/kdesktop/tdefileividesktop.cpp
+++ b/kdesktop/tdefileividesktop.cpp
@@ -150,7 +150,9 @@
   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());