From: Gustavo Noronha Silva <gustavo.noronha@collabora.co.uk>
Date: Tue, 14 Jul 2009 09:30:05 +0000 (+0100)
Subject: Merge branch 'fix-585882'
X-Git-Url: https://git.0d.be/?p=empathy.git;a=commitdiff_plain;h=0e863df2164f231255175745e092c803c56ade2a

Merge branch 'fix-585882'
---

0e863df2164f231255175745e092c803c56ade2a
diff --cc libempathy-gtk/empathy-theme-adium.c
index 37c9f1a5,d5ea2ed5..3b4a895e
--- a/libempathy-gtk/empathy-theme-adium.c
+++ b/libempathy-gtk/empathy-theme-adium.c
@@@ -52,9 -52,9 +52,10 @@@ typedef struct 
  	EmpathySmileyManager *smiley_manager;
  	EmpathyContact       *last_contact;
  	time_t                last_timestamp;
 +	gboolean              last_is_backlog;
  	gboolean              page_loaded;
  	GList                *message_queue;
+ 	gchar                *hovered_uri;
  } EmpathyThemeAdiumPriv;
  
  struct _EmpathyAdiumData {