Merge lp:~jm-leddy/ubuntu/oneiric/unity-2d/unsetenvvariables into lp:ubuntu/oneiric-updates/unity-2d

[James M. Leddy]

[James M. Leddy (jm-leddy)]

Sorry about that, I accidentally cherry picked from the unity development branch. This resubmission should be good.

[Dimitri John Ledkov (xnox)]

Did you mean to subscribe us three? If you want a sponsor, the default branch reviewer should be left as "ubuntu branches" and then one of the sponsors for the day will look into it.

[James M. Leddy (jm-leddy)]

Hey Dmitrijs, I subscribed you because you had looked it over last time, and I figured it would be better if it went to someone that was familiar with the issue. I'm trying to unsubscribe you two, but I can't figure out how to do it. Do you know how?

[Dimitri John Ledkov (xnox)]

What is more annoying, is that another 1.3 got fixes merged & swooshed passed in the mean time.
I redid the merge and will sponsor this in a second.

review: Approve

=== modified file '.pc/applied-patches'
--- .pc/applied-patches	2012-06-13 18:36:00 +0000
+++ .pc/applied-patches	2012-08-31 19:52:18 +0000
@@ -1,2 +1,3 @@
 debian-changes-4.12.0-0ubuntu1.1
 fix-event-timestamps.patch
+unset-dbus-env-variables.patch

=== added directory '.pc/unset-dbus-env-variables.patch'
=== added directory '.pc/unset-dbus-env-variables.patch/libunity-2d-private'
=== added directory '.pc/unset-dbus-env-variables.patch/libunity-2d-private/src'
=== added file '.pc/unset-dbus-env-variables.patch/libunity-2d-private/src/unity2dapplication.cpp'
--- .pc/unset-dbus-env-variables.patch/libunity-2d-private/src/unity2dapplication.cpp	1970-01-01 00:00:00 +0000
+++ .pc/unset-dbus-env-variables.patch/libunity-2d-private/src/unity2dapplication.cpp	2012-08-31 19:52:18 +0000
@@ -0,0 +1,211 @@
+/*
+ * Unity2d
+ *
+ * Copyright 2010 Canonical Ltd.
+ *
+ * Authors:
+ * - Aurélien Gâteau <[e-mail]>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; version 3.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>
+ */
+
+// Self
+#include "unity2dapplication.h"
+#include "config.h"
+
+// libunity-2d
+#include <debug_p.h>
+#include <gconnector.h>
+#include <gscopedpointer.h>
+#include <unity2ddebug.h>
+#include <unity2dtr.h>
+
+// Qt
+#include <QFont>
+#include <QWindowsStyle>
+#include <QAccessible>
+#include <QAccessibleWidget>
+#include <QWidget>
+
+// GTK
+#include <gtk/gtk.h>
+#include <pango/pango.h>
+
+static const char* A11Y_SCHEMA = "org.gnome.desktop.interface";
+static const char* A11Y_KEY = "toolkit-accessibility";
+
+///////////////////////////////
+class PlatformFontTracker
+{
+public:
+    PlatformFontTracker()
+    {
+        m_gConnector.connect(gtk_settings_get_default(), "notify::gtk-font-name",
+            G_CALLBACK(PlatformFontTracker::onFontChanged), this);
+
+        updateFont();
+    }
+
+private:
+    void updateFont()
+    {
+        gchar* fontName = 0;
+        g_object_get(gtk_settings_get_default(), "gtk-font-name", &fontName, NULL);
+        GScopedPointer<PangoFontDescription, pango_font_description_free> fontDescription(
+            pango_font_description_from_string(fontName)
+            );
+        g_free(fontName);
+
+        int size = pango_font_description_get_size(fontDescription.data());
+
+        QFont font = QFont(
+            pango_font_description_get_family(fontDescription.data()),
+            size / PANGO_SCALE
+            );
+
+        QApplication::setFont(font);
+    }
+
+    static void onFontChanged(GObject*, GParamSpec*, PlatformFontTracker* obj)
+    {
+        obj->updateFont();
+    }
+
+    GConnector m_gConnector;
+};
+
+///////////////////////////////
+AbstractX11EventFilter::~AbstractX11EventFilter()
+{
+    Unity2dApplication* application = Unity2dApplication::instance();
+    if (application != NULL) {
+        application->removeX11EventFilter(this);
+    }
+}
+
+///////////////////////////////
+static bool arrayContains(char** begin, char** end, const char* string)
+{
+    for (char** ptr = begin; ptr != end; ++ptr) {
+        if (strcmp(*ptr, string) == 0) {
+            return true;
+        }
+    }
+    return false;
+}
+
+QAccessibleInterface *panelFactory(const QString &classname, QObject *object)
+{
+    QAccessibleInterface *interface = 0;
+
+    if (classname == "Unity2dPanel" && object && object->isWidgetType()) {
+        interface = new QAccessibleWidget(static_cast<QWidget *>(object), QAccessible::ToolBar);
+    }
+
+    return interface;
+}
+
+void Unity2dApplication::earlySetup(int& argc, char** argv)
+{
+    // Parts of unity-2d uses GTK so it needs to be initialized
+    gtk_init(&argc, &argv);
+
+    Unity2dDebug::installHandlers();
+
+    /* Enable a11y for all Unity 2d components.
+     * See https://bugs.launchpad.net/ubuntu/+source/qt-at-spi/+bug/877358
+     *
+     * Note: We cannot use the Qt bindings to dconf because it requires a
+     * QApplication object, which we don't have at this point.
+     */
+    GObjectScopedPointer<GSettings> settings(g_settings_new(A11Y_SCHEMA));
+    if (g_settings_get_boolean(settings.data(), A11Y_KEY)) {
+        qputenv("QT_ACCESSIBILITY", "1");
+    }
+
+    /* When the environment variable QT_GRAPHICSSYSTEM is not set, force
+     * graphics system to 'raster' instead of the default 'native' which on X11
+     * is 'XRender'.  'XRender' defaults to using a TrueColor visual. We do
+     * _not_ mimick that behaviour with 'raster' by calling
+     * QApplication::setColorSpec because of bugs where some pixmaps become
+     * blueish or black rectangular artifacts were appearing randomly:
+     *
+     *  https://bugs.launchpad.net/unity-2d/+bug/689877
+     *  https://bugs.launchpad.net/unity-2d/+bug/734143
+     */
+    if(getenv("QT_GRAPHICSSYSTEM") == 0) {
+        QApplication::setGraphicsSystem("raster");
+    }
+
+    /* Unless style has been specified in args, set default Qt style to
+     * QWindowStyle to avoid loading QGtkStyle. We don't want to load QGtkStyle
+     * because it uses libgtk2, which causes conflicts with our gtk3 code.
+     */
+    if (!arrayContains(argv, argv + argc, "-style")) {
+        QApplication::setStyle(new QWindowsStyle);
+    }
+}
+
+Unity2dApplication::Unity2dApplication(int& argc, char** argv)
+: QApplication(argc, argv)
+, m_platformFontTracker(new PlatformFontTracker)
+{
+    /* Configure translations */
+    Unity2dTr::init("unity-2d", INSTALL_PREFIX "/share/locale");
+    if (u2dTr("QT_LAYOUT_DIRECTION") == "RTL") {
+        QApplication::setLayoutDirection(Qt::RightToLeft);
+    }
+
+    /* Allow developers to run Unity 2D uninstalled by telling dconf-qt
+       where to look for Unity 2D's schemas.
+       It relies on the fact that the schema is compiled when running cmake.
+    */
+    if (!isRunningInstalled()) {
+        qputenv("GSETTINGS_SCHEMA_DIR", unity2dDirectory().toLocal8Bit() + "/data");
+    }
+
+    QAccessible::installFactory(panelFactory);
+}
+
+Unity2dApplication::~Unity2dApplication()
+{
+    qDeleteAll(m_x11EventFilters);
+    delete m_platformFontTracker;
+}
+
+Unity2dApplication* Unity2dApplication::instance()
+{
+    return qobject_cast<Unity2dApplication*>(QCoreApplication::instance());
+}
+
+void Unity2dApplication::installX11EventFilter(AbstractX11EventFilter* filter)
+{
+    m_x11EventFilters.append(filter);
+}
+
+void Unity2dApplication::removeX11EventFilter(AbstractX11EventFilter* filter)
+{
+    m_x11EventFilters.removeAll(filter);
+}
+
+bool Unity2dApplication::x11EventFilter(XEvent* event)
+{
+    Q_FOREACH(AbstractX11EventFilter* filter, m_x11EventFilters) {
+        if (filter->x11EventFilter(event)) {
+            return true;
+        }
+    }
+    return QApplication::x11EventFilter(event);
+}
+
+#include <unity2dapplication.moc>

=== modified file 'debian/changelog'
--- debian/changelog	2012-06-13 18:36:00 +0000
+++ debian/changelog	2012-08-31 19:52:18 +0000
@@ -1,3 +1,11 @@
+unity-2d (4.12.0-0ubuntu1.3) oneiric-proposed; urgency=low
+
+  [ Chris Coulson ]
+  * DBUS_STARTER_ADDRESS and DBUS_STARTER_BUS_TYPE aren't always unset from
+    environment making gedit and possibly others fail to start (LP: #873027)
+
+ -- James M Leddy <[e-mail]>  Fri, 31 Aug 2012 15:04:49 -0400
+
 unity-2d (4.12.0-0ubuntu1.2) oneiric-security; urgency=low
 
   * Fix issue with unity-2d sending the wrong event timestamp when closing an

=== modified file 'debian/patches/series'
--- debian/patches/series	2012-06-13 18:36:00 +0000
+++ debian/patches/series	2012-08-31 19:52:18 +0000
@@ -1,2 +1,3 @@
 debian-changes-4.12.0-0ubuntu1.1
 fix-event-timestamps.patch
+unset-dbus-env-variables.patch

=== added file 'debian/patches/unset-dbus-env-variables.patch'
--- debian/patches/unset-dbus-env-variables.patch	1970-01-01 00:00:00 +0000
+++ debian/patches/unset-dbus-env-variables.patch	2012-08-31 19:52:18 +0000
@@ -0,0 +1,27 @@
+--- a/libunity-2d-private/src/unity2dapplication.cpp
++++ b/libunity-2d-private/src/unity2dapplication.cpp
+@@ -41,6 +41,9 @@
+ #include <gtk/gtk.h>
+ #include <pango/pango.h>
+ 
++// libc
++#include <stdlib.h>
++
+ static const char* A11Y_SCHEMA = "org.gnome.desktop.interface";
+ static const char* A11Y_KEY = "toolkit-accessibility";
+ 
+@@ -146,6 +149,14 @@
+     if(getenv("QT_GRAPHICSSYSTEM") == 0) {
+         QApplication::setGraphicsSystem("raster");
+     }
++    
++    /* We have these if we were DBus activated, but we don't want our child
++     * processes to inherit them
++     *
++     * https://launchpad.net/bugs/873027
++     */
++    unsetenv("DBUS_STARTER_ADDRESS");
++    unsetenv("DBUS_STARTER_BUS_TYPE");
+ 
+     /* Unless style has been specified in args, set default Qt style to
+      * QWindowStyle to avoid loading QGtkStyle. We don't want to load QGtkStyle

=== modified file 'libunity-2d-private/src/unity2dapplication.cpp'
--- libunity-2d-private/src/unity2dapplication.cpp	2011-11-23 15:05:39 +0000
+++ libunity-2d-private/src/unity2dapplication.cpp	2012-08-31 19:52:18 +0000
@@ -41,6 +41,9 @@
 #include <gtk/gtk.h>
 #include <pango/pango.h>
 
+// libc
+#include <stdlib.h>
+
 static const char* A11Y_SCHEMA = "org.gnome.desktop.interface";
 static const char* A11Y_KEY = "toolkit-accessibility";
 
@@ -146,6 +149,14 @@
     if(getenv("QT_GRAPHICSSYSTEM") == 0) {
         QApplication::setGraphicsSystem("raster");
     }
+    
+    /* We have these if we were DBus activated, but we don't want our child
+     * processes to inherit them
+     *
+     * https://launchpad.net/bugs/873027
+     */
+    unsetenv("DBUS_STARTER_ADDRESS");
+    unsetenv("DBUS_STARTER_BUS_TYPE");
 
     /* Unless style has been specified in args, set default Qt style to
      * QWindowStyle to avoid loading QGtkStyle. We don't want to load QGtkStyle