summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChristophe Fergeau <cfergeau@redhat.com>2015-05-27 16:04:14 +0200
committerChristophe Fergeau <cfergeau@redhat.com>2015-06-09 09:57:25 +0200
commit8b620b39ff250ecb64940c234a04fe05320c2ca3 (patch)
treefd3b498323a7429ccd58a2f96307f3309d60ada0
parentef04d6e88cd32f391aa620f723df3eddaa7d4751 (diff)
Workaround firefox-gtk3 bugHEADmaster
When it's built with gtk3, firefox plugin-container will use some LD_PRELOAD hack in order to be able to load the gtk2 flash plugin. However, this LD_PRELOAD'ed .so will cause gtk3 remote-viewer to crash when it's started by spice-xpi This commit just cleans up the unwanted LD_PRELOAD variable from the environment before starting remote-viewer.
-rw-r--r--SpiceXPI/src/plugin/controller.cpp8
1 files changed, 8 insertions, 0 deletions
diff --git a/SpiceXPI/src/plugin/controller.cpp b/SpiceXPI/src/plugin/controller.cpp
index bd8b9d7..440ad63 100644
--- a/SpiceXPI/src/plugin/controller.cpp
+++ b/SpiceXPI/src/plugin/controller.cpp
@@ -168,6 +168,14 @@ gpointer SpiceController::ClientThread(gpointer data)
if (!fake_this->m_proxy.empty())
env = g_environ_setenv(env, "SPICE_PROXY", fake_this->m_proxy.c_str(), TRUE);
+ // Work around bug in firefox gtk3 builds, see
+ // https://bugzilla.redhat.com/show_bug.cgi?id=1217076
+ // http://emilio.pozuelo.org/posts/75
+ //
+ // This LD_PRELOAD'ed library causes gtk3 applications to crash
+ // FIXME: remove this hack if this ever gets improved in firefox-gtk3
+ env = g_environ_unsetenv(env, "LD_PRELOAD");
+
// Try to spawn main client
client_argv = fake_this->GetClientPath();
if (client_argv != NULL) {