[empathy] theme_adium_remove_focus_marks: early return if there is no unread message



commit 0a6ce2b0c136c05fa5395d51517208c041bc392d
Author: Guillaume Desmottes <guillaume desmottes collabora co uk>
Date:   Wed May 11 12:14:53 2011 +0200

    theme_adium_remove_focus_marks: early return if there is no unread message

 libempathy-gtk/empathy-theme-adium.c |   11 +++++++----
 1 files changed, 7 insertions(+), 4 deletions(-)
---
diff --git a/libempathy-gtk/empathy-theme-adium.c b/libempathy-gtk/empathy-theme-adium.c
index 8c3aec8..06410c5 100644
--- a/libempathy-gtk/empathy-theme-adium.c
+++ b/libempathy-gtk/empathy-theme-adium.c
@@ -571,11 +571,17 @@ theme_adium_append_event_escaped (EmpathyChatView *view,
 static void
 theme_adium_remove_focus_marks (EmpathyThemeAdium *theme)
 {
+	EmpathyThemeAdiumPriv *priv = GET_PRIV (theme);
 	WebKitDOMDocument *dom;
 	WebKitDOMNodeList *nodes;
 	guint i;
 	GError *error = NULL;
 
+	if (!priv->has_unread_message)
+		return;
+
+	priv->has_unread_message = FALSE;
+
 	dom = webkit_web_view_get_dom_document (WEBKIT_WEB_VIEW (theme));
 	if (dom == NULL) {
 		return;
@@ -928,10 +934,7 @@ theme_adium_focus_toggled (EmpathyChatView *view,
 	EmpathyThemeAdiumPriv *priv = GET_PRIV (view);
 
 	priv->has_focus = has_focus;
-	if (priv->has_focus) {
-		priv->has_unread_message = FALSE;
-	}
-	else {
+	if (!priv->has_focus) {
 		theme_adium_remove_focus_marks (self);
 	}
 }



[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]