[Telepathy-commits] merge: telepathy-gabble

[Merge Monkey]

Merge to:

  telepathy-gabble

From:

  /home/alban/public_html/darcs/telepathy-gabble-alban-xep0115

Changes:

  Alban Crequy <alban.crequy at collabora.co.uk>
    Fix: also cache the caps set when there is a verification string

  Alban Crequy <alban.crequy at collabora.co.uk>
    Remove bundles strings, use a 3-state enum for caps type

  Alban Crequy <alban.crequy at collabora.co.uk>
    Fix comment: do not say settings cap for a handle when we are setting caps for another handle

  Alban Crequy <alban.crequy at collabora.co.uk>
    XEP-0115: send an hash and reply to disco#hash iq queries

  Alban Crequy <alban.crequy at collabora.co.uk>
    Revert deletion of 'ext' attribute in presence stanza: we need it for backward compatibility

  Alban Crequy <alban.crequy at collabora.co.uk>
    Remove debugs that I did not mean to record

  Alban Crequy <alban.crequy at collabora.co.uk>
    Twisted tests: rename dbus_sync to sync_dbus

  Alban Crequy <alban.crequy at collabora.co.uk>
    When receiving a broken verification string, send the request to another contact if there is one

  Alban Crequy <alban.crequy at collabora.co.uk>
    Reply to disco requests from XEP-0115, both version 1.3 and version 1.5

  Alban Crequy <alban.crequy at collabora.co.uk>
    Use typedef and CamelCase for all types

  Alban Crequy <alban.crequy at collabora.co.uk>
    Remove bogus comment

  Alban Crequy <alban.crequy at collabora.co.uk>
    Move gabble_presence_get_xep0115_hash() in presence.c

  Alban Crequy <alban.crequy at collabora.co.uk>
    Coding style

  Alban Crequy <alban.crequy at collabora.co.uk>
    Coding style

  Alban Crequy <alban.crequy at collabora.co.uk>
    Rename _extract_cap_bundles to _parse_cap_bundles

  Alban Crequy <alban.crequy at collabora.co.uk>
    Implement hash for dataforms

  Alban Crequy <alban.crequy at collabora.co.uk>
    Do not use freed string hash and ver

  Alban Crequy <alban.crequy at collabora.co.uk>
    Fix jingle test: do not assume Gabble has cache for bundles

  Alban Crequy <alban.crequy at collabora.co.uk>
    Use g_str_equal. '==' does not work in C !

  Alban Crequy <alban.crequy at collabora.co.uk>
    Since I moved functions in caps-hash.c, change functions prefix to caps_hash

  Alban Crequy <alban.crequy at collabora.co.uk>
    Fix comment about CAPABILITY_BUNDLE_ENOUGH_TRUST

  Alban Crequy <alban.crequy at collabora.co.uk>
    Fix hash generation

  Alban Crequy <alban.crequy at collabora.co.uk>
    Coding style: remove unneeded spaces

  Alban Crequy <alban.crequy at collabora.co.uk>
    Remove useless assertion on caps_changed_flag

  Alban Crequy <alban.crequy at collabora.co.uk>
    Fix parsing of dataforms (do not include "FORM_TYPE" in the verification string)

  Alban Crequy <alban.crequy at collabora.co.uk>
    Use tp_strdiff instead of g_str_equal

  Alban Crequy <alban.crequy at collabora.co.uk>
    Fix checking the absence of signal

  Alban Crequy <alban.crequy at collabora.co.uk>
    Move hash functions in a new file caps-hash.[ch]

  Alban Crequy <alban.crequy at collabora.co.uk>
    src/caps-hash.c: do not leak str when computing the hash of the verification string

  Alban Crequy <alban.crequy at collabora.co.uk>
    Free temporary structures after hashing caps

  Alban Crequy <alban.crequy at collabora.co.uk>
    Better comment: the hash algorithm is indicated in the original presence stanza

  Alban Crequy <alban.crequy at collabora.co.uk>
    Add test on caps cache

  Alban Crequy <alban.crequy at collabora.co.uk>
    Debugs

  Alban Crequy <alban.crequy at collabora.co.uk>
    Remove print in test suite

  Alban Crequy <alban.crequy at collabora.co.uk>
    Use !tp_strdiff instead of g_str_equal

g_str_equal(suffix, caps_hash) is never executed when suffix is NULL. However,
the code is more readable when using !tp_strdiff().


  Alban Crequy <alban.crequy at collabora.co.uk>
    Implement the hash as required by XEP-0115

  Alban Crequy <alban.crequy at collabora.co.uk>
    Use PACKAGE_STRING instead of hardcoded string

  Alban Crequy <alban.crequy at collabora.co.uk>
    80 columns

  Alban Crequy <alban.crequy at collabora.co.uk>
    Fix loop

  Alban Crequy <alban.crequy at collabora.co.uk>
    Merge conflict resolved: delete file tests/twisted/test-caps-update.py

  Alban Crequy <alban.crequy at collabora.co.uk>
    Use g_slice_free instead of g_slice_free1

  Alban Crequy <alban.crequy at collabora.co.uk>
    Twisted tests: move dbus_sync to servicetest.py

  Alban Crequy <alban.crequy at collabora.co.uk>
    New test for caps: the "can they DoS us?" use-case

  Alban Crequy <alban.crequy at collabora.co.uk>
    Add comment about the Google Talk voice-v1 bundle

  Alban Crequy <alban.crequy at collabora.co.uk>
    Add comment on backward compatibility on feature bundle "voice-v1"

  Alban Crequy <alban.crequy at collabora.co.uk>
    test-caps-hash.py: new test for XEP-0115

  Alban Crequy <alban.crequy at collabora.co.uk>
    Only sha-1 is implemented. Check that the received algorithm name is implemented

  Alban Crequy <alban.crequy at collabora.co.uk>
    Remove unneeded casts

  Alban Crequy <alban.crequy at collabora.co.uk>
    Do not advertise bundle since we use the verification string, except for voice-v1 for compatibility with Gabble 0.2 and Google Talk

  Alban Crequy <alban.crequy at collabora.co.uk>
    comment on GPtrArray. Case field_name

  Alban Crequy <alban.crequy at collabora.co.uk>
    Add comment on identity

  Alban Crequy <alban.crequy at collabora.co.uk>
    Fix the dataform parsing

  Alban Crequy <alban.crequy at collabora.co.uk>
    Check hash when we receive a caps from a contact

  Alban Crequy <alban.crequy at collabora.co.uk>
    Remove print in test suite

  Alban Crequy <alban.crequy at collabora.co.uk>
    Makefile.am: fix conflicts with twisted tests changes

  Alban Crequy <alban.crequy at collabora.co.uk>
    Use tp_strdiff

  Alban Crequy <alban.crequy at collabora.co.uk>
    src/caps-hash.c: split the too long caps_hash_compute_from_lm_node function: use helper function _parse_dataform()

  Alban Crequy <alban.crequy at collabora.co.uk>
    Check the hash containing a XEP-0128 dataform

  Alban Crequy <alban.crequy at collabora.co.uk>
    Fix waiter->ver

  Alban Crequy <alban.crequy at collabora.co.uk>
    Twisted tests: Use False and True instead of 0 and 1 in Python

  Alban Crequy <alban.crequy at collabora.co.uk>
    Coding style and simplification (review from smcv)

  Alban Crequy <alban.crequy at collabora.co.uk>
    When asserting on the absence of D-Bus signal, call synchronously a dummy D-Bus method to be sure to get the signal if any (avoid races)