[meego-commits] 5638: Changes to Trunk:Testing/libmeegotouch

[Kaitlin Rupert]

Hi,
I have made the following changes to libmeegotouch in project Trunk:Testing. Please review and accept ASAP.

Thank You,
Kaitlin Rupert

[This message was auto-generated]

---

Request #5638:

  submit:   devel:qt-mtf/libmeegotouch(r2) -> Trunk:Testing/libmeegotouch


Message:
    This patch reverts a change in upstream libmeegotouch.  Upstream source has
the orientation related code commented out.  This means libmeegotouch always
runs in portrait mode.

State:   new          2010-07-13T09:51:26 krupert
Comment: None



changes files:
--------------
--- libmeegotouch.changes
+++ libmeegotouch.changes
@@ -0,0 +1,3 @@
+* Tue Jul 13 2010 Kaitlin Rupert <kaitlin.rupert at intel.com> 0.20.25
+- Add re-enable_code_to_set_orientation.patch to allow for orientation changes
+

new:
----
  re-enable_code_to_set_orientation.patch

spec files:
-----------
--- libmeegotouch.spec
+++ libmeegotouch.spec
@@ -24,6 +24,7 @@
 Patch7:     libmeegotouch-0.20.15-ARM-QEMU-stall-fix.patch
 Patch8:     fix_locale_build_issue.patch
 Patch9:     fix_mbubble_build_issue.patch
+Patch10:     re-enable_code_to_set_orientation.patch
 Requires:   meegotouch-theme >= 0.20.14
 Requires(pre): GConf2
 Requires(preun): GConf2
@@ -101,6 +102,8 @@
 %patch8 -p1
 # fix_mbubble_build_issue.patch
 %patch9 -p1
+# re-enable_code_to_set_orientation.patch
+%patch10 -p1
 # >> setup
 # << setup
 

other changes:
--------------

++++++ libmeegotouch.yaml
--- libmeegotouch.yaml
+++ libmeegotouch.yaml
@@ -18,6 +18,7 @@
     - libmeegotouch-0.20.15-ARM-QEMU-stall-fix.patch
     - fix_locale_build_issue.patch
     - fix_mbubble_build_issue.patch
+    - re-enable_code_to_set_orientation.patch
 Requires: 
     - meegotouch-theme >= 0.20.14
 Description: |

++++++ re-enable_code_to_set_orientation.patch (new)
--- re-enable_code_to_set_orientation.patch
+++ re-enable_code_to_set_orientation.patch
+From: Kaitlin Rupert <kaitlin.rupert at linux.intel.com>
+Date: Fri, 09 JuL 2010
+Subject: [PATCH] Re-enable code to set orientation
+
+This should be fixed upstream - see BMC #3844.
+
+Signed-off-by: Kaitlin Rupert <kaitlin.rupert at linux.intel.com>
+
+diff -Naur libmeegotouch-0.20.25/src/corelib/events/morientationtracker.cpp libmeegotouch-0.20.25-new/src/corelib/events/morientationtracker.cpp
+--- libmeegotouch-0.20.25/src/corelib/events/morientationtracker.cpp	2010-07-06 15:41:33.000000000 -0700
++++ libmeegotouch-0.20.25-new/src/corelib/events/morientationtracker.cpp	2010-07-13 12:39:55.796439925 -0700
+@@ -71,25 +71,23 @@
+     M::Orientation orientation = M::Landscape;
+     QString edge = topEdgeProperty.value().toString();
+ 
+-// Following code is diabled only temporarily
+-// Will probably by used again later.
+-//    if (edge == "top") {
+-//        angle = M::Angle0;
+-//    } else if (edge == "left") {
+-//        angle = M::Angle270;
+-//        orientation = M::Portrait;
+-//    } else if (edge == "right") {
+-//        //angle = M::Angle90; Disabled for now
+-//        angle = M::Angle270;
+-//        orientation = M::Portrait;
+-//    } else if (edge == "bottom") {
+-//        //angle = M::Angle180; Disabled for now
+-//        angle = M::Angle0;
+-//    } else {
+-//        angle = M::Angle0;
+-//    }
+-    angle = M::Angle270;
+-    orientation = M::Portrait;
++    if (edge == "top") {
++        angle = M::Angle0;
++    } else if (edge == "left") {
++        angle = M::Angle270;
++        orientation = M::Portrait;
++    } else if (edge == "right") {
++        //angle = M::Angle90; Disabled for now
++        angle = M::Angle270;
++        orientation = M::Portrait;
++    } else if (edge == "bottom") {
++        //angle = M::Angle180; Disabled for now
++        angle = M::Angle0;
++    } else {
++        angle = M::Angle0;
++    }
++//    angle = M::Angle270;
++//    orientation = M::Portrait;
+ 
+     // if hardware keyboard is opened, don't allow orientation angle to be changed.
+     if (angle != currentAngle