[Telepathy-commits] merge: telepathy-haze

[Merge Monkey]

Merge to:

  telepathy-haze

From:

  telepathy-haze-tp-glib-0.7

Changes:

  Will Thompson <will at willthompson.co.uk>
    The parameter names don't need to be strduped when used as hash keys.

  Will Thompson <will at willthompson.co.uk>
    Bring haze.manager up to date.

  Will Thompson <will at willthompson.co.uk>
    Depend on new enough telepathy-glib to support set_param

  Will Thompson <will at willthompson.co.uk>
    Merge the purple_accounts_add patch.

  Will Thompson <will.thompson at collabora.co.uk>
    Resolve conflict.

  Will Thompson <will at willthompson.co.uk>
    Add a parameter renaming map to HazeProtocolInfo, and use it to set parameter names.

  Will Thompson <will at willthompson.co.uk>
    Add user_data to "account" and "password" ParamSpecs in _build_paramspecs
Fixes a null pointer dereference when you try to connect.

  Will Thompson <will at willthompson.co.uk>
    Sort the manager file.

  Will Thompson <will.thompson at collabora.co.uk>
    Use DEBUG rather than g_debug.

  Will Thompson <will at willthompson.co.uk>
    Remove obsolete static TpCMParamSpec array.

  Will Thompson <will at willthompson.co.uk>
    Set any option from prpl_info->protocol_options that appears in the parameters hash.
This breaks setting a server on XMPP.  This will be fixed shortly.

  Will Thompson <will at willthompson.co.uk>
    Store RequestConnection parameters in a hash, and pass that to HazeConnection.
This lays the ground for dealing with whatever random parameters random
prpls might need.

  Will Thompson <will at willthompson.co.uk>
    Use setter_data as the key for parameters hashes.

  Will Thompson <will at willthompson.co.uk>
    Make a parameter list from the prpl's options, not from a hardcoded list of potential lies.

  Will Thompson <will at willthompson.co.uk>
    Standardize character set properties as 'charset'

  Will Thompson <will.thompson at collabora.co.uk>
    Improve documentation of _build_paramspecs().

  Will Thompson <will at willthompson.co.uk>
    update haze.manager to reflect reality

  Will Thompson <will.thompson at collabora.co.uk>
    Depend on tp-glib 0.7 now that it's released.

  Will Thompson <will at willthompson.co.uk>
    Salut has first-name and last-name parameters; rename first and last to match

  Will Thompson <will.thompson at collabora.co.uk>
    Replace underscores with hyphens in parameter names.