Merge lp:~dobey/unity-scope-click/log-logic-exc into lp:unity-scope-click/touch-15-04

[dobey]

Log logic exceptions as critical to avoid failing on incorrect .desktop files.

[Paweł Stołowski (stolowski)]

Looks good, +1

review: Approve

=== modified file 'libclickscope/click/key_file_locator.cpp'
--- libclickscope/click/key_file_locator.cpp	2014-05-13 19:32:29 +0000
+++ libclickscope/click/key_file_locator.cpp	2015-07-15 14:05:18 +0000
@@ -56,6 +56,8 @@
                        filename.toUtf8().data());
         } catch (const unity::FileException& file_exp) {
             qWarning() << "Error reading file:" << file_exp.to_string().c_str();
+        } catch (const unity::LogicException& logic_exp) {
+            qCritical() << "Error reading file:" << logic_exp.to_string().c_str();
         }
     }
 }

=== added file 'libclickscope/tests/applications/user/pre-translated.desktop'
--- libclickscope/tests/applications/user/pre-translated.desktop	1970-01-01 00:00:00 +0000
+++ libclickscope/tests/applications/user/pre-translated.desktop	2015-07-15 14:05:18 +0000
@@ -0,0 +1,14 @@
+[Desktop Entry]
+Version=1.0
+Type=Application
+Terminal=false
+Exec=aa-exec-click -p com.ubuntu.clock_clock_1.0.300 -- qmlscene ./ubuntu-clock-app.qml
+Icon=/usr/share/click/preinstalled/.click/users/@all/com.ubuntu.clock/./clock64.png
+_Name=Untranslated Clock
+X-Ubuntu-Touch=true
+X-Ubuntu-StageHint=SideStage
+X-Ubuntu-Gettext-Domain=com.ubuntu.clock
+
+Path=/usr/share/click/preinstalled/.click/users/@all/com.ubuntu.clock
+X-Ubuntu-Old-Icon=./clock64.png
+X-Ubuntu-Application-ID=com.ubuntu.clock_clock_1.0.300