[vlc-commits] Revert "Do not load KDE Qt plugins until KDE gets a clue"
Rémi Denis-Courmont
git at videolan.org
Thu Feb 3 13:57:52 CET 2011
vlc | branch: master | Rémi Denis-Courmont <remi at remlab.net> | Thu Feb 3 14:54:19 2011 +0200| [1ea58b26cc545708fac6c3d198118eb9561c9410] | committer: Rémi Denis-Courmont
Revert "Do not load KDE Qt plugins until KDE gets a clue"
This reverts commit 96c7f9c26940828357655380470a930cbb09497e.
This did not work with KDE 4.6 anyhow.
> http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=1ea58b26cc545708fac6c3d198118eb9561c9410
---
bin/override.c | 22 ++--------------------
1 files changed, 2 insertions(+), 20 deletions(-)
diff --git a/bin/override.c b/bin/override.c
index 0828f00..2c94afe 100644
--- a/bin/override.c
+++ b/bin/override.c
@@ -264,26 +264,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.
*/
More information about the vlc-commits
mailing list