Attachment 7195 Details for Bug 17123 – kdelibs-4.14.5-klauncher-no-glib.patch

[patch] kdelibs-4.14.5-klauncher-no-glib.patch

kdelibs-4.14.5-klauncher-no-glib.patch (text/plain), 814 bytes, created by David Walser on 2015-11-10 20:51:45 CET

(hide)

Description:

Filename:

MIME Type:

Creator: David Walser

Created: 2015-11-10 20:51:45 CET

Size: 814 bytes

patch

obsolete

--- kdelibs-4.14.12/kinit/klauncher_main.cpp	2015-09-08 21:05:58.000000000 +0200
+++ kdelibs-4.14.14/kinit/klauncher_main.cpp	2015-11-04 23:29:10.000000000 +0100
@@ -75,10 +75,21 @@
    // WABA: Make sure not to enable session management.
    putenv(strdup("SESSION_MANAGER="));
 
+   // Disable the GLib event loop (bug 328571)
+   const bool wasQtNoGlibSet = !qgetenv("QT_NO_GLIB").isEmpty();
+   if (!wasQtNoGlibSet) {
+      qputenv("QT_NO_GLIB", "1");
+   }
+
    // We need a QCoreApplication to get a DBus event loop
    QCoreApplication app(argc, argv);
    app.setApplicationName( componentData.componentName() );
 
+   // Now get rid of QT_NO_GLIB again so launched processes don't inherit it
+   if (!wasQtNoGlibSet) {
+      qputenv("QT_NO_GLIB", "");
+   }
+
    int maxTry = 3;
    while(true)
    {

Actions: View | Diff

Attachments on bug 17123: 7195 | 9620 | 9621