commit cd3533354e318fd0ebeee4dba4491a0b99a0c387
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:   Wed Mar 16 15:45:35 2011 +0100

    prepare 2.33.4

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

commit c81fdc0417476ab122cd3d555095577269c3dd58
Author: Emilio Pozuelo Monfort <emilio.pozuelo@collabora.co.uk>
Date:   Wed Mar 16 13:35:28 2011 +0000

    Log window: grey out accounts without logs

 libempathy-gtk/empathy-log-window.c |   11 +++++++++++
 1 files changed, 11 insertions(+), 0 deletions(-)

commit 3245172e9de4d7eada65f0155c0d5039b3e7b0d6
Author: Emilio Pozuelo Monfort <emilio.pozuelo@collabora.co.uk>
Date:   Wed Mar 16 13:18:06 2011 +0000

    Clear logs: grey out accounts without logs

 libempathy-gtk/empathy-log-window.c |   45
 +++++++++++++++++++++++++++++++++++
 1 files changed, 45 insertions(+), 0 deletions(-)

commit 7f7ef3c33eba6fbef4c3fdd01503db000d6be41e
Author: Emilio Pozuelo Monfort <emilio.pozuelo@collabora.co.uk>
Date:   Wed Mar 16 13:17:19 2011 +0000

    ContactSearch: don't leak a GError

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

commit 6cfff1f1ceaaab0f5baa0d8901cf53af97c6682f
Author: Emilio Pozuelo Monfort <emilio.pozuelo@collabora.co.uk>
Date:   Tue Mar 15 17:25:21 2011 +0000

    AccountChooser: All -> All accounts

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

commit 36f043adbd2baffbd72066184bd95cbcb6663b00
Author: Emilio Pozuelo Monfort <emilio.pozuelo@collabora.co.uk>
Date:   Tue Mar 15 17:19:13 2011 +0000

    Select the same account as in the history window

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

commit 3a84dfc206e7e31b431130e4e8272cc0522eedab
Author: Emilio Pozuelo Monfort <emilio.pozuelo@collabora.co.uk>
Date:   Tue Mar 15 16:40:40 2011 +0000

    Change the 'Delete logs' button to a menu entry

    And make the confirmation dialog let you select one specific
    account, or 'All of them'.

 libempathy-gtk/empathy-log-window.c  |   79 ++++---
 libempathy-gtk/empathy-log-window.ui |  445
 +++++++++++++++++++---------------
 2 files changed, 296 insertions(+), 228 deletions(-)

commit 0e1edc0339c271acada9588f59adc5933d16f4ec
Author: Emilio Pozuelo Monfort <emilio.pozuelo@collabora.co.uk>
Date:   Tue Mar 15 16:40:01 2011 +0000

    Add a empathy_account_chooser_has_all_selected

    So we can know if 'All' is selected in the accounts chooser.

 libempathy-gtk/empathy-account-chooser.c |   24 ++++++++++++++++++++++++
 libempathy-gtk/empathy-account-chooser.h |    1 +
 2 files changed, 25 insertions(+), 0 deletions(-)

commit bd72a338cdb8e91bf24cc82bbfb0b6bfc1cf7b97
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:   Wed Nov 17 20:06:15 2010 +0100

    set do-lost property on the gstrtpjitterbuffer element

 data/element-properties |    3 +++
 1 files changed, 3 insertions(+), 0 deletions(-)

commit 49d46ebf46c683f1aee19ae94abc70a3f3741a7d
Author: David Laban <david.laban@collabora.co.uk>
Date:   Mon Dec 20 15:46:36 2010 +0000

    Also turn off Access Unit Delimiters (aud)

    AUDs are *completely* pointless in RTP and just waste packets/confuse
    people.

 data/element-properties |    1 +
 1 files changed, 1 insertions(+), 0 deletions(-)

commit 7933b216dbc4937f52300aab70d841dbcc114983
Author: Sjoerd Simons <sjoerd.simons@collabora.co.uk>
Date:   Mon Dec 20 15:22:30 2010 +0000

    Turn off sliced-threads, some implementations have problems with
    decoding it

 data/element-properties |    1 +
 1 files changed, 1 insertions(+), 0 deletions(-)

commit 99706ebbfea4df20a95d7e8cfdc13d33eaf4c8b8
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:   Wed Mar 16 11:17:02 2011 +0100

    call-window: Put the details vbox in a scroll window

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

commit 2c4f9f10da3432db913ed9c85b0adb55b0f5704a
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:   Wed Mar 16 09:54:14 2011 +0100

    streamed-media-window: Put the details vbox in a scroll window

    It can require a lot of horizontal space and we don't want to enlarge
    the call
    window just for that (#644830).

 src/empathy-streamed-media-window.c |    9 ++++++++-
 1 files changed, 8 insertions(+), 1 deletions(-)

commit 12b493671971c0a0a73b02bf467f448022ea88b7
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:   Mon Mar 14 15:24:43 2011 +0100

    individual-view: call empathy_individual_manager_remove() also when
    the response is GTK_RESPONSE_YES

    Also, don't remove the contact if the operation has been cancelled in
    empathy_block_individual_dialog_show().

 libempathy-gtk/empathy-individual-view.c |   12 +++++-------
 1 files changed, 5 insertions(+), 7 deletions(-)

commit 251967fd833d753f2f4b30afb437d9cbc43dd89a
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:   Mon Mar 14 14:58:55 2011 +0100

    individual-view: use our own RESPONSE enum

    This code was too confusing when using GTK_RESPONSE_*

 libempathy-gtk/empathy-individual-view.c |   22 ++++++++++++++++------
 1 files changed, 16 insertions(+), 6 deletions(-)

commit cb2741bee8b6808953a6afeea90114f123a47982
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:   Wed Mar 16 10:11:26 2011 +0100

    depends on folks 0.4.0

    This is based on Travis's commits from master.

 configure.ac                                       |    2 +-
 libempathy-gtk/empathy-contact-widget.c            |   17 ++--
 libempathy-gtk/empathy-groups-widget.c             |  114
 ++++++++++----------
 libempathy-gtk/empathy-groups-widget.h             |    8 +-
 libempathy-gtk/empathy-individual-dialogs.c        |    4 +-
 .../empathy-individual-information-dialog.c        |    2 +-
 libempathy-gtk/empathy-individual-menu.c           |    6 +-
 libempathy-gtk/empathy-individual-store.c          |   52 +++++----
 libempathy-gtk/empathy-individual-view.c           |   29 +++---
 libempathy-gtk/empathy-individual-widget.c         |   35 +++---
 libempathy-gtk/empathy-linking-dialog.c            |    2 +-
 libempathy-gtk/empathy-persona-store.c             |   33 +++---
 libempathy-gtk/empathy-ui-utils.c                  |    6 +-
 libempathy/empathy-contact.c                       |   37 ++++---
 libempathy/empathy-individual-manager.c            |   14 ++--
 libempathy/empathy-utils.c                         |    2 +-
 libempathy/empathy-utils.h                         |    2 +-
 17 files changed, 191 insertions(+), 174 deletions(-)

commit 15761dfafa40dce3e5acb2f9fecc5b808fa11e47
Author: Emilio Pozuelo Monfort <emilio.pozuelo@collabora.co.uk>
Date:   Tue Mar 15 19:06:20 2011 +0000

    Don't start the Call when the streams start

    Since that can happen before the call is accepted. Instead of that,
    wait for the Call state to be ACCEPTED.

 src/empathy-call-handler.c |    9 +++++++++
 src/empathy-call-window.c  |   28 +++++++++++++++-------------
 2 files changed, 24 insertions(+), 13 deletions(-)

commit d07f730181b12a13b7af86f9095a7b6c86648e10
Author: Sjoerd Simons <sjoerd.simons@collabora.co.uk>
Date:   Mon Mar 14 18:43:57 2011 +0000

    client file channel file should be Call.DRAFT

 data/Empathy.Call.client |    6 +++---
 1 files changed, 3 insertions(+), 3 deletions(-)

commit 830793cef27543482fb031171f265048f0bd71fc
Author: Emilio Pozuelo Monfort <emilio.pozuelo@collabora.co.uk>
Date:   Mon Mar 14 13:56:03 2011 +0000

    Don't check the style on mx-gtk-light-switch.[ch]

    Since they are imported code.

 libempathy-gtk/Makefile.am |    3 +--
 1 files changed, 1 insertions(+), 2 deletions(-)

commit 8f37a79424dc8bd8b389d3d28a61a9ef28e1978f
Author: Sjoerd Simons <sjoerd.simons@collabora.co.uk>
Date:   Mon Mar 14 13:48:04 2011 +0000

    Add depend on new GStreamer for gst_element_request_pad

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

commit 525107a21db785a0105c68393a148dc1bfaacc4c
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:   Mon Mar 14 14:20:29 2011 +0100

    individual_view_remove_dialog_show: set a mnemonic on the 'Delete
    and Block' button

 libempathy-gtk/empathy-individual-view.c |   15 +++++++++++++--
 1 files changed, 13 insertions(+), 2 deletions(-)

commit 07ecd3f4d9cc71d4192599a89a9c8f45f7958c3e
Author: Sjoerd Simons <sjoerd.simons@collabora.co.uk>
Date:   Mon Mar 14 13:23:19 2011 +0000

    Reject approval if call was hung up during approval

    If an incoming call gets ENDED during our approval stage either we or
    someone else closed it. In that case reject the approval (which will
    claim and close the channel). A future improvement could be to show a
    notification in case this happens

 src/empathy-event-manager.c |   29 +++++++++++++++++++++++++++--
 1 files changed, 27 insertions(+), 2 deletions(-)

commit 84e01611475d67c21b718a35ed5f1b2587b64544
Author: Danielle Madeley <danielle.madeley@collabora.co.uk>
Date:   Mon Mar 14 21:30:10 2011 +1100

    Remove enabled toggle from account-widget

 libempathy-gtk/empathy-account-widget.c |    4 ++++
 1 files changed, 4 insertions(+), 0 deletions(-)

commit 25dadf4cd14de2ce0d39bdb4143e7cdd2631fe9a
Author: Danielle Madeley <danielle.madeley@collabora.co.uk>
Date:   Mon Mar 14 21:24:15 2011 +1100

    Add an enabled switch to the account dialog GtkInfoBar

 src/empathy-accounts-dialog.c |   63
 +++++++++++++++++++++++++++++++++++++++++
 1 files changed, 63 insertions(+), 0 deletions(-)

commit d307a9d0608735925aaa7bd758ee5c5df62f2a0e
Author: Danielle Madeley <danielle.madeley@collabora.co.uk>
Date:   Mon Mar 14 21:08:12 2011 +1100

    Reenable labels in MxGtkLightSwitch

 libempathy-gtk/mx-gtk-light-switch.c |   15 ++++++---------
 1 files changed, 6 insertions(+), 9 deletions(-)

commit 706b0ad396bd569224e28ed45090a3457e0634f8
Author: Danielle Madeley <danielle.madeley@collabora.co.uk>
Date:   Mon Mar 14 20:26:23 2011 +1100

    Import MxGtkLightSwitch from Mx

    Available under the terms of the LGPL 2.1.

 libempathy-gtk/Makefile.am           |    8 +-
 libempathy-gtk/mx-gtk-light-switch.c |  539
 ++++++++++++++++++++++++++++++++++
 libempathy-gtk/mx-gtk-light-switch.h |   71 +++++
 po/POTFILES.in                       |    1 +
 4 files changed, 617 insertions(+), 2 deletions(-)

commit 706bdd3ad6d9c788015a5e8733046e653dcbbd21
Merge: e28558f a340eee
Author: Sjoerd Simons <sjoerd.simons@collabora.co.uk>
Date:   Mon Mar 14 12:57:55 2011 +0000

    Merge branch 'remove-liveadder' into gnome-2-34

commit a340eeee18728a1fc59ddcb641b49537d03dd60a
Author: Sjoerd Simons <sjoerd.simons@collabora.co.uk>
Date:   Mon Mar 14 12:14:32 2011 +0000

    Only distroy the video output if it exists

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

commit b159d5e210b2ffd38d6c0d59f5758e58e7054969
Author: Sjoerd Simons <sjoerd.simons@collabora.co.uk>
Date:   Mon Mar 14 12:14:13 2011 +0000

    Monitor the call state and close the channel when it ends

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

commit 8e5dd810b778a722b0f7d0b8d233ff187547cbbf
Author: Sjoerd Simons <sjoerd.simons@collabora.co.uk>
Date:   Mon Mar 14 11:09:23 2011 +0000

    Lock the hash table contents when using them

 src/empathy-audio-sink.c |   24 +++++++++++++++++++++++-
 1 files changed, 23 insertions(+), 1 deletions(-)

commit e026781c4d7974cc047a823512fb6cb8aa266f17
Author: Sjoerd Simons <sjoerd.simons@collabora.co.uk>
Date:   Mon Mar 14 09:37:43 2011 +0000

    Ensure our bin doesn't change state before being in the hash table

 src/empathy-audio-sink.c |   12 ++++++++++--
 1 files changed, 10 insertions(+), 2 deletions(-)

commit e8a99ac3fc77e2746078b688c208963df5ae19aa
Author: Sjoerd Simons <sjoerd.simons@collabora.co.uk>
Date:   Fri Mar 11 19:02:43 2011 +0000

    Remove live-adder

 src/empathy-call-window.c           |  116
 +++++-----------------------------
 src/empathy-streamed-media-window.c |  119
 +++++------------------------------
 2 files changed, 30 insertions(+), 205 deletions(-)

commit 952d1607e5be84369843eaaee6f1b668330bd9ff
Author: Sjoerd Simons <sjoerd.simons@collabora.co.uk>
Date:   Fri Mar 11 19:01:17 2011 +0000

    Implement request pads for multiple sinks

    Instead of using an live-adder we're moving to using multiple
    pulseaudio
    sinks as pulse can do the right thing (tm). To make this easy for the
    call window have one bin that handles all the juggling of audiosinks
    and
    audio conversion

 src/empathy-audio-sink.c |  274
 ++++++++++++++++++++++++++++++++++++++--------
 src/empathy-audio-sink.h |    2 +
 2 files changed, 230 insertions(+), 46 deletions(-)

commit e28558ffcd25c365ca6992e6e03ce59ec9e8d9fb
Author: Emilio Pozuelo Monfort <emilio.pozuelo@collabora.co.uk>
Date:   Fri Mar 11 14:42:14 2011 +0000

    Add a .client and a .service file for empathy-call

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

 data/Empathy.Call.client                           |   21
 ++++++++++++++++++++
 data/Makefile.am                                   |    9 ++++++-
 ...esktop.Telepathy.Client.Empathy.Call.service.in |    3 ++
 3 files changed, 31 insertions(+), 2 deletions(-)

commit 2bf0786b1afd3e9c9c4bead7d9704ae2c18303fc
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:   Fri Mar 11 12:23:25 2011 +0100

    Empathy.Auth.client: set DelayApprovers (#644475)

 data/Empathy.Auth.client |    3 +++
 1 files changed, 3 insertions(+), 0 deletions(-)

commit d42f413aec2997c59c20e305e1fa0c7f8dae9c2a
Author: Danielle Madeley <danielle.madeley@collabora.co.uk>
Date:   Fri Mar 11 12:05:24 2011 +1100

    Update the wording of the other contact blocking dialog

 libempathy-gtk/empathy-contact-dialogs.c |    7 ++++---
 1 files changed, 4 insertions(+), 3 deletions(-)

commit 20e419d127c87e1c00c1dbe6236ac013090ea319
Author: Danielle Madeley <danielle.madeley@collabora.co.uk>
Date:   Fri Mar 11 11:39:48 2011 +1100

    Reword 'Remove Contact'

    This comes from usability feedback from Canonical

 libempathy-gtk/empathy-individual-view.c |    6 +++---
 1 files changed, 3 insertions(+), 3 deletions(-)

commit 0e3cb52a72f79ff77fa4cf2445c3c3eae4a9cf76
Author: Danielle Madeley <danielle.madeley@collabora.co.uk>
Date:   Fri Mar 11 11:08:06 2011 +1100

    Update the wording of the contact blocking dialog

    Include the list of personas which will not be blocked.

 libempathy-gtk/empathy-individual-dialogs.c |   71
 +++++++++++++++++++++------
 1 files changed, 56 insertions(+), 15 deletions(-)

commit cf3de9d34d649a4b4711224ff581710542de3bab
Author: Emilio Pozuelo Monfort <emilio.pozuelo@collabora.co.uk>
Date:   Thu Mar 10 16:50:39 2011 +0000

    Display Upgrade Software errors

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

 libempathy/empathy-utils.c |    2 +
 src/empathy-main-window.c  |  134
 ++++++++++++++++++++++++++++++++++++++++++++
 2 files changed, 136 insertions(+), 0 deletions(-)

commit 4dec7a70c17c13a8f731972bca83ed6903746c95
Author: Emilio Pozuelo Monfort <emilio.pozuelo@collabora.co.uk>
Date:   Thu Mar 10 15:12:15 2011 +0000

    Check for TP_ERROR_EMERGENCY_CALLS_NOT_SUPPORTED when a call fails

 libempathy-gtk/empathy-call-utils.c |    2 ++
 1 files changed, 2 insertions(+), 0 deletions(-)

commit fe8febb3a87c87a2ccdc5ad452b18f0d6c4f3017
Author: Emilio Pozuelo Monfort <emilio.pozuelo@collabora.co.uk>
Date:   Thu Mar 10 13:43:08 2011 +0000

    Bump tp-glib requirement for the new errors

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

commit b282a16c129b5fd965217146d149df85b69b094a
Author: Emilio Pozuelo Monfort <emilio.pozuelo@collabora.co.uk>
Date:   Thu Mar 10 12:02:27 2011 +0000

    Fix a couple of 'may be used uninitialized' warnings

 libempathy-gtk/empathy-contact-list-view.c |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

commit 0fbfa19469d0ace2b6ac0b11e2176a1088fef64b
Author: Sjoerd Simons <sjoerd.simons@collabora.co.uk>
Date:   Wed Mar 9 18:33:02 2011 +0000

    media_type is of type FsMediaType, so use that enum to compare

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

commit e619a7b070c4e7b19d2398068eca480887e82ce0
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:   Wed Mar 9 11:47:12 2011 +0100

    remove released flag

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