commit 8cd279f2dd43b31409a396549195a4144b54c695
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:   Mon Aug 22 11:50:35 2011 +0200

    prepare 3.1.5.1

 NEWS         |   43 +++++++++++++++++++++++++++++++++++++++++++
 configure.ac |    4 ++--
 2 files changed, 45 insertions(+), 2 deletions(-)

commit 2e4efa578faaebb0ef45606080d3586e8e2e739f
Author: Travis Reitter <travis.reitter@collabora.co.uk>
Date:   Mon Jun 27 21:29:31 2011 -0700

    Don't assume that all FolksIndividuals have a corresponding
    EmpathyContact.

    Closes: bgo#653599 - Empathy shouldn't assume all TpfPersonas
    contain a
    valid TpContact

    Signed-off-by: Jonny Lamb <jonnylamb@gnome.org>

 libempathy-gtk/empathy-individual-store.c |   39
 +++++++++++++++++------------
 libempathy-gtk/empathy-individual-view.c  |    3 +-
 2 files changed, 25 insertions(+), 17 deletions(-)

commit d1d3a49fc919ed734b77a6e94afb2d49109182f2
Author: Travis Reitter <travis.reitter@collabora.co.uk>
Date:   Mon Jun 27 14:31:25 2011 -0700

    Don't assume that all TpfPersonas contain valid TpContacts

    Helps: bgo#653599 - Empathy shouldn't assume all TpfPersonas contain a
    valid TpContact

    Signed-off-by: Jonny Lamb <jonnylamb@gnome.org>

 libempathy-gtk/empathy-individual-dialogs.c |    3 +
 libempathy-gtk/empathy-individual-menu.c    |   34 ++++++---
 libempathy-gtk/empathy-individual-store.c   |   57 +++++++++------
 libempathy-gtk/empathy-individual-widget.c  |   46 ++++++++----
 libempathy-gtk/empathy-persona-store.c      |  106
 ++++++++++++++++-----------
 libempathy-gtk/empathy-persona-view.c       |   11 ++-
 libempathy/empathy-contact.c                |    3 +
 libempathy/empathy-individual-manager.c     |   52 ++++++++-----
 libempathy/empathy-utils.c                  |    7 +-
 9 files changed, 203 insertions(+), 116 deletions(-)

commit 358fab1eb85cecb34ca45f492be2e623ab443a5e
Merge: 64cc7e6 fb1f95d
Author: Jonny Lamb <jonny.lamb@collabora.co.uk>
Date:   Mon Aug 22 09:02:54 2011 +0100

    Merge remote-tracking branch 'pochu/preview-position'

commit 64cc7e6fe9b37afbc55fe0c5166132e32ac3f994
Merge: 18f318c 569c338
Author: Jonny Lamb <jonny.lamb@collabora.co.uk>
Date:   Mon Aug 22 09:01:59 2011 +0100

    Merge remote-tracking branch 'pochu/request-message'

commit 18f318c2dc698f416fc9a05587908fa5eb3f96d1
Author: Aron Xu <aronxu@gnome.org>
Date:   Sun Aug 21 15:57:31 2011 +0000

    Update Simplified Chinese translation.

 po/zh_CN.po |  780
 ++++++++++++++++++++++++++++++-----------------------------
 1 files changed, 400 insertions(+), 380 deletions(-)

commit 569c3381242efcb5bc7966825023e890965c0b62
Author: Emilio Pozuelo Monfort <emilio.pozuelo@collabora.co.uk>
Date:   Wed Jun 8 09:55:08 2011 +0100

    Hide the request message entry if it can't be used

    https://bugzilla.gnome.org/show_bug.cgi?id=656934

 libempathy-gtk/empathy-contact-search-dialog.c |   38
 +++++++++++++++++++-----
 1 files changed, 30 insertions(+), 8 deletions(-)

commit 82600285342927b40d8a7b72f0b559b4b14d01a3
Author: Emilio Pozuelo Monfort <emilio.pozuelo@collabora.co.uk>
Date:   Wed Jun 8 09:54:30 2011 +0100

    EmpathyContactListFlags: add _MESSAGE_ADD flag

    https://bugzilla.gnome.org/show_bug.cgi?id=656934

 libempathy/empathy-contact-list.h    |    1 +
 libempathy/empathy-tp-contact-list.c |    4 ++++
 2 files changed, 5 insertions(+), 0 deletions(-)

commit 138759c101a9dd03db74d082d58c43e252e96217
Author: Emilio Pozuelo Monfort <emilio.pozuelo@collabora.co.uk>
Date:   Mon Jun 6 17:13:32 2011 +0100

    Set the scrolled window shadow type to Etched in

    https://bugzilla.gnome.org/show_bug.cgi?id=656934

 libempathy-gtk/empathy-contact-search-dialog.c |    2 ++
 1 files changed, 2 insertions(+), 0 deletions(-)

commit 6afea914d5c915cde2fc3bf660441d8417ffcede
Author: Emilio Pozuelo Monfort <emilio.pozuelo@collabora.co.uk>
Date:   Wed Jun 1 17:26:36 2011 +0100

    Allow to specify the subscription request message

    https://bugzilla.gnome.org/show_bug.cgi?id=656934

 libempathy-gtk/empathy-contact-search-dialog.c |   37
 ++++++++++++++++++++++--
 1 files changed, 34 insertions(+), 3 deletions(-)

commit fb1f95dfba027a0cb62bf94b77a429c5809f47fc
Author: Emilio Pozuelo Monfort <emilio.pozuelo@collabora.co.uk>
Date:   Fri Aug 19 20:01:43 2011 +0100

    CallWindow: correctly position the preview when dragging

    https://bugzilla.gnome.org/show_bug.cgi?id=656887

 src/empathy-call-window.c |    7 ++++++-
 1 files changed, 6 insertions(+), 1 deletions(-)

commit 129f902925f603c163dc66757faf4d22632efe9e
Author: Laurent Bigonville <bigon@bigon.be>
Date:   Fri Aug 19 14:55:25 2011 +0200

    Fix call-event.h detection

    Correctly set the LDFLAGS from EMPATHY_LDFLAGS so AC_CHECK_HEADER can
    find call-event.h

    https://bugzilla.gnome.org/show_bug.cgi?id=656908

 configure.ac |    3 +++
 1 files changed, 3 insertions(+), 0 deletions(-)

commit 376c8299f4c69345fd783b20a8f2f4d8827551bb
Author: Emilio Pozuelo Monfort <emilio.pozuelo@collabora.co.uk>
Date:   Fri Aug 19 13:01:59 2011 +0100

    CameraMenu: don't change the device if it's the current one

    https://bugzilla.gnome.org/show_bug.cgi?id=656885

 src/empathy-camera-menu.c |    9 +++++++++
 1 files changed, 9 insertions(+), 0 deletions(-)

commit 09b8172fb599c1a5dd1971eb4501304915034112
Author: Emilio Pozuelo Monfort <emilio.pozuelo@collabora.co.uk>
Date:   Fri Aug 19 13:42:54 2011 +0100

    Flip the preview in RoundedTexture->paint()

    We can't flip the preview clone that we're dragging because
    of https://bugzilla.gnome.org/show_bug.cgi?id=656894, so
    directly paint it flipped.

    Partly fixes: https://bugzilla.gnome.org/show_bug.cgi?id=656887

 src/empathy-call-window.c     |   19 -------------------
 src/empathy-rounded-texture.c |    4 ++++
 2 files changed, 4 insertions(+), 19 deletions(-)

commit cf84d9a8617e31a5b0a51ed5d56df661ec8f1ede
Author: Emilio Pozuelo Monfort <emilio.pozuelo@collabora.co.uk>
Date:   Fri Aug 19 12:16:05 2011 +0100

    CallWindow: make the preview button reactive

    So it reacts to click events. Otherwise the video preview,
    which is reactive, will get all the events.

    https://bugzilla.gnome.org/show_bug.cgi?id=656888

 src/empathy-call-window.c |    1 +
 1 files changed, 1 insertions(+), 0 deletions(-)

commit b9582cf3bee2de40dc4dbb9b73e0c2d998e25875
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:   Fri Aug 19 12:20:02 2011 +0200

    contact-chooser: use tp_connection_get_account()

    https://bugzilla.gnome.org/show_bug.cgi?id=656866

 libempathy-gtk/empathy-contact-chooser.c |    6 +-----
 1 files changed, 1 insertions(+), 5 deletions(-)

commit 010b9fefd050ad4d4c2627cad084b55573a455a3
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:   Fri Aug 19 12:12:22 2011 +0200

    main-window: use tp_connection_get_account()

    https://bugzilla.gnome.org/show_bug.cgi?id=656866

 src/empathy-main-window.c |   16 ++++------------
 1 files changed, 4 insertions(+), 12 deletions(-)

commit 7684cbad9c0b6f0ac8b9640b1b74e0dafc058e84
Author: Emilio Pozuelo Monfort <emilio.pozuelo@collabora.co.uk>
Date:   Thu Aug 18 18:14:27 2011 +0100

    Reset all the necessary elements when switching cameras

    https://bugzilla.gnome.org/show_bug.cgi?id=656579

 src/empathy-camera-menu.c |    2 ++
 src/empathy-video-src.c   |    4 ++--
 2 files changed, 4 insertions(+), 2 deletions(-)

commit 508b2cd4c64f2a1786a5e969bec208cb867ceb5e
Author: Emilio Pozuelo Monfort <emilio.pozuelo@collabora.co.uk>
Date:   Thu Aug 18 18:13:56 2011 +0100

    CallWindow: make empathy_call_window_play_camera() public

    https://bugzilla.gnome.org/show_bug.cgi?id=656579

 src/empathy-call-window.c |    8 ++++----
 src/empathy-call-window.h |    3 +++
 2 files changed, 7 insertions(+), 4 deletions(-)

commit 08af50eabef5f5a18ced797fd2fd967c08a13198
Author: Emilio Pozuelo Monfort <emilio.pozuelo@collabora.co.uk>
Date:   Wed Aug 17 13:21:40 2011 +0100

    CallWindow: make the rectangles have rounded corners

    https://bugzilla.gnome.org/show_bug.cgi?id=656576

 src/empathy-call-window.c |   26 ++++++++++++--------------
 1 files changed, 12 insertions(+), 14 deletions(-)

commit c1eb12ebde6572a01744a8120440e630c8920d3a
Author: Emilio Pozuelo Monfort <emilio.pozuelo@collabora.co.uk>
Date:   Wed Aug 17 13:20:29 2011 +0100

    Add a rectangle actor with rounded corners

    This is a ClutterCairoTexture subclass and uses Cairo for
    drawing as Cairo is antialiased while Cogl is not.

    https://bugzilla.gnome.org/show_bug.cgi?id=656576

 src/Makefile.am                 |    2 +
 src/empathy-rounded-rectangle.c |  133
 +++++++++++++++++++++++++++++++++++++++
 src/empathy-rounded-rectangle.h |   75 ++++++++++++++++++++++
 3 files changed, 210 insertions(+), 0 deletions(-)

commit b11d6d385735ef43450271d7f07604448f751ce2
Author: Emilio Pozuelo Monfort <emilio.pozuelo@collabora.co.uk>
Date:   Wed Aug 17 12:36:13 2011 +0100

    CallWindow: make the info buttons rounded

    https://bugzilla.gnome.org/show_bug.cgi?id=656576

 src/empathy-call-window.c |   15 +++++++++++----
 1 files changed, 11 insertions(+), 4 deletions(-)

commit 46958ec5bbd485a9875047c367d32deb8ba0aa54
Author: Emilio Pozuelo Monfort <emilio.pozuelo@collabora.co.uk>
Date:   Wed Aug 17 12:20:43 2011 +0100

    CallWindow: round the video preview corners

    https://bugzilla.gnome.org/show_bug.cgi?id=656576

 src/empathy-call-window.c |    3 ++-
 1 files changed, 2 insertions(+), 1 deletions(-)

commit df6a08ae4314e831b437a88edd14c4d8e4eb61c4
Author: Emilio Pozuelo Monfort <emilio.pozuelo@collabora.co.uk>
Date:   Wed Aug 17 12:20:20 2011 +0100

    Add a ClutterTexture subclass with rounded corners

    https://bugzilla.gnome.org/show_bug.cgi?id=656576

 src/Makefile.am               |    2 +
 src/empathy-rounded-texture.c |   69
 +++++++++++++++++++++++++++++++++++++++++
 src/empathy-rounded-texture.h |   63
 +++++++++++++++++++++++++++++++++++++
 3 files changed, 134 insertions(+), 0 deletions(-)

commit 2a15005b42394c72c7c883aa9beff4f8f87b8e26
Author: Emilio Pozuelo Monfort <emilio.pozuelo@collabora.co.uk>
Date:   Fri Aug 19 09:55:04 2011 +0100

    CallWindow: don't hide the toolbar when not in a call

    https://bugzilla.gnome.org/show_bug.cgi?id=656566

 src/empathy-call-window.c |   12 +++++++++++-
 1 files changed, 11 insertions(+), 1 deletions(-)

commit 335d9576a93088c11a44de1cdb9c3884a285d95e
Merge: fb56e32 6b35d5c
Author: Danielle Madeley <danielle.madeley@collabora.co.uk>
Date:   Fri Aug 19 17:33:42 2011 +1000

    Merge branch 'trivia'

commit fb56e32dcdc0ad78c59c3d34d500a24c954a6ab0
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:   Thu Aug 18 17:29:56 2011 +0200

    rely on the factory to prepare TP_CONNECTION_FEATURE_BALANCE

    https://bugzilla.gnome.org/show_bug.cgi?id=656831

 libempathy/empathy-client-factory.c |    3 ++
 src/empathy-main-window.c           |   36
 +++++++---------------------------
 2 files changed, 11 insertions(+), 28 deletions(-)

commit 3f96f6d69d75bef18d372c26df40ab3bbd3628fe
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:   Thu Aug 18 17:20:51 2011 +0200

    tp-chat: rely on the factory to prepare
    TP_CONNECTION_FEATURE_CAPABILITIES

    https://bugzilla.gnome.org/show_bug.cgi?id=656831

 libempathy/empathy-tp-chat.c |   48
 +++++++++++------------------------------
 1 files changed, 13 insertions(+), 35 deletions(-)

commit c9b5bba619706d6b1a45654f845e7722870a25df
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:   Thu Aug 18 17:17:49 2011 +0200

    new-message-dialog: rely on the factory to prepare
    TP_CONNECTION_FEATURE_CAPABILITIES

    https://bugzilla.gnome.org/show_bug.cgi?id=656831

 libempathy-gtk/empathy-new-message-dialog.c |   55
 +++++---------------------
 1 files changed, 11 insertions(+), 44 deletions(-)

commit 686b4e258c29a7adde96606474e81929d62976b1
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:   Thu Aug 18 16:20:44 2011 +0200

    ft-handler: rely on the factory to prepare
    TP_CONNECTION_FEATURE_CAPABILITIES

    https://bugzilla.gnome.org/show_bug.cgi?id=656831

 libempathy/empathy-ft-handler.c |   25 ++++++++-----------------
 1 files changed, 8 insertions(+), 17 deletions(-)

commit 3370401046e7233a98afbe528e9a936fdad18b18
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:   Thu Aug 18 16:13:10 2011 +0200

    new-call-dialog: rely on the factory to prepare
    TP_CONNECTION_FEATURE_CAPABILITIES

    https://bugzilla.gnome.org/show_bug.cgi?id=656831

 libempathy-gtk/empathy-new-call-dialog.c |   61
 ++++++++---------------------
 1 files changed, 17 insertions(+), 44 deletions(-)

commit a87c7313fa5fca97265a533b5613726c5958e9bd
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:   Thu Aug 18 18:07:12 2011 +0200

    individual-widget: rely on the factory to prepare
    TP_CONNECTION_FEATURE_CONTACT_INFO

    https://bugzilla.gnome.org/show_bug.cgi?id=656831

 libempathy-gtk/empathy-individual-widget.c |   96
 ++++++++++------------------
 1 files changed, 35 insertions(+), 61 deletions(-)

commit c428f8a475111473ea9a9dc246ca1d2312f41d8c
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:   Thu Aug 18 14:06:14 2011 +0200

    contact-widget: rely on the factory to prepare
    TP_CONNECTION_FEATURE_CONTACT_INFO

    https://bugzilla.gnome.org/show_bug.cgi?id=656831

 libempathy-gtk/empathy-contact-widget.c |   16 ++++++----------
 libempathy/empathy-client-factory.c     |    3 +++
 2 files changed, 9 insertions(+), 10 deletions(-)

commit 8b69b96e01c9b11ac779dcce99c21a1aa7fba7a3
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:   Thu Aug 18 13:58:53 2011 +0200

    contact-search-dialog: rely on the factory to prepare
    TP_CONNECTION_FEATURE_AVATAR_REQUIREMENTS

    https://bugzilla.gnome.org/show_bug.cgi?id=656831

 libempathy-gtk/empathy-contact-search-dialog.c |   60
 ++++--------------------
 1 files changed, 10 insertions(+), 50 deletions(-)

commit 7cbbd2ee8253dfd69994d83e0dfe1a63c7ca4fd0
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:   Thu Aug 18 12:29:27 2011 +0200

    avatar-chooser: rely on the factory to prepare
    TP_CONNECTION_FEATURE_AVATAR_REQUIREMENTS

    https://bugzilla.gnome.org/show_bug.cgi?id=656831

 libempathy-gtk/empathy-avatar-chooser.c |    6 +-----
 libempathy/empathy-client-factory.c     |    3 +++
 2 files changed, 4 insertions(+), 5 deletions(-)

commit 5a3861854b566ba034bf9ddc2fd581185dcc2ef1
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:   Thu Aug 18 12:28:05 2011 +0200

    account-chooser: rely on the factory to prepare
    TP_CONNECTION_FEATURE_CAPABILITIES,

    Also simplify empathy_account_chooser_filter_supports_chatrooms in the
    process.

    https://bugzilla.gnome.org/show_bug.cgi?id=656831

 libempathy-gtk/empathy-account-chooser.c |   55
 ++++++------------------------
 1 files changed, 11 insertions(+), 44 deletions(-)

commit 5f8f65f8c95b7c01138992190b559e00b0790962
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:   Thu Aug 18 17:42:39 2011 +0200

    ask factory to prepare TP_ACCOUNT_FEATURE_CONNECTION

    So we can rely on the connection returned by
    tp_account_get_connection() to be
    usable right away.

    https://bugzilla.gnome.org/show_bug.cgi?id=656831

 libempathy/empathy-client-factory.c |   18 ++++++++++++++++++
 1 files changed, 18 insertions(+), 0 deletions(-)

commit 6b35d5c27162fdf750a6d1e193e31e51dfe225dd
Author: Danielle Madeley <danielle.madeley@collabora.co.uk>
Date:   Fri Aug 19 17:26:08 2011 +1000

    [log-window] Change Quit for Close

 libempathy-gtk/empathy-log-window.c  |    6 +++---
 libempathy-gtk/empathy-log-window.ui |    4 ++--
 2 files changed, 5 insertions(+), 5 deletions(-)

commit 8cfb78f8251e9cdd663bc92b7cf4e0ce00f0d9e3
Author: Yaron Shahrabani <sh.yaron@gmail.com>
Date:   Thu Aug 18 23:42:36 2011 +0300

    Updated Hebrew translation.

 po/he.po |  620
 ++++++++++++++++++++++++++++++++------------------------------
 1 files changed, 320 insertions(+), 300 deletions(-)

commit 19ce5d04599b6425b59aac6ce0ef4850cfdc9059
Author: Hannie Dumoleyn <hannie@ubuntu-nl.org>
Date:   Thu Aug 18 22:37:30 2011 +0200

    Updated Dutch translation by Hannie Dumoleyn

 po/nl.po | 1239
 +++++++++++++++++++++++++++++++++++---------------------------
 1 files changed, 692 insertions(+), 547 deletions(-)

commit d7650c7ac5c90a7ad615196a8fcef05cafc7a2d6
Author: Andrej Žnidaršič <andrej.znidarsic@gmail.com>
Date:   Thu Aug 18 19:28:15 2011 +0200

    Updated Slovenian translation

 po/sl.po |   46 ++++------------------------------------------
 1 files changed, 4 insertions(+), 42 deletions(-)

commit ddc5879579652ace80965450d98178771a18b210
Author: Emilio Pozuelo Monfort <emilio.pozuelo@collabora.co.uk>
Date:   Thu Aug 18 12:38:52 2011 +0100

    CallWindow: hide the preview button while dragging it

    https://bugzilla.gnome.org/show_bug.cgi?id=656573

 src/empathy-call-window.c |    6 +++++-
 1 files changed, 5 insertions(+), 1 deletions(-)

commit 33dab5dcf04b0f979c91e65373c9a7d89da014b3
Author: Emilio Pozuelo Monfort <emilio.pozuelo@collabora.co.uk>
Date:   Thu Aug 18 12:34:05 2011 +0100

    CallWindow: hide the preview while dragging it

    We show a clone of it moving through the stage, so there's no
    point in showing the main preview at the same time.

    https://bugzilla.gnome.org/show_bug.cgi?id=656573

 src/empathy-call-window.c |    4 ++++
 1 files changed, 4 insertions(+), 0 deletions(-)

commit 3f60db5fb3b3c80440d381e3a8fc1a52e1da700a
Author: Emilio Pozuelo Monfort <emilio.pozuelo@collabora.co.uk>
Date:   Thu Aug 18 12:02:55 2011 +0100

    CallWindow: flip the dragged preview

    Currently disabled as it doesn't work as expected.

    https://bugzilla.gnome.org/show_bug.cgi?id=656573

 src/empathy-call-window.c |   11 +++++++++++
 1 files changed, 11 insertions(+), 0 deletions(-)

commit fe5db93073fa90597d86ae9d1500a6abaf49f3ae
Author: Emilio Pozuelo Monfort <emilio.pozuelo@collabora.co.uk>
Date:   Wed Aug 17 19:03:24 2011 +0100

    CallWindow: make the preview follow the pointer when dragging it

    https://bugzilla.gnome.org/show_bug.cgi?id=656573

 src/empathy-call-window.c |   29 ++++++++++++++++++++++-------
 1 files changed, 22 insertions(+), 7 deletions(-)

commit aba9ae9e811e5cb65745f16450c547362595330c
Author: Emilio Pozuelo Monfort <emilio.pozuelo@collabora.co.uk>
Date:   Thu Aug 18 16:19:38 2011 +0100

    Don't install Call service files if empathy-call is not built

 data/Makefile.am |   12 ++++++++++--
 1 files changed, 10 insertions(+), 2 deletions(-)

commit fb90ae1ed068d4f0f0972b886cb8d1f643bf2f9f
Author: Jonny Lamb <jonny.lamb@collabora.co.uk>
Date:   Wed Aug 17 16:28:39 2011 +0100

    mic-monitor: add set_default function

    Signed-off-by: Jonny Lamb <jonny.lamb@collabora.co.uk>

 src/empathy-mic-monitor.c |   64
 +++++++++++++++++++++++++++++++++++++++++++++
 src/empathy-mic-monitor.h |    5 +++
 2 files changed, 69 insertions(+), 0 deletions(-)

commit e5cd9e64870fbca5bc57d205ba4fe9aadb726614
Author: Jonny Lamb <jonny.lamb@collabora.co.uk>
Date:   Wed Aug 17 15:59:29 2011 +0100

    mic-monitor: add get_default function

    Signed-off-by: Jonny Lamb <jonny.lamb@collabora.co.uk>

 src/empathy-mic-monitor.c |   58
 +++++++++++++++++++++++++++++++++++++++++++++
 src/empathy-mic-monitor.h |    5 ++++
 2 files changed, 63 insertions(+), 0 deletions(-)

commit a719df5e3df6a31d0e629516cffcdfca9436e5ae
Author: Jonny Lamb <jonny.lamb@collabora.co.uk>
Date:   Wed Aug 17 16:04:30 2011 +0100

    mic-menu: don't show the menu if we can't switch microphones

    Signed-off-by: Jonny Lamb <jonny.lamb@collabora.co.uk>

 src/empathy-mic-menu.c |   10 ++++++++--
 1 files changed, 8 insertions(+), 2 deletions(-)

commit 9a93b2732802719b6263b1d314252c7df9c62c1a
Author: Jonny Lamb <jonny.lamb@collabora.co.uk>
Date:   Wed Aug 17 16:01:01 2011 +0100

    audio-src: make supports_changing_mic public

    Signed-off-by: Jonny Lamb <jonny.lamb@collabora.co.uk>

 src/empathy-audio-src.c |    2 +-
 src/empathy-audio-src.h |    2 ++
 2 files changed, 3 insertions(+), 1 deletions(-)

commit cd40005a5e9608fa8e1295b8606788af38100dba
Author: Jonny Lamb <jonny.lamb@collabora.co.uk>
Date:   Wed Aug 17 15:55:32 2011 +0100

    mic-monitor: move the PA-specific stuff from audio-src to here

    Sorry for another big commit.

    Signed-off-by: Jonny Lamb <jonny.lamb@collabora.co.uk>

 src/Makefile.am           |    6 +-
 src/empathy-audio-src.c   |  396 +++++---------------------------
 src/empathy-audio-src.h   |   13 -
 src/empathy-mic-menu.c    |   27 ++-
 src/empathy-mic-monitor.c |  566
 +++++++++++++++++++++++++++++++++++++++++++++
 src/empathy-mic-monitor.h |   80 +++++++
 6 files changed, 724 insertions(+), 364 deletions(-)

commit 956bfcb33c33452f4ce958ae0a7112efb5ccf4a9
Author: Jonny Lamb <jonny.lamb@collabora.co.uk>
Date:   Thu Aug 18 15:56:40 2011 +0100

    chatroom-manager: removed set and unused priv variable

    Signed-off-by: Jonny Lamb <jonny.lamb@collabora.co.uk>

 libempathy/empathy-chatroom-manager.c |    3 ---
 1 files changed, 0 insertions(+), 3 deletions(-)

commit 9ddd25f8589ae0cd5ec8e09c4c012e4ccac6a416
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:   Thu Aug 18 11:31:10 2011 +0200

    Port to new tp-glib client factory

    - EmpathyChannelFactory has been changed to EmpathyClientFactory
    and inherit
    from TpAutomaticClientFactory.
    - We now always use the _with_am variant of TpSimple* constructors
    - We define our own factory as default.
    - Replace empathy_get_account_for_connection() by
    tp_connection_get_account()
    - The factory is passed to EmpathyTpChat and TpyCallChannel
    - Use tp_simple_client_factory_ensure_account() instead of
    tp_account_manager_ensure_account().
    - Rely on the factory to prepare connection features.

    This should ensure that all the TpProxy and TpContact objects
    created in
    Empathy are shared and use EmpathyClientFactory.

    https://bugzilla.gnome.org/show_bug.cgi?id=655799

 libempathy-gtk/empathy-contact-list-view.c |   13 ++-
 libempathy-gtk/empathy-log-window.c        |   17 +--
 libempathy/Makefile.am                     |    4 +-
 libempathy/empathy-channel-factory.c       |  163
 -------------------------
 libempathy/empathy-channel-factory.h       |   58 ---------
 libempathy/empathy-chatroom-manager.c      |   39 ++----
 libempathy/empathy-client-factory.c        |  181
 ++++++++++++++++++++++++++++
 libempathy/empathy-client-factory.h        |   56 +++++++++
 libempathy/empathy-contact.c               |    2 +-
 libempathy/empathy-ft-factory.c            |   15 +--
 libempathy/empathy-message.c               |   12 +-
 libempathy/empathy-tp-chat.c               |    5 +-
 libempathy/empathy-tp-chat.h               |    4 +-
 libempathy/empathy-utils.c                 |   40 ++-----
 libempathy/empathy-utils.h                 |    2 -
 src/empathy-call-factory.c                 |   22 +---
 src/empathy-call-handler.c                 |    7 -
 src/empathy-call-observer.c                |   21 +---
 src/empathy-chat-manager.c                 |   29 +----
 src/empathy-chat-window.c                  |   14 ++-
 src/empathy-event-manager.c                |   30 +----
 src/empathy-streamed-media-factory.c       |   15 +--
 tests/empathy-chatroom-manager-test.c      |   10 +-
 23 files changed, 329 insertions(+), 430 deletions(-)

commit 7fbf3e0c200b0a3c5086fdce0cc19afe48c429bb
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:   Thu Aug 18 10:01:54 2011 +0200

    Depend on telepathy-glib 0.15.5

    Needed for new factory API.

    https://bugzilla.gnome.org/show_bug.cgi?id=655799

 configure.ac |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

commit c99e88c23e6a55d5ad43aa6d0239ccbfff23e8af
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:   Thu Aug 18 10:09:58 2011 +0200

    update git ignore with new build system

 .gitignore    |    2 ++
 m4/.gitignore |   30 +++++++++++++++++++++++++++++-
 po/.gitignore |    7 +++++++
 3 files changed, 38 insertions(+), 1 deletions(-)

commit ecf2cb496e3815a0b54270888e0710b20b47ba0d
Author: A S Alam <aalam@users.sf.net>
Date:   Thu Aug 18 06:44:02 2011 +0530

    update translation for Punjabi

 po/pa.po | 1128
 +++++++++++++++++++++++++++++++++-----------------------------
 1 files changed, 594 insertions(+), 534 deletions(-)

commit 2021c145e0c5eb6aa9eda91d58d54b13007113ad
Merge: d3e8563 dc7080f
Author: Danielle Madeley <danielle.madeley@collabora.co.uk>
Date:   Thu Aug 18 10:10:00 2011 +1000

    Merge branch 'log-window-webview'

commit d3e8563fe9b3d3c0b5ee5f225964b8078e18d1e6
Author: Fran Dieguez <fran@openhost.es>
Date:   Thu Aug 18 02:00:25 2011 +0200

    Updated Galician translations

 help/gl/gl.po | 4319
 +++++++++++++++------------------------------------------
 1 files changed, 1142 insertions(+), 3177 deletions(-)

commit 96174dd10b0fd5f43656d582d5ecb2b4877641a8
Author: Javier Jardón <jjardon@gnome.org>
Date:   Tue Aug 16 17:21:14 2011 +0100

    configure.ac: Generate xz tarballs with ustar format by default

 configure.ac |    6 +++---
 release.py   |    7 ++-----
 2 files changed, 5 insertions(+), 8 deletions(-)

commit 12b920d355e4a8be744cd820dcbf2354f7cd6d49
Author: Javier Jardón <jjardon@gnome.org>
Date:   Tue Aug 16 17:19:04 2011 +0100

    configure.ac: Use upstream gettext instead the glib one

 configure.ac |    5 +++--
 1 files changed, 3 insertions(+), 2 deletions(-)

commit 641eee8befe742a34cd872fc1378cce99622fd90
Author: Javier Jardón <jjardon@gnome.org>
Date:   Tue Aug 16 17:18:03 2011 +0100

    build: Update autotools config a bit

    Replace deprecated autoconf macros
    Use new libtool syntax

 Makefile.am  |    2 +-
 configure.ac |   41 ++++++++++++++++++++++++++---------------
 2 files changed, 27 insertions(+), 16 deletions(-)

commit dc7080f5071a9130bbd9288b50f807b41a5f9864
Author: Danielle Madeley <danielle.madeley@collabora.co.uk>
Date:   Wed Aug 17 15:44:22 2011 +1000

    Use context menu utility in log viewer

 libempathy-gtk/empathy-log-window.c |   30 +++++++++++++++++++++++++-----
 1 files changed, 25 insertions(+), 5 deletions(-)

commit 1ba7c298c282b4775c29c80214009876e943648d
Author: Danielle Madeley <danielle.madeley@collabora.co.uk>
Date:   Wed Aug 17 15:37:09 2011 +1000

    Factor out WebKit context menu as a utility

 libempathy-gtk/empathy-theme-adium.c  |  121
 +----------------------------
 libempathy-gtk/empathy-webkit-utils.c |  136
 +++++++++++++++++++++++++++++++++
 libempathy-gtk/empathy-webkit-utils.h |    6 ++
 3 files changed, 145 insertions(+), 118 deletions(-)

commit 434e50f056b8f3cb5043bf478f2716d7bc2c4cad
Author: Daniel Mustieles <daniel.mustieles@gmail.com>
Date:   Wed Aug 17 01:45:28 2011 +0200

    Updated Spanish translation

 po/es.po |  375
 +++++++++++++++++++++++++++++++++-----------------------------
 1 files changed, 201 insertions(+), 174 deletions(-)

commit afe59f99f61e73298c7020b4eb36e16152df08e7
Author: Fran Dieguez <fran@openhost.es>
Date:   Tue Aug 16 19:17:27 2011 +0200

    Updated Galician translations

 po/gl.po |  390
 +++++++++++++++++++++++++++++++++-----------------------------
 1 files changed, 208 insertions(+), 182 deletions(-)

commit 8e1fa68d047f6e05145815490d37eaaa5c18ec8a
Author: Andika Triwidada <andika@gmail.com>
Date:   Tue Aug 16 21:44:12 2011 +0700

    Updated Indonesian translation

 po/id.po | 2869
 ++++++++++++++++++++++++++++++++++----------------------------
 1 files changed, 1557 insertions(+), 1312 deletions(-)

commit 04fb4922da622924282b8a6321587b89e1168aaf
Author: Kjartan Maraas <kmaraas@gnome.org>
Date:   Tue Aug 16 16:40:39 2011 +0200

    Updated Norwegian bokmål translation.

 po/nb.po |  382
 +++++++++++++++++++++++++++++++++-----------------------------
 1 files changed, 205 insertions(+), 177 deletions(-)

commit 3b7cad12fe7c90afee27e25b97a748e3195d5e88
Author: Emilio Pozuelo Monfort <emilio.pozuelo@collabora.co.uk>
Date:   Tue Aug 16 15:26:44 2011 +0100

    CallWindow: move preview rectangles on top of remote video

 src/empathy-call-window.c |   26 ++++++++++++++++++++++++--
 1 files changed, 24 insertions(+), 2 deletions(-)

commit 775cada033b7430eadee1dedbef519c584b1f81b
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:   Tue Aug 16 16:31:50 2011 +0200

    remove released flag

 configure.ac |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)