Merge branch 'master' into mc5
authorCosimo Cecchi <cosimo.cecchi@collabora.co.uk>
Sat, 1 Aug 2009 08:33:18 +0000 (10:33 +0200)
committerCosimo Cecchi <cosimo.cecchi@collabora.co.uk>
Sat, 1 Aug 2009 08:33:18 +0000 (10:33 +0200)
1  2 
configure.ac
libempathy-gtk/empathy-contact-dialogs.c
libempathy-gtk/empathy-theme-adium.c
libempathy-gtk/empathy-ui-utils.c
src/empathy-chat-window.c
src/empathy.c

diff --cc configure.ac
Simple merge
@@@ -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;
Simple merge
Simple merge
Simple merge
diff --cc src/empathy.c
Simple merge