Change license & Add privilege for app launch

Change-Id: I03ef181add5f89d061c6f06399190a5030c92f9b

diff --git a/data/edje/all_apps_portrait.edc b/data/edje/all_apps_portrait.edc
index 4b2c759b14c1b43969504f843ed09abfe2f3049b..2f3773df7bbaa2afff1ba718b6b3fbbb27676186 100644 (file)
--- a/data/edje/all_apps_portrait.edc
+++ b/data/edje/all_apps_portrait.edc
@@ -1,7 +1,7 @@
 /*
  * MENU-SCREEN
  *
- * Copyright (c) 2009-2014 Samsung Electronics Co., Ltd All Rights Reserved
+ * Copyright (c) 2009-2015 Samsung Electronics Co., Ltd All Rights Reserved
  *
  * Contact: Jin Yoon <jinny.yoon@samsung.com>
  *          Junkyu Han <junkyu.han@samsung.com>

diff --git a/data/edje/button_edit.edc b/data/edje/button_edit.edc
index fefa59fcbfae6064f488bd0326daf03711a6862a..b9b53e8e3cef562a83ba8a5e79579943e2e59fac 100644 (file)
--- a/data/edje/button_edit.edc
+++ b/data/edje/button_edit.edc
@@ -1,7 +1,7 @@
 /*
  * MENU-SCREEN
  *
- * Copyright (c) 2009-2014 Samsung Electronics Co., Ltd All Rights Reserved
+ * Copyright (c) 2009-2015 Samsung Electronics Co., Ltd All Rights Reserved
  *
  * Contact: Jin Yoon <jinny.yoon@samsung.com>
  *          Junkyu Han <junkyu.han@samsung.com>

diff --git a/data/edje/group_4x4_portrait.edc b/data/edje/group_4x4_portrait.edc
index ff7a34a2889632e634425d379a01c6ff154b7823..00f64d659dd17ef8453313506a74193a4188405d 100644 (file)
--- a/data/edje/group_4x4_portrait.edc
+++ b/data/edje/group_4x4_portrait.edc
@@ -1,7 +1,7 @@
 /*
  * MENU-SCREEN
  *
- * Copyright (c) 2009-2014 Samsung Electronics Co., Ltd All Rights Reserved
+ * Copyright (c) 2009-2015 Samsung Electronics Co., Ltd All Rights Reserved
  *
  * Contact: Jin Yoon <jinny.yoon@samsung.com>
  *          Junkyu Han <junkyu.han@samsung.com>

diff --git a/data/edje/index.edc b/data/edje/index.edc
index 713e38240a8c6817dcfb98154c81a3ccaa586110..50d19066ff33094aa619e06f8a90adc2a342286e 100644 (file)
--- a/data/edje/index.edc
+++ b/data/edje/index.edc
@@ -1,7 +1,7 @@
 /*
  * MENU-SCREEN
  *
- * Copyright (c) 2009-2014 Samsung Electronics Co., Ltd All Rights Reserved
+ * Copyright (c) 2009-2015 Samsung Electronics Co., Ltd All Rights Reserved
  *
  * Contact: Jin Yoon <jinny.yoon@samsung.com>
  *          Junkyu Han <junkyu.han@samsung.com>

diff --git a/data/edje/item_4x4.edc b/data/edje/item_4x4.edc
index 541e59c56a54a9f993a5ad1e58ffc746eba3b139..8f33fc2826322fa32b6c5938f7ac8df12ea8c5cb 100644 (file)
--- a/data/edje/item_4x4.edc
+++ b/data/edje/item_4x4.edc
@@ -1,7 +1,7 @@
 /*
  * MENU-SCREEN
  *
- * Copyright (c) 2009-2014 Samsung Electronics Co., Ltd All Rights Reserved
+ * Copyright (c) 2009-2015 Samsung Electronics Co., Ltd All Rights Reserved
  *
  * Contact: Jin Yoon <jinny.yoon@samsung.com>
  *          Junkyu Han <junkyu.han@samsung.com>

diff --git a/data/edje/layout_portrait.edc b/data/edje/layout_portrait.edc
index dc95b87b08b3d2e7df608beb85796889fe182510..6bcea05bfe34146a1619e577250e7c4bb5f8809f 100644 (file)
--- a/data/edje/layout_portrait.edc
+++ b/data/edje/layout_portrait.edc
@@ -1,7 +1,7 @@
 /*
  * MENU-SCREEN
  *
- * Copyright (c) 2009-2014 Samsung Electronics Co., Ltd All Rights Reserved
+ * Copyright (c) 2009-2015 Samsung Electronics Co., Ltd All Rights Reserved
  *
  * Contact: Jin Yoon <jinny.yoon@samsung.com>
  *          Junkyu Han <junkyu.han@samsung.com>

diff --git a/data/org.tizen.menu-screen.xml.in b/data/org.tizen.menu-screen.xml.in
index 75ab12492a8658b6fc0eec1796db3e992fd40213..66c6134288eb02e2566211acd71d68c473e4252f 100644 (file)
--- a/data/org.tizen.menu-screen.xml.in
+++ b/data/org.tizen.menu-screen.xml.in
@@ -10,4 +10,7 @@
                <category name="http://tizen.org/category/homeapp"/>
                <icon>/usr/share/icons/default/small/org.tizen.menu-screen.png</icon>
        </ui-application>
+       <privileges>
+               <privilege>http://tizen.org/privilege/appmanager.launch</privilege>
+       </privileges>
 </manifest>

diff --git a/include/all_apps/db.h b/include/all_apps/db.h
index 08997d5440b788670f774042cb5520964f5f29db..23745e81542083cec920aed0e4acdad5bd57b63a 100644 (file)
--- a/include/all_apps/db.h
+++ b/include/all_apps/db.h
@@ -1,7 +1,7 @@
 /*
  * MENU-SCREEN
  *
- * Copyright (c) 2009-2014 Samsung Electronics Co., Ltd All Rights Reserved
+ * Copyright (c) 2009-2015 Samsung Electronics Co., Ltd All Rights Reserved
  *
  * Contact: Jin Yoon <jinny.yoon@samsung.com>
  *          Junkyu Han <junkyu.han@samsung.com>

diff --git a/include/all_apps/layout.h b/include/all_apps/layout.h
index f3d615196ed786500e24b1a85e9614ab32a894c4..9f0087dd516c22a6555520b233c1d2407aec04df 100644 (file)
--- a/include/all_apps/layout.h
+++ b/include/all_apps/layout.h
@@ -1,7 +1,7 @@
 /*
  * MENU-SCREEN
  *
- * Copyright (c) 2009-2014 Samsung Electronics Co., Ltd All Rights Reserved
+ * Copyright (c) 2009-2015 Samsung Electronics Co., Ltd All Rights Reserved
  *
  * Contact: Jin Yoon <jinny.yoon@samsung.com>
  *          Junkyu Han <junkyu.han@samsung.com>

diff --git a/include/all_apps/list.h b/include/all_apps/list.h
index 126aed85b79dc09b6a1e652294fc8db3e42a02c3..6f253038b922f9b7e79b01ea77b92997d9f866e5 100644 (file)
--- a/include/all_apps/list.h
+++ b/include/all_apps/list.h
@@ -1,7 +1,7 @@
 /*
  * MENU-SCREEN
  *
- * Copyright (c) 2009-2014 Samsung Electronics Co., Ltd All Rights Reserved
+ * Copyright (c) 2009-2015 Samsung Electronics Co., Ltd All Rights Reserved
  *
  * Contact: Jin Yoon <jinny.yoon@samsung.com>
  *          Junkyu Han <junkyu.han@samsung.com>

diff --git a/include/all_apps/shortcut.h b/include/all_apps/shortcut.h
index 2421671dbf3ea359f7460b2f8f739613e689a890..7c6d5f6f162af6df0860367b43401418cc1fb86e 100644 (file)
--- a/include/all_apps/shortcut.h
+++ b/include/all_apps/shortcut.h
@@ -1,7 +1,7 @@
 /*
  * MENU-SCREEN
  *
- * Copyright (c) 2009-2014 Samsung Electronics Co., Ltd All Rights Reserved
+ * Copyright (c) 2009-2015 Samsung Electronics Co., Ltd All Rights Reserved
  *
  * Contact: Jin Yoon <jinny.yoon@samsung.com>
  *          Junkyu Han <junkyu.han@samsung.com>

diff --git a/include/conf.h b/include/conf.h
index 47cb96c21fbccd563b0f41046d1a66746bba53cc..bfe45a31fd21ae29150e8a94737b48832f9882bb 100644 (file)
--- a/include/conf.h
+++ b/include/conf.h
@@ -1,7 +1,7 @@
 /*
  * MENU-SCREEN
  *
- * Copyright (c) 2009-2014 Samsung Electronics Co., Ltd All Rights Reserved
+ * Copyright (c) 2009-2015 Samsung Electronics Co., Ltd All Rights Reserved
  *
  * Contact: Jin Yoon <jinny.yoon@samsung.com>
  *          Junkyu Han <junkyu.han@samsung.com>

diff --git a/include/db.h b/include/db.h
index 5ec5bd910d94fb42d87f6b6d821e0d0190844b48..98f36360f9e72869ae3874c39276770e98bf2b36 100644 (file)
--- a/include/db.h
+++ b/include/db.h
@@ -1,7 +1,7 @@
 /*
  * MENU-SCREEN
  *
- * Copyright (c) 2009-2014 Samsung Electronics Co., Ltd All Rights Reserved
+ * Copyright (c) 2009-2015 Samsung Electronics Co., Ltd All Rights Reserved
  *
  * Contact: Jin Yoon <jinny.yoon@samsung.com>
  *          Junkyu Han <junkyu.han@samsung.com>

diff --git a/include/index.h b/include/index.h
index 27ef1c0c893a23531aefb0c94e2d8949f8c963dd..68a1447198b0d6f9282c1e11ec49ab9767a55cf1 100644 (file)
--- a/include/index.h
+++ b/include/index.h
@@ -1,7 +1,7 @@
 /*
  * MENU-SCREEN
  *
- * Copyright (c) 2009-2014 Samsung Electronics Co., Ltd All Rights Reserved
+ * Copyright (c) 2009-2015 Samsung Electronics Co., Ltd All Rights Reserved
  *
  * Contact: Jin Yoon <jinny.yoon@samsung.com>
  *          Junkyu Han <junkyu.han@samsung.com>

diff --git a/include/item.h b/include/item.h
index a42d3c82fc60e7ff450777ee3b2615f5646143ea..105943979202188702e363deaa674ccd554e139e 100644 (file)
--- a/include/item.h
+++ b/include/item.h
@@ -1,7 +1,7 @@
 /*
  * MENU-SCREEN
  *
- * Copyright (c) 2009-2014 Samsung Electronics Co., Ltd All Rights Reserved
+ * Copyright (c) 2009-2015 Samsung Electronics Co., Ltd All Rights Reserved
  *
  * Contact: Jin Yoon <jinny.yoon@samsung.com>
  *          Junkyu Han <junkyu.han@samsung.com>

diff --git a/include/item_badge.h b/include/item_badge.h
index 659b32301c7fbfce2102969cdded43625f7a00a7..b510761907ec223c5e0c111736ff5fca3407a6e1 100644 (file)
--- a/include/item_badge.h
+++ b/include/item_badge.h
@@ -1,7 +1,7 @@
 /*
  * MENU-SCREEN
  *
- * Copyright (c) 2009-2014 Samsung Electronics Co., Ltd All Rights Reserved
+ * Copyright (c) 2009-2015 Samsung Electronics Co., Ltd All Rights Reserved
  *
  * Contact: Jin Yoon <jinny.yoon@samsung.com>
  *          Junkyu Han <junkyu.han@samsung.com>

diff --git a/include/item_event.h b/include/item_event.h
index d140130f15dcb5d79b82f2b55588972e54d9f195..605dc3309553b52dc3975615b6f96fac59853c07 100644 (file)
--- a/include/item_event.h
+++ b/include/item_event.h
@@ -1,7 +1,7 @@
 /*
  * MENU-SCREEN
  *
- * Copyright (c) 2009-2014 Samsung Electronics Co., Ltd All Rights Reserved
+ * Copyright (c) 2009-2015 Samsung Electronics Co., Ltd All Rights Reserved
  *
  * Contact: Jin Yoon <jinny.yoon@samsung.com>
  *          Junkyu Han <junkyu.han@samsung.com>

diff --git a/include/key.h b/include/key.h
index 33e4e2ab910bad36662f3690bc360ca1a54bac68..d9ff3207fe54209dea585fa66c0770731be517fb 100644 (file)
--- a/include/key.h
+++ b/include/key.h
@@ -1,7 +1,7 @@
 /*
  * MENU-SCREEN
  *
- * Copyright (c) 2009-2014 Samsung Electronics Co., Ltd All Rights Reserved
+ * Copyright (c) 2009-2015 Samsung Electronics Co., Ltd All Rights Reserved
  *
  * Contact: Jin Yoon <jinny.yoon@samsung.com>
  *          Junkyu Han <junkyu.han@samsung.com>

diff --git a/include/layout.h b/include/layout.h
index 4edc6b011331a6c4d479fc4777ea10df792dbf87..44d76b4f6667a156b455c33cfa229c766d976883 100644 (file)
--- a/include/layout.h
+++ b/include/layout.h
@@ -1,7 +1,7 @@
 /*
  * MENU-SCREEN
  *
- * Copyright (c) 2009-2014 Samsung Electronics Co., Ltd All Rights Reserved
+ * Copyright (c) 2009-2015 Samsung Electronics Co., Ltd All Rights Reserved
  *
  * Contact: Jin Yoon <jinny.yoon@samsung.com>
  *          Junkyu Han <junkyu.han@samsung.com>

diff --git a/include/list.h b/include/list.h
index dda4a7a4695182690bcbaf2b1bb6157a5981096d..b8a0af916cb339dfec4c3175c5e0a2768eff77c4 100644 (file)
--- a/include/list.h
+++ b/include/list.h
@@ -1,7 +1,7 @@
 /*
  * MENU-SCREEN
  *
- * Copyright (c) 2009-2014 Samsung Electronics Co., Ltd All Rights Reserved
+ * Copyright (c) 2009-2015 Samsung Electronics Co., Ltd All Rights Reserved
  *
  * Contact: Jin Yoon <jinny.yoon@samsung.com>
  *          Junkyu Han <junkyu.han@samsung.com>

diff --git a/include/mapbuf.h b/include/mapbuf.h
index db209041ffe3440f120ed9707b0d7838a97d2152..ae607df4a7c95d0ed9a1a9dc377d653012962d3b 100644 (file)
--- a/include/mapbuf.h
+++ b/include/mapbuf.h
@@ -1,7 +1,7 @@
 /*
  * MENU-SCREEN
  *
- * Copyright (c) 2009-2014 Samsung Electronics Co., Ltd All Rights Reserved
+ * Copyright (c) 2009-2015 Samsung Electronics Co., Ltd All Rights Reserved
  *
  * Contact: Jin Yoon <jinny.yoon@samsung.com>
  *          Junkyu Han <junkyu.han@samsung.com>

diff --git a/include/menu_screen.h b/include/menu_screen.h
index 06d8fc3041c427b56d7f7b0a2519e2d2975131b2..b13382148923baba852841fe2e9dc7b886d5ec2e 100644 (file)
--- a/include/menu_screen.h
+++ b/include/menu_screen.h
@@ -1,7 +1,7 @@
 /*
  * MENU-SCREEN
  *
- * Copyright (c) 2009-2014 Samsung Electronics Co., Ltd All Rights Reserved
+ * Copyright (c) 2009-2015 Samsung Electronics Co., Ltd All Rights Reserved
  *
  * Contact: Jin Yoon <jinny.yoon@samsung.com>
  *          Junkyu Han <junkyu.han@samsung.com>

diff --git a/include/mouse.h b/include/mouse.h
index 85d0a29c30570fe35934ee785975998dc7b81d3c..b46d295df455bbd08e86c229cdd2d53690a09108 100644 (file)
--- a/include/mouse.h
+++ b/include/mouse.h
@@ -1,7 +1,7 @@
 /*
  * MENU-SCREEN
  *
- * Copyright (c) 2009-2014 Samsung Electronics Co., Ltd All Rights Reserved
+ * Copyright (c) 2009-2015 Samsung Electronics Co., Ltd All Rights Reserved
  *
  * Contact: Jin Yoon <jinny.yoon@samsung.com>
  *          Junkyu Han <junkyu.han@samsung.com>

diff --git a/include/page.h b/include/page.h
index 4c4ad3aeb7432ea28c703e07ab2c7efa71a0508a..ef81e3ee5f566a3ce5870f141b4c0de71beaf3e9 100644 (file)
--- a/include/page.h
+++ b/include/page.h
@@ -1,7 +1,7 @@
 /*
  * MENU-SCREEN
  *
- * Copyright (c) 2009-2014 Samsung Electronics Co., Ltd All Rights Reserved
+ * Copyright (c) 2009-2015 Samsung Electronics Co., Ltd All Rights Reserved
  *
  * Contact: Jin Yoon <jinny.yoon@samsung.com>
  *          Junkyu Han <junkyu.han@samsung.com>

diff --git a/include/page_scroller.h b/include/page_scroller.h
index da9e4f25ad971d40f6a6846baf2f9ffebbac5e79..b700d99afb77b0f66ea8da112feb3683e18ac677 100644 (file)
--- a/include/page_scroller.h
+++ b/include/page_scroller.h
@@ -1,7 +1,7 @@
 /*
  * MENU-SCREEN
  *
- * Copyright (c) 2009-2014 Samsung Electronics Co., Ltd All Rights Reserved
+ * Copyright (c) 2009-2015 Samsung Electronics Co., Ltd All Rights Reserved
  *
  * Contact: Jin Yoon <jinny.yoon@samsung.com>
  *          Junkyu Han <junkyu.han@samsung.com>

diff --git a/include/pkgmgr.h b/include/pkgmgr.h
index bd2aa06732252dbdf6b726219acc8d493ffd1733..934299100dd787ce3b34e73d23282b78b39457fd 100644 (file)
--- a/include/pkgmgr.h
+++ b/include/pkgmgr.h
@@ -1,7 +1,7 @@
 /*
  * MENU-SCREEN
  *
- * Copyright (c) 2009-2014 Samsung Electronics Co., Ltd All Rights Reserved
+ * Copyright (c) 2009-2015 Samsung Electronics Co., Ltd All Rights Reserved
  *
  * Contact: Jin Yoon <jinny.yoon@samsung.com>
  *          Junkyu Han <junkyu.han@samsung.com>

diff --git a/include/popup.h b/include/popup.h
index d871b919713dc04f2032406a907eefd049773d23..85502a6e8b42147c7b2ca3d05df06c60d5cf54b3 100644 (file)
--- a/include/popup.h
+++ b/include/popup.h
@@ -1,7 +1,7 @@
 /*
  * MENU-SCREEN
  *
- * Copyright (c) 2009-2014 Samsung Electronics Co., Ltd All Rights Reserved
+ * Copyright (c) 2009-2015 Samsung Electronics Co., Ltd All Rights Reserved
  *
  * Contact: Jin Yoon <jinny.yoon@samsung.com>
  *          Junkyu Han <junkyu.han@samsung.com>

diff --git a/include/util.h b/include/util.h
index 4ddc2b71bb2e296993f39553119880e4b07d51e3..0dd632680594954c9b362933d3542f606260cde2 100644 (file)
--- a/include/util.h
+++ b/include/util.h
@@ -1,7 +1,7 @@
 /*
  * MENU-SCREEN
  *
- * Copyright (c) 2009-2014 Samsung Electronics Co., Ltd All Rights Reserved
+ * Copyright (c) 2009-2015 Samsung Electronics Co., Ltd All Rights Reserved
  *
  * Contact: Jin Yoon <jinny.yoon@samsung.com>
  *          Junkyu Han <junkyu.han@samsung.com>

diff --git a/packaging/org.tizen.menu-screen.spec b/packaging/org.tizen.menu-screen.spec
index 8dfe4c1123f6174ecd16667aa13759673ebb37cc..2bb49eb200f379985ce2381fef790ea90344969c 100644 (file)
--- a/packaging/org.tizen.menu-screen.spec
+++ b/packaging/org.tizen.menu-screen.spec
@@ -23,7 +23,7 @@ Summary:    An utility library of the menu screen
 Version:    1.2.5
 Release:    1.1
 Group:      TO_BE/FILLED_IN
-License:    Apache
+License:    Apache-2.0
 Source0:    %{name}-%{version}.tar.gz
 BuildRequires:  pkgconfig(ail)
 BuildRequires:  pkgconfig(appcore-efl)

diff --git a/src/all_apps/db.c b/src/all_apps/db.c
index eb5485d55b91896d93bbf85b5474ba07a8f2bd9b..104d13c638b38d3646fbed5984cab546137ad5b2 100644 (file)
--- a/src/all_apps/db.c
+++ b/src/all_apps/db.c
@@ -1,7 +1,7 @@
 /*
  * MENU-SCREEN
  *
- * Copyright (c) 2009-2014 Samsung Electronics Co., Ltd All Rights Reserved
+ * Copyright (c) 2009-2015 Samsung Electronics Co., Ltd All Rights Reserved
  *
  * Contact: Jin Yoon <jinny.yoon@samsung.com>
  *          Junkyu Han <junkyu.han@samsung.com>

diff --git a/src/all_apps/layout.c b/src/all_apps/layout.c
index 3842193c6df44e2d0346efbb7b42aae4c7eb294c..03bc04fe38a39cb1add30e788d3c4a0f465f7770 100644 (file)
--- a/src/all_apps/layout.c
+++ b/src/all_apps/layout.c
@@ -1,7 +1,7 @@
 /*
  * MENU-SCREEN
  *
- * Copyright (c) 2009-2014 Samsung Electronics Co., Ltd All Rights Reserved
+ * Copyright (c) 2009-2015 Samsung Electronics Co., Ltd All Rights Reserved
  *
  * Contact: Jin Yoon <jinny.yoon@samsung.com>
  *          Junkyu Han <junkyu.han@samsung.com>

diff --git a/src/all_apps/list.c b/src/all_apps/list.c
index 322b65ee29de9dd110459e87d048d4e10646dca1..9b72d1270b355a790206bfa4a66525c37c5ae7dc 100644 (file)
--- a/src/all_apps/list.c
+++ b/src/all_apps/list.c
@@ -1,22 +1,22 @@
 /*
- * menu-screen
+ * MENU-SCREEN
  *
- * copyright (c) 2009-2014 samsung electronics co., ltd all rights reserved
+ * Copyright (c) 2009-2015 Samsung Electronics Co., Ltd All Rights Reserved
  *
- * contact: jin yoon <jinny.yoon@samsung.com>
- *          junkyu han <junkyu.han@samsung.com>
+ * Contact: Jin Yoon <jinny.yoon@samsung.com>
+ *          Junkyu Han <junkyu.han@samsung.com>
 
- * licensed under the apache license, version 2.0 (the "license");
- * you may not use this file except in compliance with the license.
- * you may obtain a copy of the license at
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
  *
- * http://www.apache.org/licenses/license-2.0
+ * http://www.apache.org/licenses/LICENSE-2.0
  *
- * unless required by applicable law or agreed to in writing, software
- * distributed under the license is distributed on an "as is" basis,
- * without warranties or conditions of any kind, either express or implied.
- * see the license for the specific language governing permissions and
- * limitations under the license.
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
  *
  */
 

diff --git a/src/all_apps/shortcut.c b/src/all_apps/shortcut.c
index d92cd7ac95d87ef1b83a81b781cd2ab9ebf1cbb3..36536d9cda26cb1f0ddf3274efd729d8ee5cc642 100644 (file)
--- a/src/all_apps/shortcut.c
+++ b/src/all_apps/shortcut.c
@@ -1,7 +1,7 @@
 /*
  * MENU-SCREEN
  *
- * Copyright (c) 2009-2014 Samsung Electronics Co., Ltd All Rights Reserved
+ * Copyright (c) 2009-2015 Samsung Electronics Co., Ltd All Rights Reserved
  *
  * Contact: Jin Yoon <jinny.yoon@samsung.com>
  *          Junkyu Han <junkyu.han@samsung.com>

diff --git a/src/db.c b/src/db.c
index 9efce2d498a95348da7c81ee98821611c35afc9a..19473dd7afec1175fd22acbfa128dbd2ae94a21b 100644 (file)
--- a/src/db.c
+++ b/src/db.c
@@ -1,7 +1,7 @@
 /*
  * MENU-SCREEN
  *
- * Copyright (c) 2009-2014 Samsung Electronics Co., Ltd All Rights Reserved
+ * Copyright (c) 2009-2015 Samsung Electronics Co., Ltd All Rights Reserved
  *
  * Contact: Jin Yoon <jinny.yoon@samsung.com>
  *          Junkyu Han <junkyu.han@samsung.com>

diff --git a/src/index.c b/src/index.c
index afac24bd09eccec9f6ac6b71e3d771d1d9cf598d..d01b84a1be12f2381a722da732c4f94708a3b415 100644 (file)
--- a/src/index.c
+++ b/src/index.c
@@ -1,7 +1,7 @@
 /*
  * MENU-SCREEN
  *
- * Copyright (c) 2009-2014 Samsung Electronics Co., Ltd All Rights Reserved
+ * Copyright (c) 2009-2015 Samsung Electronics Co., Ltd All Rights Reserved
  *
  * Contact: Jin Yoon <jinny.yoon@samsung.com>
  *          Junkyu Han <junkyu.han@samsung.com>

diff --git a/src/item.c b/src/item.c
index 9313466b7041f5194a0d5c4839cc67cd96f5dd51..c69b347d3898959d6f38b33e4cda992d2a71cc6f 100644 (file)
--- a/src/item.c
+++ b/src/item.c
@@ -1,7 +1,7 @@
 /*
  * MENU-SCREEN
  *
- * Copyright (c) 2009-2014 Samsung Electronics Co., Ltd All Rights Reserved
+ * Copyright (c) 2009-2015 Samsung Electronics Co., Ltd All Rights Reserved
  *
  * Contact: Jin Yoon <jinny.yoon@samsung.com>
  *          Junkyu Han <junkyu.han@samsung.com>

diff --git a/src/item_badge.c b/src/item_badge.c
index ce4c853b0aa3d30f4beb518688d0efc62dae9cc0..94d4d38cad58445fa3ebead06f10ed58a184948e 100644 (file)
--- a/src/item_badge.c
+++ b/src/item_badge.c
@@ -1,7 +1,7 @@
 /*
  * MENU-SCREEN
  *
- * Copyright (c) 2009-2014 Samsung Electronics Co., Ltd All Rights Reserved
+ * Copyright (c) 2009-2015 Samsung Electronics Co., Ltd All Rights Reserved
  *
  * Contact: Jin Yoon <jinny.yoon@samsung.com>
  *          Junkyu Han <junkyu.han@samsung.com>

diff --git a/src/item_event.c b/src/item_event.c
index 01aa4f1cd4ae2e9395ffd3f8ab84ee64e372ae06..1210e25c2ba997109c0f5ccfe99c1db2a4d61611 100644 (file)
--- a/src/item_event.c
+++ b/src/item_event.c
@@ -1,7 +1,7 @@
 /*
  * MENU-SCREEN
  *
- * Copyright (c) 2009-2014 Samsung Electronics Co., Ltd All Rights Reserved
+ * Copyright (c) 2009-2015 Samsung Electronics Co., Ltd All Rights Reserved
  *
  * Contact: Jin Yoon <jinny.yoon@samsung.com>
  *          Junkyu Han <junkyu.han@samsung.com>

diff --git a/src/key.c b/src/key.c
index 15685de1c8bac7da33ac302cc6227072dbf07d71..f1eb244add3c2c1903ebf34c4549dd17b06f1512 100644 (file)
--- a/src/key.c
+++ b/src/key.c
@@ -1,7 +1,7 @@
 /*
  * MENU-SCREEN
  *
- * Copyright (c) 2009-2014 Samsung Electronics Co., Ltd All Rights Reserved
+ * Copyright (c) 2009-2015 Samsung Electronics Co., Ltd All Rights Reserved
  *
  * Contact: Jin Yoon <jinny.yoon@samsung.com>
  *          Junkyu Han <junkyu.han@samsung.com>
@@ -22,8 +22,6 @@
 
 #include <stdlib.h>
 #include <Elementary.h>
-//#include <utilX.h>
-//#include <Ecore_X.h>
 
 #include "conf.h"
 #include "key.h"

diff --git a/src/layout.c b/src/layout.c
index 8fe34ad70c58bc2d4a4dd6e90f701a6d8ef709e5..8cdab6b1f8718625e3c3af678d58f4e98ba490ac 100644 (file)
--- a/src/layout.c
+++ b/src/layout.c
@@ -1,7 +1,7 @@
 /*
  * MENU-SCREEN
  *
- * Copyright (c) 2009-2014 Samsung Electronics Co., Ltd All Rights Reserved
+ * Copyright (c) 2009-2015 Samsung Electronics Co., Ltd All Rights Reserved
  *
  * Contact: Jin Yoon <jinny.yoon@samsung.com>
  *          Junkyu Han <junkyu.han@samsung.com>
@@ -21,8 +21,6 @@
  */
 
 #include <Elementary.h>
-//#include <Ecore_X.h>
-//#include <utilX.h>
 #include <vconf.h>
 
 #include "menu_screen.h"

diff --git a/src/list.c b/src/list.c
index 853b11fc0eea72ab4350e359abfb38840f6d71e8..a33be5991d3e8f591fc1f8a56737058c3791cf9b 100644 (file)
--- a/src/list.c
+++ b/src/list.c
@@ -1,7 +1,7 @@
 /*
  * MENU-SCREEN
  *
- * Copyright (c) 2009-2014 Samsung Electronics Co., Ltd All Rights Reserved
+ * Copyright (c) 2009-2015 Samsung Electronics Co., Ltd All Rights Reserved
  *
  * Contact: Jin Yoon <jinny.yoon@samsung.com>
  *          Junkyu Han <junkyu.han@samsung.com>

diff --git a/src/mapbuf.c b/src/mapbuf.c
index a9fb5bb3fca07dd4d387326ab979e92493a090b0..f6561a52730197c57b1e95c7842ea7ab35eab7a4 100644 (file)
--- a/src/mapbuf.c
+++ b/src/mapbuf.c
@@ -1,7 +1,7 @@
 /*
  * MENU-SCREEN
  *
- * Copyright (c) 2009-2014 Samsung Electronics Co., Ltd All Rights Reserved
+ * Copyright (c) 2009-2015 Samsung Electronics Co., Ltd All Rights Reserved
  *
  * Contact: Jin Yoon <jinny.yoon@samsung.com>
  *          Junkyu Han <junkyu.han@samsung.com>

diff --git a/src/menu_screen.c b/src/menu_screen.c
index da494ddd75391c46743bd2640b8e288e735bf5a4..6da58bd5fbbabd0e9aa08346b47e6f706422e2a7 100755 (executable)
--- a/src/menu_screen.c
+++ b/src/menu_screen.c
@@ -1,7 +1,7 @@
 /*
  * MENU-SCREEN
  *
- * Copyright (c) 2009-2014 Samsung Electronics Co., Ltd All Rights Reserved
+ * Copyright (c) 2009-2015 Samsung Electronics Co., Ltd All Rights Reserved
  *
  * Contact: Jin Yoon <jinny.yoon@samsung.com>
  *          Junkyu Han <junkyu.han@samsung.com>
@@ -187,7 +187,7 @@ HAPI int menu_screen_get_booting_state(void)
 static bool _is_emulator_on(void)
 {
        int ret;
-       char *model;
+       char *model = NULL;
 
        ret = system_info_get_platform_string("tizen.org/system/model_name", &model);
        if (SYSTEM_INFO_ERROR_NONE != ret) {
@@ -212,7 +212,6 @@ static bool _is_emulator_on(void)
 
 static menu_screen_error_e _create_canvas(char *name, char *title)
 {
-       //Ecore_X_Atom ATOM_WM_WINDOW_ROLE;
        char *buf;
 
        if (_is_emulator_on()) {
@@ -290,15 +289,9 @@ static void _create_bg(void)
 {
        _D("Create BG");
        char *buf = NULL;
-       Evas_Coord w;
-       Evas_Coord h;
        Evas_Object *bg;
-       double f, wf, hf;
-       static int trigger = 0;
-       const char *key;
        int width;
        int height;
-       int ret = SYSTEM_SETTINGS_ERROR_NONE;
 
        if (system_settings_get_value_string(SYSTEM_SETTINGS_KEY_WALLPAPER_HOME_SCREEN, &buf) < 0) {
                _E("Failed to get a wallpaper: %d\n", SYSTEM_SETTINGS_KEY_WALLPAPER_HOME_SCREEN);
@@ -311,8 +304,9 @@ static void _create_bg(void)
        bg = evas_object_data_get(menu_screen_get_win(), "bg");
        if (!bg) {
                Evas_Object *rect;
+
                rect = evas_object_rectangle_add(menu_screen_get_evas());
-               goto_if(!rect, ERROR);
+               ret_if(!rect);
                evas_object_data_set(menu_screen_get_win(), "rect", rect);
                evas_object_color_set(rect, 0, 0, 0, 255);
                evas_object_size_hint_min_set(rect, width, height);
@@ -320,50 +314,28 @@ static void _create_bg(void)
                elm_win_resize_object_add(menu_screen_get_win(), rect);
                evas_object_show(rect);
 
-               bg = evas_object_image_add(menu_screen_get_evas());
-               if (!bg) {
-                   if (rect) {
-                       evas_object_del(rect);
-                   }
-                   goto ERROR;
+               bg = elm_image_add(menu_screen_get_win());
+               if (NULL == bg) {
+                       free(buf);
+                       return;
                }
-               evas_object_image_load_orientation_set(bg, EINA_TRUE);
                evas_object_data_set(menu_screen_get_win(), "bg", bg);
        }
 
-       if (trigger == 0) {
-               key = "/";
-               trigger = 1;
-       } else {
-               key = NULL;
-               trigger = 0;
-       }
+       elm_image_aspect_fixed_set(bg, EINA_TRUE);
+       elm_image_fill_outside_set(bg, EINA_TRUE);
+       elm_image_preload_disabled_set(bg, EINA_FALSE);
 
-       evas_object_image_file_set(bg, buf, key);
-       evas_object_image_size_get(bg, &w, &h);
-       if (w == 0 || h == 0) {
-           _E("There's something wrong, width or height is ZERO");
-           goto ERROR;
+       evas_object_size_hint_min_set(bg, width, height);
+       evas_object_size_hint_max_set(bg, width, height);
+       if (!elm_image_file_set(bg, buf, NULL)) {
+               _E("Failed to set image file : %s", buf);
        }
-       evas_object_image_filled_set(bg, 1);
 
-       wf = (double) width / (double) w;
-       hf = (double) height / (double) h;
-
-       f = wf < hf ? hf : wf;
-
-       w = (int) ((double) f * (double) w);
-       h = (int) ((double) f * (double) h);
-
-       evas_object_image_load_size_set(bg, w, h);
-       evas_object_image_fill_set(bg, 0, 0, w, h);
        elm_win_resize_object_add(menu_screen_get_win(), bg);
        evas_object_show(bg);
 
-ERROR:
-       if (buf) {
-               free(buf);
-       }
+       free(buf);
 }
 
 

diff --git a/src/mouse.c b/src/mouse.c
index 1dec1dbf5d0c223261e54643144032194c8dcd45..0348f3a39b77cec9b158cbaee018468a23b500d9 100644 (file)
--- a/src/mouse.c
+++ b/src/mouse.c
@@ -1,7 +1,7 @@
 /*
  * MENU-SCREEN
  *
- * Copyright (c) 2009-2014 Samsung Electronics Co., Ltd All Rights Reserved
+ * Copyright (c) 2009-2015 Samsung Electronics Co., Ltd All Rights Reserved
  *
  * Contact: Jin Yoon <jinny.yoon@samsung.com>
  *          Junkyu Han <junkyu.han@samsung.com>

diff --git a/src/page.c b/src/page.c
index e51349bc9ae2eb00cf2c573fc596697973de9c17..1791481586e7ce92e0fa3abc5f7022bdc93e90d6 100644 (file)
--- a/src/page.c
+++ b/src/page.c
@@ -1,7 +1,7 @@
 /*
  * MENU-SCREEN
  *
- * Copyright (c) 2009-2014 Samsung Electronics Co., Ltd All Rights Reserved
+ * Copyright (c) 2009-2015 Samsung Electronics Co., Ltd All Rights Reserved
  *
  * Contact: Jin Yoon <jinny.yoon@samsung.com>
  *          Junkyu Han <junkyu.han@samsung.com>

diff --git a/src/page_scroller.c b/src/page_scroller.c
index ba393e8ce25fdc2b7417cfef49800306f66069b8..f7c14132b2774421473e2e6fa47c59ecea98af9d 100644 (file)
--- a/src/page_scroller.c
+++ b/src/page_scroller.c
@@ -1,7 +1,7 @@
 /*
  * MENU-SCREEN
  *
- * Copyright (c) 2009-2014 Samsung Electronics Co., Ltd All Rights Reserved
+ * Copyright (c) 2009-2015 Samsung Electronics Co., Ltd All Rights Reserved
  *
  * Contact: Jin Yoon <jinny.yoon@samsung.com>
  *          Junkyu Han <junkyu.han@samsung.com>

diff --git a/src/pkgmgr.c b/src/pkgmgr.c
index 8ffe7ede78a644f202e4455cb9dfc63b8720ed0a..aaafe4981ccf4555fbc920efe95a3153c8f02d14 100644 (file)
--- a/src/pkgmgr.c
+++ b/src/pkgmgr.c
@@ -1,7 +1,7 @@
 /*
  * MENU-SCREEN
  *
- * Copyright (c) 2009-2014 Samsung Electronics Co., Ltd All Rights Reserved
+ * Copyright (c) 2009-2015 Samsung Electronics Co., Ltd All Rights Reserved
  *
  * Contact: Jin Yoon <jinny.yoon@samsung.com>
  *          Junkyu Han <junkyu.han@samsung.com>

diff --git a/src/popup.c b/src/popup.c
index 1609621df9b0905a5a304201d1dfe407729176cd..6a3b3c269ef523037fc35b37707d18a9da28de4f 100644 (file)
--- a/src/popup.c
+++ b/src/popup.c
@@ -1,7 +1,7 @@
 /*
  * MENU-SCREEN
  *
- * Copyright (c) 2009-2014 Samsung Electronics Co., Ltd All Rights Reserved
+ * Copyright (c) 2009-2015 Samsung Electronics Co., Ltd All Rights Reserved
  *
  * Contact: Jin Yoon <jinny.yoon@samsung.com>
  *          Junkyu Han <junkyu.han@samsung.com>

diff --git a/src/util.c b/src/util.c
index 2f518bcaa002228483c17dada85354cd2cca78af..4326c4f66f5afdac1d573eb08643201fe9ec4385 100644 (file)
--- a/src/util.c
+++ b/src/util.c
@@ -1,7 +1,7 @@
 /*
  * MENU-SCREEN
  *
- * Copyright (c) 2009-2014 Samsung Electronics Co., Ltd All Rights Reserved
+ * Copyright (c) 2009-2015 Samsung Electronics Co., Ltd All Rights Reserved
  *
  * Contact: Jin Yoon <jinny.yoon@samsung.com>
  *          Junkyu Han <junkyu.han@samsung.com>