[vlc-commits] Revert "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> | Tue Feb  1 20:37:02 2011 +0200| [5d51aca28a38cf9880e8d84e6978a819ab3f747f] | committer: Rémi Denis-Courmont

Revert "Do not load KDE Qt plugins until KDE gets a clue"

This reverts commit 1b29a1317752f01486def947bcf2e58146b82805.
This reverts commit 79f476d62e7219e3ffc9a167c9399d4298edf5a4.

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

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

diff --git a/bin/override.c b/bin/override.c
index 21c7673..498b060 100644
--- a/bin/override.c
+++ b/bin/override.c
@@ -33,7 +33,6 @@ void vlc_enable_override (void);
 
 #include <stdarg.h>
 #include <stdio.h>
-#include <string.h>
 #include <stdlib.h>
 #include <dlfcn.h>
 #include <pthread.h>
@@ -239,26 +238,8 @@ error:
 #endif
 
 
-/*** 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
+/*** 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.
  */