Merge lp:~boiko/phone-app/revert_conversation_fixes into lp:phone-app

[Gustavo Pichorim Boiko]

Revert the fixes for the conversation view behavior (bugs #1091682 and #1091253), as it causes many cases to not work.

Revert the fixes for the conversation view behavior (bugs #1091682 and #1091253), as it causes many cases to not work.

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:632
http://jenkins.qa.ubuntu.com/job/phone-app-ci/69/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/phone-app-quantal-armhf-ci/70
        deb: http://jenkins.qa.ubuntu.com/job/phone-app-quantal-armhf-ci/70/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/phone-app-quantal-i386-ci/69
    SUCCESS: http://jenkins.qa.ubuntu.com/job/phone-app-raring-armhf-ci/42
        deb: http://jenkins.qa.ubuntu.com/job/phone-app-raring-armhf-ci/42/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/phone-app-raring-i386-ci/42
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-runner/811

Click here to trigger a rebuild:
http://s-jenkins:8080/job/phone-app-ci/69/rebuild

review: Approve (continuous-integration)

[Tiago Salem Herrmann (tiagosh)]

looks good.

review: Approve

=== modified file 'DetailViewCommunication/CommunicationView.qml'
--- DetailViewCommunication/CommunicationView.qml	2013-04-03 18:43:04 +0000
+++ DetailViewCommunication/CommunicationView.qml	2013-04-09 21:57:23 +0000
@@ -64,8 +64,6 @@
             if (pendingMessage != "") {
                 chatManager.sendMessage(view.phoneNumber, pendingMessage);
                 pendingMessage = "";
-                footer.focus = false;
-                view.phoneNumber = "";
             }
         }
     }
@@ -201,8 +199,8 @@
                 if (itemType == "call") {
                     // call item clicked
                     mainView.callNumber(item.phoneNumber);
-                } else if (item.incoming) {
-                    // incoming message clicked
+                } else {
+                    // message clicked
                     view.phoneNumber = item.phoneNumber
                     footer.focus = true
                 }
@@ -254,8 +252,6 @@
 
             if (chatManager.isChattingToContact(view.phoneNumber)) {
                 chatManager.sendMessage(view.phoneNumber, message);
-                footer.focus = false;
-                view.phoneNumber = "";
             } else {
                 view.pendingMessage = message;
                 chatManager.startChat(view.phoneNumber);

=== modified file 'debian/changelog'
--- debian/changelog	2013-04-03 22:10:05 +0000
+++ debian/changelog	2013-04-09 21:57:23 +0000
@@ -1,3 +1,10 @@
+phone-app (0.59.6) quantal; urgency=low
+
+  * Revert the fixes for the conversation view behavior (bugs #1091682 and 
+    #1091253), as it causes many cases to not work.
+
+ -- Gustavo Pichorim Boiko <[e-mail]>  Tue, 09 Apr 2013 18:45:22 -0300
+
 phone-app (0.59.5) quantal; urgency=low
 
   [ Ying-Chun Liu (PaulLiu) ]