/* Explicit HACK */
extern void LocaleFree (const char *);
extern char *FromLocale (const char *);
+extern void vlc_enable_override (void);
#include <signal.h>
#include <time.h>
* LibVLC runs outside of VLC, we cannot rely on this code snippet. */
signal (SIGPIPE, SIG_IGN);
+#ifdef HAVE_PUTENV
+# ifndef NDEBUG
+ /* Activate malloc checking routines to detect heap corruptions. */
+ putenv( (char*)"MALLOC_CHECK_=2" );
+
+ /* Disable the ugly Gnome crash dialog so that we properly segfault */
+ putenv( (char *)"GNOME_DISABLE_CRASH_DIALOG=1" );
+# endif
+#endif
+#ifdef HAVE_SETENV
+ /* Clear the X.Org startup notification ID. Otherwise the UI might try to
+ * change the environment while the process is multi-threaded. That could
+ * crash. Screw you X.Org. Next time write a thread-safe specification. */
+ unsetenv ("DESKTOP_STARTUP_ID");
+#endif
+
#ifndef ALLOW_RUN_AS_ROOT
if (geteuid () == 0)
{
libvlc_get_version(), libvlc_get_changeset() );
#endif
-#ifdef HAVE_PUTENV
-# ifndef NDEBUG
- /* Activate malloc checking routines to detect heap corruptions. */
- putenv( (char*)"MALLOC_CHECK_=2" );
-
- /* Disable the ugly Gnome crash dialog so that we properly segfault */
- putenv( (char *)"GNOME_DISABLE_CRASH_DIALOG=1" );
-# endif
-#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" );
-
/* Synchronously intercepted POSIX signals.
*
* In a threaded program such as VLC, the only sane way to handle signals
return 1; // BOOM!
argv[argc] = NULL;
+ vlc_enable_override ();
+
/* Initialize libvlc */
libvlc_instance_t *vlc = libvlc_new (argc, argv);