Merge with a fair number of conflicts. Nothing too crazy.
I didn't merge a lot of changes from 07e827917960
libpurple/protocols/gg/gg.c I think maybe that code has either been
removed or changed significantly in main.
/* This file contains macros that wrap calls to the purple dbus module.
These macros call the appropriate functions if the build includes
dbus support and do nothing otherwise. See "dbus-server.h" for