pidgin/pidgin

Merge with a fair number of conflicts. Nothing too crazy.

2014-01-20, Mark Doliner
77664079d0f0
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.
/** @page core-signals Core Signals
@signals
@signal quitting
@signal uri-handler
@endsignals
@see core.h
<hr>
@signaldef quitting
@signalproto
void (*quitting)();
@endsignalproto
@signaldesc
Emitted when libpurple is quitting.
@endsignaldef
@signaldef uri-handler
@signalproto
gboolean (*uri_handler)(const gchar *proto, const gchar *cmd, GHashTable *params);
@endsignalproto
@signaldesc
Emitted when handling a registered URI.
@param proto The protocol of the URI.
@param cmd The 'command' of the URI.
@param params Any key/value parameters from the URI.
@endsignaldef
*/
// vim: syntax=c.doxygen tw=75 et