[tizen_2.1]merge with private
authorsckim <sungchan81.kim@samsung.com>
Tue, 9 Apr 2013 09:35:52 +0000 (18:35 +0900)
committersckim <sungchan81.kim@samsung.com>
Tue, 9 Apr 2013 09:35:52 +0000 (18:35 +0900)
Change-Id: I711ab9bdee2605d0128221ff8679cc85fa988335

45 files changed:
LICENSE [deleted file]
data/edc/myaccount_edc_images.edc
data/myaccount_photo/01_button_on_lighting.png [deleted file]
data/myaccount_photo/01_controlbar_icon_add.png [deleted file]
data/myaccount_photo/01_dialog_field_input.png [deleted file]
data/myaccount_photo/01_dialog_field_input_bottom.png [deleted file]
data/myaccount_photo/01_dialog_field_input_middle.png [deleted file]
data/myaccount_photo/01_dialog_field_input_top.png [deleted file]
data/myaccount_photo/01_dialog_field_lighting.png [deleted file]
data/myaccount_photo/01_dialogue_field_bg.png [deleted file]
data/myaccount_photo/01_hybrid_spinner_bg.png [deleted file]
data/myaccount_photo/01_list_bottom_blur.png [deleted file]
data/myaccount_photo/01_on_off_button.png [deleted file]
data/myaccount_photo/01_on_off_button_on.png [deleted file]
data/myaccount_photo/01_picker_input_bg.png [deleted file]
data/myaccount_photo/08_textinput_btn_bg_1.png [deleted file]
data/myaccount_photo/08_textinput_btn_bg_2.png [deleted file]
data/myaccount_photo/08_textinput_btn_clear.png [deleted file]
data/myaccount_photo/08_textinput_btn_enter.png [deleted file]
data/myaccount_photo/08_textinput_panel_bg.png [deleted file]
data/myaccount_photo/09_search_button_normal_bg.png [deleted file]
data/myaccount_photo/09_search_button_normal_bg_press.png [deleted file]
data/myaccount_photo/09_search_input_bg.png [deleted file]
data/myaccount_photo/09_search_softkey_icon_zoom.png [deleted file]
data/myaccount_photo/09_search_text_input_03.png [deleted file]
data/myaccount_photo/50_repeat_btn.png [deleted file]
data/myaccount_photo/50_repeat_btn_Press.png [deleted file]
data/myaccount_photo/A01_2_Icon_default.png [new file with mode: 0755]
data/myaccount_photo/A01_2_Icon_others.png [new file with mode: 0755]
data/myaccount_photo/bada.png [deleted file]
data/myaccount_photo/bg.png [deleted file]
data/myaccount_photo/docomo.png [deleted file]
data/myaccount_photo/icq.png
data/myaccount_photo/youtube.png
icon_myaccount.png [changed mode: 0755->0644]
include/myaccount_ug.h
include/myaccount_ug_common.h
packaging/my-account.spec
po/GT-I7800_Accounts_Strings.csv [changed mode: 0755->0644]
po/myaccount_ui.pot [changed mode: 0755->0644]
setting-myaccount-efl.xml
src/myaccount_ug_account_list.c
src/myaccount_ug_addaccount.c
src/myaccount_ug_common.c
src/myaccount_ug_main.c

diff --git a/LICENSE b/LICENSE
deleted file mode 100755 (executable)
index bbe9d02..0000000
--- a/LICENSE
+++ /dev/null
@@ -1,206 +0,0 @@
-Copyright (c) 2000 - 2011 Samsung Electronics Co., Ltd. All rights reserved.\r
-\r
-                                 Apache License\r
-                           Version 2.0, January 2004\r
-                        http://www.apache.org/licenses/\r
-\r
-   TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION\r
-\r
-   1. Definitions.\r
-\r
-      "License" shall mean the terms and conditions for use, reproduction,\r
-      and distribution as defined by Sections 1 through 9 of this document.\r
-\r
-      "Licensor" shall mean the copyright owner or entity authorized by\r
-      the copyright owner that is granting the License.\r
-\r
-      "Legal Entity" shall mean the union of the acting entity and all\r
-      other entities that control, are controlled by, or are under common\r
-      control with that entity. For the purposes of this definition,\r
-      "control" means (i) the power, direct or indirect, to cause the\r
-      direction or management of such entity, whether by contract or\r
-      otherwise, or (ii) ownership of fifty percent (50%) or more of the\r
-      outstanding shares, or (iii) beneficial ownership of such entity.\r
-\r
-      "You" (or "Your") shall mean an individual or Legal Entity\r
-      exercising permissions granted by this License.\r
-\r
-      "Source" form shall mean the preferred form for making modifications,\r
-      including but not limited to software source code, documentation\r
-      source, and configuration files.\r
-\r
-      "Object" form shall mean any form resulting from mechanical\r
-      transformation or translation of a Source form, including but\r
-      not limited to compiled object code, generated documentation,\r
-      and conversions to other media types.\r
-\r
-      "Work" shall mean the work of authorship, whether in Source or\r
-      Object form, made available under the License, as indicated by a\r
-      copyright notice that is included in or attached to the work\r
-      (an example is provided in the Appendix below).\r
-\r
-      "Derivative Works" shall mean any work, whether in Source or Object\r
-      form, that is based on (or derived from) the Work and for which the\r
-      editorial revisions, annotations, elaborations, or other modifications\r
-      represent, as a whole, an original work of authorship. For the purposes\r
-      of this License, Derivative Works shall not include works that remain\r
-      separable from, or merely link (or bind by name) to the interfaces of,\r
-      the Work and Derivative Works thereof.\r
-\r
-      "Contribution" shall mean any work of authorship, including\r
-      the original version of the Work and any modifications or additions\r
-      to that Work or Derivative Works thereof, that is intentionally\r
-      submitted to Licensor for inclusion in the Work by the copyright owner\r
-      or by an individual or Legal Entity authorized to submit on behalf of\r
-      the copyright owner. For the purposes of this definition, "submitted"\r
-      means any form of electronic, verbal, or written communication sent\r
-      to the Licensor or its representatives, including but not limited to\r
-      communication on electronic mailing lists, source code control systems,\r
-      and issue tracking systems that are managed by, or on behalf of, the\r
-      Licensor for the purpose of discussing and improving the Work, but\r
-      excluding communication that is conspicuously marked or otherwise\r
-      designated in writing by the copyright owner as "Not a Contribution."\r
-\r
-      "Contributor" shall mean Licensor and any individual or Legal Entity\r
-      on behalf of whom a Contribution has been received by Licensor and\r
-      subsequently incorporated within the Work.\r
-\r
-   2. Grant of Copyright License. Subject to the terms and conditions of\r
-      this License, each Contributor hereby grants to You a perpetual,\r
-      worldwide, non-exclusive, no-charge, royalty-free, irrevocable\r
-      copyright license to reproduce, prepare Derivative Works of,\r
-      publicly display, publicly perform, sublicense, and distribute the\r
-      Work and such Derivative Works in Source or Object form.\r
-\r
-   3. Grant of Patent License. Subject to the terms and conditions of\r
-      this License, each Contributor hereby grants to You a perpetual,\r
-      worldwide, non-exclusive, no-charge, royalty-free, irrevocable\r
-      (except as stated in this section) patent license to make, have made,\r
-      use, offer to sell, sell, import, and otherwise transfer the Work,\r
-      where such license applies only to those patent claims licensable\r
-      by such Contributor that are necessarily infringed by their\r
-      Contribution(s) alone or by combination of their Contribution(s)\r
-      with the Work to which such Contribution(s) was submitted. If You\r
-      institute patent litigation against any entity (including a\r
-      cross-claim or counterclaim in a lawsuit) alleging that the Work\r
-      or a Contribution incorporated within the Work constitutes direct\r
-      or contributory patent infringement, then any patent licenses\r
-      granted to You under this License for that Work shall terminate\r
-      as of the date such litigation is filed.\r
-\r
-   4. Redistribution. You may reproduce and distribute copies of the\r
-      Work or Derivative Works thereof in any medium, with or without\r
-      modifications, and in Source or Object form, provided that You\r
-      meet the following conditions:\r
-\r
-      (a) You must give any other recipients of the Work or\r
-          Derivative Works a copy of this License; and\r
-\r
-      (b) You must cause any modified files to carry prominent notices\r
-          stating that You changed the files; and\r
-\r
-      (c) You must retain, in the Source form of any Derivative Works\r
-          that You distribute, all copyright, patent, trademark, and\r
-          attribution notices from the Source form of the Work,\r
-          excluding those notices that do not pertain to any part of\r
-          the Derivative Works; and\r
-\r
-      (d) If the Work includes a "NOTICE" text file as part of its\r
-          distribution, then any Derivative Works that You distribute must\r
-          include a readable copy of the attribution notices contained\r
-          within such NOTICE file, excluding those notices that do not\r
-          pertain to any part of the Derivative Works, in at least one\r
-          of the following places: within a NOTICE text file distributed\r
-          as part of the Derivative Works; within the Source form or\r
-          documentation, if provided along with the Derivative Works; or,\r
-          within a display generated by the Derivative Works, if and\r
-          wherever such third-party notices normally appear. The contents\r
-          of the NOTICE file are for informational purposes only and\r
-          do not modify the License. You may add Your own attribution\r
-          notices within Derivative Works that You distribute, alongside\r
-          or as an addendum to the NOTICE text from the Work, provided\r
-          that such additional attribution notices cannot be construed\r
-          as modifying the License.\r
-\r
-      You may add Your own copyright statement to Your modifications and\r
-      may provide additional or different license terms and conditions\r
-      for use, reproduction, or distribution of Your modifications, or\r
-      for any such Derivative Works as a whole, provided Your use,\r
-      reproduction, and distribution of the Work otherwise complies with\r
-      the conditions stated in this License.\r
-\r
-   5. Submission of Contributions. Unless You explicitly state otherwise,\r
-      any Contribution intentionally submitted for inclusion in the Work\r
-      by You to the Licensor shall be under the terms and conditions of\r
-      this License, without any additional terms or conditions.\r
-      Notwithstanding the above, nothing herein shall supersede or modify\r
-      the terms of any separate license agreement you may have executed\r
-      with Licensor regarding such Contributions.\r
-\r
-   6. Trademarks. This License does not grant permission to use the trade\r
-      names, trademarks, service marks, or product names of the Licensor,\r
-      except as required for reasonable and customary use in describing the\r
-      origin of the Work and reproducing the content of the NOTICE file.\r
-\r
-   7. Disclaimer of Warranty. Unless required by applicable law or\r
-      agreed to in writing, Licensor provides the Work (and each\r
-      Contributor provides its Contributions) on an "AS IS" BASIS,\r
-      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or\r
-      implied, including, without limitation, any warranties or conditions\r
-      of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A\r
-      PARTICULAR PURPOSE. You are solely responsible for determining the\r
-      appropriateness of using or redistributing the Work and assume any\r
-      risks associated with Your exercise of permissions under this License.\r
-\r
-   8. Limitation of Liability. In no event and under no legal theory,\r
-      whether in tort (including negligence), contract, or otherwise,\r
-      unless required by applicable law (such as deliberate and grossly\r
-      negligent acts) or agreed to in writing, shall any Contributor be\r
-      liable to You for damages, including any direct, indirect, special,\r
-      incidental, or consequential damages of any character arising as a\r
-      result of this License or out of the use or inability to use the\r
-      Work (including but not limited to damages for loss of goodwill,\r
-      work stoppage, computer failure or malfunction, or any and all\r
-      other commercial damages or losses), even if such Contributor\r
-      has been advised of the possibility of such damages.\r
-\r
-   9. Accepting Warranty or Additional Liability. While redistributing\r
-      the Work or Derivative Works thereof, You may choose to offer,\r
-      and charge a fee for, acceptance of support, warranty, indemnity,\r
-      or other liability obligations and/or rights consistent with this\r
-      License. However, in accepting such obligations, You may act only\r
-      on Your own behalf and on Your sole responsibility, not on behalf\r
-      of any other Contributor, and only if You agree to indemnify,\r
-      defend, and hold each Contributor harmless for any liability\r
-      incurred by, or claims asserted against, such Contributor by reason\r
-      of your accepting any such warranty or additional liability.\r
-\r
-   END OF TERMS AND CONDITIONS\r
-\r
-   APPENDIX: How to apply the Apache License to your work.\r
-\r
-      To apply the Apache License to your work, attach the following\r
-      boilerplate notice, with the fields enclosed by brackets "[]"\r
-      replaced with your own identifying information. (Don't include\r
-      the brackets!)  The text should be enclosed in the appropriate\r
-      comment syntax for the file format. We also recommend that a\r
-      file or class name and description of purpose be included on the\r
-      same "printed page" as the copyright notice for easier\r
-      identification within third-party archives.\r
-\r
-   Copyright [yyyy] [name of copyright owner]\r
-\r
-   Licensed under the Apache License, Version 2.0 (the "License");\r
-   you may not use this file except in compliance with the License.\r
-   You may obtain a copy of the License at\r
-\r
-       http://www.apache.org/licenses/LICENSE-2.0\r
-\r
-   Unless required by applicable law or agreed to in writing, software\r
-   distributed under the License is distributed on an "AS IS" BASIS,\r
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.\r
-   See the License for the specific language governing permissions and\r
-   limitations under the License.\r
-\r
-\r
-\r
index b77f956..f84a4c4 100755 (executable)
@@ -2,32 +2,7 @@
 
 collections {
 RESOURCE_IMAGE("00_list_bar_press_1x80.png");
-RESOURCE_IMAGE("01_button_on_lighting.png");
-RESOURCE_IMAGE("01_controlbar_icon_add.png");
-RESOURCE_IMAGE("01_dialog_field_input_bottom.png");
-RESOURCE_IMAGE("01_dialog_field_input_middle.png");
-RESOURCE_IMAGE("01_dialog_field_input.png");
-RESOURCE_IMAGE("01_dialog_field_input_top.png");
-RESOURCE_IMAGE("01_dialog_field_lighting.png");
-RESOURCE_IMAGE("01_dialogue_field_bg.png");
-RESOURCE_IMAGE("01_hybrid_spinner_bg.png");
-RESOURCE_IMAGE("01_list_bottom_blur.png");
-RESOURCE_IMAGE("01_on_off_button_on.png");
-RESOURCE_IMAGE("01_on_off_button.png");
-RESOURCE_IMAGE("01_picker_input_bg.png");
 RESOURCE_IMAGE("01_samsungaccount.png");
-RESOURCE_IMAGE("08_textinput_btn_bg_1.png");
-RESOURCE_IMAGE("08_textinput_btn_bg_2.png");
-RESOURCE_IMAGE("08_textinput_btn_clear.png");
-RESOURCE_IMAGE("08_textinput_btn_enter.png");
-RESOURCE_IMAGE("08_textinput_panel_bg.png");
-RESOURCE_IMAGE("09_search_button_normal_bg.png");
-RESOURCE_IMAGE("09_search_button_normal_bg_press.png");
-RESOURCE_IMAGE("09_search_input_bg.png");
-RESOURCE_IMAGE("09_search_softkey_icon_zoom.png");
-RESOURCE_IMAGE("09_search_text_input_03.png");
-RESOURCE_IMAGE("50_repeat_btn.png");
-RESOURCE_IMAGE("50_repeat_btn_Press.png");
 RESOURCE_IMAGE("66_myaccount_icon_facebook_50x50.png");
 RESOURCE_IMAGE("66_myaccount_icon_google_50x50.png");
 RESOURCE_IMAGE("66_myaccount_icon_msn_50x50.png");
@@ -38,19 +13,17 @@ RESOURCE_IMAGE("66_myaccount_icon_twitter_50x50.png");
 RESOURCE_IMAGE("66_myaccount_icon_windows_live_50x50.png");
 RESOURCE_IMAGE("66_myaccount_icon_yahoo_50x50.png");
 RESOURCE_IMAGE("99_email.png");
-RESOURCE_IMAGE("bada.png");
-RESOURCE_IMAGE("bg.png");
 RESOURCE_IMAGE("cancel_sync.png");
 RESOURCE_IMAGE("exchange.png");
 RESOURCE_IMAGE("facebook.png");
 RESOURCE_IMAGE("flickr.png");
 RESOURCE_IMAGE("gmail.png");
 RESOURCE_IMAGE("icq.png");
-RESOURCE_IMAGE("myaccount_bg.png");
 RESOURCE_IMAGE("myspace.png");
 RESOURCE_IMAGE("picasa.png");
 RESOURCE_IMAGE("refresh.png");
-RESOURCE_IMAGE("tw3_list_select.png");
 RESOURCE_IMAGE("twitter.png");
 RESOURCE_IMAGE("youtube.png");
+RESOURCE_IMAGE("A01_2_Icon_default.png");
+RESOURCE_IMAGE("A01_2_Icon_others.png");
 }
diff --git a/data/myaccount_photo/01_button_on_lighting.png b/data/myaccount_photo/01_button_on_lighting.png
deleted file mode 100755 (executable)
index 7c32535..0000000
Binary files a/data/myaccount_photo/01_button_on_lighting.png and /dev/null differ
diff --git a/data/myaccount_photo/01_controlbar_icon_add.png b/data/myaccount_photo/01_controlbar_icon_add.png
deleted file mode 100755 (executable)
index 0dc1144..0000000
Binary files a/data/myaccount_photo/01_controlbar_icon_add.png and /dev/null differ
diff --git a/data/myaccount_photo/01_dialog_field_input.png b/data/myaccount_photo/01_dialog_field_input.png
deleted file mode 100755 (executable)
index 51158c7..0000000
Binary files a/data/myaccount_photo/01_dialog_field_input.png and /dev/null differ
diff --git a/data/myaccount_photo/01_dialog_field_input_bottom.png b/data/myaccount_photo/01_dialog_field_input_bottom.png
deleted file mode 100755 (executable)
index ddeb595..0000000
Binary files a/data/myaccount_photo/01_dialog_field_input_bottom.png and /dev/null differ
diff --git a/data/myaccount_photo/01_dialog_field_input_middle.png b/data/myaccount_photo/01_dialog_field_input_middle.png
deleted file mode 100755 (executable)
index 81b4c62..0000000
Binary files a/data/myaccount_photo/01_dialog_field_input_middle.png and /dev/null differ
diff --git a/data/myaccount_photo/01_dialog_field_input_top.png b/data/myaccount_photo/01_dialog_field_input_top.png
deleted file mode 100755 (executable)
index 2bec20f..0000000
Binary files a/data/myaccount_photo/01_dialog_field_input_top.png and /dev/null differ
diff --git a/data/myaccount_photo/01_dialog_field_lighting.png b/data/myaccount_photo/01_dialog_field_lighting.png
deleted file mode 100755 (executable)
index 45fa72a..0000000
Binary files a/data/myaccount_photo/01_dialog_field_lighting.png and /dev/null differ
diff --git a/data/myaccount_photo/01_dialogue_field_bg.png b/data/myaccount_photo/01_dialogue_field_bg.png
deleted file mode 100755 (executable)
index fd8c9ed..0000000
Binary files a/data/myaccount_photo/01_dialogue_field_bg.png and /dev/null differ
diff --git a/data/myaccount_photo/01_hybrid_spinner_bg.png b/data/myaccount_photo/01_hybrid_spinner_bg.png
deleted file mode 100755 (executable)
index d6ee659..0000000
Binary files a/data/myaccount_photo/01_hybrid_spinner_bg.png and /dev/null differ
diff --git a/data/myaccount_photo/01_list_bottom_blur.png b/data/myaccount_photo/01_list_bottom_blur.png
deleted file mode 100755 (executable)
index 5f2adf0..0000000
Binary files a/data/myaccount_photo/01_list_bottom_blur.png and /dev/null differ
diff --git a/data/myaccount_photo/01_on_off_button.png b/data/myaccount_photo/01_on_off_button.png
deleted file mode 100755 (executable)
index fda54d0..0000000
Binary files a/data/myaccount_photo/01_on_off_button.png and /dev/null differ
diff --git a/data/myaccount_photo/01_on_off_button_on.png b/data/myaccount_photo/01_on_off_button_on.png
deleted file mode 100755 (executable)
index ffa54cf..0000000
Binary files a/data/myaccount_photo/01_on_off_button_on.png and /dev/null differ
diff --git a/data/myaccount_photo/01_picker_input_bg.png b/data/myaccount_photo/01_picker_input_bg.png
deleted file mode 100755 (executable)
index af08729..0000000
Binary files a/data/myaccount_photo/01_picker_input_bg.png and /dev/null differ
diff --git a/data/myaccount_photo/08_textinput_btn_bg_1.png b/data/myaccount_photo/08_textinput_btn_bg_1.png
deleted file mode 100755 (executable)
index 7de2cf9..0000000
Binary files a/data/myaccount_photo/08_textinput_btn_bg_1.png and /dev/null differ
diff --git a/data/myaccount_photo/08_textinput_btn_bg_2.png b/data/myaccount_photo/08_textinput_btn_bg_2.png
deleted file mode 100755 (executable)
index 8590ab5..0000000
Binary files a/data/myaccount_photo/08_textinput_btn_bg_2.png and /dev/null differ
diff --git a/data/myaccount_photo/08_textinput_btn_clear.png b/data/myaccount_photo/08_textinput_btn_clear.png
deleted file mode 100755 (executable)
index 53b681e..0000000
Binary files a/data/myaccount_photo/08_textinput_btn_clear.png and /dev/null differ
diff --git a/data/myaccount_photo/08_textinput_btn_enter.png b/data/myaccount_photo/08_textinput_btn_enter.png
deleted file mode 100755 (executable)
index 8161fe3..0000000
Binary files a/data/myaccount_photo/08_textinput_btn_enter.png and /dev/null differ
diff --git a/data/myaccount_photo/08_textinput_panel_bg.png b/data/myaccount_photo/08_textinput_panel_bg.png
deleted file mode 100755 (executable)
index c418243..0000000
Binary files a/data/myaccount_photo/08_textinput_panel_bg.png and /dev/null differ
diff --git a/data/myaccount_photo/09_search_button_normal_bg.png b/data/myaccount_photo/09_search_button_normal_bg.png
deleted file mode 100755 (executable)
index 2f47be9..0000000
Binary files a/data/myaccount_photo/09_search_button_normal_bg.png and /dev/null differ
diff --git a/data/myaccount_photo/09_search_button_normal_bg_press.png b/data/myaccount_photo/09_search_button_normal_bg_press.png
deleted file mode 100755 (executable)
index e71e54b..0000000
Binary files a/data/myaccount_photo/09_search_button_normal_bg_press.png and /dev/null differ
diff --git a/data/myaccount_photo/09_search_input_bg.png b/data/myaccount_photo/09_search_input_bg.png
deleted file mode 100755 (executable)
index f0cd0ef..0000000
Binary files a/data/myaccount_photo/09_search_input_bg.png and /dev/null differ
diff --git a/data/myaccount_photo/09_search_softkey_icon_zoom.png b/data/myaccount_photo/09_search_softkey_icon_zoom.png
deleted file mode 100755 (executable)
index d121ca3..0000000
Binary files a/data/myaccount_photo/09_search_softkey_icon_zoom.png and /dev/null differ
diff --git a/data/myaccount_photo/09_search_text_input_03.png b/data/myaccount_photo/09_search_text_input_03.png
deleted file mode 100755 (executable)
index 3a4bbfe..0000000
Binary files a/data/myaccount_photo/09_search_text_input_03.png and /dev/null differ
diff --git a/data/myaccount_photo/50_repeat_btn.png b/data/myaccount_photo/50_repeat_btn.png
deleted file mode 100755 (executable)
index 38648b6..0000000
Binary files a/data/myaccount_photo/50_repeat_btn.png and /dev/null differ
diff --git a/data/myaccount_photo/50_repeat_btn_Press.png b/data/myaccount_photo/50_repeat_btn_Press.png
deleted file mode 100755 (executable)
index 5b3207b..0000000
Binary files a/data/myaccount_photo/50_repeat_btn_Press.png and /dev/null differ
diff --git a/data/myaccount_photo/A01_2_Icon_default.png b/data/myaccount_photo/A01_2_Icon_default.png
new file mode 100755 (executable)
index 0000000..3b39b6d
Binary files /dev/null and b/data/myaccount_photo/A01_2_Icon_default.png differ
diff --git a/data/myaccount_photo/A01_2_Icon_others.png b/data/myaccount_photo/A01_2_Icon_others.png
new file mode 100755 (executable)
index 0000000..53c8f2b
Binary files /dev/null and b/data/myaccount_photo/A01_2_Icon_others.png differ
diff --git a/data/myaccount_photo/bada.png b/data/myaccount_photo/bada.png
deleted file mode 100755 (executable)
index 9f2ee01..0000000
Binary files a/data/myaccount_photo/bada.png and /dev/null differ
diff --git a/data/myaccount_photo/bg.png b/data/myaccount_photo/bg.png
deleted file mode 100755 (executable)
index 7f21fd9..0000000
Binary files a/data/myaccount_photo/bg.png and /dev/null differ
diff --git a/data/myaccount_photo/docomo.png b/data/myaccount_photo/docomo.png
deleted file mode 100755 (executable)
index 2cf5a4e..0000000
Binary files a/data/myaccount_photo/docomo.png and /dev/null differ
index 56046e4..ac3372c 100755 (executable)
Binary files a/data/myaccount_photo/icq.png and b/data/myaccount_photo/icq.png differ
index 9cc5c52..5b3a776 100755 (executable)
Binary files a/data/myaccount_photo/youtube.png and b/data/myaccount_photo/youtube.png differ
old mode 100755 (executable)
new mode 100644 (file)
index 702515b..a2dd4c2 100755 (executable)
@@ -120,6 +120,7 @@ typedef struct appdata {
        /* extra data from ug caller */\r
        char *capability_filter;\r
        char *caller_userdata;\r
+       char *called_from;\r
        account_subscribe_h account_subscribe;\r
 }myaccount_appdata;\r
 \r
index df114b4..a785052 100755 (executable)
@@ -67,11 +67,12 @@ int myaccount_common_launch_application(MyAccountRequestViewType
                                                                                                        char *username,\r
                                                                                                        char *email_sp,\r
                                                                                                        int account_id,\r
+                                                                                                       MyAccountProviderType sp_type,\r
                                                                                                        void *data );\r
 \r
 int myaccount_common_get_all_account_cnt(int *count);\r
 \r
-void myaccount_common_handle_notification();\r
+void myaccount_common_handle_notification(const char* event_type);\r
 \r
 void myaccount_common_listen_pkgmgr_for_pkg_uninstall();\r
 \r
index 0f64807..261b340 100755 (executable)
@@ -1,7 +1,7 @@
 #sbs-git:slp/apps/m/my-account my-account 1.5.38 c12e7805519b99951f91c33cc96745c7f36166af
 Name:       my-account
 Summary:    My account application
-Version:    1.8.25
+Version:    1.8.34
 Release:    1
 Group:      main/devel
 License:    TO_BE_FILL
old mode 100755 (executable)
new mode 100644 (file)
old mode 100755 (executable)
new mode 100644 (file)
index d1f0e29..6043d52 100755 (executable)
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>\r
-<manifest xmlns="http://tizen.org/ns/packages" package="setting-myaccount-efl" version="1.8.25" install-location="internal-only">\r
+<manifest xmlns="http://tizen.org/ns/packages" package="setting-myaccount-efl" version="1.8.34" install-location="internal-only">\r
        <label>my-account</label>\r
        <author email="wy1115.lee@samsung.com" href="www.samsung.com">Wonyoung Lee</author>\r
        <description>My Account Application</description>\r
index 7d1407e..3e32653 100755 (executable)
@@ -85,8 +85,10 @@ static char *__myaccount_account_list_get_capablity_string_value(const char* cap
                return dgettext(MA_UG_NAME, "IDS_COM_BODY_TASK");
        else if (!strcmp(capability_type ,ACCOUNT_SUPPORTS_CAPABILITY_MEMO))
                return dgettext("sys_string", "IDS_COM_BODY_S_NOTE");
+       else if (!strcmp(capability_type ,ACCOUNT_SUPPORTS_CAPABILITY_MUSIC))
+               return dgettext("sys_string", "IDS_COM_BODY_MUSIC");
        else
-               return dgettext(MA_UG_NAME, "IDS_COM_POP_UNKNOWN");
+               return NULL;//return dgettext(MA_UG_NAME, "IDS_COM_POP_UNKNOWN");
 }
 
 bool _myaccount_account_list_get_capablity_text(const char* capability_type,
@@ -114,9 +116,8 @@ bool _myaccount_account_list_get_capablity_text(const char* capability_type,
                capability_string = __myaccount_account_list_get_capablity_string_value(
                                                                                                                        capability_type);
 
-               MYACCOUNT_VERBOSE("capability_string = %s\n",   capability_string);
-
                if (capability_string != NULL) {
+                       MYACCOUNT_VERBOSE("capability_string = %s\n",   capability_string);
                        if(strlen(capability_textbuf) > 0) {
                                char *temp2 = strdup(capability_textbuf);
                                if (!temp2) {
@@ -283,9 +284,12 @@ void myaccount_account_list_quit_cb( void *data,
                MYACCOUNT_ERROR("myaccount_account_list_quit_cb callback user data is null!!!\n");
                return;
        }
-       if (account_info->capablity_list) {
-               g_slist_free(account_info->capablity_list);
-               account_info->capablity_list = NULL;
+
+       if(account_info){
+               if (account_info->capablity_list) {
+                       g_slist_free(account_info->capablity_list);
+                       account_info->capablity_list = NULL;
+               }
        }
        MA_MEMFREE(account_info);
        account_index = 0;
@@ -694,7 +698,7 @@ static void _myaccount_ug_account_list_destroy_cb(ui_gadget_h ug,
        MYACCOUNT_VERBOSE("_myaccount_ug_account_list_destroy_cb : ug callee request kill layout_addaccount=%p\n",
                                                                                        mydata->layout_addaccount);
 #ifndef ENABLE_NOTI
-       myaccount_common_handle_notification();
+       myaccount_common_handle_notification(NULL);
 #endif
 }
 
@@ -711,11 +715,12 @@ static void __myaccount_ug_launch_signin_view(void *data, myaccount_list_priv *a
 
        ret = service_create(&service);
 
-       myaccount_common_launch_application(MYACCOUNT_REQUEST_VIEW,
+       ret = myaccount_common_launch_application(MYACCOUNT_REQUEST_VIEW,
                                                                strdup(account->package_name),
                                                                strdup(account->username),
                                                                "",
                                                                account->account_id,
+                                                               0,
                                                                ad);
 
        service_destroy(service);
@@ -801,6 +806,8 @@ static void __myaccount_account_list_append_genlist(myaccount_appdata *ad,
                                                                                ELM_GENLIST_ITEM_NONE,
                                                                                __myaccount_account_list_gl_sel,
                                                                                (void *)&account_info[index]);
+
+                                               MYACCOUNT_VERBOSE("genlist item(%p)\n", it);
                                        }
                                } else {
                                        it = elm_genlist_item_append(ad->account_genlist,
@@ -809,6 +816,7 @@ static void __myaccount_account_list_append_genlist(myaccount_appdata *ad,
                                                                        ELM_GENLIST_ITEM_NONE,
                                                                        __myaccount_account_list_gl_sel,
                                                                        (void *)&account_info[index]);
+                                       MYACCOUNT_VERBOSE("genlist item(%p)\n", it);
                                }
                        }
                }
@@ -850,36 +858,39 @@ static void _myaccount_ug_account_gl_realized(void *data, Evas_Object *obj, void
        if(index > 2 && index < total_count)
 #endif
        {
-                /*Add account items. index 1 and last are the seperators*/
+        /*Add account items. index 1 and last are the seperators*/
                myaccount_list_priv *account_info_item = (myaccount_list_priv*)elm_object_item_data_get(it);
-                memset(buf, 0, 2048);
-                memset(bufdomain, 0, 2048);
 
-               if (strlen(account_info_item->domain_name) > 0)
-                       g_snprintf(bufdomain, 1024, "Logged into %s with user id ", account_info_item->domain_name);
-               else
-                       g_snprintf(bufdomain, 1024, "Service unknown user id ");
-
-               if (strlen(account_info_item->display_name) > 0)
-                       g_snprintf(buf, 1024, "%s%s", bufdomain, account_info_item->display_name);
-               else if (strlen(account_info_item->email_address) > 0)
-                       g_snprintf(buf, 1024, "%s%s", bufdomain, account_info_item->email_address);
-               else if (strlen(account_info_item->username) > 0)
-                       g_snprintf(buf, 1024, "%s%s", bufdomain, account_info_item->username);
-               else
-                       g_snprintf(buf, 1024, "%sUnknown", account_info_item->domain_name);
-
-                ao = elm_object_item_access_object_get(it);
-                elm_access_info_set(ao, ELM_ACCESS_INFO, buf);
-        } else if (index == 2) {
+               if(account_info_item){
+               memset(buf, 0, 2048);
+               memset(bufdomain, 0, 2048);
+
+                       if (strlen(account_info_item->domain_name) > 0)
+                               g_snprintf(bufdomain, 1024, "Logged into %s with user id ", account_info_item->domain_name);
+                       else
+                               g_snprintf(bufdomain, 1024, "Service unknown user id ");
+
+                       if (strlen(account_info_item->display_name) > 0)
+                               g_snprintf(buf, 1024, "%s%s", bufdomain, account_info_item->display_name);
+                       else if (strlen(account_info_item->email_address) > 0)
+                               g_snprintf(buf, 1024, "%s%s", bufdomain, account_info_item->email_address);
+                       else if (strlen(account_info_item->username) > 0)
+                               g_snprintf(buf, 1024, "%s%s", bufdomain, account_info_item->username);
+                       else
+                               g_snprintf(buf, 1024, "%sUnknown", account_info_item->domain_name);
+
+               ao = elm_object_item_access_object_get(it);
+               elm_access_info_set(ao, ELM_ACCESS_INFO, buf);
+               }
+       } else if (index == 2) {
                ao = elm_object_item_access_object_get(it);
                elm_access_info_set(ao, ELM_ACCESS_CONTEXT_INFO, "Turn Auto Sync on or off");
-        } else if (index == 3) {
+    } else if (index == 3) {
                ao = elm_object_item_access_object_get(it);
                elm_access_info_set(ao, ELM_ACCESS_CONTEXT_INFO, "Below is the list of all logged in accounts");
        } else {
-                /*Remove access for seperators*/
-                elm_object_item_access_unregister(ei);
+               /*Remove access for seperators*/
+               elm_object_item_access_unregister(ei);
        }
 
 #ifdef ACCOUNT_SYNC_ALL
@@ -890,16 +901,16 @@ static void _myaccount_ug_account_gl_realized(void *data, Evas_Object *obj, void
        {
                MYACCOUNT_INFO("DO NOTHING only one account exist, total_count(%d) index(%d) !!! \n", total_count, index);
        } else {
-               if (index == 2) {
+               if (index == 1) {
                        MYACCOUNT_VERBOSE("DO NOTHING realized (%d) !!! \n", index);
 #ifdef ACCOUNT_SYNC_ALL
                } else if (index == 4) {
 #else
-               } else if (index == 3) {
+               } else if (index == 2) {
 #endif
                        MYACCOUNT_VERBOSE("TOP realized (%d) !!! \n", index);
                        elm_object_item_signal_emit(ei, "elm,state,top", "");
-               } else if (index == (total_count-1)) {
+               } else if (index == (total_count-2)) {
                        MYACCOUNT_VERBOSE("BOTTOM realized (%d) item count (%d) !!! \n", index, total_count);
                        elm_object_item_signal_emit(ei, "elm,state,bottom", "");
                } else  {
index 579c67d..7dfec99 100755 (executable)
@@ -161,6 +161,7 @@ static void __myaccount_addaccount_gl_sel(void *data,
                                                strdup(service->package_name),
                                                NULL,
                                                email_sp,
+                                               service->sp_type,
                                                -1,
                                                ad);
                                break;
@@ -173,6 +174,7 @@ static void __myaccount_addaccount_gl_sel(void *data,
                                                NULL,
                                                email_sp,
                                                -1,
+                                               service->sp_type,
                                                ad);
                                break;
                        default:
@@ -182,6 +184,7 @@ static void __myaccount_addaccount_gl_sel(void *data,
                                                        NULL,
                                                        "",
                                                        -1,
+                                                       service->sp_type,
                                                        ad) != SERVICE_ERROR_NONE ) {
                                        MYACCOUNT_ERROR("__myaccount_addaccount_gl_sel : Failed to launch application\n");
                                        ad->item_selected_state = false;
@@ -435,7 +438,6 @@ static bool _myaccount_addaccount_get_csc_sp_list(GList** sp_info_list)
                                        sizeof(sp_info->package_name));
 
                sp_info->sp_type = MYACCOUNT_TYPE_CSC;
-
                sp_info->b_tizen_email = TRUE;
                sp_info->multiple_account_support = TRUE;
 
@@ -493,10 +495,12 @@ static void _myaccount_ug_addaccount_gl_realized(void *data, Evas_Object *obj, v
        if(index != 1 && index != total_count) {
                /*Add account items. index 1 and last are the seperators*/
                addaccount_list_priv *service = (addaccount_list_priv*)elm_object_item_data_get(it);
-               memset(buf, 0, 2048);
-               g_snprintf(buf, 100, "Allows you to add your %s Account", service->service_name);
-               ao = elm_object_item_access_object_get(it);
-               elm_access_info_set(ao, ELM_ACCESS_CONTEXT_INFO, buf);
+               if(service) {
+                       memset(buf, 0, 2048);
+                       g_snprintf(buf, 100, "Allows you to add your %s Account", service->service_name);
+                       ao = elm_object_item_access_object_get(it);
+                       elm_access_info_set(ao, ELM_ACCESS_CONTEXT_INFO, buf);
+               }
        } else {
                /*Remove access for seperators*/
                elm_object_item_access_unregister(ei);
@@ -507,10 +511,10 @@ static void _myaccount_ug_addaccount_gl_realized(void *data, Evas_Object *obj, v
        if(total_count <= 3) {
                 MYACCOUNT_VERBOSE("DO NOTHING only one add account item, total_count(%d) index(%d) !!! \n", total_count, index);
         } else {
-               if (index == 2) {
+               if (index == 1) {
                        MYACCOUNT_VERBOSE("TOP realized (%d) !!! \n", index);
                        elm_object_item_signal_emit(ei, "elm,state,top", "");
-               } else if (index == (total_count-1)) {
+               } else if (index == (total_count-2)) {
                        MYACCOUNT_VERBOSE("BOTTOM realized (%d) item count (%d) !!! \n", index, total_count);
                        elm_object_item_signal_emit(ei, "elm,state,bottom", "");
                } else  {
index 85b7e7a..ccc019f 100755 (executable)
@@ -137,6 +137,7 @@ void myaccount_destroy_appdata()
        g_myaccount_appdata->sorted_sp_list= NULL;\r
 \r
        MA_MEMFREE(g_myaccount_appdata->caller_userdata);\r
+       MA_MEMFREE(g_myaccount_appdata->called_from);\r
        MA_MEMFREE(g_myaccount_appdata);\r
 \r
        MYACCOUNT_VERBOSE("myaccount_destroy_appdata END \n");\r
@@ -199,9 +200,11 @@ void myaccount_common_get_icon_by_name(char *domain_name,
                                        "01_samsungaccount.png");\r
        } else if (!strcmp(tmp_domain_name, "youtube")) {\r
                MA_SNPRINTF(icon_path, BUFSIZE, "%s", "youtube.png");\r
+       } else if (!strcmp(tmp_domain_name, "others")) {\r
+               MA_SNPRINTF(icon_path, BUFSIZE, "%s", "A01_2_Icon_others.png");\r
        }else {\r
                MYACCOUNT_VERBOSE("Default icon\n");\r
-               MA_SNPRINTF(icon_path, BUFSIZE, "%s", "99_email.png");\r
+               MA_SNPRINTF(icon_path, BUFSIZE, "%s", "A01_2_Icon_default.png");\r
        }\r
 }\r
 \r
@@ -222,7 +225,7 @@ void myaccount_common_lowercase(char *src, char *dest)
        dest[i] = '\0';\r
 }\r
 \r
-void myaccount_common_handle_notification()\r
+void myaccount_common_handle_notification(const char* event_type)\r
 {\r
        myaccount_appdata *appdata = (myaccount_appdata*)myaccount_get_appdata();\r
 \r
@@ -277,19 +280,21 @@ void myaccount_common_handle_notification()
                        }\r
                }\r
        } else if (appdata->eMode == eMYACCOUNT_ADD_ACCOUNT) {\r
-               if (appdata->ug) {\r
-                       service_h service = NULL;\r
-                       int ret = -1;\r
-\r
-                       ret = service_create(&service);\r
-                       MYACCOUNT_VERBOSE("service_create ret (%x)\n", ret);\r
-                       ret = service_add_extra_data(service, "account_noti", noti_name);\r
-                       MYACCOUNT_VERBOSE("service_add_extra_data ret (%x)\n", ret);\r
-                       error_code = ug_send_result(appdata->ug, service);\r
-                       MYACCOUNT_VERBOSE("ug_send_result ret (%x)\n", error_code);\r
-                       error_code = ug_destroy_me(appdata->ug);\r
-                       MYACCOUNT_VERBOSE("myaccount_common_handle_notification callback : return = %d!!!\n",\r
-                                                               error_code);\r
+               if(event_type){\r
+                       if (!strcmp(event_type, ACCOUNT_NOTI_NAME_INSERT) && appdata->ug) {\r
+                               service_h service = NULL;\r
+                               int ret = -1;\r
+\r
+                               ret = service_create(&service);\r
+                               MYACCOUNT_VERBOSE("service_create ret (%x)\n", ret);\r
+                               ret = service_add_extra_data(service, "account_noti", noti_name);\r
+                               MYACCOUNT_VERBOSE("service_add_extra_data ret (%x)\n", ret);\r
+                               error_code = ug_send_result(appdata->ug, service);\r
+                               MYACCOUNT_VERBOSE("ug_send_result ret (%x)\n", error_code);\r
+                               error_code = ug_destroy_me(appdata->ug);\r
+                               MYACCOUNT_VERBOSE("myaccount_common_handle_notification callback : return = %d!!!\n",\r
+                                                                       error_code);\r
+                       }\r
                }\r
        } else {\r
                MYACCOUNT_WARNING("Unknown mode !!!");\r
@@ -340,6 +345,7 @@ int  myaccount_common_launch_application(MyAccountRequestViewType
                                                                                                                char *username,\r
                                                                                                                char *email_sp,\r
                                                                                                                int account_id,\r
+                                                                                                               MyAccountProviderType sp_type,\r
                                                                                                                void *data )\r
 {\r
        int ret = SERVICE_ERROR_NONE;\r
index 3cdf83c..a5b4a75 100755 (executable)
@@ -47,6 +47,7 @@ static gboolean __myaccount_account_list_parse_param(myaccount_mode_e
                service_get_extra_data(data, "mode", &extracted);\r
                service_get_extra_data(data, "capability_filter", &ad->capability_filter);\r
                service_get_extra_data(data, "myaccount_userdata", &ad->caller_userdata);\r
+               service_get_extra_data(data, "from", &ad->called_from);\r
 \r
                if (ad->capability_filter)\r
                        MYACCOUNT_DBUG("capability_filter = %s\n", ad->capability_filter);\r
@@ -141,7 +142,7 @@ bool myaccount_subscribe_callback(const char* event_type, int account_id, void*
        MYACCOUNT_DBUG("event_type (%s)\n", event_type);\r
        MYACCOUNT_DBUG("account id (%d)\n", account_id);\r
 \r
-       myaccount_common_handle_notification();\r
+       myaccount_common_handle_notification(event_type);\r
 \r
        return TRUE;\r
 }\r
@@ -180,7 +181,7 @@ int myaccount_subscribe_to_account_notification_vconfkey()
         MYACCOUNT_DBUG("Myaccount ug resume\n");\r
         ugd->item_selected_state = false;\r
 #ifndef ENABLE_NOTI\r
-        myaccount_common_handle_notification();\r
+        myaccount_common_handle_notification(NULL);\r
 #endif\r
 }\r
 \r