[empathy/mc5: 238/483] Merge branch 'master' into mc5

[Sjoerd Simons <sjoerds src gnome org>]

commit 8dcbfe163b293dda9bc0481e846db3bdd4e0ea98
Merge: 3e8f251... c62744a...
Author: Cosimo Cecchi <cosimo cecchi collabora co uk>
Date:   Sat Aug 1 10:33:18 2009 +0200

    Merge branch 'master' into mc5

 NEWS                                        |   34 +
 configure.ac                                |   10 +-
 data/empathy.desktop.in.in                  |    6 +-
 data/empathy.schemas.in                     |    2 +-
 empathy.doap                                |    4 +-
 help/C/empathy.xml                          |    2 +-
 libempathy-gtk/empathy-conf.h               |    1 +
 libempathy-gtk/empathy-contact-dialogs.c    |    3 +-
 libempathy-gtk/empathy-contact-list-store.c |    5 +-
 libempathy-gtk/empathy-contact-widget.c     |    4 +
 libempathy-gtk/empathy-theme-adium.c        |   84 +-
 libempathy-gtk/empathy-ui-utils.c           |    4 +-
 po/LINGUAS                                  |    1 +
 po/et.po                                    | 1917 +++++++++++++++++++++++++++
 po/zh_CN.po                                 |  207 ++--
 src/empathy-call-window.c                   |    6 +-
 src/empathy-chat-window.c                   |    7 +-
 src/empathy.c                               |    2 +-
 18 files changed, 2135 insertions(+), 164 deletions(-)
---
diff --cc libempathy-gtk/empathy-contact-dialogs.c
index 725011c,0ec8c8e..ad466da
--- a/libempathy-gtk/empathy-contact-dialogs.c
+++ b/libempathy-gtk/empathy-contact-dialogs.c
@@@ -337,12 -339,9 +337,13 @@@ can_add_contact_to_account (EmpathyAcco
  	if (connection == NULL)
  		return FALSE;
  
 +	if (connection == NULL) {
 +		return FALSE;
 +	}
 +
  	contact_manager = empathy_contact_manager_dup_singleton ();
- 	result = empathy_contact_manager_get_flags_for_connection (contact_manager, connection) & EMPATHY_CONTACT_LIST_CAN_ADD;
+ 	result = empathy_contact_manager_get_flags_for_connection (
+ 		contact_manager, connection) & EMPATHY_CONTACT_LIST_CAN_ADD;
  	g_object_unref (contact_manager);
  
  	return result;