[Telepathy-commits] merge: telepathy-gabble

[Merge Monkey]

Merge to:

  telepathy-gabble

From:

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

Changes:

  Simon McVittie <simon.mcvittie at collabora.co.uk>
    gabble_connection_advertise_capabilities: rename remove parameter to del to avoid shadowing remove(3)

  Simon McVittie <simon.mcvittie at collabora.co.uk>
    tube-stream check_unix_params: rename socket to socket_address to avoid shadowing socket(2)

  Simon McVittie <simon.mcvittie at collabora.co.uk>
    debug.h: give gabble_debug_set_flags_from_env a proper declaration

  Simon McVittie <simon.mcvittie at collabora.co.uk>
    conn-avatars: make gabble_connection_clear_avatar static

  Simon McVittie <simon.mcvittie at collabora.co.uk>
    Compile with -Wdeclaration-after-statement -Wshadow -Wstrict-prototypes -Wmissing-prototypes -Wmissing-declarations, if available

  Simon McVittie <simon.mcvittie at collabora.co.uk>
    gabble_connection_advertise_capabilities: rename local variable iface to channel_type, to be more descriptive and avoid shadowing a parameter

  Simon McVittie <simon.mcvittie at collabora.co.uk>
    gabble_disco_dispose: remove unnecessary call to tp_get_bus_proxy()

  Simon McVittie <simon.mcvittie at collabora.co.uk>
    conn-olpc: make quark-generating functions static

  Simon McVittie <simon.mcvittie at collabora.co.uk>
    bytestream-factory: make bytestream_id_* static

  Simon McVittie <simon.mcvittie at collabora.co.uk>
    Remove empty statement in definition of GABBLE_DISCO_GET_PRIVATE that caused -Wdeclaration-after-statement warnings

  Simon McVittie <simon.mcvittie at collabora.co.uk>
    _gabble_media_session_remove_streams: Remove unnecessary store of result of a function called for its side-effects

  Simon McVittie <simon.mcvittie at collabora.co.uk>
    conn-presence set_own_status_cb: avoid confusing shadowing

  Simon McVittie <simon.mcvittie at collabora.co.uk>
    gabble_disco_conn_status_changed_cb: fix mixed code/declarations

  Simon McVittie <simon.mcvittie at collabora.co.uk>
    test-handles: make test_handles static

  Simon McVittie <simon.mcvittie at collabora.co.uk>
    GabbleMucChannel properties_disco_cb: remove unnecessary access to priv

  Simon McVittie <simon.mcvittie at collabora.co.uk>
    gabble_presence_update: avoid shadowing

  Simon McVittie <simon.mcvittie at collabora.co.uk>
    Fix minor coding-style nit

  Simon McVittie <simon.mcvittie at collabora.co.uk>
    gabble_tube_dbus_dispose: avoid redundant call to tp_base_connection_get_handles

  Simon McVittie <simon.mcvittie at collabora.co.uk>
    capabilities.h: fix indentation, make capabilities_get_initial_caps a proper declaration by s/()/(void)/

  Simon McVittie <simon.mcvittie at collabora.co.uk>
    vcard-manager patch_vcard_foreach: remove unnecessary storage of the return from a function called for its side-effects

  Simon McVittie <simon.mcvittie at collabora.co.uk>
    extensions/Makefile.am: generate signals-marshal.c in a way that works with -Wmissing-declarations -Wmissing-prototypes

  Simon McVittie <simon.mcvittie at collabora.co.uk>
    gabble_tubes_channel_get_available_stream_tube_types: rename access to access_control to avoid shadowing access(3)

  Simon McVittie <simon.mcvittie at collabora.co.uk>
    Make gabble_disco_dispose, gabble_disco_finalize explicitly static

  Simon McVittie <simon.mcvittie at collabora.co.uk>
    room_jid_verify: rename parameter index to i to avoid shadowing index(3)

  Simon McVittie <simon.mcvittie at collabora.co.uk>
    src/Makefile.am: generate gabble-signals-marshal.c in a way that works with -Wmissing-declarations -Wmissing-prototypes.
Also remove a couple of unused rules.

  Simon McVittie <simon.mcvittie at collabora.co.uk>
    vcard-manager get_error_from_pipeline_reply: make static

  Simon McVittie <simon.mcvittie at collabora.co.uk>
    Don't produce _gabble_media_session_debug unless ENABLE_DEBUG

  Simon McVittie <simon.mcvittie at collabora.co.uk>
    change_password_flags: rename remove to del to avoid shadowing remove(3)

  Simon McVittie <simon.mcvittie at collabora.co.uk>
    gabble_tubes_channel_presence_updated: skip to next <tube> if tube ID is bad

  Simon McVittie <simon.mcvittie at collabora.co.uk>
    gabble_media_factory_iface_close_all: fix mixed code/declarations

  Simon McVittie <simon.mcvittie at collabora.co.uk>
    tubes-channel: avoid shadowing GError *error with GError e

  Simon McVittie <simon.mcvittie at collabora.co.uk>
    gabble_tubes_channel_presence_updated: remove redundant variables

  Simon McVittie <simon.mcvittie at collabora.co.uk>
    GabbleVCardManager delete_request: remove unnecessary call to tp_base_connection_get_handles

  Simon McVittie <simon.mcvittie at collabora.co.uk>
    GabbleMediaFactory: remove no-op constructor

  Simon McVittie <simon.mcvittie at collabora.co.uk>
    _emit_capabilities_changed: rename variables for clarity and to avoid shadowing

  Simon McVittie <simon.mcvittie at collabora.co.uk>
    gabble_tubes_channel_accept_stream_tube: if accepting fails, don't leak the GError

  Simon McVittie <simon.mcvittie at collabora.co.uk>
    olpc_buddy_info_set_activities: remove redundant declaration of GError *error

  Simon McVittie <simon.mcvittie at collabora.co.uk>
    gabble-muc-channel: when error is a boolean, rename it to is_error to avoid shadowing a GError

  Simon McVittie <simon.mcvittie at collabora.co.uk>
    conn-olpc: remove redundant call to tp_base_connection_get_handles (already called at function scope)

  Simon McVittie <simon.mcvittie at collabora.co.uk>
    Remove empty statement from GABBLE_ROSTER_GET_PRIVATE

  Simon McVittie <simon.mcvittie at collabora.co.uk>
    gabble_roster_handle_remove_from_group: Remove unnecessary call to tp_handle_inspect

  Simon McVittie <simon.mcvittie at collabora.co.uk>
    gabble-media-session: make _add_ready_new_streams static

  Simon McVittie <simon.mcvittie at collabora.co.uk>
    gabble_tubes_channel_accept_stream_tube: remove redundant GError* variable

  Simon McVittie <simon.mcvittie at collabora.co.uk>
    tube-stream: make data_to_read_on_socket_cb, listen_cb static

  Simon McVittie <simon.mcvittie at collabora.co.uk>
    lm_message_node_add_build_va: remove unreachable code

  Simon McVittie <simon.mcvittie at collabora.co.uk>
    presence-cache _caps_disco_cb: avoid shadowing

  Simon McVittie <simon.mcvittie at collabora.co.uk>
    gabble-media-session _add_ready_new_streams: add a couple more assertions to make it clearer (or less murky) why the code isn't as buggy as it looks

  Simon McVittie <simon.mcvittie at collabora.co.uk>
    media-factory jingle_info_iq_callback: make static

  Simon McVittie <simon.mcvittie at collabora.co.uk>
    tubes-channel tube_msg_close: remove redundant GError variable

  Simon McVittie <simon.mcvittie at collabora.co.uk>
    gabble_tubes_channel_accept_d_bus_tube: if virtual accept method fails, don't leak the GError

  Simon McVittie <simon.mcvittie at collabora.co.uk>
    tube-channel: make create_new_tube, tube_msg_close static

  Simon McVittie <simon.mcvittie at collabora.co.uk>
    Remove empty statement from accessor macro

  Simon McVittie <simon.mcvittie at collabora.co.uk>
    connection_iq_disco_cb: fix shadowing for clarity

  Simon McVittie <simon.mcvittie at collabora.co.uk>
    lm_message_node_add_build_va: don't shadow argument with local variable