From 620d86c8e534aefa5ae9cd6d881241168c5a7751 Mon Sep 17 00:00:00 2001 From: Sungbok Park Date: Mon, 28 Jan 2013 19:42:19 +0900 Subject: [PATCH] fix prevent bugs --- composer/include/email-composer-callback.h | 2 +- composer/src/email-composer-callback.c | 24 ++++++++++-------------- composer/src/email-composer-contents.c | 4 ++-- composer/src/email-composer-util.c | 5 +++-- composer/src/email-composer.c | 5 ++++- 5 files changed, 20 insertions(+), 20 deletions(-) diff --git a/composer/include/email-composer-callback.h b/composer/include/email-composer-callback.h index 86bec99..10318ad 100755 --- a/composer/include/email-composer-callback.h +++ b/composer/include/email-composer-callback.h @@ -27,7 +27,7 @@ void _composer_mbe_deleted_cb(void *data, Evas_Object *obj, void *event_info); void _composer_mbe_selected_cb(void *data, Evas_Object *obj, void *event_info); void _composer_mbe_focused_cb(void *data, Evas_Object *obj, void *event_info); void _composer_mbe_unfocused_cb(void *data, Evas_Object *obj, void *event_info); -Eina_Bool _composer_mbe_verified_item_cb(Evas_Object *obj, const char *item_label, void *item_data, void *data); +Eina_Bool _composer_mbe_verified_item_cb(Evas_Object *obj, const char *item_label, const void *item_data, const void *data); void _composer_mbe_popup_delete_cb(void *data, Evas_Object *obj, void *event_info); void _composer_mbe_popup_edit_cb(void *data, Evas_Object *obj, void *event_info); void _composer_mbe_popup_move_to_to_cb(void *data, Evas_Object *obj, void *event_info); diff --git a/composer/src/email-composer-callback.c b/composer/src/email-composer-callback.c index c45ed50..9b50d1a 100755 --- a/composer/src/email-composer-callback.c +++ b/composer/src/email-composer-callback.c @@ -131,9 +131,9 @@ void _composer_more_toolbar_button_cb(void *data, Evas_Object *obj, void *event_ ugd->context_popup = elm_ctxpopup_add(ugd->main_layout); elm_ctxpopup_direction_priority_set(ugd->context_popup, ELM_CTXPOPUP_DIRECTION_DOWN, - ELM_CTXPOPUP_DIRECTION_UNKNOWN, - ELM_CTXPOPUP_DIRECTION_UNKNOWN, - ELM_CTXPOPUP_DIRECTION_UNKNOWN); + ELM_CTXPOPUP_DIRECTION_UNKNOWN, + ELM_CTXPOPUP_DIRECTION_UNKNOWN, + ELM_CTXPOPUP_DIRECTION_UNKNOWN); elm_object_style_set(ugd->context_popup, "more_button"); evas_object_smart_callback_add(ugd->context_popup, "dismissed", _composer_ctxpopup_dismissed_cb, ugd); @@ -232,9 +232,7 @@ void _composer_mbe_added_cb(void *data, Evas_Object *obj, void *event_info) debug_log(""); EmailComposerUGD *ugd = (EmailComposerUGD *)data; - - Elm_Object_Item *item = (Elm_Object_Item *) event_info; - + Elm_Object_Item *item = (Elm_Object_Item *)event_info; EmailRecpInfo *ri = NULL; bool is_contact_info = false; @@ -246,7 +244,6 @@ void _composer_mbe_added_cb(void *data, Evas_Object *obj, void *event_info) if (addr == NULL) { debug_log("Added - Address is NULL"); - return; } @@ -271,7 +268,6 @@ void _composer_mbe_added_cb(void *data, Evas_Object *obj, void *event_info) } free(addr); - debug_log("email_addr = %s", temp_addr); if (!is_contact_info && !is_always_bcc && !is_from_addr) { @@ -576,7 +572,7 @@ void _composer_mbe_unfocused_cb(void *data, Evas_Object *obj, void *event_info) elm_multibuttonentry_expanded_set(obj, FALSE); } -Eina_Bool _composer_mbe_verified_item_cb(Evas_Object *obj, const char *item_label, void *item_data, void *data) +Eina_Bool _composer_mbe_verified_item_cb(Evas_Object *obj, const char *item_label, const void *item_data, const void *data) { debug_log(""); @@ -2153,10 +2149,10 @@ void _composer_cbar_save_as_draft_clicked(void *data, Evas_Object *obj, void *ev } if (EINA_FALSE == ewk_view_script_execute(ugd->body_ewkview, COMPOSER_JS_GET_LATEST_INFO_CONTENT, _composer_get_latest_info_content_cb, (void *)ugd)) - debug_log("COMPOSER_JS_GET_ORIGINAL_INFO_CONTENT failed."); + debug_log("COMPOSER_JS_GET_LATEST_INFO_CONTENT failed."); if (EINA_FALSE == ewk_view_script_execute(ugd->body_ewkview, COMPOSER_JS_GET_LATEST_HTML_CONTENT, _composer_get_latest_html_content_cb, (void *)ugd)) - debug_log("COMPOSER_JS_GET_ORIGINAL_HTML_CONTENT failed."); + debug_log("COMPOSER_JS_GET_LATEST_HTML_CONTENT failed."); if (EINA_FALSE == ewk_view_plain_text_get(ugd->body_ewkview, _composer_plain_text_get_cb, (void *)ugd)) debug_log("ewk_view_plain_text_get Failed"); @@ -2165,7 +2161,7 @@ void _composer_cbar_save_as_draft_clicked(void *data, Evas_Object *obj, void *ev debug_log("COMPOSER_JS_GET_IMAGE_LIST error."); if (EINA_FALSE == ewk_view_script_execute(ugd->body_ewkview, COMPOSER_JS_GET_LATEST_HTML_CONTENT, _composer_cbar_save_as_draft_cb, (void *)ugd)) - debug_log("COMPOSER_JS_GET_HTML_CONTENT failed."); + debug_log("COMPOSER_JS_GET_LATEST_HTML_CONTENT failed."); } static void _composer_priority_radio_cb(void *data, Evas_Object *obj, void *event_info) @@ -2532,10 +2528,10 @@ void _composer_cbar_send_clicked(void *data, Evas_Object *obj, void *event_info) } if (EINA_FALSE == ewk_view_script_execute(ugd->body_ewkview, COMPOSER_JS_GET_LATEST_INFO_CONTENT, _composer_get_latest_info_content_cb, (void *)ugd)) - debug_log("COMPOSER_JS_GET_ORIGINAL_INFO_CONTENT failed."); + debug_log("COMPOSER_JS_GET_LATEST_INFO_CONTENT failed."); if (EINA_FALSE == ewk_view_script_execute(ugd->body_ewkview, COMPOSER_JS_GET_LATEST_HTML_CONTENT, _composer_get_latest_html_content_cb, (void *)ugd)) - debug_log("COMPOSER_JS_GET_ORIGINAL_HTML_CONTENT failed."); + debug_log("COMPOSER_JS_GET_LATEST_HTML_CONTENT failed."); if (EINA_FALSE == ewk_view_plain_text_get(ugd->body_ewkview, _composer_plain_text_get_cb, (void *)ugd)) debug_log("ewk_view_plain_text_get Failed"); diff --git a/composer/src/email-composer-contents.c b/composer/src/email-composer-contents.c index 6b561a7..5866174 100755 --- a/composer/src/email-composer-contents.c +++ b/composer/src/email-composer-contents.c @@ -295,9 +295,9 @@ static void _composer_webkit_script_executed_cb(Evas_Object *o, const char *resu EmailComposerUGD *ugd = (EmailComposerUGD *)data; if (ewk_view_script_execute(ugd->body_ewkview, COMPOSER_JS_GET_LATEST_HTML_CONTENT, _composer_set_original_html_content_cb, (void *)ugd) == EINA_FALSE) - debug_log("COMPOSER_JS_GET_ORIGINAL_HTML_CONTENT failed."); + debug_log("COMPOSER_JS_GET_LATEST_HTML_CONTENT failed."); if (ewk_view_script_execute(ugd->body_ewkview, COMPOSER_JS_GET_LATEST_INFO_CONTENT, _composer_set_original_info_content_cb, (void *)ugd) == EINA_FALSE) - debug_log("COMPOSER_JS_GET_ORIGINAL_INFO_CONTENT failed."); + debug_log("COMPOSER_JS_GET_LATEST_INFO_CONTENT failed."); if (EINA_FALSE == ewk_view_script_execute(ugd->body_ewkview, COMPOSER_JS_GET_IMAGE_LIST, _composer_get_image_list_cb, (void *)ugd)) { debug_log("COMPOSER_JS_GET_IMAGE_LIST error."); } diff --git a/composer/src/email-composer-util.c b/composer/src/email-composer-util.c index 4f95d92..a919880 100755 --- a/composer/src/email-composer-util.c +++ b/composer/src/email-composer-util.c @@ -45,6 +45,7 @@ #define ADDED_TEXT "%s: %s
\n" #define BODY_TAG_START "\n" #define BODY_TAG_END "\n" +#define HTML_TAG_START "\n" #define HTML_TAG_END "\n" #define DIVIDE_LINE "\n\n-----------------------------------\n" @@ -571,9 +572,9 @@ static void _composer_make_draft_html_content(EmailComposerUGD *ugd, char **html char *latest_html_content = _composer_make_text_with_div_tag(ugd->latest_html_content, 1); if (b_save_to_draft == EINA_TRUE) { - *html_content = g_strconcat(BODY_TAG_START, latest_info_content, latest_html_content, BODY_TAG_END, NULL); + *html_content = g_strconcat(HTML_TAG_START, BODY_TAG_START, latest_info_content, latest_html_content, BODY_TAG_END, HTML_TAG_END, NULL); } else { - *html_content = g_strconcat(BODY_TAG_START, ugd->latest_info_content, ugd->latest_html_content, BODY_TAG_END, HTML_TAG_END, NULL); + *html_content = g_strconcat(HTML_TAG_START, BODY_TAG_START, ugd->latest_info_content, ugd->latest_html_content, BODY_TAG_END, HTML_TAG_END, NULL); } if (latest_info_content) { diff --git a/composer/src/email-composer.c b/composer/src/email-composer.c index fabb818..3b02a83 100755 --- a/composer/src/email-composer.c +++ b/composer/src/email-composer.c @@ -987,7 +987,10 @@ static int _composer_init_service(void *data) COMPOSER_ERROR_TYPE_E ret = COMPOSER_ERROR_NONE; debug_log("contact service begin"); - contacts_connect2(); + if (contacts_connect2() != CONTACTS_ERROR_NONE) { + debug_log("Fail of contacts_connect2 !!!"); + return COMPOSER_ERROR_SERVICE_INIT_FAIL; + } /* DBUS */ if (_composer_dbus_receiver_setup(ugd) < 0) -- 2.7.4