email_0.0.11 package upload

diff --git a/account/src/email-account-folder.c b/account/src/email-account-folder.c
index 2ea72c9..9ab22f8 100755 (executable)
--- a/account/src/email-account-folder.c
+++ b/account/src/email-account-folder.c
@@ -521,7 +521,7 @@ void _create_folder_view(EmailAccountUGD *ug_data)
                for (i = ACC_MAILBOX_TYPE_INBOX; i < ACC_MAILBOX_TYPE_MAX; i++)
                {
                        itc_item_for_all_acc_box[i].item_style = "2text";
-                       itc_item_for_all_acc_box[i].func.text_get = menu_its[i].func;
+                       itc_item_for_all_acc_box[i].func.text_get = (char *)menu_its[i].func;
                        itc_item_for_all_acc_box[i].func.state_get = _gl_state_get;
                        itc_item_for_all_acc_box[i].func.del = _gl_del;
 

diff --git a/common/include/email-utils.h b/common/include/email-utils.h
index 4d9f3e2..39c41cf 100755 (executable)
--- a/common/include/email-utils.h
+++ b/common/include/email-utils.h
@@ -124,6 +124,7 @@ char *email_get_current_theme_name(void);
 gboolean email_check_dir_exist(const gchar *path);
 gboolean email_check_file_exist(const gchar *path);
 
+gchar *email_parse_get_filepath_from_path(const gchar *path);  /* g_free(). */
 gchar *email_parse_get_filename_from_path(const gchar *path);  /* g_free(). */
 void email_parse_get_filename_n_ext_from_path(const gchar *path, gchar **ret_file_name, gchar **ret_ext);
 
@@ -132,6 +133,7 @@ gchar *email_get_buff_from_file(const gchar *path, guint max_kbyte);        /* g_free()
 gchar *email_get_file_size_string(guint64 size);       /* g_free(). */
 guint64 email_get_file_size(const gchar *path);
 gboolean email_get_address_validation(const char *address);
+gchar *email_cut_text_by_byte_len(const gchar *text, gint len);        /* g_free(). */
 
 char* email_get_str_datetime(const time_t time_val);
 char *email_get_date_text(const char *locale, char *skeleton, void *time);

diff --git a/composer/src/email-composer-callback.c b/composer/src/email-composer-callback.c
index 089d6da..8411845 100755 (executable)
--- a/composer/src/email-composer-callback.c
+++ b/composer/src/email-composer-callback.c
@@ -24,6 +24,7 @@
 #include "email-composer-callback.h"
 #include "email-composer-predictive-search.h"
 #include "email-composer-js.h"
+#include "email-composer-contents.h"
 
 #define ACCOUNT_ICON_OTHERS IMGDIR"/icon_email.png"
 
@@ -54,8 +55,6 @@ static void _composer_myemail_radio_cb(void *data, Evas_Object *obj, void *event
 static void _composer_myemail_gl_sel(void *data, Evas_Object *obj, void *event_info);
 
 static Eina_Bool _composer_cc_mbe_set_focus(void *data);
-static void *_composer_contact_search_by_email(EmailComposerUGD *ugd, const char *search_word);
-static void _composer_delete_contacts_list(EMAIL_CONTACT_LIST_INFO_S *contacts_list_item);
 static void _composer_get_html_content_for_draft_cb(Evas_Object *o, const char *result, void *data);
 static void _composer_send_clicked_cb(Evas_Object *o, const char *result, void *data);
 static void _composer_plain_text_get_cb(Evas_Object *o, const char *plain_text, void *user_data);

diff --git a/composer/src/email-composer-util.c b/composer/src/email-composer-util.c
index 89bc8d9..29af2eb 100755 (executable)
--- a/composer/src/email-composer-util.c
+++ b/composer/src/email-composer-util.c
@@ -1339,8 +1339,6 @@ void _composer_set_mail_info(EmailComposerUGD *ugd)
 
        _composer_add_attachment(ugd);
 
-//     _composer_download_attachment(ugd);
-
        if ((EINA_TRUE == ugd->has_body_html) &&
                (ugd->composer_type == RUN_COMPOSER_EDIT || ugd->composer_type == RUN_COMPOSER_REPLY || ugd->composer_type == RUN_COMPOSER_REPLY_ALL || ugd->composer_type == RUN_COMPOSER_FORWARD)) {
                _composer_add_softlink_to_inline_images(ugd);
@@ -1597,7 +1595,7 @@ void _composer_download_attachment(EmailComposerUGD *ugd)
                        }
                }
        } else {
-               ugd->need_download == EINA_FALSE;
+               ugd->need_download = EINA_FALSE;
                ugd->bSendBtnDisabled = true;
                ugd->send_timer = ecore_timer_add(0.5, _composer_send_mail_cb, ugd);
        }

diff --git a/mailbox/src/email-mailbox-controlbar.c b/mailbox/src/email-mailbox-controlbar.c
index 66f4ded..72e6c8b 100755 (executable)
--- a/mailbox/src/email-mailbox-controlbar.c
+++ b/mailbox/src/email-mailbox-controlbar.c
@@ -24,8 +24,6 @@
 
 static Elm_Genlist_Item_Class itc_popup;
 static Evas_Object *radio_grp;
-static Evas_Coord touch_x;
-static Evas_Coord touch_y;
 Elm_Object_Item *g_delete_button;
 Elm_Object_Item *g_move_button;
 Elm_Object_Item *g_block_button;
@@ -54,9 +52,7 @@ static void _block_mail_cb(void *data, Evas_Object *obj, void *event_info);
 static void _markunread_mail_cb(void *data, Evas_Object *obj, void *event_info);
 static void _markread_mail_cb(void *data, Evas_Object *obj, void *event_info);
 static void _compose_toolbar_clicked_cb(void *data, Evas_Object *obj, void *event_info);
-static ui_gadget_h create_document_ug(char *ug_name, service_h service, void *data);
 static void _popup_response_cb(void *data, Evas_Object *obj, void *event_info);
-static void destroy_document_cb(ui_gadget_h ug, void *priv);
 static void _radio_cb(void *data, Evas_Object *obj, void *event_info);
 static void _move_ctxpopup(Evas_Object *ctxpopup, Evas_Object *win);
 static void _move_mail_cb(void *data, Evas_Object *obj, void *event_info);
@@ -65,40 +61,6 @@ static void _add_account_cb(void *data, Evas_Object *obj, void *event_info);
 static Evas_Object *_create_toolbar_more_btn(Evas_Object *parent, Evas_Smart_Cb func, void *data);
 static Evas_Object *_create_toolbar_btn(Evas_Object *parent, const char *text, Evas_Smart_Cb func, void *data);
 
-static void destroy_document_cb(ui_gadget_h ug, void *priv)
-{
-       debug_log("");
-
-       if (!ug || !priv)
-               return;
-
-       EmailMailboxUGD *mailbox_ugd = (EmailMailboxUGD *)priv;
-
-       if (mailbox_ugd->ug_document) {
-               ug_destroy(mailbox_ugd->ug_document);
-               mailbox_ugd->ug_document = NULL;
-       }
-}
-
-
-static ui_gadget_h create_document_ug(char *ug_name, service_h service, void *data)
-{
-       debug_log("");
-       ui_gadget_h ug;
-       struct ug_cbs cbs = { 0, };
-       EmailMailboxUGD *mailbox_ugd = (EmailMailboxUGD *)data;
-
-       cbs.layout_cb = layout_composer_cb;
-       cbs.result_cb = result_composer_cb;
-       cbs.destroy_cb = destroy_document_cb;
-       cbs.priv = mailbox_ugd;
-       mailbox_ugd->cbs = cbs;
-
-       ug = ug_create(mailbox_ugd->ug, ug_name, UG_MODE_FULLVIEW, service, &mailbox_ugd->cbs);
-
-       return ug;
-}
-
 static void _block_clicked_cb(void *data, Evas_Object *obj, void *event_info)
 {
        evas_object_del(obj);

diff --git a/mailbox/src/email-mailbox-item.c b/mailbox/src/email-mailbox-item.c
index ebdae4b..55ae18b 100755 (executable)
--- a/mailbox/src/email-mailbox-item.c
+++ b/mailbox/src/email-mailbox-item.c
@@ -285,7 +285,6 @@ void mailbox_process_delete_mail(void* data, Ecore_Thread *thd)
 
        edit_req_t *req = (edit_req_t *)data;
        EmailMailboxUGD *mailbox_ugd = req->mailbox_ugd;
-       EmailMailboxViewType previous_view = req->previous_view;
 
        int i = 0;
        int max_account_id = email_engine_get_max_account_id();

diff --git a/mailbox/src/email-mailbox-list.c b/mailbox/src/email-mailbox-list.c
index 9d364f9..456afd9 100755 (executable)
--- a/mailbox/src/email-mailbox-list.c
+++ b/mailbox/src/email-mailbox-list.c
@@ -467,10 +467,8 @@ static void _important_status_changed_cb(void *data, Evas_Object *obj, void *eve
 {
        debug_log("");
        list_data *ld = (list_data *)data;
-       int vt = ld->mailbox_ugd->view_type;
        int count = 0;
 
-
        ld->mailbox_ugd->important_list = g_list_prepend(ld->mailbox_ugd->important_list,
                                                                                                GINT_TO_POINTER(ld->mail_id));
        count = 1;

diff --git a/packaging/org.tizen.email.spec b/packaging/org.tizen.email.spec
index 5dfa6a4..5b698a4 100755 (executable)
--- a/packaging/org.tizen.email.spec
+++ b/packaging/org.tizen.email.spec
@@ -1,6 +1,6 @@
 Name:       org.tizen.email
 Summary:    email application
-Version:    0.0.10
+Version:    0.0.11
 Release:    1
 Group:      devel
 License:    Flora
@@ -80,34 +80,6 @@ mkdir -p %{buildroot}/usr/share/license
 /usr/bin/vconftool set -t int    file/private/org.tizen.email/slot_size "50" -g 6514
 /usr/bin/vconftool set -t int    file/private/org.tizen.email/spam_rule_changed "0" -g 6514
 /usr/bin/vconftool set -t int    file/private/org.tizen.email/threadlist "1" -g 6514
-/usr/bin/vconftool set -t string file/private/org.tizen.email/aol_sending_address   "smtp.aol.com" -g 6514
-/usr/bin/vconftool set -t int    file/private/org.tizen.email/aol_sending_port      "587" -g 6514
-/usr/bin/vconftool set -t int    file/private/org.tizen.email/aol_sending_ssl       "0" -g 6514
-/usr/bin/vconftool set -t int    file/private/org.tizen.email/aol_receiving_type    "2" -g 6514
-/usr/bin/vconftool set -t string file/private/org.tizen.email/aol_receiving_address "imap.aol.com" -g 6514
-/usr/bin/vconftool set -t int    file/private/org.tizen.email/aol_receiving_port    "143" -g 6514
-/usr/bin/vconftool set -t int    file/private/org.tizen.email/aol_receiving_ssl     "0" -g 6514
-/usr/bin/vconftool set -t string file/private/org.tizen.email/gmail_sending_address   "smtp.gmail.com" -g 6514
-/usr/bin/vconftool set -t int    file/private/org.tizen.email/gmail_sending_port      "465" -g 6514
-/usr/bin/vconftool set -t int    file/private/org.tizen.email/gmail_sending_ssl       "1" -g 6514
-/usr/bin/vconftool set -t int    file/private/org.tizen.email/gmail_receiving_type    "2" -g 6514
-/usr/bin/vconftool set -t string file/private/org.tizen.email/gmail_receiving_address "imap.gmail.com" -g 6514
-/usr/bin/vconftool set -t int    file/private/org.tizen.email/gmail_receiving_port    "993" -g 6514
-/usr/bin/vconftool set -t int    file/private/org.tizen.email/gmail_receiving_ssl     "1" -g 6514
-/usr/bin/vconftool set -t string file/private/org.tizen.email/yahoo_sending_address   "smtp.mail.yahoo.co.kr" -g 6514
-/usr/bin/vconftool set -t int    file/private/org.tizen.email/yahoo_sending_port      "465" -g 6514
-/usr/bin/vconftool set -t int    file/private/org.tizen.email/yahoo_sending_ssl       "1" -g 6514
-/usr/bin/vconftool set -t int    file/private/org.tizen.email/yahoo_receiving_type    "1" -g 6514
-/usr/bin/vconftool set -t string file/private/org.tizen.email/yahoo_receiving_address "pop.mail.yahoo.co.kr" -g 6514
-/usr/bin/vconftool set -t int    file/private/org.tizen.email/yahoo_receiving_port    "995" -g 6514
-/usr/bin/vconftool set -t int    file/private/org.tizen.email/yahoo_receiving_ssl     "1" -g 6514
-/usr/bin/vconftool set -t string file/private/org.tizen.email/hotmail_sending_address   "smtp.live.com" -g 6514
-/usr/bin/vconftool set -t int    file/private/org.tizen.email/hotmail_sending_port      "587" -g 6514
-/usr/bin/vconftool set -t int    file/private/org.tizen.email/hotmail_sending_ssl       "2" -g 6514
-/usr/bin/vconftool set -t int    file/private/org.tizen.email/hotmail_receiving_type    "1" -g 6514
-/usr/bin/vconftool set -t string file/private/org.tizen.email/hotmail_receiving_address "pop3.live.com" -g 6514
-/usr/bin/vconftool set -t int    file/private/org.tizen.email/hotmail_receiving_port    "995" -g 6514
-/usr/bin/vconftool set -t int    file/private/org.tizen.email/hotmail_receiving_ssl     "1" -g 6514
 
 chown -R 5000:5000 %{_pkgdir}/data
 
@@ -133,11 +105,11 @@ ln -sf /usr/bin/ug-client %{_ugdir}/bin/email-composer-efl
 %{_pkgdir}/res/edje/email-mailbox-theme.edj
 %{_pkgdir}/res/locale/*/LC_MESSAGES/*
 %{_pkgdir}/res/images/*
+%{_pkgdir}/res/xml/sp_list.xml
 %{_pkgdir}/bin/email
 %{_pkgdir}/data/_email_default.html
-%{_pkgdir}/res/xml/sp_list.xml
 %{_sharedir}/packages/org.tizen.email.xml
-/opt/usr/share/account/org.tizen.email.account.xml
+/opt/usr/share/account/email-setting-efl.account.xml
 %{_sharedir}/icons/default/small/org.tizen.email.png
 %{_sharedir}/license/%{name}/LICENSE
 

diff --git a/viewer/src/email-viewer-webview.c b/viewer/src/email-viewer-webview.c
index 7cc0dac..edbcad5 100755 (executable)
--- a/viewer/src/email-viewer-webview.c
+++ b/viewer/src/email-viewer-webview.c
@@ -23,8 +23,6 @@
 #include "email-engine.h"
 #include "email-html-converter.h"
 
-static void _webview_script_executed_cb(Evas_Object *o, const char *result, void *data);
-static void _webview_get_html_content_cb(Evas_Object *o, const char *result, void *data);
 static void _webview_load_finished_cb(void *data, Evas_Object *obj, void *event_info);
 static void _webview_load_error_cb(void *data, Evas_Object *obj, void *event_info);
 static void _webview_load_committed_cb(void *data, Evas_Object *obj, void *event_info);
@@ -228,16 +226,6 @@ Eina_Bool viewer_send_message(void *data)
        return EINA_FALSE;
 }
 
-static void _webview_script_executed_cb(Evas_Object *o, const char *result, void *data)
-{
-       debug_log("");
-}
-
-static void _webview_get_html_content_cb(Evas_Object *o, const char *result, void *data)
-{
-       debug_log("");
-}
-
 static Eina_Bool _loading_prog_finish_cb(void *data)
 {
        debug_log("");

diff --git a/viewer/src/email-viewer.c b/viewer/src/email-viewer.c
index f894258..5eb4417 100755 (executable)
--- a/viewer/src/email-viewer.c
+++ b/viewer/src/email-viewer.c
@@ -88,8 +88,6 @@ static void _delete_evas_objects(EmailViewerUGD *ug_data);
 
 /* callback functions */
 static void _back_cb(void *data, Evas_Object *obj, void *event_info);
-static void _prev_mail_cb(void *data, Evas_Object *obj, void *event_info);
-static void _next_mail_cb(void *data, Evas_Object *obj, void *event_info);
 static void _reply_cb(void *data, Evas_Object *obj, void *event_info);
 static void _reply_all_cb(void *data, Evas_Object *obj, void *event_info);
 static void _reply_option_cb(void *data, Evas_Object *obj, void *event_info);
@@ -995,7 +993,6 @@ static void _create_view(EmailViewerUGD *ug_data)
        debug_log("");
 
        Evas_Object *b_btn;
-       EmailViewerProp *prop = ug_data->property;
 
        ug_data->bg = _create_bg(ug_data->win_main);
 
@@ -2752,66 +2749,6 @@ static void _back_cb(void *data, Evas_Object *obj, void *event_info)
        }
 }
 
-static void _prev_mail_cb(void *data, Evas_Object *obj, void *event_info)
-{
-       debug_log("");
-       if (!data) {
-               debug_log("data is NULL");
-               return;
-       }
-
-       /* send next or previous mail request to mailbox. */
-       int ret;
-       service_h service = NULL;
-
-       ret = service_create(&service);
-       debug_log("service_create: %d", ret);
-       if (!service) {
-               debug_log("service create failed");
-               return;
-       }
-
-       ret = service_add_extra_data(service, EMAIL_BUNDLE_KEY_MSG, EMAIL_BUNDLE_VAL_PREV_MSG);
-       debug_log("service_add_extra_data: %d", ret);
-       ret = service_add_extra_data(service, EMAIL_BUNDLE_KEY_DO_DELETE, "0");
-       debug_log("service_add_extra_data: %d", ret);
-
-       ug_send_message(_g_mailbox_ug, service);
-
-       ret = service_destroy(service);
-       debug_log("service_destroy: %d", ret);
-}
-
-static void _next_mail_cb(void *data, Evas_Object *obj, void *event_info)
-{
-       debug_log("");
-       if (!data) {
-               debug_log("data is NULL");
-               return;
-       }
-
-       /* send next or previous mail request to mailbox. */
-       int ret;
-       service_h service = NULL;
-
-       ret = service_create(&service);
-       debug_log("service_create: %d", ret);
-       if (!service) {
-               debug_log("service create failed");
-               return;
-       }
-
-       ret = service_add_extra_data(service, EMAIL_BUNDLE_KEY_MSG, EMAIL_BUNDLE_VAL_NEXT_MSG);
-       debug_log("service_add_extra_data: %d", ret);
-       ret = service_add_extra_data(service, EMAIL_BUNDLE_KEY_DO_DELETE, "0");
-       debug_log("service_add_extra_data: %d", ret);
-
-       ug_send_message(_g_mailbox_ug, service);
-
-       ret = service_destroy(service);
-       debug_log("service_destroy: %d", ret);
-}
-
 static void _reply_cb(void *data, Evas_Object *obj, void *event_info)
 {
        debug_log("");
@@ -4386,13 +4323,6 @@ static void _mbe_unfocused_cb(void *data, Evas_Object *obj, void *event_info)
        debug_log("");
 }
 
-static void _mbe_clicked_cb(void *data, Evas_Object *obj, void *event_info)
-{
-       debug_log("");
-       EmailViewerUGD *ug_data = (EmailViewerUGD *)data;
-       elm_object_focus_set(ug_data->con_popup, EINA_TRUE);
-}
-
 static void _mbe_added_cb(void *data, Evas_Object *obj, void *event_info)
 {
        debug_log("");