[meego-commits] 8059: Changes to MeeGo:1.1:Core:Testing/meegotouch-controlpanel

[Kaitlin Rupert]

Hi,
I have made the following changes to meegotouch-controlpanel in project MeeGo:1.1:Core:Testing. Please review and accept ASAP.

Thank You,
Kaitlin Rupert

[This message was auto-generated]

---

Request #8059:

  submit:   devel:qt-mtf:MeeGo:1.1/meegotouch-controlpanel(r2) -> MeeGo:1.1:Core:Testing/meegotouch-controlpanel


Message:
    * Fri Oct 01 2010 Kaitlin Rupert <kaitlin.rupert at intel.com> - 0.8.12
- BMC #7538 - Use icon-m-startup-personalize, not icon-m-settings-personalize

State:   new          2010-10-01T17:01:26 krupert
Comment: None



changes files:
--------------
--- meegotouch-controlpanel.changes
+++ meegotouch-controlpanel.changes
@@ -0,0 +1,3 @@
+* Fri Oct 01 2010 Kaitlin Rupert <kaitlin.rupert at intel.com> - 0.8.12
+- BMC #7538 - Use icon-m-startup-personalize, not icon-m-settings-personalize
+

new:
----
  fix_look_and_feel_icon_id.patch

spec files:
-----------
--- meegotouch-controlpanel.spec
+++ meegotouch-controlpanel.spec
@@ -16,6 +16,7 @@
 Source100:  meegotouch-controlpanel.yaml
 Patch0:     remove_werror.patch
 Patch1:     do_not_show_settings_in_launcher.patch
+Patch2:     fix_look_and_feel_icon_id.patch
 Requires(post): /sbin/ldconfig
 Requires(postun): /sbin/ldconfig
 BuildRequires:  pkgconfig(QtGui)
@@ -50,6 +51,8 @@
 %patch0 -p1
 # do_not_show_settings_in_launcher.patch
 %patch1 -p1
+# fix_look_and_feel_icon_id.patch
+%patch2 -p1
 # >> setup
 # << setup
 

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

++++++ fix_look_and_feel_icon_id.patch (new)
--- fix_look_and_feel_icon_id.patch
+++ fix_look_and_feel_icon_id.patch
+From: David Kedves <dkedves at blumsoft.eu>
+Date: Fri, 01 Oct 2010
+Subject: [PATCH] Use the icon-m-startup-personalize icon...
+
+instead of using the icon-m-settings-personalize icon.  This resolves BMC#7538
+
+diff --git a/controlpanel/src/page/maintranslations.cpp b/controlpanel/src/page/maintranslations.cpp
+index 2578c94..48f0480 100644
+--- a/controlpanel/src/page/maintranslations.cpp
++++ b/controlpanel/src/page/maintranslations.cpp
+@@ -32,7 +32,7 @@ DcpMain::CategoryInfos[] =
+         QT_TRID_NOOP ("qtn_sett_main_look"),
+         "Look & Feel",
+         PageHandle::LOOKANDFEEL,
+-        "icon-m-settings-personalize",
++        "icon-m-startup-personalize",
+         0
+     },
+     {

++++++ meegotouch-controlpanel.yaml
--- meegotouch-controlpanel.yaml
+++ meegotouch-controlpanel.yaml
@@ -10,6 +10,7 @@
 Patches:
     - remove_werror.patch
     - do_not_show_settings_in_launcher.patch
+    - fix_look_and_feel_icon_id.patch 
 Description: MeeGo Control Panel
 PkgConfigBR:
     - QtGui