commit e2637fcafa862b69129027d9d79374b4309abe47
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:   Mon Dec 20 16:42:17 2010 +0100

    prepare 2.91.4 release

 NEWS         |   25 +++++++++++++++++++++++++
 configure.ac |    6 +++---
 2 files changed, 28 insertions(+), 3 deletions(-)

commit 385cc631f856d933724aa5c726dfd956fc28bed0
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 0cefa514f4e3be2572576acc017219991328ec61
Author: Mattias Põldaru <mahfiaz gmail com>
Date:   Mon Dec 20 14:13:30 2010 +0200

    [l10n] Updated Estonian translation

 po/et.po |   96
 +++++++++++++++++++++++++++++++++++++++++--------------------
 1 files changed, 64 insertions(+), 32 deletions(-)

commit 98cdd44dfc25ca3424924fbaffaf131d0a65cf19
Author: Kristjan SCHMIDT <kristjan.schmidt@googlemail.com>
Date:   Sun Dec 19 14:26:49 2010 +0100

    Updated Esperanto translation

 po/eo.po | 2453
 ++++++++++++++++++++++++++++++++++++++------------------------
 1 files changed, 1498 insertions(+), 955 deletions(-)

commit cd1ac335ab5c0a76ee0b1a2148a0997be91a0ea1
Author: Yaron Shahrabani <sh.yaron@gmail.com>
Date:   Sun Dec 19 01:00:22 2010 +0200

    Updated Hebrew translation.

 po/he.po |  249
 ++++++++++++++++++++++++++++++++++----------------------------
 1 files changed, 136 insertions(+), 113 deletions(-)

commit 1a864c32e5c194f3ee07e5fa4874e97cbb0f5900
Author: Daniel Mustieles <daniel.mustieles@gmail.com>
Date:   Sat Dec 18 09:50:13 2010 +0100

    Updated Spanish Translation

 po/es.po |   14 +++++---------
 1 files changed, 5 insertions(+), 9 deletions(-)

commit bcccb4db182e39ab9fed47f83fe90acae4bd1ef6
Author: Kjartan Maraas <kmaraas@gnome.org>
Date:   Fri Dec 17 13:18:20 2010 +0100

    Updated Norwegian bokmål translation

 po/nb.po |  360
 +++++++++++++++++++++++++++++++++-----------------------------
 1 files changed, 194 insertions(+), 166 deletions(-)

commit 0bc496f9399912f0ed4f73aa55a335a340246d3b
Author: Jonny Lamb <jonnylamb@gnome.org>
Date:   Fri Dec 17 10:05:00 2010 +0000

    password-dialog: make OK insensitive unless there's a password set

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

 libempathy-gtk/empathy-password-dialog.c |   17 ++++++++++++-----
 1 files changed, 12 insertions(+), 5 deletions(-)

commit e007679385406659e5653f3b80d566c1d964535e
Author: Sjoerd Simons <sjoerd.simons@collabora.co.uk>
Date:   Fri Dec 17 10:05:55 2010 +0000

    Make empathy-persona-view include empathy-ui-utils

 libempathy-gtk/empathy-persona-view.c |    1 +
 1 files changed, 1 insertions(+), 0 deletions(-)

commit a482e027803c3f83dfb02f113d3bd5e15e22588c
Author: Daniel Mustieles <daniel.mustieles@gmail.com>
Date:   Wed Dec 15 22:09:31 2010 +0100

    Updated Spanish translation

 po/es.po |  372
 ++++++++++++++++++++++++++++++++++----------------------------
 1 files changed, 206 insertions(+), 166 deletions(-)

commit 119cc5f2451bac0ef8eec82a8ea746846327be0b
Merge: d55a1e7 b10823a
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:   Wed Dec 15 17:01:37 2010 +0100

    Merge branch 'gtk-style-636654'

commit b10823a453d7189c1b3515a8bd075a91d91e796b
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:   Wed Dec 15 16:56:32 2010 +0100

    depends on GTK+ 2.91.6 as we use the new style API

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

commit 91aa125dff5bbd4e967aa4cbec4892b4158c2f5b
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:   Wed Dec 15 16:50:52 2010 +0100

    remove useless paranthesis

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

commit 30f5f6ea4a935eaa5d68f9d68998bee4b5d1bcbb
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:   Wed Dec 15 14:55:29 2010 +0100

    persona-view: use new GTK+ style API (#636500)

 libempathy-gtk/empathy-persona-view.c |   21 ++++++++++-----------
 1 files changed, 10 insertions(+), 11 deletions(-)

commit 4b9243dc87b1e8659c3349d54c0f86b77c677876
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:   Wed Dec 15 14:53:11 2010 +0100

    individual-view: use new GTK+ style API (#636500)

 libempathy-gtk/empathy-individual-view.c |   21 ++++++++++-----------
 1 files changed, 10 insertions(+), 11 deletions(-)

commit f77a1b3b6b3ffa4b47cf2e3cfab2f25f8383a3c1
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:   Wed Dec 15 14:46:24 2010 +0100

    contact-list-view: use new GTK+ style API (#636500)

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

commit 676e1f544d851935cb2dc7781f4a5ff39c366b2f
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:   Wed Dec 15 14:43:31 2010 +0100

    factor out empathy_make_color_whiter()

 libempathy-gtk/empathy-account-widget.c |    5 +----
 libempathy-gtk/empathy-ui-utils.c       |   10 ++++++++++
 libempathy-gtk/empathy-ui-utils.h       |    3 +++
 3 files changed, 14 insertions(+), 4 deletions(-)

commit 46f7d3a0152fd23d15c707d851e9b1889fc512f0
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:   Wed Dec 15 14:28:19 2010 +0100

    account-widget: use new GTK+ style API (#636500)

 libempathy-gtk/empathy-account-widget.c |   28
 ++++++++++++++++------------
 1 files changed, 16 insertions(+), 12 deletions(-)

commit 554b78890fd7c8c2b392c335ab3f49c7bc756b8a
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:   Tue Dec 7 09:53:48 2010 +0100

    status-preset-dialog: use new GTK+ style API (#636500)

 libempathy-gtk/empathy-status-preset-dialog.c |    8 ++++----
 1 files changed, 4 insertions(+), 4 deletions(-)

commit 3951d3a3c1a7181bee75cc963711ea1900949c02
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:   Tue Dec 7 09:52:40 2010 +0100

    chat-text-view: use new GTK+ style API (#636500)

 libempathy-gtk/empathy-chat-text-view.c |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

commit 06637c4ad0fcc8765c2388f9264db7b49b260eaa
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:   Mon Dec 6 15:08:29 2010 +0100

    video-widget: use new GTK+ style API (#636500)

 libempathy-gtk/empathy-video-widget.c |   10 ++++------
 1 files changed, 4 insertions(+), 6 deletions(-)

commit d55a1e75859e5aea911d2483fac21de714514163
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:   Wed Dec 15 15:57:52 2010 +0100

    use tp_account_get_path_suffix()

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

commit f6f81b5b1c229e7f2e1806519ae065675d5ec183
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:   Wed Dec 15 15:57:41 2010 +0100

    show the account UI even if the selected account doesn't exist

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

commit a1aab6e03da2d2e031ebf1c0f65f30dc967bd8eb
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:   Wed Dec 15 15:52:36 2010 +0100

    always set account_manager_prepared

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

commit 07c1e70246e3d01ccc1000e8bf624ad039b063a6
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:   Wed Dec 15 15:49:08 2010 +0100

    get the value of selected_account_name in the callback (#637307)

    There is no point to pass it as user_data as selected_account_name
    is global
    and it's not defined yet when calling
    tp_account_manager_prepare_async() as
    the GApplication has not be prepared yet.

 src/empathy-accounts.c |    7 +++----
 1 files changed, 3 insertions(+), 4 deletions(-)

commit 79d91365e3f7d986d28441ad072567bd72b9c776
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:   Wed Dec 15 15:34:35 2010 +0100

    empathy-accounts: no need to get argv, we don't use it

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

commit 86aa1501e7a76b92ba402dddc4ce85d403c609bf
Author: Jonny Lamb <jonnylamb@gnome.org>
Date:   Wed Dec 15 13:57:02 2010 +0000

    password-dialog: destroy the dialog if the handler is invalidated

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

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

commit 275aa2505465bd2f1c5cf02427219a6ae54dfe93
Author: Jonny Lamb <jonnylamb@gnome.org>
Date:   Wed Dec 15 09:17:15 2010 +0000

    keyring: change display name for passwords to be more human-readable

    Apparently people complained that when they opened seahorse to look at
    their passwords they were greeted by nice display names for keys for
    wireless networks saved by NetworkManager, and ugly keys for secret
    parameters saved by mission-control. Let's fix this now then and shut
    these people up.

    gnome-keyring finds passwords on the parameters set in the schema, so
    the display name really is only to show in seahorse. We can set
    anything we want here.

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

 libempathy/empathy-keyring.c |    3 ++-
 1 files changed, 2 insertions(+), 1 deletions(-)

commit e63548aeb4d170976beea77c299a3575287ca048
Author: Jonny Lamb <jonnylamb@gnome.org>
Date:   Wed Dec 15 09:10:56 2010 +0000

    server-sasl-handler: add more debugging and only call Close in
    Status_Succeeded

    Calling Close() straight after AcceptSASL() should be fine, but it
    crashed gabble on versions < 0.11.4. Waiting for State_Accepted is
    fine though.

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

 libempathy/empathy-server-sasl-handler.c |    6 +++++-
 1 files changed, 5 insertions(+), 1 deletions(-)

commit 2ec9b6e89141999f919f8a3bd4a44fd8abad86ff
Merge: 2e38a9c 225ca2e
Author: Jonny Lamb <jonnylamb@gnome.org>
Date:   Wed Dec 15 08:56:03 2010 +0000

    Merge branch 'sasl-gui'

commit 225ca2e12b053a6c8ece18179d470f01ed1d6fb7
Author: Jonny Lamb <jonnylamb@gnome.org>
Date:   Tue Dec 14 16:38:48 2010 +0000

    main-window: s/Cancel/Disconnect/ when not giving a password

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

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

commit 01e02a165d271a155a4af0e79dd94c210b584cfa
Author: Jonny Lamb <jonnylamb@gnome.org>
Date:   Tue Dec 14 16:38:19 2010 +0000

    main-window: don't use _full functions where not necessary

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

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

commit 932835ccd42c55d77017d6ffc77773db40385a27
Author: Jonny Lamb <jonnylamb@gnome.org>
Date:   Tue Dec 14 16:37:18 2010 +0000

    main-window: document what the key and value types are for hash tables

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

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

commit 05e14d747fd88a260996c406a938a1bfdfbaca8f
Author: Jonny Lamb <jonnylamb@gnome.org>
Date:   Tue Dec 14 16:33:46 2010 +0000

    event-manager: use tp_clear_object

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

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

commit 483c580a8b6aa2c0b4205e3cb2c674e80abe5ba7
Author: Jonny Lamb <jonnylamb@gnome.org>
Date:   Tue Dec 14 16:31:57 2010 +0000

    auth-factory: add a comment as to why we're also an approver

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

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

commit 6093afb467c0c2ae855d8635d9a10e9bc5f072c4
Author: Jonny Lamb <jonnylamb@gnome.org>
Date:   Tue Dec 14 16:30:41 2010 +0000

    account-settings: use tp_clear_object in dispose

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

 libempathy/empathy-account-settings.c |   24 +++++-------------------
 1 files changed, 5 insertions(+), 19 deletions(-)

commit 2e38a9c56cdac919f424107928dbbf35d69a41ed
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:   Tue Dec 14 16:43:03 2010 +0100

    remove released flag

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