[Spice-commits] SpiceXPI/src

[Christophe Fergau]

 SpiceXPI/src/plugin/controller.cpp |    8 ++++++++
 1 file changed, 8 insertions(+)

New commits:
commit 8b620b39ff250ecb64940c234a04fe05320c2ca3
Author: Christophe Fergeau <cfergeau at redhat.com>
Date:   Wed May 27 16:04:14 2015 +0200

    Workaround firefox-gtk3 bug
    
    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.

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) {