[Telepathy-commits] merge: telepathy-glib

[Merge Monkey]

Merge to:

  telepathy-glib

From:

  /home/smcv/public_html/darcs/tp-glib-smcv-trivia

Changes:

  Simon McVittie <simon.mcvittie at collabora.co.uk>
    TpTextMixin: prototype _pending_get_alloc correctly

  Simon McVittie <simon.mcvittie at collabora.co.uk>
    TpPresenceMixin: don't shadow index() from string.h

  Simon McVittie <simon.mcvittie at collabora.co.uk>
    TpPresenceMixin: don't shadow time()

  Simon McVittie <simon.mcvittie at collabora.co.uk>
    TpGroupMixin: don't shadow remove() from stdlib.h

  Simon McVittie <simon.mcvittie at collabora.co.uk>
    telepathy-glib/Makefile.am: fix compilation of signals-marshal.c with -Wmissing-prototypes -Wmissing-declarations -Wstrict-prototypes

  Simon McVittie <simon.mcvittie at collabora.co.uk>
    configure.ac: build with some extra warnings

  Simon McVittie <simon.mcvittie at collabora.co.uk>
    examples/extensions/: fix compilation with -Wmissing-prototypes -Wmissing-declarations -Wstrict-prototypes

  Simon McVittie <simon.mcvittie at collabora.co.uk>
    TpPropertiesMixin: don't shadow remove()

  Simon McVittie <simon.mcvittie at collabora.co.uk>
    TpDynamicHandleRepo: prototype handle_priv_new correctly

  Simon McVittie <simon.mcvittie at collabora.co.uk>
    TpConnectionManager: fix shadowing with two variables called iter (fixes compilation with -Wshadow)

  Simon McVittie <simon.mcvittie at collabora.co.uk>
    TpPresenceMixin: fix C99ism

  Simon McVittie <simon.mcvittie at collabora.co.uk>
    dbus.c: include dbus-internal.h to verify that prototypes match