fixed Nabi issues N_SE-38858, N_SE-38827, N_SE-38894

Change-Id: I1bfe426a56f2b2e33bd6d899887203ea234091eb

diff --git a/src/IntBookmarkPresentationModel.cpp b/src/IntBookmarkPresentationModel.cpp
index c09b1bd..c08130b 100644 (file)
--- a/src/IntBookmarkPresentationModel.cpp
+++ b/src/IntBookmarkPresentationModel.cpp
@@ -809,14 +809,14 @@ BookmarkPresentationModel::GetSearchBookmark(int startIndex, int limit, ArrayLis
        text.Replace(L"'", L"''");
        query.Append(L"SELECT * FROM ");
        query.Append(bookmarkTable);
-       query.Append(L" WHERE (TITLE LIKE '%");
+       query.Append(L" WHERE ((TITLE LIKE '%");
        query.Append(text);
        query.Append("%')");
        query.Append(" OR ");
        query.Append(L"(ADDRESS LIKE '%");
        query.Append(text);
-       query.Append("%')");
-       query.Append(" AND ADDRESS != ''");
+       query.Append("%'))");
+       query.Append(" AND (ADDRESS != '')");
        //Append LIMIT
        if (limit > 0)
        {
@@ -830,7 +830,7 @@ BookmarkPresentationModel::GetSearchBookmark(int startIndex, int limit, ArrayLis
                        query.Append(startIndex);
                }
        }
-
+       AppLog("Query is %ls", query.GetPointer());
        r = BookmarkPresentationModel::ExecuteQuery(query, count);
        TryCatch( r == E_SUCCESS,,"BookmarkPresentationModel::GetSearchBookmark query failed  %s",GetErrorMessage(r));
 

diff --git a/src/IntMainForm.cpp b/src/IntMainForm.cpp
index 858196f..15ae441 100644 (file)
--- a/src/IntMainForm.cpp
+++ b/src/IntMainForm.cpp
@@ -2794,7 +2794,7 @@ MainForm::OnEstimatedProgress(int progress)
 void MainForm::OnFaviconReceived(const Tizen::Graphics::Bitmap& favicon)
 {
        AppLog("MainForm::OnFaviconReceived");
-       if (__pWebViewer != null && __pHistory != null)
+       if (__pWebViewer != null && __pHistory != null && __pWindowInfo != null && (__pWindowInfo->pageUrl.CompareTo(__pHistory->GetHistoryUrl()) == 0))
        {
                HistoryPresentationModel::GetInstance()->UpdateHistoryFavIcon(*__pHistory, *(__pWebViewer->GetFaviconN()));
        }