[empathy: 2/2] Merge branch 'fix-585882'

[Gustavo Noronha Silva <gns src gnome org>]

commit 0e863df2164f231255175745e092c803c56ade2a
Merge: 69a72d6... c157ac3...
Author: Gustavo Noronha Silva <gustavo noronha collabora co uk>
Date:   Tue Jul 14 10:30:05 2009 +0100

    Merge branch 'fix-585882'

 libempathy-gtk/empathy-theme-adium.c |   94 ++++++++++++++++++++++++++++++++--
 1 files changed, 90 insertions(+), 4 deletions(-)
---
diff --cc libempathy-gtk/empathy-theme-adium.c
index 37c9f1a,d5ea2ed..3b4a895
--- 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 {