[Telepathy] merge: telepathy-gabble

[Merge Monkey]

Merge to:

  telepathy-gabble

From:

  telepathy-gabble-olpc2

Changes:

  Dafydd Harries <dafydd.harries at collabora.co.uk>
    autogen.sh: fix update-spec-gen-am.sh invocation

  Simon McVittie <simon.mcvittie at collabora.co.uk>
    conn-olpc.h: Use the "official" extensions.h

  Dafydd Harries <dafydd.harries at collabora.co.uk>
    copy code generation tools from telepathy-glib in order to build extensions

  Guillaume Desmottes <guillaume.desmottes at collabora.co.uk>
    include conn-olpc.h first

  Dafydd Harries <dafydd.harries at collabora.co.uk>
    OLPC properties: adapt bas64_encode call to revised interface

  Guillaume Desmottes <guillaume.desmottes at collabora.co.uk>
    use new base64_encode API in conn-avatars

  Guillaume Desmottes <guillaume.desmottes at collabora.co.uk>
    make base64_encode take length + gchar * instead of GString

  Simon McVittie <simon.mcvittie at collabora.co.uk>
    src/gabble-connection.c: Use the interface-name strings generated in extensions/

  Dafydd Harries <dafydd.harries at collabora.co.uk>
    define namespaces for OLPC Jabber extensions

  Guillaume Desmottes <guillaume.desmottes at collabora.co.uk>
    add lm_message_node_extract_properties and lm_message_node_add_children_from_properties in utility functions (re-recored)

  Dafydd Harries <dafydd.harries at collabora.co.uk>
    add libgabble-extensions to libgabble-convenience

  Dafydd Harries <dafydd.harries at collabora.co.uk>
    build OLPC/PubSub code

  Dafydd Harries <dafydd.harries at collabora.co.uk>
    extensions/_gen is boring

  Dafydd Harries <dafydd.harries at collabora.co.uk>
    define OLPC capability bundle

  Dafydd Harries <dafydd.harries at collabora.co.uk>
    add OLPC interface implementation

  Dafydd Harries <dafydd.harries at collabora.co.uk>
    include extensions/ in build

  Simon McVittie <simon.mcvittie at collabora.co.uk>
    src/Makefile.am: make sure we can use generated headers

  Dafydd Harries <dafydd.harries at collabora.co.uk>
    add extensions/ directory with OLPC interface XML

  Guillaume Desmottes <guillaume.desmottes at collabora.co.uk>
    set GABBLE_IFACE as prefix for extensions interfaces

  Guillaume Desmottes <guillaume.desmottes at collabora.co.uk>
    s/previoulsy/previously

  Guillaume Desmottes <guillaume.desmottes at collabora.co.uk>
    conn-olpc.h: fix functions declarations style

  Dafydd Harries <dafydd.harries at collabora.co.uk>
    remove lying comment from extensions/Makefile.am

  Dafydd Harries <dafydd.harries at collabora.co.uk>
    add debug flag for OLPC code

  Guillaume Desmottes <guillaume.desmottes at collabora.co.uk>
    move pubsub event cb from gabble-connection.c to pubsub.c

  Dafydd Harries <dafydd.harries at collabora.co.uk>
    add extensions/Makefile.am

  Simon McVittie <simon.mcvittie at collabora.co.uk>
    Generate list of GabbleSvc* headers, and also enums and interface strings. Fix "make distcheck" in extensions directory.

  Guillaume Desmottes <guillaume.desmottes at collabora.co.uk>
    conn-olpc: use new mapping XML <--> HashTable functions from util.c

  Dafydd Harries <dafydd.harries at collabora.co.uk>
    use tp_g_value_slice_free instead of our own function

  Dafydd Harries <dafydd.harries at collabora.co.uk>
    let tp_handle_is_valid set an error for us, rather than creating our own

  Dafydd Harries <dafydd.harries at collabora.co.uk>
    support PEP nicknames

  Dafydd Harries <dafydd.harries at collabora.co.uk>
    host comment

  Dafydd Harries <dafydd.harries at collabora.co.uk>
    add pubsub support code

  Dafydd Harries <dafydd.harries at collabora.co.uk>
    GabbleConnection: hook up OLPC/PubSub code

  Dafydd Harries <dafydd.harries at collabora.co.uk>
    autogen.sh: bootstrap extensions/ code generation