Merge remote-tracking branch 'pochu/error-dialog'

diff --cc libempathy-gtk/empathy-chat.c
Simple merge

diff --cc libempathy-gtk/empathy-individual-menu.c
Simple merge

diff --cc libempathy/empathy-auth-factory.c
Simple merge

diff --cc src/empathy-chat-manager.c
Simple merge

diff --cc src/empathy-chat-window.c
Simple merge