Fix the KDE open file dialog KIO scheduler crash avoidance hack

[vlc] / bin / vlc.c

diff --git a/bin/vlc.c b/bin/vlc.c
index 68cbfa07b2a630ebace6259366d7388c540c74e8..d6fc5a820fa3f43ab0ea728f07d3e948f9de8bbc 100644 (file)
--- a/bin/vlc.c
+++ b/bin/vlc.c
@@ -70,6 +70,10 @@ int main( int i_argc, const char *ppsz_argv[] )
     /* Disable the ugly Gnome crash dialog so that we properly segfault */
     putenv( (char *)"GNOME_DISABLE_CRASH_DIALOG=1" );
 # endif
+
+    /* Make Xlib hide visuals with an alphachannel. Ensure that Qt4 will not
+     * use the alpha channel for the embedded video window. */
+    putenv( (char *)"XLIB_SKIP_ARGB_VISUALS=1" );
 #endif
 #ifdef HAVE_SETENV
     /* Clear the X.Org startup notification ID. Otherwise the UI might try to
@@ -186,9 +190,10 @@ int main( int i_argc, const char *ppsz_argv[] )
 #ifdef RTLD_NOLOAD
     /* Avoid crash in KIO scheduler cleanup. */
     /* This is ugly, but we get way too many crash reports due to this. */
-    if (dlopen ("libkfilemodule.so", RTLD_LAZY|RTLD_LOCAL|RTLD_NOLOAD) != NULL)
+    if (dlopen ("libkio.so.5", RTLD_LAZY|RTLD_LOCAL|RTLD_NOLOAD) != NULL)
     {
-        fprintf (stderr, "KFile plugin present. Unclean shutdown!\n");
+        fprintf (stderr, "KIO present. Unclean shutdown!\n"
+           " (see http://bugs.kde.org/show_bug.cgi?id=234484 for details)\n");
         _exit (0);
     }
 #endif