Merge lp:~libqtelegram-team/telegram-app/the-aggregator-photos-scope-shows-nothing-after-checked-telegram-content into lp:telegram-app

[Jin]

[Roberto Mier Escandon (rmescandon)]

LGTM: Works as expected

review: Approve

=== modified file 'telegram/app/qml/MessageReplyItem.qml'
--- telegram/app/qml/MessageReplyItem.qml	2016-03-11 07:53:28 +0000
+++ telegram/app/qml/MessageReplyItem.qml	2016-04-14 10:41:42 +0000
@@ -17,14 +17,14 @@
 
     property real maximumWidth: 100
 
-    property real typeMessageMediaDocument: 0x2fda2204
+    property real typeMessageMediaEmpty: 0x3ded6320
+    property real typeMessageMediaPhoto: 0x3d8ce53d
+    property real typeMessageMediaVideo: 0x5bcf1675
+    property real typeMessageMediaGeo: 0x56e0d474
     property real typeMessageMediaContact: 0x5e7d2f39
-    property real typeMessageMediaEmpty: 0x3ded6320
-    property real typeMessageMediaVideo: 0xa2d24290
     property real typeMessageMediaUnsupported: 0x9f84f49e
+    property real typeMessageMediaDocument: 0x2fda2204
     property real typeMessageMediaAudio: 0xc6b68300
-    property real typeMessageMediaPhoto: 0xc8c45a2a
-    property real typeMessageMediaGeo: 0x56e0d474
 
     signal messageFocusRequest(int msgId)
 

=== modified file 'telegram/scope/config.h'
--- telegram/scope/config.h	2015-10-20 17:20:12 +0000
+++ telegram/scope/config.h	2016-04-14 10:41:42 +0000
@@ -32,12 +32,12 @@
 };
 
 enum MessageMedia {
-   typeMessageMediaDocument = 0x2fda2204,
-   typeMessageMediaContact = 0x5e7d2f39,
-   typeMessageMediaEmpty = 0x3ded6320,
-   typeMessageMediaVideo = 0xa2d24290,
-   typeMessageMediaUnsupported = 0x29632a36,
-   typeMessageMediaAudio = 0xc6b68300,
-   typeMessageMediaPhoto = 0xc8c45a2a,
-   typeMessageMediaGeo = 0x56e0d474
-};
\ No newline at end of file
+    typeMessageMediaEmpty       = 0x3ded6320,
+    typeMessageMediaPhoto       = 0x3d8ce53d,
+    typeMessageMediaVideo       = 0x5bcf1675,
+    typeMessageMediaGeo         = 0x56e0d474,
+    typeMessageMediaContact     = 0x5e7d2f39,
+    typeMessageMediaUnsupported = 0x9f84f49e,
+    typeMessageMediaDocument    = 0x2fda2204,
+    typeMessageMediaAudio       = 0xc6b68300,
+};