From: Hyerim Bae <hyerim.bae@samsung.com>
Date: Wed, 29 Aug 2012 05:36:32 +0000 (+0900)
Subject: [Title] The favicon is displayed when cancel edit mode.
X-Git-Tag: 2.0_alpha~51
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=dd28b5ef1597d2358d992a7068ce0fcec3d489fb;p=profile%2Fcommon%2Fapps%2Fweb%2Fbrowser.git

[Title] The favicon is displayed when cancel edit mode.

[Issue#] N_SE-7753
[Problem] The favicon is displayed when cancel edit mode.
[Cause] The source code is not syncronized with master branch.
[Solution] Syncronize with master branch.
[Team] Browser UI
[Developer] hyerim.bae
[Request] N/A

Change-Id: I4898e82641fc4858f301e115be2312ebf1d3dc4b
---

diff --git a/src/browser-view/browser-view.cpp b/src/browser-view/browser-view.cpp
index 82b9a8f6..c42f01b2 100755
--- a/src/browser-view/browser-view.cpp
+++ b/src/browser-view/browser-view.cpp
@@ -2991,11 +2991,9 @@ void Browser_View::_set_edit_mode(edit_mode mode)
 				if (m_focused_window->m_favicon)
 					edje_object_signal_emit(elm_layout_edje_get(m_url_entry_layout),
 											"show,favicon,signal", "");
-				_set_secure_icon();
-			}
-			if (m_focused_window->m_option_header_favicon) {
-				edje_object_signal_emit(elm_layout_edje_get(m_option_header_url_entry_layout),
-										"show,favicon,signal", "");
+				if (m_focused_window->m_option_header_favicon)
+					edje_object_signal_emit(elm_layout_edje_get(m_option_header_url_entry_layout),
+											"show,favicon,signal", "");
 				_set_secure_icon();
 			}