Merge lp:~tiagosh/unity-2d/bugfix-857575 into lp:unity-2d

[Tiago Salem Herrmann]

In a particular scenario unity-2d-places may abort due to a SIGABRT raised by QConf().
If for some reason (probably during a distro upgrade) the schema file isn't properly installed and
unity-2d-places is wrapped, then it simply aborts with the following message:

unity-2d-places: [FATAL] Settings schema 'com.canonical.Unity2d' is not installed

This patch adds a simple check if the schema file is present, and if not, assume the default
value. Other components like launcher and panel won't probably have this same issue since
they keep running in memory, and not launched on-the-fly.

=== modified file 'CMakeLists.txt'
--- CMakeLists.txt	2011-11-23 12:43:09 +0000
+++ CMakeLists.txt	2011-12-07 19:50:36 +0000
@@ -9,8 +9,6 @@
 set(UNITY_DIR /usr/share/unity/)
 set(UNITY_2D_DATA_DIR "${CMAKE_SOURCE_DIR}/data")
 
-configure_file(config.h.in ${CMAKE_CURRENT_BINARY_DIR}/config.h @ONLY)
-
 # Configure debian files
 string(SUBSTRING "${CMAKE_INSTALL_PREFIX}" 1 -1 DEBIAN_INSTALL_PREFIX)
 file(GLOB DEBIAN_FILES debian/*.in)
@@ -53,6 +51,7 @@
 set (UNITY_2D_SCHEMAS "com.canonical.Unity2d.gschema.xml")
 set (UNITY_2D_GCONF_CONVERT "unity-2d.convert")
 set (GSETTINGS_DIR "${CMAKE_INSTALL_PREFIX}/share/glib-2.0/schemas/")
+set (UNITY_2D_SCHEMA_FILE "${GSETTINGS_DIR}${UNITY_2D_SCHEMAS}")
 set (GCONF_CONVERT_DIR "${CMAKE_INSTALL_PREFIX}/share/GConf/gsettings")
 execute_process (COMMAND ${PKG_CONFIG_EXECUTABLE} gio-2.0 --variable glib_compile_schemas  OUTPUT_VARIABLE GLIB_COMPILE_SCHEMAS OUTPUT_STRIP_TRAILING_WHITESPACE)
 
@@ -69,6 +68,8 @@
 install (CODE "message (STATUS \"Compiling GSettings schemas\")")
 install (CODE "execute_process (COMMAND ${GLIB_COMPILE_SCHEMAS} ${GSETTINGS_DIR})")
 
+configure_file(config.h.in ${CMAKE_CURRENT_BINARY_DIR}/config.h @ONLY)
+
 # Install GConf to GSettings conversion file
 install (FILES ${UNITY_2D_DATA_DIR}/${UNITY_2D_GCONF_CONVERT} DESTINATION ${GCONF_CONVERT_DIR})
 

=== modified file 'config.h.in'
--- config.h.in	2011-11-18 10:15:49 +0000
+++ config.h.in	2011-12-07 19:50:36 +0000
@@ -3,6 +3,7 @@
 #define INSTALL_BINDIR "@CMAKE_INSTALL_BINDIR@"
 #define UNITY_2D_DIR "@UNITY_2D_DIR@"
 #define UNITY_DIR "@UNITY_DIR@"
+#define UNITY_2D_SCHEMA_FILE "@UNITY_2D_SCHEMA_FILE@"
 
 #include <QCoreApplication>
 #include "qconf.h"

=== modified file 'libunity-2d-private/src/unity2ddeclarativeview.cpp'
--- libunity-2d-private/src/unity2ddeclarativeview.cpp	2011-11-18 10:15:49 +0000
+++ libunity-2d-private/src/unity2ddeclarativeview.cpp	2011-12-07 19:50:36 +0000
@@ -20,6 +20,7 @@
 #include <QGLWidget>
 #include <QVariant>
 #include <QX11Info>
+#include <QFileInfo>
 
 #include <X11/Xlib.h>
 #include <X11/Xatom.h>
@@ -33,7 +34,11 @@
     m_transparentBackground(false),
     m_last_focused_window(None)
 {
-    m_useOpenGL = unity2dConfiguration().property("useOpengl").toBool();
+    if (!QFileInfo(UNITY_2D_SCHEMA_FILE).exists()) {
+        m_useOpenGL = false;
+    } else {
+        m_useOpenGL = unity2dConfiguration().property("useOpengl").toBool();
+    }
 
     setupViewport();
 }