[Telepathy-commits] merge: telepathy-gabble

[Merge Monkey]

Merge to:

  telepathy-gabble

From:

  /home/smcv/public_html/darcs/gabble-smcv

Changes:

  Simon McVittie <simon.mcvittie at collabora.co.uk>
    Fix one remaining use of HAVE_TP_DEBUG_SET_FLAGS

  Simon McVittie <simon.mcvittie at collabora.co.uk>
    Don't #ifdef Loudmouth >= 1.3.2 features, just enable them, now we have a hard dependency

  Simon McVittie <simon.mcvittie at collabora.co.uk>
    _gabble_connection_connect: Wrap "else" body in {} to be consistent with "if" body

  Simon McVittie <simon.mcvittie at collabora.co.uk>
    Add hard dependency on Loudmouth 1.3.2

  Simon McVittie <simon.mcvittie at collabora.co.uk>
    Stop supporting telepathy-glib < 0.7.0

  Simon McVittie <simon.mcvittie at collabora.co.uk>
    Minor coding style fix in main()