changes for the new email-service

diff --git a/account/src/email-account-folder.c b/account/src/email-account-folder.c
index 7b87d5a..d0f2970 100755 (executable)
--- a/account/src/email-account-folder.c
+++ b/account/src/email-account-folder.c
@@ -665,7 +665,7 @@ static gboolean _check_duplicated_node(GNode *node, gpointer data)
        gchar *foler_name = g_strdup(vector2[vlen2-1]);
        gchar* retval = g_strdup(ug_data->traverse_compare_mlist->mailbox_name);
        gchar* ptr = NULL;
-       ptr = g_strstr_len(retval, -1, foler_name);
+       ptr = g_strrstr_len(retval, -1, foler_name);
        if (ptr != NULL && vlen > 1 && vlen2 > 1){
                gchar* temp = g_strndup(retval, ptr-retval-1);
                b_search_parent = TRUE;

diff --git a/common/src/email-engine.c b/common/src/email-engine.c
index 82d3bf0..9177496 100755 (executable)
--- a/common/src/email-engine.c
+++ b/common/src/email-engine.c
@@ -333,7 +333,7 @@ gboolean email_engine_get_default_account(gint *account_id)
        return TRUE;
 }
 
-gboolean email_engine_sync_folder(gint account_id, int mailbox_id, unsigned *handle)
+gboolean email_engine_sync_folder(gint account_id, int mailbox_id, int *handle)
 {
        debug_log("");
 
@@ -361,7 +361,7 @@ gboolean email_engine_sync_folder(gint account_id, int mailbox_id, unsigned *han
        return res;
 }
 
-void email_engine_stop_working(gint account_id, unsigned handle)
+void email_engine_stop_working(gint account_id, int handle)
 {
        debug_log("");
 
@@ -442,7 +442,7 @@ int email_engine_check_body_download(int mail_id)
        return res;
 }
 
-gboolean email_engine_body_download(gint account_id, gint mail_id, unsigned *handle)
+gboolean email_engine_body_download(gint account_id, gint mail_id, int *handle)
 {
        debug_log("");
        RETURN_VAL_IF_FAIL(account_id > ACCOUNT_MIN, FALSE);