Sun, 23 Nov 2014 23:20:53 -0500
Merge with release-2.x.y (with a number of conflicts)
* Lots of po files conflicted and I just chose the files from default.
#error "This file is not a valid C code and is not intended to be compiled." /* This file contains some of the macros from other header files as function declarations. This does not make sense in C, but it provides type information for the dbus-analyze-functions.py program, which makes these macros callable by DBUS. */ /* buddylist.h */ gboolean PURPLE_BUDDY_IS_ONLINE(PurpleBuddy *buddy); /* connection.h */ gboolean PURPLE_CONNECTION_IS_CONNECTED(PurpleConnection *connection);