[vlc-commits] Do not load KDE Qt plugins until KDE gets a clue

[Rémi Denis-Courmont]

vlc/vlc-1.1 | branch: master | Rémi Denis-Courmont <remi at remlab.net> | Sun Jan 30 14:40:02 2011 +0200| [79f476d62e7219e3ffc9a167c9399d4298edf5a4] | committer: Rémi Denis-Courmont

Do not load KDE Qt plugins until KDE gets a clue

(cherry picked from commit 96c7f9c26940828357655380470a930cbb09497e)

> http://git.videolan.org/gitweb.cgi/vlc/vlc-1.1.git/?a=commit;h=79f476d62e7219e3ffc9a167c9399d4298edf5a4
---

 bin/override.c |   22 ++++++++++++++++++++--
 1 files changed, 20 insertions(+), 2 deletions(-)

diff --git a/bin/override.c b/bin/override.c
index 498b060..3c54ab0 100644
--- a/bin/override.c
+++ b/bin/override.c
@@ -238,8 +238,26 @@ error:
 #endif
 
 
-/*** Locales ***
- * setlocale() is not thread-safe and has a tendency to crash other threads as
+/*** Dynaminc linker ***/
+
+void *dlopen (const char *path, int flags)
+{
+    if (override && path != NULL)
+    {
+        /* Work around the KDE SIGCHLD and KDE D-Bus exit handler bugs */
+        if (strstr (path, "libkde") != NULL)
+        {
+            LOG("Blocked", "\"%s\", %d", path, flags);
+            return NULL;
+        }
+    }
+    return CALL(dlopen, path, flags);
+}
+
+
+/*** Locales ***/
+
+/* setlocale() is not thread-safe and has a tendency to crash other threads as
  * quite many libc and libintl calls depend on the locale.
  * Use uselocale() instead for thread-safety.
  */