From 3ab166f9d04f897fd4456db56da5c31199476ca7 Mon Sep 17 00:00:00 2001 From: Sunggoo Kim Date: Mon, 29 Apr 2013 13:39:54 +0900 Subject: Apply new license Change-Id: I8b20cc63e02c7ae97f2ef9664eac79df40bf0680 --- CMakeLists.txt | 2 +- LICENSE.Flora | 206 +++++++++++++++++++++++++++++++++++++ LICENSE.flora | 26 ++--- NOTICE | 4 +- contacts-viewer/contacts-viewer.c | 2 +- contacts/contacts.c | 2 +- include/contacts-ug.h | 2 +- include/phone-ug.h | 2 +- lib/common/ct-group-input-view.c | 2 +- lib/common/ct-list-detail.c | 2 +- lib/common/ct-list-view-common.c | 2 +- lib/common/include/ct-group.h | 2 +- lib/common/include/phone-common.h | 2 +- lib/common/include/phone-path.h | 2 +- lib/common/include/phone-text.h | 2 +- lib/common/include/phone.h | 2 +- lib/common/ph-common.c | 2 +- lib/common/ph-detail-log.c | 2 +- lib/common/ph-dialer-speed.c | 2 +- lib/common/ph-text.c | 2 +- lib/ct-front/ct-front-main.c | 2 +- lib/ct-front/ct-front-view.c | 2 +- lib/ct-front/ct-front-view.h | 2 +- lib/ct-front/include/ct-front.h | 2 +- lib/details/ct-detail-activity.c | 2 +- lib/details/ct-detail-activity.h | 2 +- lib/details/ct-detail-history.c | 2 +- lib/details/ct-detail-history.h | 2 +- lib/details/ct-detail-main.c | 4 +- lib/details/ct-detail-utils.c | 2 +- lib/details/ct-detail-utils.h | 2 +- lib/details/ct-detail-view.c | 2 +- lib/details/ct-detail-view.h | 2 +- lib/details/ct-group-assign-view.c | 2 +- lib/details/ct-group-assign-view.h | 2 +- lib/details/ct-image-viewer.c | 4 +- lib/details/ct-image-viewer.h | 2 +- lib/details/ct-input-change-name.c | 2 +- lib/details/ct-input-change-name.h | 2 +- lib/details/ct-input-num-email.c | 2 +- lib/details/ct-input-num-email.h | 2 +- lib/details/ct-input-utils.c | 2 +- lib/details/ct-input-utils.h | 2 +- lib/details/ct-input-view.c | 2 +- lib/details/ct-input-view.h | 2 +- lib/details/ct-share-info-ug.c | 2 +- lib/details/include/ct-detail.h | 2 +- lib/dialer/include/phone-dialer.h | 2 +- lib/dialer/ph-dialer-main.c | 2 +- lib/dialer/ph-dialer-search.c | 2 +- lib/dialer/ph-dialer-search.h | 2 +- lib/dialer/ph-dialer-tapi.c | 2 +- lib/dialer/ph-dialer-tapi.h | 2 +- lib/dialer/ph-dialer-utils.c | 2 +- lib/dialer/ph-dialer-utils.h | 2 +- lib/dialer/ph-dialer-view.c | 2 +- lib/dialer/ph-dialer-view.h | 2 +- lib/favor/include/ct-favor.h | 2 +- lib/favor/ph-favorite-edit-view.c | 2 +- lib/favor/ph-favorite-edit-view.h | 2 +- lib/favor/ph-favorite-view.c | 2 +- lib/favor/ph-favorite-view.h | 2 +- lib/list/ct-group-edit-view.h | 2 +- lib/list/ct-group-view.c | 2 +- lib/list/ct-list-contact-view.c | 2 +- lib/list/ct-list-contact-view.h | 2 +- lib/list/ct-list-edit-view.c | 4 +- lib/list/ct-list-edit-view.h | 2 +- lib/list/ct-list-main.c | 2 +- lib/list/ct-list-utils.c | 2 +- lib/list/ct-list-utils.h | 2 +- lib/list/ct-list-view-ug.c | 2 +- lib/list/ct-list-view-ug.h | 2 +- lib/list/include/ct-list.h | 2 +- lib/log/include/phone-log.h | 2 +- lib/log/ph-log-check-view.c | 2 +- lib/log/ph-log-check-view.h | 2 +- lib/log/ph-log-detail-view.c | 2 +- lib/log/ph-log-detail-view.h | 2 +- lib/log/ph-log-main-view.c | 2 +- lib/log/ph-log-main-view.h | 2 +- lib/log/ph-log-main.c | 2 +- lib/log/ph-log-utils.c | 2 +- lib/log/ph-log-utils.h | 2 +- lib/ph-front/include/ph-front.h | 2 +- lib/ph-front/ph-front-main.c | 2 +- lib/ph-front/ph-front-view.c | 2 +- lib/ph-front/ph-front-view.h | 2 +- lib/settings/ct-setting-main.c | 2 +- lib/settings/ct-setting-view.c | 2 +- lib/settings/ct-setting-view.h | 2 +- lib/speed/include/phone-speed.h | 2 +- lib/speed/ph-speeddial-main.c | 2 +- lib/speed/ph-speeddial-view.c | 2 +- lib/speed/ph-speeddial-view.h | 2 +- packaging/phone.spec | 2 +- phone/phone.c | 2 +- 97 files changed, 318 insertions(+), 112 deletions(-) create mode 100644 LICENSE.Flora diff --git a/CMakeLists.txt b/CMakeLists.txt index aea2195..43c01e4 100755 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -13,7 +13,7 @@ SET(EDC_SRC_DIR "${CMAKE_SOURCE_DIR}/lib/edc") SET(EDJDIR "/usr/ug/res/edje/ug-${PACKAGE}") SET(IMGDIR "/usr/ug/res/images/ug-${PACKAGE}") SET(VERSION_MAJOR 0) -SET(VERSION "${VERSION_MAJOR}.6.63.23") +SET(VERSION "${VERSION_MAJOR}.6.63.24") SET(CMAKE_SKIP_BUILD_RPATH FALSE) SET(CMAKE_BUILD_WITH_INSTALL_RPATH FALSE) diff --git a/LICENSE.Flora b/LICENSE.Flora new file mode 100644 index 0000000..571fe79 --- /dev/null +++ b/LICENSE.Flora @@ -0,0 +1,206 @@ +Flora License + +Version 1.1, April, 2013 + +http://floralicense.org/license/ + +TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION + +1. Definitions. + +"License" shall mean the terms and conditions for use, reproduction, +and distribution as defined by Sections 1 through 9 of this document. + +"Licensor" shall mean the copyright owner or entity authorized by +the copyright owner that is granting the License. + +"Legal Entity" shall mean the union of the acting entity and +all other entities that control, are controlled by, or are +under common control with that entity. For the purposes of +this definition, "control" means (i) the power, direct or indirect, +to cause the direction or management of such entity, +whether by contract or otherwise, or (ii) ownership of fifty percent (50%) +or more of the outstanding shares, or (iii) beneficial ownership of +such entity. + +"You" (or "Your") shall mean an individual or Legal Entity +exercising permissions granted by this License. + +"Source" form shall mean the preferred form for making modifications, +including but not limited to software source code, documentation source, +and configuration files. + +"Object" form shall mean any form resulting from mechanical +transformation or translation of a Source form, including but +not limited to compiled object code, generated documentation, +and conversions to other media types. + +"Work" shall mean the work of authorship, whether in Source or Object form, +made available under the License, as indicated by a copyright notice +that is included in or attached to the work (an example is provided +in the Appendix below). + +"Derivative Works" shall mean any work, whether in Source or Object form, +that is based on (or derived from) the Work and for which the editorial +revisions, annotations, elaborations, or other modifications represent, +as a whole, an original work of authorship. For the purposes of this License, +Derivative Works shall not include works that remain separable from, +or merely link (or bind by name) to the interfaces of, the Work and +Derivative Works thereof. + +"Contribution" shall mean any work of authorship, including the original +version of the Work and any modifications or additions to that Work or +Derivative Works thereof, that is intentionally submitted to Licensor +for inclusion in the Work by the copyright owner or by an individual or +Legal Entity authorized to submit on behalf of the copyright owner. +For the purposes of this definition, "submitted" means any form of +electronic, verbal, or written communication sent to the Licensor or +its representatives, including but not limited to communication on +electronic mailing lists, source code control systems, and issue +tracking systems that are managed by, or on behalf of, the Licensor +for the purpose of discussing and improving the Work, but excluding +communication that is conspicuously marked or otherwise designated +in writing by the copyright owner as "Not a Contribution." + +"Contributor" shall mean Licensor and any individual or Legal Entity +on behalf of whom a Contribution has been received by Licensor and +subsequently incorporated within the Work. + +"Tizen Certified Platform" shall mean a software platform that complies +with the standards set forth in the Tizen Compliance Specification +and passes the Tizen Compliance Tests as defined from time to time +by the Tizen Technical Steering Group and certified by the Tizen +Association or its designated agent. + +2. Grant of Copyright License. Subject to the terms and conditions of +this License, each Contributor hereby grants to You a perpetual, +worldwide, non-exclusive, no-charge, royalty-free, irrevocable +copyright license to reproduce, prepare Derivative Works of, +publicly display, publicly perform, sublicense, and distribute the +Work and such Derivative Works in Source or Object form. + +3. Grant of Patent License. Subject to the terms and conditions of +this License, each Contributor hereby grants to You a perpetual, +worldwide, non-exclusive, no-charge, royalty-free, irrevocable +(except as stated in this section) patent license to make, have made, +use, offer to sell, sell, import, and otherwise transfer the Work +solely as incorporated into a Tizen Certified Platform, where such +license applies only to those patent claims licensable by such +Contributor that are necessarily infringed by their Contribution(s) +alone or by combination of their Contribution(s) with the Work solely +as incorporated into a Tizen Certified Platform to which such +Contribution(s) was submitted. If You institute patent litigation +against any entity (including a cross-claim or counterclaim +in a lawsuit) alleging that the Work or a Contribution incorporated +within the Work constitutes direct or contributory patent infringement, +then any patent licenses granted to You under this License for that +Work shall terminate as of the date such litigation is filed. + +4. Redistribution. You may reproduce and distribute copies of the +Work or Derivative Works thereof pursuant to the copyright license +above, in any medium, with or without modifications, and in Source or +Object form, provided that You meet the following conditions: + + 1. You must give any other recipients of the Work or Derivative Works + a copy of this License; and + 2. You must cause any modified files to carry prominent notices stating + that You changed the files; and + 3. You must retain, in the Source form of any Derivative Works that + You distribute, all copyright, patent, trademark, and attribution + notices from the Source form of the Work, excluding those notices + that do not pertain to any part of the Derivative Works; and + 4. If the Work includes a "NOTICE" text file as part of its distribution, + then any Derivative Works that You distribute must include a readable + copy of the attribution notices contained within such NOTICE file, + excluding those notices that do not pertain to any part of + the Derivative Works, in at least one of the following places: + within a NOTICE text file distributed as part of the Derivative Works; + within the Source form or documentation, if provided along with the + Derivative Works; or, within a display generated by the Derivative Works, + if and wherever such third-party notices normally appear. + The contents of the NOTICE file are for informational purposes only + and do not modify the License. You may add Your own attribution notices + within Derivative Works that You distribute, alongside or as an addendum + to the NOTICE text from the Work, provided that such additional attribution + notices cannot be construed as modifying the License. You may add Your own + copyright statement to Your modifications and may provide additional or + different license terms and conditions for use, reproduction, or + distribution of Your modifications, or for any such Derivative Works + as a whole, provided Your use, reproduction, and distribution of + the Work otherwise complies with the conditions stated in this License + and your own copyright statement or terms and conditions do not conflict + the conditions stated in the License including section 3. + +5. Submission of Contributions. Unless You explicitly state otherwise, +any Contribution intentionally submitted for inclusion in the Work +by You to the Licensor shall be under the terms and conditions of +this License, without any additional terms or conditions. +Notwithstanding the above, nothing herein shall supersede or modify +the terms of any separate license agreement you may have executed +with Licensor regarding such Contributions. + +6. Trademarks. This License does not grant permission to use the trade +names, trademarks, service marks, or product names of the Licensor, +except as required for reasonable and customary use in describing the +origin of the Work and reproducing the content of the NOTICE file. + +7. Disclaimer of Warranty. Unless required by applicable law or +agreed to in writing, Licensor provides the Work (and each +Contributor provides its Contributions) on an "AS IS" BASIS, +WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or +implied, including, without limitation, any warranties or conditions +of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A +PARTICULAR PURPOSE. You are solely responsible for determining the +appropriateness of using or redistributing the Work and assume any +risks associated with Your exercise of permissions under this License. + +8. Limitation of Liability. In no event and under no legal theory, +whether in tort (including negligence), contract, or otherwise, +unless required by applicable law (such as deliberate and grossly +negligent acts) or agreed to in writing, shall any Contributor be +liable to You for damages, including any direct, indirect, special, +incidental, or consequential damages of any character arising as a +result of this License or out of the use or inability to use the +Work (including but not limited to damages for loss of goodwill, +work stoppage, computer failure or malfunction, or any and all +other commercial damages or losses), even if such Contributor +has been advised of the possibility of such damages. + +9. Accepting Warranty or Additional Liability. While redistributing +the Work or Derivative Works thereof, You may choose to offer, +and charge a fee for, acceptance of support, warranty, indemnity, +or other liability obligations and/or rights consistent with this +License. However, in accepting such obligations, You may act only +on Your own behalf and on Your sole responsibility, not on behalf +of any other Contributor, and only if You agree to indemnify, +defend, and hold each Contributor harmless for any liability +incurred by, or claims asserted against, such Contributor by reason +of your accepting any such warranty or additional liability. + +END OF TERMS AND CONDITIONS + +APPENDIX: How to apply the Flora License to your work + +To apply the Flora License to your work, attach the following +boilerplate notice, with the fields enclosed by brackets "[]" +replaced with your own identifying information. (Don't include +the brackets!) The text should be enclosed in the appropriate +comment syntax for the file format. We also recommend that a +file or class name and description of purpose be included on the +same "printed page" as the copyright notice for easier +identification within third-party archives. + + Copyright [yyyy] [name of copyright owner] + + Licensed under the Flora License, Version 1.1 (the "License"); + you may not use this file except in compliance with the License. + You may obtain a copy of the License at + + http://floralicense.org/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/LICENSE.flora b/LICENSE.flora index fd90a36..571fe79 100644 --- a/LICENSE.flora +++ b/LICENSE.flora @@ -1,6 +1,6 @@ Flora License -Version 1.0, April, 2013 +Version 1.1, April, 2013 http://floralicense.org/license/ @@ -119,17 +119,17 @@ Object form, provided that You meet the following conditions: Derivative Works; or, within a display generated by the Derivative Works, if and wherever such third-party notices normally appear. The contents of the NOTICE file are for informational purposes only - and do not modify the License. - -You may add Your own attribution notices within Derivative Works -that You distribute, alongside or as an addendum to the NOTICE text -from the Work, provided that such additional attribution notices -cannot be construed as modifying the License. You may add Your own -copyright statement to Your modifications and may provide additional or -different license terms and conditions for use, reproduction, or -distribution of Your modifications, or for any such Derivative Works -as a whole, provided Your use, reproduction, and distribution of -the Work otherwise complies with the conditions stated in this License. + and do not modify the License. You may add Your own attribution notices + within Derivative Works that You distribute, alongside or as an addendum + to the NOTICE text from the Work, provided that such additional attribution + notices cannot be construed as modifying the License. You may add Your own + copyright statement to Your modifications and may provide additional or + different license terms and conditions for use, reproduction, or + distribution of Your modifications, or for any such Derivative Works + as a whole, provided Your use, reproduction, and distribution of + the Work otherwise complies with the conditions stated in this License + and your own copyright statement or terms and conditions do not conflict + the conditions stated in the License including section 3. 5. Submission of Contributions. Unless You explicitly state otherwise, any Contribution intentionally submitted for inclusion in the Work @@ -192,7 +192,7 @@ identification within third-party archives. Copyright [yyyy] [name of copyright owner] - Licensed under the Flora License, Version 1.0 (the "License"); + Licensed under the Flora License, Version 1.1 (the "License"); you may not use this file except in compliance with the License. You may obtain a copy of the License at diff --git a/NOTICE b/NOTICE index 221b55e..f93330b 100755 --- a/NOTICE +++ b/NOTICE @@ -1,3 +1,3 @@ Copyright (c) 2012 Samsung Electronics Co., Ltd. All rights reserved. -Except as noted, this software is licensed under Flora License, Version 1. -Please, see the LICENSE.flora file for Flora License, Version 1 terms and conditions. +Except as noted, this software is licensed under Flora License, Version 1.1. +Please, see the LICENSE.flora file for Flora License, Version 1.1 terms and conditions. diff --git a/contacts-viewer/contacts-viewer.c b/contacts-viewer/contacts-viewer.c index 02eda8c..fffc7c5 100755 --- a/contacts-viewer/contacts-viewer.c +++ b/contacts-viewer/contacts-viewer.c @@ -1,7 +1,7 @@ /* * Copyright 2012 Samsung Electronics Co., Ltd * -* Licensed under the Flora License, Version 1.0 (the "License"); +* Licensed under the Flora License, Version 1.1 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at * diff --git a/contacts/contacts.c b/contacts/contacts.c index fdaa9d3..d96874a 100755 --- a/contacts/contacts.c +++ b/contacts/contacts.c @@ -1,7 +1,7 @@ /* * Copyright 2012 Samsung Electronics Co., Ltd * -* Licensed under the Flora License, Version 1.0 (the "License"); +* Licensed under the Flora License, Version 1.1 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at * diff --git a/include/contacts-ug.h b/include/contacts-ug.h index 78bd7e7..4ef86a5 100755 --- a/include/contacts-ug.h +++ b/include/contacts-ug.h @@ -1,7 +1,7 @@ /* * Copyright 2012 Samsung Electronics Co., Ltd * -* Licensed under the Flora License, Version 1.0 (the "License"); +* Licensed under the Flora License, Version 1.1 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at * diff --git a/include/phone-ug.h b/include/phone-ug.h index e608458..902182f 100755 --- a/include/phone-ug.h +++ b/include/phone-ug.h @@ -1,7 +1,7 @@ /* * Copyright 2012 Samsung Electronics Co., Ltd * -* Licensed under the Flora License, Version 1.0 (the "License"); +* Licensed under the Flora License, Version 1.1 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at * diff --git a/lib/common/ct-group-input-view.c b/lib/common/ct-group-input-view.c index 7bb0665..f908b0e 100755 --- a/lib/common/ct-group-input-view.c +++ b/lib/common/ct-group-input-view.c @@ -1,7 +1,7 @@ /* * Copyright 2012 Samsung Electronics Co., Ltd * -* Licensed under the Flora License, Version 1.0 (the "License"); +* Licensed under the Flora License, Version 1.1 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at * diff --git a/lib/common/ct-list-detail.c b/lib/common/ct-list-detail.c index aa12524..21549fd 100755 --- a/lib/common/ct-list-detail.c +++ b/lib/common/ct-list-detail.c @@ -1,7 +1,7 @@ /* * Copyright 2012 Samsung Electronics Co., Ltd * -* Licensed under the Flora License, Version 1.0 (the "License"); +* Licensed under the Flora License, Version 1.1 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at * diff --git a/lib/common/ct-list-view-common.c b/lib/common/ct-list-view-common.c index 481cba5..fb6548d 100755 --- a/lib/common/ct-list-view-common.c +++ b/lib/common/ct-list-view-common.c @@ -1,7 +1,7 @@ /* * Copyright 2012 Samsung Electronics Co., Ltd * -* Licensed under the Flora License, Version 1.0 (the "License"); +* Licensed under the Flora License, Version 1.1 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at * diff --git a/lib/common/include/ct-group.h b/lib/common/include/ct-group.h index 6e7661e..cac85e3 100755 --- a/lib/common/include/ct-group.h +++ b/lib/common/include/ct-group.h @@ -1,7 +1,7 @@ /* * Copyright 2012 Samsung Electronics Co., Ltd * -* Licensed under the Flora License, Version 1.0 (the "License"); +* Licensed under the Flora License, Version 1.1 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at * diff --git a/lib/common/include/phone-common.h b/lib/common/include/phone-common.h index e99f9d3..db91a0a 100755 --- a/lib/common/include/phone-common.h +++ b/lib/common/include/phone-common.h @@ -1,7 +1,7 @@ /* * Copyright 2012 Samsung Electronics Co., Ltd * -* Licensed under the Flora License, Version 1.0 (the "License"); +* Licensed under the Flora License, Version 1.1 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at * diff --git a/lib/common/include/phone-path.h b/lib/common/include/phone-path.h index 2613249..0b29da8 100755 --- a/lib/common/include/phone-path.h +++ b/lib/common/include/phone-path.h @@ -1,7 +1,7 @@ /* * Copyright 2012 Samsung Electronics Co., Ltd * -* Licensed under the Flora License, Version 1.0 (the "License"); +* Licensed under the Flora License, Version 1.1 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at * diff --git a/lib/common/include/phone-text.h b/lib/common/include/phone-text.h index f8536a5..66e7694 100755 --- a/lib/common/include/phone-text.h +++ b/lib/common/include/phone-text.h @@ -1,7 +1,7 @@ /* * Copyright 2012 Samsung Electronics Co., Ltd * -* Licensed under the Flora License, Version 1.0 (the "License"); +* Licensed under the Flora License, Version 1.1 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at * diff --git a/lib/common/include/phone.h b/lib/common/include/phone.h index 4fc78af..8618812 100755 --- a/lib/common/include/phone.h +++ b/lib/common/include/phone.h @@ -1,7 +1,7 @@ /* * Copyright 2012 Samsung Electronics Co., Ltd * -* Licensed under the Flora License, Version 1.0 (the "License"); +* Licensed under the Flora License, Version 1.1 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at * diff --git a/lib/common/ph-common.c b/lib/common/ph-common.c index 21ba393..2035b5f 100755 --- a/lib/common/ph-common.c +++ b/lib/common/ph-common.c @@ -1,7 +1,7 @@ /* * Copyright 2012 Samsung Electronics Co., Ltd * -* Licensed under the Flora License, Version 1.0 (the "License"); +* Licensed under the Flora License, Version 1.1 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at * diff --git a/lib/common/ph-detail-log.c b/lib/common/ph-detail-log.c index fb81596..4266ab5 100755 --- a/lib/common/ph-detail-log.c +++ b/lib/common/ph-detail-log.c @@ -1,7 +1,7 @@ /* * Copyright 2012 Samsung Electronics Co., Ltd * -* Licensed under the Flora License, Version 1.0 (the "License"); +* Licensed under the Flora License, Version 1.1 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at * diff --git a/lib/common/ph-dialer-speed.c b/lib/common/ph-dialer-speed.c index ed8d6a5..4e84660 100755 --- a/lib/common/ph-dialer-speed.c +++ b/lib/common/ph-dialer-speed.c @@ -1,7 +1,7 @@ /* * Copyright 2012 Samsung Electronics Co., Ltd * -* Licensed under the Flora License, Version 1.0 (the "License"); +* Licensed under the Flora License, Version 1.1 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at * diff --git a/lib/common/ph-text.c b/lib/common/ph-text.c index 81739a2..76dfaa9 100755 --- a/lib/common/ph-text.c +++ b/lib/common/ph-text.c @@ -1,7 +1,7 @@ /* * Copyright 2012 Samsung Electronics Co., Ltd * -* Licensed under the Flora License, Version 1.0 (the "License"); +* Licensed under the Flora License, Version 1.1 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at * diff --git a/lib/ct-front/ct-front-main.c b/lib/ct-front/ct-front-main.c index 704ffcd..23d6edd 100755 --- a/lib/ct-front/ct-front-main.c +++ b/lib/ct-front/ct-front-main.c @@ -1,7 +1,7 @@ /* * Copyright 2012 Samsung Electronics Co., Ltd * -* Licensed under the Flora License, Version 1.0 (the "License"); +* Licensed under the Flora License, Version 1.1 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at * diff --git a/lib/ct-front/ct-front-view.c b/lib/ct-front/ct-front-view.c index 1b4cb14..b912d71 100755 --- a/lib/ct-front/ct-front-view.c +++ b/lib/ct-front/ct-front-view.c @@ -1,7 +1,7 @@ /* * Copyright 2012 Samsung Electronics Co., Ltd * -* Licensed under the Flora License, Version 1.0 (the "License"); +* Licensed under the Flora License, Version 1.1 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at * diff --git a/lib/ct-front/ct-front-view.h b/lib/ct-front/ct-front-view.h index 84410c9..5f0f683 100755 --- a/lib/ct-front/ct-front-view.h +++ b/lib/ct-front/ct-front-view.h @@ -1,7 +1,7 @@ /* * Copyright 2012 Samsung Electronics Co., Ltd * -* Licensed under the Flora License, Version 1.0 (the "License"); +* Licensed under the Flora License, Version 1.1 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at * diff --git a/lib/ct-front/include/ct-front.h b/lib/ct-front/include/ct-front.h index 479aacd..a7071f2 100755 --- a/lib/ct-front/include/ct-front.h +++ b/lib/ct-front/include/ct-front.h @@ -1,7 +1,7 @@ /* * Copyright 2012 Samsung Electronics Co., Ltd * -* Licensed under the Flora License, Version 1.0 (the "License"); +* Licensed under the Flora License, Version 1.1 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at * diff --git a/lib/details/ct-detail-activity.c b/lib/details/ct-detail-activity.c index bd59617..6556af5 100755 --- a/lib/details/ct-detail-activity.c +++ b/lib/details/ct-detail-activity.c @@ -1,7 +1,7 @@ /* * Copyright 2012 Samsung Electronics Co., Ltd * -* Licensed under the Flora License, Version 1.0 (the "License"); +* Licensed under the Flora License, Version 1.1 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at * diff --git a/lib/details/ct-detail-activity.h b/lib/details/ct-detail-activity.h index 057aa81..f508513 100755 --- a/lib/details/ct-detail-activity.h +++ b/lib/details/ct-detail-activity.h @@ -1,7 +1,7 @@ /* * Copyright 2012 Samsung Electronics Co., Ltd * -* Licensed under the Flora License, Version 1.0 (the "License"); +* Licensed under the Flora License, Version 1.1 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at * diff --git a/lib/details/ct-detail-history.c b/lib/details/ct-detail-history.c index a209f67..8b25847 100755 --- a/lib/details/ct-detail-history.c +++ b/lib/details/ct-detail-history.c @@ -1,7 +1,7 @@ /* * Copyright 2012 Samsung Electronics Co., Ltd * -* Licensed under the Flora License, Version 1.0 (the "License"); +* Licensed under the Flora License, Version 1.1 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at * diff --git a/lib/details/ct-detail-history.h b/lib/details/ct-detail-history.h index e6ff994..2a0dd36 100755 --- a/lib/details/ct-detail-history.h +++ b/lib/details/ct-detail-history.h @@ -1,7 +1,7 @@ /* * Copyright 2012 Samsung Electronics Co., Ltd * -* Licensed under the Flora License, Version 1.0 (the "License"); +* Licensed under the Flora License, Version 1.1 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at * diff --git a/lib/details/ct-detail-main.c b/lib/details/ct-detail-main.c index 9d05c66..01779e5 100755 --- a/lib/details/ct-detail-main.c +++ b/lib/details/ct-detail-main.c @@ -1,7 +1,7 @@ /* * Copyright 2012 Samsung Electronics Co., Ltd * -* Licensed under the Flora License, Version 1.0 (the "License"); +* Licensed under the Flora License, Version 1.1 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at * @@ -325,7 +325,7 @@ static void *detail_on_create(ui_gadget_h ug, enum ug_mode mode, base = phone_create_base_layout(parent, true); else base = phone_create_base_layout(parent, false); - + if (-2 == ret) { Evas_Object *popup; diff --git a/lib/details/ct-detail-utils.c b/lib/details/ct-detail-utils.c index 6fd57e0..fe4f2d0 100755 --- a/lib/details/ct-detail-utils.c +++ b/lib/details/ct-detail-utils.c @@ -1,7 +1,7 @@ /* * Copyright 2012 Samsung Electronics Co., Ltd * -* Licensed under the Flora License, Version 1.0 (the "License"); +* Licensed under the Flora License, Version 1.1 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at * diff --git a/lib/details/ct-detail-utils.h b/lib/details/ct-detail-utils.h index fee753b..5e93c9c 100755 --- a/lib/details/ct-detail-utils.h +++ b/lib/details/ct-detail-utils.h @@ -1,7 +1,7 @@ /* * Copyright 2012 Samsung Electronics Co., Ltd * -* Licensed under the Flora License, Version 1.0 (the "License"); +* Licensed under the Flora License, Version 1.1 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at * diff --git a/lib/details/ct-detail-view.c b/lib/details/ct-detail-view.c index 507b8dc..03f4d75 100755 --- a/lib/details/ct-detail-view.c +++ b/lib/details/ct-detail-view.c @@ -1,7 +1,7 @@ /* * Copyright 2012 Samsung Electronics Co., Ltd * -* Licensed under the Flora License, Version 1.0 (the "License"); +* Licensed under the Flora License, Version 1.1 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at * diff --git a/lib/details/ct-detail-view.h b/lib/details/ct-detail-view.h index 480d2f9..04b8953 100755 --- a/lib/details/ct-detail-view.h +++ b/lib/details/ct-detail-view.h @@ -1,7 +1,7 @@ /* * Copyright 2012 Samsung Electronics Co., Ltd * -* Licensed under the Flora License, Version 1.0 (the "License"); +* Licensed under the Flora License, Version 1.1 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at * diff --git a/lib/details/ct-group-assign-view.c b/lib/details/ct-group-assign-view.c index cbed8fe..3f2452e 100755 --- a/lib/details/ct-group-assign-view.c +++ b/lib/details/ct-group-assign-view.c @@ -1,7 +1,7 @@ /* * Copyright 2012 Samsung Electronics Co., Ltd * -* Licensed under the Flora License, Version 1.0 (the "License"); +* Licensed under the Flora License, Version 1.1 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at * diff --git a/lib/details/ct-group-assign-view.h b/lib/details/ct-group-assign-view.h index 2b4498c..acb7971 100755 --- a/lib/details/ct-group-assign-view.h +++ b/lib/details/ct-group-assign-view.h @@ -1,7 +1,7 @@ /* * Copyright 2012 Samsung Electronics Co., Ltd * -* Licensed under the Flora License, Version 1.0 (the "License"); +* Licensed under the Flora License, Version 1.1 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at * diff --git a/lib/details/ct-image-viewer.c b/lib/details/ct-image-viewer.c index 7ac4a30..f388690 100755 --- a/lib/details/ct-image-viewer.c +++ b/lib/details/ct-image-viewer.c @@ -1,7 +1,7 @@ /* * Copyright 2012 Samsung Electronics Co., Ltd * -* Licensed under the Flora License, Version 1.0 (the "License"); +* Licensed under the Flora License, Version 1.1 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at * @@ -238,7 +238,7 @@ static void __ct_image_refresh(ct_image_viewer_data *cimage_viewer_d) int v_page = 0; elm_scroller_current_page_get(cimage_viewer_d->scroller, &h_page, &v_page); - + evas_object_del(cimage_viewer_d->scroller); evas_object_geometry_get(cimage_viewer_d->layout, NULL, NULL, &cimage_viewer_d->width, &cimage_viewer_d->height); diff --git a/lib/details/ct-image-viewer.h b/lib/details/ct-image-viewer.h index a00870c..0ca53bf 100755 --- a/lib/details/ct-image-viewer.h +++ b/lib/details/ct-image-viewer.h @@ -1,7 +1,7 @@ /* * Copyright 2012 Samsung Electronics Co., Ltd * -* Licensed under the Flora License, Version 1.0 (the "License"); +* Licensed under the Flora License, Version 1.1 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at * diff --git a/lib/details/ct-input-change-name.c b/lib/details/ct-input-change-name.c index 8bd67ac..0209079 100755 --- a/lib/details/ct-input-change-name.c +++ b/lib/details/ct-input-change-name.c @@ -1,7 +1,7 @@ /* * Copyright 2012 Samsung Electronics Co., Ltd * -* Licensed under the Flora License, Version 1.0 (the "License"); +* Licensed under the Flora License, Version 1.1 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at * diff --git a/lib/details/ct-input-change-name.h b/lib/details/ct-input-change-name.h index 357ce39..f580831 100755 --- a/lib/details/ct-input-change-name.h +++ b/lib/details/ct-input-change-name.h @@ -1,7 +1,7 @@ /* * Copyright 2012 Samsung Electronics Co., Ltd * -* Licensed under the Flora License, Version 1.0 (the "License"); +* Licensed under the Flora License, Version 1.1 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at * diff --git a/lib/details/ct-input-num-email.c b/lib/details/ct-input-num-email.c index 6c4d9fd..cfca20b 100755 --- a/lib/details/ct-input-num-email.c +++ b/lib/details/ct-input-num-email.c @@ -1,7 +1,7 @@ /* * Copyright 2012 Samsung Electronics Co., Ltd * -* Licensed under the Flora License, Version 1.0 (the "License"); +* Licensed under the Flora License, Version 1.1 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at * diff --git a/lib/details/ct-input-num-email.h b/lib/details/ct-input-num-email.h index 890397b..171a4c2 100755 --- a/lib/details/ct-input-num-email.h +++ b/lib/details/ct-input-num-email.h @@ -1,7 +1,7 @@ /* * Copyright 2012 Samsung Electronics Co., Ltd * -* Licensed under the Flora License, Version 1.0 (the "License"); +* Licensed under the Flora License, Version 1.1 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at * diff --git a/lib/details/ct-input-utils.c b/lib/details/ct-input-utils.c index 4297e0d..c8d32c8 100755 --- a/lib/details/ct-input-utils.c +++ b/lib/details/ct-input-utils.c @@ -1,7 +1,7 @@ /* * Copyright 2012 Samsung Electronics Co., Ltd * -* Licensed under the Flora License, Version 1.0 (the "License"); +* Licensed under the Flora License, Version 1.1 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at * diff --git a/lib/details/ct-input-utils.h b/lib/details/ct-input-utils.h index 1cc1771..058bc78 100755 --- a/lib/details/ct-input-utils.h +++ b/lib/details/ct-input-utils.h @@ -1,7 +1,7 @@ /* * Copyright 2012 Samsung Electronics Co., Ltd * -* Licensed under the Flora License, Version 1.0 (the "License"); +* Licensed under the Flora License, Version 1.1 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at * diff --git a/lib/details/ct-input-view.c b/lib/details/ct-input-view.c index 5b3e624..078a722 100755 --- a/lib/details/ct-input-view.c +++ b/lib/details/ct-input-view.c @@ -1,7 +1,7 @@ /* * Copyright 2012 Samsung Electronics Co., Ltd * -* Licensed under the Flora License, Version 1.0 (the "License"); +* Licensed under the Flora License, Version 1.1 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at * diff --git a/lib/details/ct-input-view.h b/lib/details/ct-input-view.h index 0ed6f1d..907ae0b 100755 --- a/lib/details/ct-input-view.h +++ b/lib/details/ct-input-view.h @@ -1,7 +1,7 @@ /* * Copyright 2012 Samsung Electronics Co., Ltd * -* Licensed under the Flora License, Version 1.0 (the "License"); +* Licensed under the Flora License, Version 1.1 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at * diff --git a/lib/details/ct-share-info-ug.c b/lib/details/ct-share-info-ug.c index 11d43c8..ec7f683 100755 --- a/lib/details/ct-share-info-ug.c +++ b/lib/details/ct-share-info-ug.c @@ -1,7 +1,7 @@ /* * Copyright 2012 Samsung Electronics Co., Ltd * -* Licensed under the Flora License, Version 1.0 (the "License"); +* Licensed under the Flora License, Version 1.1 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at * diff --git a/lib/details/include/ct-detail.h b/lib/details/include/ct-detail.h index d620901..84af655 100755 --- a/lib/details/include/ct-detail.h +++ b/lib/details/include/ct-detail.h @@ -1,7 +1,7 @@ /* * Copyright 2012 Samsung Electronics Co., Ltd * -* Licensed under the Flora License, Version 1.0 (the "License"); +* Licensed under the Flora License, Version 1.1 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at * diff --git a/lib/dialer/include/phone-dialer.h b/lib/dialer/include/phone-dialer.h index 5326e4b..658f759 100755 --- a/lib/dialer/include/phone-dialer.h +++ b/lib/dialer/include/phone-dialer.h @@ -1,7 +1,7 @@ /* * Copyright 2012 Samsung Electronics Co., Ltd * -* Licensed under the Flora License, Version 1.0 (the "License"); +* Licensed under the Flora License, Version 1.1 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at * diff --git a/lib/dialer/ph-dialer-main.c b/lib/dialer/ph-dialer-main.c index fb43363..bdcbc1b 100755 --- a/lib/dialer/ph-dialer-main.c +++ b/lib/dialer/ph-dialer-main.c @@ -1,7 +1,7 @@ /* * Copyright 2012 Samsung Electronics Co., Ltd * -* Licensed under the Flora License, Version 1.0 (the "License"); +* Licensed under the Flora License, Version 1.1 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at * diff --git a/lib/dialer/ph-dialer-search.c b/lib/dialer/ph-dialer-search.c index 3f6804d..64ba523 100755 --- a/lib/dialer/ph-dialer-search.c +++ b/lib/dialer/ph-dialer-search.c @@ -1,7 +1,7 @@ /* * Copyright 2012 Samsung Electronics Co., Ltd * -* Licensed under the Flora License, Version 1.0 (the "License"); +* Licensed under the Flora License, Version 1.1 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at * diff --git a/lib/dialer/ph-dialer-search.h b/lib/dialer/ph-dialer-search.h index 6ab89de..52e6e24 100755 --- a/lib/dialer/ph-dialer-search.h +++ b/lib/dialer/ph-dialer-search.h @@ -1,7 +1,7 @@ /* * Copyright 2012 Samsung Electronics Co., Ltd * -* Licensed under the Flora License, Version 1.0 (the "License"); +* Licensed under the Flora License, Version 1.1 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at * diff --git a/lib/dialer/ph-dialer-tapi.c b/lib/dialer/ph-dialer-tapi.c index 5aa5a64..7514cbb 100755 --- a/lib/dialer/ph-dialer-tapi.c +++ b/lib/dialer/ph-dialer-tapi.c @@ -1,7 +1,7 @@ /* * Copyright 2012 Samsung Electronics Co., Ltd * -* Licensed under the Flora License, Version 1.0 (the "License"); +* Licensed under the Flora License, Version 1.1 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at * diff --git a/lib/dialer/ph-dialer-tapi.h b/lib/dialer/ph-dialer-tapi.h index 5b6d98f..edaaa3f 100755 --- a/lib/dialer/ph-dialer-tapi.h +++ b/lib/dialer/ph-dialer-tapi.h @@ -1,7 +1,7 @@ /* * Copyright 2012 Samsung Electronics Co., Ltd * -* Licensed under the Flora License, Version 1.0 (the "License"); +* Licensed under the Flora License, Version 1.1 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at * diff --git a/lib/dialer/ph-dialer-utils.c b/lib/dialer/ph-dialer-utils.c index 515fbab..c4c827a 100755 --- a/lib/dialer/ph-dialer-utils.c +++ b/lib/dialer/ph-dialer-utils.c @@ -1,7 +1,7 @@ /* * Copyright 2012 Samsung Electronics Co., Ltd * -* Licensed under the Flora License, Version 1.0 (the "License"); +* Licensed under the Flora License, Version 1.1 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at * diff --git a/lib/dialer/ph-dialer-utils.h b/lib/dialer/ph-dialer-utils.h index 68e06a9..89d826a 100755 --- a/lib/dialer/ph-dialer-utils.h +++ b/lib/dialer/ph-dialer-utils.h @@ -1,7 +1,7 @@ /* * Copyright 2012 Samsung Electronics Co., Ltd * -* Licensed under the Flora License, Version 1.0 (the "License"); +* Licensed under the Flora License, Version 1.1 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at * diff --git a/lib/dialer/ph-dialer-view.c b/lib/dialer/ph-dialer-view.c index 0a0d2e0..61cf108 100755 --- a/lib/dialer/ph-dialer-view.c +++ b/lib/dialer/ph-dialer-view.c @@ -1,7 +1,7 @@ /* * Copyright 2012 Samsung Electronics Co., Ltd * -* Licensed under the Flora License, Version 1.0 (the "License"); +* Licensed under the Flora License, Version 1.1 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at * diff --git a/lib/dialer/ph-dialer-view.h b/lib/dialer/ph-dialer-view.h index 76ea5ca..2320bc0 100755 --- a/lib/dialer/ph-dialer-view.h +++ b/lib/dialer/ph-dialer-view.h @@ -1,7 +1,7 @@ /* * Copyright 2012 Samsung Electronics Co., Ltd * -* Licensed under the Flora License, Version 1.0 (the "License"); +* Licensed under the Flora License, Version 1.1 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at * diff --git a/lib/favor/include/ct-favor.h b/lib/favor/include/ct-favor.h index e9e6f12..15ef398 100755 --- a/lib/favor/include/ct-favor.h +++ b/lib/favor/include/ct-favor.h @@ -1,7 +1,7 @@ /* * Copyright 2012 Samsung Electronics Co., Ltd * -* Licensed under the Flora License, Version 1.0 (the "License"); +* Licensed under the Flora License, Version 1.1 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at * diff --git a/lib/favor/ph-favorite-edit-view.c b/lib/favor/ph-favorite-edit-view.c index ed7126b..59c77d3 100755 --- a/lib/favor/ph-favorite-edit-view.c +++ b/lib/favor/ph-favorite-edit-view.c @@ -1,7 +1,7 @@ /* * Copyright 2012 Samsung Electronics Co., Ltd * -* Licensed under the Flora License, Version 1.0 (the "License"); +* Licensed under the Flora License, Version 1.1 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at * diff --git a/lib/favor/ph-favorite-edit-view.h b/lib/favor/ph-favorite-edit-view.h index 12f0606..c661436 100755 --- a/lib/favor/ph-favorite-edit-view.h +++ b/lib/favor/ph-favorite-edit-view.h @@ -1,7 +1,7 @@ /* * Copyright 2012 Samsung Electronics Co., Ltd * -* Licensed under the Flora License, Version 1.0 (the "License"); +* Licensed under the Flora License, Version 1.1 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at * diff --git a/lib/favor/ph-favorite-view.c b/lib/favor/ph-favorite-view.c index e380894..b1f5bde 100755 --- a/lib/favor/ph-favorite-view.c +++ b/lib/favor/ph-favorite-view.c @@ -1,7 +1,7 @@ /* * Copyright 2012 Samsung Electronics Co., Ltd * -* Licensed under the Flora License, Version 1.0 (the "License"); +* Licensed under the Flora License, Version 1.1 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at * diff --git a/lib/favor/ph-favorite-view.h b/lib/favor/ph-favorite-view.h index 830d6c3..a0de14c 100755 --- a/lib/favor/ph-favorite-view.h +++ b/lib/favor/ph-favorite-view.h @@ -1,7 +1,7 @@ /* * Copyright 2012 Samsung Electronics Co., Ltd * -* Licensed under the Flora License, Version 1.0 (the "License"); +* Licensed under the Flora License, Version 1.1 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at * diff --git a/lib/list/ct-group-edit-view.h b/lib/list/ct-group-edit-view.h index 10f6120..7185161 100755 --- a/lib/list/ct-group-edit-view.h +++ b/lib/list/ct-group-edit-view.h @@ -1,7 +1,7 @@ /* * Copyright 2012 Samsung Electronics Co., Ltd * -* Licensed under the Flora License, Version 1.0 (the "License"); +* Licensed under the Flora License, Version 1.1 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at * diff --git a/lib/list/ct-group-view.c b/lib/list/ct-group-view.c index 9bdf642..6df536a 100755 --- a/lib/list/ct-group-view.c +++ b/lib/list/ct-group-view.c @@ -1,7 +1,7 @@ /* * Copyright 2012 Samsung Electronics Co., Ltd * - * Licensed under the Flora License, Version 1.0 (the "License"); + * Licensed under the Flora License, Version 1.1 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at * diff --git a/lib/list/ct-list-contact-view.c b/lib/list/ct-list-contact-view.c index ef8aab8..f9920c8 100755 --- a/lib/list/ct-list-contact-view.c +++ b/lib/list/ct-list-contact-view.c @@ -1,7 +1,7 @@ /* * Copyright 2012 Samsung Electronics Co., Ltd * -* Licensed under the Flora License, Version 1.0 (the "License"); +* Licensed under the Flora License, Version 1.1 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at * diff --git a/lib/list/ct-list-contact-view.h b/lib/list/ct-list-contact-view.h index 0694af8..7f4b2c5 100755 --- a/lib/list/ct-list-contact-view.h +++ b/lib/list/ct-list-contact-view.h @@ -1,7 +1,7 @@ /* * Copyright 2012 Samsung Electronics Co., Ltd * -* Licensed under the Flora License, Version 1.0 (the "License"); +* Licensed under the Flora License, Version 1.1 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at * diff --git a/lib/list/ct-list-edit-view.c b/lib/list/ct-list-edit-view.c index 874a285..2fca47a 100755 --- a/lib/list/ct-list-edit-view.c +++ b/lib/list/ct-list-edit-view.c @@ -1,7 +1,7 @@ /* * Copyright 2012 Samsung Electronics Co., Ltd * -* Licensed under the Flora License, Version 1.0 (the "License"); +* Licensed under the Flora License, Version 1.1 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at * @@ -412,7 +412,7 @@ static void list_edit_check_done(void *data, Evas_Object *obj, void *event_info) phone_list_ug_return_values(clist_d->service_operation, result_list_number, cnt_checked, CT_OPERATION_RESULT_TYPE_PHONE); else phone_list_ug_return_ids(clist_d->ug, result_list_number, cnt_checked, CT_UG_BUNDLE_RESULT_NUMBER_ID_LIST); - } + } else if (CT_UG_REQUEST_CHECK_FOR_EMAIL == clist_d->ug_request) { if(clist_d->service_operation) phone_list_ug_return_values(clist_d->service_operation, result_list_email, cnt_checked, CT_OPERATION_RESULT_TYPE_EMAIL); diff --git a/lib/list/ct-list-edit-view.h b/lib/list/ct-list-edit-view.h index 577fb00..7827a41 100755 --- a/lib/list/ct-list-edit-view.h +++ b/lib/list/ct-list-edit-view.h @@ -1,7 +1,7 @@ /* * Copyright 2012 Samsung Electronics Co., Ltd * -* Licensed under the Flora License, Version 1.0 (the "License"); +* Licensed under the Flora License, Version 1.1 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at * diff --git a/lib/list/ct-list-main.c b/lib/list/ct-list-main.c index 9cdc8cc..dc0ae3b 100755 --- a/lib/list/ct-list-main.c +++ b/lib/list/ct-list-main.c @@ -1,7 +1,7 @@ /* * Copyright 2012 Samsung Electronics Co., Ltd * -* Licensed under the Flora License, Version 1.0 (the "License"); +* Licensed under the Flora License, Version 1.1 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at * diff --git a/lib/list/ct-list-utils.c b/lib/list/ct-list-utils.c index 7ad6315..7394636 100755 --- a/lib/list/ct-list-utils.c +++ b/lib/list/ct-list-utils.c @@ -1,7 +1,7 @@ /* * Copyright 2012 Samsung Electronics Co., Ltd * -* Licensed under the Flora License, Version 1.0 (the "License"); +* Licensed under the Flora License, Version 1.1 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at * diff --git a/lib/list/ct-list-utils.h b/lib/list/ct-list-utils.h index 90038c5..2bf9950 100755 --- a/lib/list/ct-list-utils.h +++ b/lib/list/ct-list-utils.h @@ -1,7 +1,7 @@ /* * Copyright 2012 Samsung Electronics Co., Ltd * -* Licensed under the Flora License, Version 1.0 (the "License"); +* Licensed under the Flora License, Version 1.1 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at * diff --git a/lib/list/ct-list-view-ug.c b/lib/list/ct-list-view-ug.c index 2da2cfc..dc5e69e 100755 --- a/lib/list/ct-list-view-ug.c +++ b/lib/list/ct-list-view-ug.c @@ -1,7 +1,7 @@ /* * Copyright 2012 Samsung Electronics Co., Ltd * -* Licensed under the Flora License, Version 1.0 (the "License"); +* Licensed under the Flora License, Version 1.1 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at * diff --git a/lib/list/ct-list-view-ug.h b/lib/list/ct-list-view-ug.h index 9ff06b3..edd8ed0 100755 --- a/lib/list/ct-list-view-ug.h +++ b/lib/list/ct-list-view-ug.h @@ -1,7 +1,7 @@ /* * Copyright 2012 Samsung Electronics Co., Ltd * -* Licensed under the Flora License, Version 1.0 (the "License"); +* Licensed under the Flora License, Version 1.1 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at * diff --git a/lib/list/include/ct-list.h b/lib/list/include/ct-list.h index 29e5122..c76b346 100755 --- a/lib/list/include/ct-list.h +++ b/lib/list/include/ct-list.h @@ -1,7 +1,7 @@ /* * Copyright 2012 Samsung Electronics Co., Ltd * -* Licensed under the Flora License, Version 1.0 (the "License"); +* Licensed under the Flora License, Version 1.1 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at * diff --git a/lib/log/include/phone-log.h b/lib/log/include/phone-log.h index 3612cf8..690fe33 100755 --- a/lib/log/include/phone-log.h +++ b/lib/log/include/phone-log.h @@ -1,7 +1,7 @@ /* * Copyright 2012 Samsung Electronics Co., Ltd * -* Licensed under the Flora License, Version 1.0 (the "License"); +* Licensed under the Flora License, Version 1.1 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at * diff --git a/lib/log/ph-log-check-view.c b/lib/log/ph-log-check-view.c index 5b8c1bb..bc151bd 100755 --- a/lib/log/ph-log-check-view.c +++ b/lib/log/ph-log-check-view.c @@ -1,7 +1,7 @@ /* * Copyright 2012 Samsung Electronics Co., Ltd * -* Licensed under the Flora License, Version 1.0 (the "License"); +* Licensed under the Flora License, Version 1.1 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at * diff --git a/lib/log/ph-log-check-view.h b/lib/log/ph-log-check-view.h index f47fe43..e3a00d1 100755 --- a/lib/log/ph-log-check-view.h +++ b/lib/log/ph-log-check-view.h @@ -1,7 +1,7 @@ /* * Copyright 2012 Samsung Electronics Co., Ltd * -* Licensed under the Flora License, Version 1.0 (the "License"); +* Licensed under the Flora License, Version 1.1 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at * diff --git a/lib/log/ph-log-detail-view.c b/lib/log/ph-log-detail-view.c index 387edae..3fb38c0 100755 --- a/lib/log/ph-log-detail-view.c +++ b/lib/log/ph-log-detail-view.c @@ -1,7 +1,7 @@ /* * Copyright 2012 Samsung Electronics Co., Ltd * -* Licensed under the Flora License, Version 1.0 (the "License"); +* Licensed under the Flora License, Version 1.1 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at * diff --git a/lib/log/ph-log-detail-view.h b/lib/log/ph-log-detail-view.h index a6ce0df..712d84f 100755 --- a/lib/log/ph-log-detail-view.h +++ b/lib/log/ph-log-detail-view.h @@ -1,7 +1,7 @@ /* * Copyright 2012 Samsung Electronics Co., Ltd * -* Licensed under the Flora License, Version 1.0 (the "License"); +* Licensed under the Flora License, Version 1.1 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at * diff --git a/lib/log/ph-log-main-view.c b/lib/log/ph-log-main-view.c index f765bae..75769c2 100755 --- a/lib/log/ph-log-main-view.c +++ b/lib/log/ph-log-main-view.c @@ -1,7 +1,7 @@ /* * Copyright 2012 Samsung Electronics Co., Ltd * -* Licensed under the Flora License, Version 1.0 (the "License"); +* Licensed under the Flora License, Version 1.1 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at * diff --git a/lib/log/ph-log-main-view.h b/lib/log/ph-log-main-view.h index 18b83cc..73e97ad 100755 --- a/lib/log/ph-log-main-view.h +++ b/lib/log/ph-log-main-view.h @@ -1,7 +1,7 @@ /* * Copyright 2012 Samsung Electronics Co., Ltd * -* Licensed under the Flora License, Version 1.0 (the "License"); +* Licensed under the Flora License, Version 1.1 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at * diff --git a/lib/log/ph-log-main.c b/lib/log/ph-log-main.c index c600354..6733d68 100755 --- a/lib/log/ph-log-main.c +++ b/lib/log/ph-log-main.c @@ -1,7 +1,7 @@ /* * Copyright 2012 Samsung Electronics Co., Ltd * -* Licensed under the Flora License, Version 1.0 (the "License"); +* Licensed under the Flora License, Version 1.1 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at * diff --git a/lib/log/ph-log-utils.c b/lib/log/ph-log-utils.c index 4f2df16..ebd2392 100755 --- a/lib/log/ph-log-utils.c +++ b/lib/log/ph-log-utils.c @@ -1,7 +1,7 @@ /* * Copyright 2012 Samsung Electronics Co., Ltd * -* Licensed under the Flora License, Version 1.0 (the "License"); +* Licensed under the Flora License, Version 1.1 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at * diff --git a/lib/log/ph-log-utils.h b/lib/log/ph-log-utils.h index 91fe8a6..feb1758 100755 --- a/lib/log/ph-log-utils.h +++ b/lib/log/ph-log-utils.h @@ -1,7 +1,7 @@ /* * Copyright 2012 Samsung Electronics Co., Ltd * -* Licensed under the Flora License, Version 1.0 (the "License"); +* Licensed under the Flora License, Version 1.1 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at * diff --git a/lib/ph-front/include/ph-front.h b/lib/ph-front/include/ph-front.h index 9068bfb..4c1acd3 100755 --- a/lib/ph-front/include/ph-front.h +++ b/lib/ph-front/include/ph-front.h @@ -1,7 +1,7 @@ /* * Copyright 2012 Samsung Electronics Co., Ltd * -* Licensed under the Flora License, Version 1.0 (the "License"); +* Licensed under the Flora License, Version 1.1 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at * diff --git a/lib/ph-front/ph-front-main.c b/lib/ph-front/ph-front-main.c index f69e09a..58dfc3f 100755 --- a/lib/ph-front/ph-front-main.c +++ b/lib/ph-front/ph-front-main.c @@ -1,7 +1,7 @@ /* * Copyright 2012 Samsung Electronics Co., Ltd * -* Licensed under the Flora License, Version 1.0 (the "License"); +* Licensed under the Flora License, Version 1.1 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at * diff --git a/lib/ph-front/ph-front-view.c b/lib/ph-front/ph-front-view.c index 17f3d58..7ae7bbd 100755 --- a/lib/ph-front/ph-front-view.c +++ b/lib/ph-front/ph-front-view.c @@ -1,7 +1,7 @@ /* * Copyright 2012 Samsung Electronics Co., Ltd * -* Licensed under the Flora License, Version 1.0 (the "License"); +* Licensed under the Flora License, Version 1.1 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at * diff --git a/lib/ph-front/ph-front-view.h b/lib/ph-front/ph-front-view.h index 91ad736..b96df2f 100755 --- a/lib/ph-front/ph-front-view.h +++ b/lib/ph-front/ph-front-view.h @@ -1,7 +1,7 @@ /* * Copyright 2012 Samsung Electronics Co., Ltd * -* Licensed under the Flora License, Version 1.0 (the "License"); +* Licensed under the Flora License, Version 1.1 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at * diff --git a/lib/settings/ct-setting-main.c b/lib/settings/ct-setting-main.c index 00ddce9..72aa6e2 100755 --- a/lib/settings/ct-setting-main.c +++ b/lib/settings/ct-setting-main.c @@ -1,7 +1,7 @@ /* * Copyright 2012 Samsung Electronics Co., Ltd * -* Licensed under the Flora License, Version 1.0 (the "License"); +* Licensed under the Flora License, Version 1.1 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at * diff --git a/lib/settings/ct-setting-view.c b/lib/settings/ct-setting-view.c index 76611cd..2f32e33 100755 --- a/lib/settings/ct-setting-view.c +++ b/lib/settings/ct-setting-view.c @@ -1,7 +1,7 @@ /* * Copyright 2012 Samsung Electronics Co., Ltd * -* Licensed under the Flora License, Version 1.0 (the "License"); +* Licensed under the Flora License, Version 1.1 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at * diff --git a/lib/settings/ct-setting-view.h b/lib/settings/ct-setting-view.h index 7beecd2..7c5c592 100755 --- a/lib/settings/ct-setting-view.h +++ b/lib/settings/ct-setting-view.h @@ -1,7 +1,7 @@ /* * Copyright 2012 Samsung Electronics Co., Ltd * -* Licensed under the Flora License, Version 1.0 (the "License"); +* Licensed under the Flora License, Version 1.1 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at * diff --git a/lib/speed/include/phone-speed.h b/lib/speed/include/phone-speed.h index 337f00e..62a3103 100755 --- a/lib/speed/include/phone-speed.h +++ b/lib/speed/include/phone-speed.h @@ -1,7 +1,7 @@ /* * Copyright 2012 Samsung Electronics Co., Ltd * -* Licensed under the Flora License, Version 1.0 (the "License"); +* Licensed under the Flora License, Version 1.1 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at * diff --git a/lib/speed/ph-speeddial-main.c b/lib/speed/ph-speeddial-main.c index 24d590c..04263b0 100755 --- a/lib/speed/ph-speeddial-main.c +++ b/lib/speed/ph-speeddial-main.c @@ -1,7 +1,7 @@ /* * Copyright 2012 Samsung Electronics Co., Ltd * -* Licensed under the Flora License, Version 1.0 (the "License"); +* Licensed under the Flora License, Version 1.1 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at * diff --git a/lib/speed/ph-speeddial-view.c b/lib/speed/ph-speeddial-view.c index 15bbc59..af81f8c 100755 --- a/lib/speed/ph-speeddial-view.c +++ b/lib/speed/ph-speeddial-view.c @@ -1,7 +1,7 @@ /* * Copyright 2012 Samsung Electronics Co., Ltd * -* Licensed under the Flora License, Version 1.0 (the "License"); +* Licensed under the Flora License, Version 1.1 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at * diff --git a/lib/speed/ph-speeddial-view.h b/lib/speed/ph-speeddial-view.h index 6b1535b..f38bbfa 100755 --- a/lib/speed/ph-speeddial-view.h +++ b/lib/speed/ph-speeddial-view.h @@ -1,7 +1,7 @@ /* * Copyright 2012 Samsung Electronics Co., Ltd * -* Licensed under the Flora License, Version 1.0 (the "License"); +* Licensed under the Flora License, Version 1.1 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at * diff --git a/packaging/phone.spec b/packaging/phone.spec index 5327b93..7dddf9f 100755 --- a/packaging/phone.spec +++ b/packaging/phone.spec @@ -1,6 +1,6 @@ Name: phone Summary: Phone Application and gadgets -Version: 0.6.63.23 +Version: 0.6.63.24 Release: 1 Group: devel License: Flora Software License diff --git a/phone/phone.c b/phone/phone.c index 6955545..c8e356c 100755 --- a/phone/phone.c +++ b/phone/phone.c @@ -1,7 +1,7 @@ /* * Copyright 2012 Samsung Electronics Co., Ltd * -* Licensed under the Flora License, Version 1.0 (the "License"); +* Licensed under the Flora License, Version 1.1 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at * -- cgit v1.2.3