Merge lp:~libqtelegram-team/telegram-app/app-fix-scope-meta into lp:telegram-app/app

[Michał Karnicki]

Tested by refreshing the scope and seeing a previously shown action message "You created the chat" is now gone from the scope.

Also removed
scope/src/com.ubuntu.telegram_sctelegram_automoc.cpp
which is build at compile time.

=== modified file '.bzrignore'
--- .bzrignore	2015-01-24 08:44:54 +0000
+++ .bzrignore	2015-01-27 17:56:01 +0000
@@ -30,3 +30,4 @@
 com.ubuntu.telegram.cbp
 tests/autopilot/sctelegram/test_generic.py
 tests/autopilot/sctelegram/test_scope.py
+scope/src/com.ubuntu.telegram_sctelegram_automoc.cpp

=== removed file 'scope/src/com.ubuntu.telegram_sctelegram_automoc.cpp'
--- scope/src/com.ubuntu.telegram_sctelegram_automoc.cpp	2014-11-24 19:39:49 +0000
+++ scope/src/com.ubuntu.telegram_sctelegram_automoc.cpp	1970-01-01 00:00:00 +0000
@@ -1,2 +0,0 @@
-/* This file is autogenerated, do not edit*/
-enum some_compilers { need_more_than_nothing };

=== modified file 'scope/src/config.h'
--- scope/src/config.h	2014-12-02 15:29:08 +0000
+++ scope/src/config.h	2015-01-27 17:56:01 +0000
@@ -86,7 +86,7 @@
         "       (SELECT type FROM messageActions WHERE messageId=id) AS actionType,\n"
         "       (SELECT title FROM messageActions WHERE messageId=id) AS actionTitle\n"
         "   FROM messages\n"
-        "   WHERE %1\n";
+        "   WHERE (actionType IS NULL OR actionType = '') AND %1\n";
 
 
 const QString DATE_FORMAT="dd MMM yyyy";