commit 33d7e988e743ec40e3475c02ee2a3043c1d4a559
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:   Mon Nov 29 17:07:03 2010 +0100

    add empathy-notifications-approver.c to POTFILES.in

 po/POTFILES.in |    1 +
 1 files changed, 1 insertions(+), 0 deletions(-)

commit 1d033ef26ef053679d164686c8941727fe8c9883
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:   Mon Nov 29 16:59:07 2010 +0100

    prepare 2.91.3 release

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

commit 6fb9b3aaa5c4b8cb82820548ada136380088584d
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:   Mon Nov 29 16:32:38 2010 +0100

    event-manager: cache the UI GSettings

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

commit 6408432db9e2b1240c1cfea461d330ac0a01e49a
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:   Mon Nov 29 16:26:27 2010 +0100

    event-manager: cache the notifications GSettings

 src/empathy-event-manager.c |   12 ++++++++----
 1 files changed, 8 insertions(+), 4 deletions(-)

commit 086f0fc0375d06fa0c41cf921f883ed36fdb14d0
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:   Mon Nov 29 16:23:19 2010 +0100

    theme_adium_parse_body: use the cache GSettings chat

 libempathy-gtk/empathy-theme-adium.c |   12 ++++++------
 1 files changed, 6 insertions(+), 6 deletions(-)

commit d6b43c2ff67d2d90bf577990fb67917a01e38807
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:   Mon Nov 29 16:03:07 2010 +0100

    notify-manager: cache the notification GSettings

 libempathy-gtk/empathy-notify-manager.c |   27
 ++++++++++++---------------
 1 files changed, 12 insertions(+), 15 deletions(-)

commit a8724cc2dcfcc320b6a3c1b1e39f5d3e3978b5af
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:   Mon Nov 29 15:53:42 2010 +0100

    avatar-chooser: cache the UI GSettings

 libempathy-gtk/empathy-avatar-chooser.c |   14 +++++++-------
 1 files changed, 7 insertions(+), 7 deletions(-)

commit b63808b139096d53264b90908efcc6e63b1c4170
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:   Mon Nov 29 15:47:35 2010 +0100

    chat-text-view: cache the chat GSettings

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

commit bcc2b4414470de50b757414471b52923d1849619
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:   Mon Nov 29 15:45:16 2010 +0100

    empathy-chat-text-view: rename gsettings to gsettings_desktop

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

commit 8a9a8bc51095f76e502293b463de676a1f6bc517
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:   Mon Nov 29 15:40:11 2010 +0100

    chat-window: cache the UI GSettings

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

commit adda65622351cabb18517bef5ca853890e9829af
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:   Mon Nov 29 15:36:59 2010 +0100

    chat-window: cache the notifications GSettings

 src/empathy-chat-window.c |   10 ++++------
 1 files changed, 4 insertions(+), 6 deletions(-)

commit 87b4a33dd408c9d5fe33d9261b6185e1833696d5
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:   Mon Nov 29 08:53:08 2010 +0100

    fix typo

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

commit aa70692e1a16219f2bbda8f129dd2888d1bb6341
Author: Sjoerd Simons <sjoerd.simons@collabora.co.uk>
Date:   Sat Nov 27 18:35:29 2010 +0000

    Initialize libnotify properly to prevent crashes

    If libnotify isn't initialized properly the app_name won't be set,
    causing it
    to eventually pass NULL for a string value to GVariant. Which nicely
    results in
    a SEGV.

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

commit f2bc65f9bd9c5d47846ff44672a5a50e365d9da7
Author: Will Thompson <will.thompson@collabora.co.uk>
Date:   Fri Nov 26 18:03:55 2010 +0000

    Debug window: Correct spelling of "misson-control"

    It's been wrong for over a year, and no-one's noticed yet. :P

    Reviewed-by: Sjoerd Simons <sjoerd.simons@collabora.co.uk>

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

commit 6d815f42f4b0203bb01b2658d71dfd0dedb164c6
Merge: 5e3f159 72a4042
Author: Danielle Madeley <danielle.madeley@collabora.co.uk>
Date:   Fri Nov 26 13:02:23 2010 +1100

    Merge remote branch
    'glassrose/full_room_menu_never_insensitivated-597043'

commit 72a404293ef360571eda0eb45166517010daa247
Author: Chandni Verma <chandniverma2112@gmail.com>
Date:   Thu Nov 25 07:42:51 2010 +0530

    Only the required submenus of 'Room' menu are updated, not the
    entire menu.

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

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

commit 5e3f159c66c8a68aad18c3d2ddd79ac9bc6ece79
Merge: c487a45 212a4ec
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:   Thu Nov 25 10:25:44 2010 +0100

    Merge branch 'notifications-635500'

commit c487a45a3509c2cda4bd712ed818924ccb09184f
Author: A S Alam <aalam@users.sf.net>
Date:   Thu Nov 25 09:07:46 2010 +0530

    update for Punjabi by A S Alam

 po/pa.po |  701
 ++++++++++++++++++++++++++++++++++----------------------------
 1 files changed, 380 insertions(+), 321 deletions(-)

commit 4b33293b29499f574955946aea70dae420e7accc
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:   Wed Nov 24 16:34:13 2010 +0100

    properly manage the reference of the pixbuf returned by
    empathy_pixbuf_avatar_from_individual_scaled_finish

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

commit fef8172419c5752d7d55e65cff3bd76a8176967e
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:   Wed Nov 24 16:07:00 2010 +0100

    empathy_individual_view_get_group_menu: don't leak the group

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

commit 5086e9b0734859f3bee5c0b0aa4b302a1e328b86
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:   Wed Nov 24 16:06:42 2010 +0100

    rename empathy_individual_view_get_selected_group to
    empathy_individual_view_dup_selected_group

 libempathy-gtk/empathy-individual-view.c |    8 ++++----
 libempathy-gtk/empathy-individual-view.h |    3 ---
 2 files changed, 4 insertions(+), 7 deletions(-)

commit 0894474e8cfed8dfa4824205a9d43e76269b50b0
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:   Wed Nov 24 16:01:02 2010 +0100

    log_window_get_messages_for_date: don't leak chat_id and account

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

commit 69afcc40e1fb02956b8ee0fad404b9afc776f64e
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:   Wed Nov 24 12:05:59 2010 +0100

    smiley-manager: clean up memory management of the path

 libempathy-gtk/empathy-smiley-manager.c |    9 +++++----
 1 files changed, 5 insertions(+), 4 deletions(-)

commit 0313474daf288bd973ea491c530d26dd2df0fd28
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:   Wed Nov 24 12:00:11 2010 +0100

    empathy_message_from_tpl_log_entry: don't leak receiver and sender

 libempathy/empathy-message.c |   18 ++++++++++++------
 1 files changed, 12 insertions(+), 6 deletions(-)

commit 74f2bf579605389d30cc8fab50c7718f666ca7ee
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:   Wed Nov 24 11:57:59 2010 +0100

    chat_log_filter: don't leak EmpathyMessage

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

commit 212a4ecbdb3a41933a208f401f1803a930061cb7
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:   Tue Nov 23 11:56:17 2010 +0100

    Clean up the way we keep references on notifications

 src/empathy-notifications-approver.c |   23 +++++++++++++----------
 1 files changed, 13 insertions(+), 10 deletions(-)

commit 5196ab5cec62faae3ae7eaa3b3a9529fe7a2c33a
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:   Tue Nov 23 13:46:09 2010 +0100

    use tp_g_signal_connect_object

 src/empathy-notifications-approver.c |   12 ++++++------
 1 files changed, 6 insertions(+), 6 deletions(-)

commit 42547ca133381bad23066b1513fde237632515c7
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:   Tue Nov 23 13:42:37 2010 +0100

    fix comment

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

commit 43ed05000e87ed2798ab3bc222cc381b2859885f
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:   Mon Nov 22 12:53:17 2010 +0100

    empathy.c: instantiate a EmpathyNotificationsApprover

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

commit dedc37ecea14c0752c8a23b77e73248dd8a6fe2b
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:   Mon Nov 22 12:52:31 2010 +0100

    Move notifications code from status-icon to notifications-approver
    (#635500)

 src/empathy-notifications-approver.c |  260
 ++++++++++++++++++++++++++++++++++
 src/empathy-status-icon.c            |  259
 ---------------------------------
 2 files changed, 260 insertions(+), 259 deletions(-)

commit 426b89e06c978222479694873ec24d4dc8d2d2df
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:   Mon Nov 22 11:23:05 2010 +0100

    add EmpathyNotificationsApprover

 src/Makefile.am                      |    1 +
 src/empathy-notifications-approver.c |  107
 ++++++++++++++++++++++++++++++++++
 src/empathy-notifications-approver.h |   58 ++++++++++++++++++
 3 files changed, 166 insertions(+), 0 deletions(-)

commit 13b07c1ae1c92c9b0a431576f6c78c95a46060fb
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:   Tue Nov 23 10:44:55 2010 +0100

    empathy-av: early return if already activated

    Purely esthetic change to look more like empathy-chat.c

 src/empathy-av.c |   36 ++++++++++++++++++------------------
 1 files changed, 18 insertions(+), 18 deletions(-)

commit 141c0caa3b8e132466a0472caabce59549151f46
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:   Tue Nov 23 10:40:21 2010 +0100

    empathy-chat: register the Handler when the app is activated

    This avoid to raise warnings when the app is launched a second time.

 src/empathy-chat.c |   24 +++++++++++++++---------
 1 files changed, 15 insertions(+), 9 deletions(-)

commit e218c8d18fffbba1f17dc44ba83825c7d8cdcc63
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:   Tue Nov 23 10:31:14 2010 +0100

    empathy-chat: don't use G_APPLICATION_IS_SERVICE

    It breaks EMPATHY_PERSIST (#635592). It's already done this way
    in empathy-av.

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

commit 45cfb4b41984b7a227943666cf90a727ebee6e21
Author: Nishio Futoshi <fut_nis@d3.dion.ne.jp>
Date:   Mon Nov 22 09:16:52 2010 +0100

    Fix miss spelling quadrigraphs in the configure.ac file (#635262)

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

commit c637edc7059b1e3ed9413b9ca097abd4e307f30b
Merge: ac2b9a7 3acbe74
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:   Mon Nov 22 09:00:08 2010 +0100

    Merge branch 'chat-resize-635022'

commit ac2b9a7a95a152f874bf250f4365072a3bc976e1
Merge: 4b6678f 38f4477
Author: Danielle Madeley <danielle.madeley@collabora.co.uk>
Date:   Mon Nov 22 16:52:18 2010 +1100

    Merge remote branch 'glassrose/link_unfocussed_626560'

commit 38f4477ad6d36bc000db7f7388266007b194c0dd
Author: Chandni Verma <chandniverma2112@gmail.com>
Date:   Mon Nov 15 04:42:44 2010 +0530

    Label removed form list of focusable widgets

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

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

commit 4b6678f1a01a33d2aa171314bb139bd5236f0ae4
Author: Yaron Shahrabani <sh.yaron@gmail.com>
Date:   Sun Nov 21 13:00:41 2010 +0200

    Updated Hebrew translation.

 po/he.po |  364
 +++++++++++++++++++++++++++++++-------------------------------
 1 files changed, 184 insertions(+), 180 deletions(-)

commit ad9aaac5b3c56b9bda4fc947804a690a2a2b125f
Author: Dr.T.Vasudevan <agnihot3@gmail.com>
Date:   Sun Nov 21 12:00:39 2010 +0530

    Updated Tamil translation

 po/ta.po |    3 +--
 1 files changed, 1 insertions(+), 2 deletions(-)

commit 1f66a46ee6c848fc35d176bdd9c4d58d8d77d179
Author: Kjartan Maraas <kmaraas@gnome.org>
Date:   Sat Nov 20 11:57:38 2010 +0100

    Updated Norwegian bokmål translation

 po/nb.po |  642
 +++++++++++++++++++++++++++++++++-----------------------------
 1 files changed, 342 insertions(+), 300 deletions(-)

commit 72730ceac9dda8713149277c6a784269b8cc398b
Author: Gheyret T.Kenji <gheyret@gmail.com>
Date:   Sat Nov 20 11:00:29 2010 +0100

    Added UG translation

 po/ug.po |  384
 +++++++++++++++++++++++++++++++-------------------------------
 1 files changed, 194 insertions(+), 190 deletions(-)

commit f2240c6a236d4b9606aeb40b0de87acd30d43c16
Author: Fran Diéguez <fran.dieguez@mabishu.com>
Date:   Sat Nov 20 01:44:39 2010 +0100

    Updated Galician translations

 po/gl.po |  212
 +++++++++++++++++++++++++++++++------------------------------
 1 files changed, 108 insertions(+), 104 deletions(-)

commit 5e77d512450ae808190819be621b09acc5fe1b55
Author: Daniel Mustieles <daniel.mustieles@gmail.com>
Date:   Fri Nov 19 13:40:40 2010 +0100

    Updated Spanish translation

 po/es.po |  220
 +++++++++++++++++++++++++++++++------------------------------
 1 files changed, 112 insertions(+), 108 deletions(-)

commit 2b64bf3d16012a59a7d3b4cba68489af39c3f895
Author: Ivar Smolin <okul@linux.ee>
Date:   Fri Nov 19 01:03:13 2010 +0200

    [l10n] Updated Estonian translation

 po/et.po |    5 ++++-
 1 files changed, 4 insertions(+), 1 deletions(-)

commit b7ec8cc620c82c4c9bdb3b851b50de8b324d7add
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:   Thu Nov 18 14:51:58 2010 +0100

    individual_avatar_pixbuf_received_cb: don't leak the iters

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

commit 3f792393c4018956c7910e82c3680540612deeda
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:   Thu Nov 18 14:50:30 2010 +0100

    factor out free_iters

 libempathy-gtk/empathy-individual-store.c |   17 ++++++++++-------
 1 files changed, 10 insertions(+), 7 deletions(-)

commit 4d119f936fa8a692219fda73b5610482b554ba27
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:   Thu Nov 18 14:45:47 2010 +0100

    cell_renderer_text_set_property: don't leak client types (#635105)

 libempathy-gtk/empathy-cell-renderer-text.c |    1 +
 1 files changed, 1 insertions(+), 0 deletions(-)

commit 5594d66040047febc79e85fb99af61abcb3c8a39
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:   Thu Nov 18 14:18:05 2010 +0100

    individual_store_name_sort_func: don't leak names

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

commit 3acbe74046df8d57fdf498acceacb2737be92d80
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:   Thu Nov 18 13:32:39 2010 +0100

    chat: add a timer before saving the hpane position

    This avoid to flood with D-Bus message when resizing the window
    (#635022).

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

commit 220c1987a026a146dd8ae5121ac00e7fccd75339
Author: Dr.T.Vasudevan <agnihot3@gmail.com>
Date:   Thu Nov 18 16:04:42 2010 +0530

    Updated Tamil translation

 po/ta.po |    5 ++++-
 1 files changed, 4 insertions(+), 1 deletions(-)

commit a2882b3bb676a2196fd647cf2d09a12bae201fbc
Author: Dr.T.Vasudevan <agnihot3@gmail.com>
Date:   Thu Nov 18 16:01:20 2010 +0530

    Updated Tamil translation

 po/ta.po | 1176
 +++++++++++++++++++++++++++++++++-----------------------------
 1 files changed, 632 insertions(+), 544 deletions(-)

commit a68402544850f77879b85cf5f258696a8ebb332c
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 06098ff7becaed9aff517fb693c18adf6a21cca0
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:   Wed Nov 17 17:12:46 2010 +0100

    remove EMPATHY_CONTACT_LIST_STORE_COL_CLIENT_TYPES

    It's unusd and we don't have this column in the model. (#635082)

 libempathy-gtk/empathy-contact-list-store.h |    1 -
 1 files changed, 0 insertions(+), 1 deletions(-)

commit 479275712b6f5984d58728d28d9bad99c94108cf
Merge: a631e25 de93254
Author: Emilio Pozuelo Monfort <emilio.pozuelo@collabora.co.uk>
Date:   Wed Nov 17 15:29:01 2010 +0100

    Merge branch 'bug-547658'

commit de93254a7b91ea0620a4b6ae1c5cad2d922add91
Author: Emilio Pozuelo Monfort <emilio.pozuelo@collabora.co.uk>
Date:   Wed Nov 17 15:25:08 2010 +0100

    Remove spurious comment

 libempathy-gtk/empathy-cell-renderer-text.c |    1 -
 1 files changed, 0 insertions(+), 1 deletions(-)

commit 880bc8eddf459b8eb25dd2ee5189a0f160dc690d
Author: Emilio Pozuelo Monfort <emilio.pozuelo@collabora.co.uk>
Date:   Wed Nov 17 12:16:17 2010 +0100

    Display the phone next to the status

    As shown in the mockup in bug 547658.

 libempathy-gtk/empathy-cell-renderer-text.c |   34 ++++++++++++++++++++--
 libempathy-gtk/empathy-contact-list-store.h |    1 +
 libempathy-gtk/empathy-individual-view.c    |   41
 +-------------------------
 3 files changed, 34 insertions(+), 42 deletions(-)

commit a631e25e2ec0d4fdf0f526a38df6171a6a6b26bd
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:   Wed Nov 17 09:39:43 2010 +0100

    chat-window: cache the 'chat' gsettings

    We use it each time the window is focused so best to reduce the
    D-Bus traffic
    (#635022).

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

commit 92be64204fc424a3b2756be253b985112dcedcf2
Merge: d041967 8fd2127
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:   Tue Nov 16 14:12:28 2010 +0100

    Merge remote branch 'vminko/fix-634688-v3'

commit d041967019edda596ad98bd6d27e928dc2b7fd53
Merge: 7e37089 700d6bc
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:   Tue Nov 16 14:11:05 2010 +0100

    Merge branch 'desktop-schema-626810'

commit 8fd21279bc061f25da3cf74690d7cdb74844f6e3
Author: Vitaly Minko <vitaly.minko@gmail.com>
Date:   Tue Nov 16 14:10:23 2010 +0300

    Need to set preferred height of the search bar manually (#634688).

 libempathy-gtk/empathy-search-bar.c |   16 ++++++++++++++++
 1 files changed, 16 insertions(+), 0 deletions(-)

commit 7e37089963000a4dcce907f2e4e8849bd0c97a06
Author: Ivar Smolin <okul@linux.ee>
Date:   Tue Nov 16 11:11:24 2010 +0200

    [l10n] Updated Estonian translation

 po/et.po |   90
 ++++++++++++++++++++++++++++++++++++++++++++++----------------
 1 files changed, 67 insertions(+), 23 deletions(-)

commit 700d6bc82ed3e3a83788c6ae27df0124157e847e
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:   Tue Nov 16 09:04:25 2010 +0100

    fix identation

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

commit 5938582ef659b024de1b59d923939721d7a3730b
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:   Thu Nov 11 16:33:01 2010 +0100

    remove gconf dep

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

commit 57c1b01434b3a92f3a55fb6d859aaa142bbb14a5
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:   Thu Nov 11 16:31:00 2010 +0100

    accounts-panel: remove gconf bits (#634595)

    This code is useless.

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

commit 87f228d727344e28bb9d87f6a86845f6473a38b0
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:   Thu Nov 11 15:42:14 2010 +0100

    use gsettings version of the document-font-name key (#626810)

 libempathy-gtk/empathy-chat-text-view.c |   38
 ++++++++++--------------------
 libempathy-gtk/empathy-theme-adium.c    |   32 ++++++++++---------------
 libempathy/empathy-gsettings.h          |    3 ++
 3 files changed, 29 insertions(+), 44 deletions(-)

commit a908b286fe5cc825f61cee64298395685b81b09d
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:   Thu Nov 11 15:19:48 2010 +0100

    depend on gsettings-desktop-schemas

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

commit 3889df3fdf5964f32a96912cee0c5b02e7bcfb58
Author: Emilio Pozuelo Monfort <emilio.pozuelo@collabora.co.uk>
Date:   Mon Nov 15 17:57:27 2010 +0100

    Only check for presence in presence-enabled personas 2.0

 libempathy-gtk/empathy-individual-widget.c |    8 +++++++-
 1 files changed, 7 insertions(+), 1 deletions(-)

commit 1e22706c294c3b775d1963aabff29a0695ccf595
Author: Jonny Lamb <jonnylamb@gnome.org>
Date:   Mon Oct 18 13:15:22 2010 +0100

    empathy-individual-store: only check for presence in presence-enabled
    personas

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

 libempathy-gtk/empathy-individual-store.c |    8 +++++++-
 1 files changed, 7 insertions(+), 1 deletions(-)

commit c391eb0efd50b519218c317d0c14e34954a45f9a
Author: Jonny Lamb <jonny.lamb@collabora.co.uk>
Date:   Thu Sep 30 18:24:10 2010 +0100

    individual-widget: show a "on a phone" label in the individual view

    Also refactor having a TpContact in the EmpathyIndividualViewPriv
    struct, so that contact info and client types info use the same
    TpContact.

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

 libempathy-gtk/empathy-individual-view.c    |    3 +-
 libempathy-gtk/empathy-individual-widget.c  |  157
 +++++++++++++++++++--------
 libempathy-gtk/empathy-individual-widget.h  |    1 +
 libempathy-gtk/empathy-individual-widget.ui |   29 +++++
 4 files changed, 146 insertions(+), 44 deletions(-)

commit 6f9a0ae2e8dc6d71bc15bdc703cffec8851367ab
Author: Jonny Lamb <jonny.lamb@collabora.co.uk>
Date:   Thu Sep 30 16:01:20 2010 +0100

    contact: enable showing a phone next to contacts who are on phones

    The future!

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

 libempathy-gtk/empathy-individual-store.c |   38 +++++++++++++++++++++
 libempathy-gtk/empathy-individual-store.h |    1 +
 libempathy-gtk/empathy-individual-view.c  |   39 +++++++++++++++++++++
 libempathy/empathy-contact.c              |   52
 ++++++++++++++++++++++++++++-
 libempathy/empathy-contact.h              |    1 +
 libempathy/empathy-tp-contact-factory.c   |    1 +
 6 files changed, 131 insertions(+), 1 deletions(-)

commit 59f42ec7b50e15046fdd1b122c97a7f5d357922d
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:   Mon Nov 15 16:25:07 2010 +0100

    don't set fill on the box containing buttons

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

commit a118a7cf1afc9858f1f4c6d7a10d949abf2fc210
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:   Mon Nov 15 16:18:47 2010 +0100

    use gtk_box_pack_start() to pack our widget to the dialog (#634912)

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

commit 33d6d9dfbdeac6050a63912a9944b54e5c50d95f
Merge: 24ffd0a 4de0e21
Author: Emilio Pozuelo Monfort <emilio.pozuelo@collabora.co.uk>
Date:   Mon Nov 15 16:01:01 2010 +0100

    Merge branch 'bug-607146'

commit 24ffd0a12ef01048052c420b73d9b374515cb2f8
Author: Brian Pepple <bpepple@fedoraproject.org>
Date:   Sat Nov 6 18:31:32 2010 -0400

    Make ca-certs location configurable (#634197)

 configure.ac                      |   33
 +++++++++++++++++++++++++++++++++
 libempathy/empathy-tls-verifier.c |    2 +-
 2 files changed, 34 insertions(+), 1 deletions(-)

commit 4de0e218a3e225bbbfbbe3baf91036a262c0f782
Author: Emilio Pozuelo Monfort <emilio.pozuelo@collabora.co.uk>
Date:   Mon Nov 15 14:51:27 2010 +0100

    Make <Enter> on the account name try to log in

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

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

commit 750f7705fe5d58f2c13a57d5e3c844aa0f205e10
Merge: 4a8508f 1332eb9
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:   Mon Nov 15 14:44:35 2010 +0100

    Merge branch 'trivia'

commit 4a8508f3b3a0c595add6908188a9a3e9c46c509a
Merge: 2a549bd 8d93b86
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:   Mon Nov 15 14:14:08 2010 +0100

    Merge remote branch 'zdra/configure'

commit 8d93b865c03829043b17010bc2bd7e3a89dbfb69
Author: Xavier Claessens <xclaesse@gmail.com>
Date:   Mon Nov 15 13:40:43 2010 +0100

    Group all harddeps in one pkg-config call

    We do not support GTK2 anymore, so there is no point in keeping those

 configure.ac                       |   13 ++++---------
 libempathy-gtk/Makefile.am         |    6 +-----
 nautilus-sendto-plugin/Makefile.am |    3 +--
 src/Makefile.am                    |    6 ------
 tests/Makefile.am                  |    2 --
 tests/interactive/Makefile.am      |    2 --
 6 files changed, 6 insertions(+), 26 deletions(-)

commit 2a549bda5cbe7972fe496a9e02d6a9911214205c
Merge: c97e310 a05517d
Author: Emilio Pozuelo Monfort <emilio.pozuelo@collabora.co.uk>
Date:   Mon Nov 15 12:59:01 2010 +0100

    Merge branch 'bug-595305'

commit c97e3104c2ab967d22093d981ab57714ce840f67
Author: Fran Diéguez <fran.dieguez@mabishu.com>
Date:   Mon Nov 15 12:52:43 2010 +0100

    Updated Galician help translations

 help/gl/gl.po |  235
 +++++++++++++++++++++++++++++++-------------------------
 1 files changed, 130 insertions(+), 105 deletions(-)

commit aec32ec878a4eac2f3d885c7643891f2206d82ac
Author: Ville-Pekka Vainio <vpivaini@cs.helsinki.fi>
Date:   Mon Nov 15 13:52:02 2010 +0200

    pofilter fixes for the Finnish translation, update translator-credits

 po/fi.po |  130
 +++++++++++++++++++++++++++++++------------------------------
 1 files changed, 66 insertions(+), 64 deletions(-)

commit a05517d865e823e5bd939ae5efcc497ccadef066
Author: Emilio Pozuelo Monfort <emilio.pozuelo@collabora.co.uk>
Date:   Mon Nov 15 12:31:36 2010 +0100

    Add a close button to Previous Conversations

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

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

commit 1332eb95a91fb7e4f001757f702e79002ad3aebc
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:   Mon Nov 15 11:38:43 2010 +0100

    individual_store_contact_sort: account is not supposed to be NULL

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

commit 40c46616ed8b86375777610b6befc35f22914497
Author: Fran Diéguez <fran.dieguez@mabishu.com>
Date:   Mon Nov 15 10:58:23 2010 +0100

    Updated galician help translations

 help/gl/gl.po |   45 ++++++++++++++++++++++++++++++++++++++++++++-
 1 files changed, 44 insertions(+), 1 deletions(-)

commit c607201736ed8dd846454bc0ad397865f01ad805
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:   Mon Nov 15 10:58:34 2010 +0100

    bump folks dep to 0.3.2

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

commit 5d15b2ed1f68d17364a53549ceb503275c62769d
Merge: cb0e2e0 ff49ee8
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:   Mon Nov 15 10:54:18 2010 +0100

    Merge remote branch 'pwith/634754-folks-api-changes'

commit cb0e2e0239d2bdad3aa4afbd683684f9ca2d1815
Merge: bf03b8e 875bf69
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:   Mon Nov 15 10:12:05 2010 +0100

    Merge remote branch 'vminko/fix-633481-v2'

commit bf03b8eec2f65636fde1abd1c9daddc7e2e2310d
Author: Matej Urbančič <mateju@svn.gnome.org>
Date:   Sun Nov 14 12:20:27 2010 +0100

    Updated Slovenian translation

 po/sl.po |  211
 +++++++++++++++++++++++++++++---------------------------------
 1 files changed, 99 insertions(+), 112 deletions(-)

commit 56b049b0bc721d16378f2c2ab57d8f29ffc9ef71
Author: Gheyret T.Kenji <gheyret@gmail.com>
Date:   Sat Nov 13 23:47:18 2010 +0100

    Added UG translation

 po/LINGUAS |    1 +
 1 files changed, 1 insertions(+), 0 deletions(-)

commit e46c802a4071583cd642cfd2e2ac6090fe8c191b
Author: Ville-Pekka Vainio <vpivaini@cs.helsinki.fi>
Date:   Sun Nov 14 00:40:10 2010 +0200

    Updated Finnish translation

 po/fi.po |  972
 ++++++++++++++++++++++++++++++++++----------------------------
 1 files changed, 528 insertions(+), 444 deletions(-)

commit 2e8e24cd771f95e98de65219f7a70116088e1afa
Author: Gheyret T.Kenji <gheyret@gmail.com>
Date:   Sat Nov 13 21:49:27 2010 +0100

    Added UG translation

 po/ug.po | 3740
 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
 1 files changed, 3740 insertions(+), 0 deletions(-)

commit ff49ee828e63dd35b5c4faf3a0ccd962c7cd63a8
Author: Philip Withnall <philip@tecnocode.co.uk>
Date:   Sat Nov 13 14:07:46 2010 +0000

    Stop using removed Individual convenience methods from folks

    They were removed from folks with commit
    def47dffa31a95ec6bd333f43c69822416098283. This doesn't require
    a dependency
    bump, since they're being replaced with calls to methods which exist
    in folks
    0.3.1. See: bgo#629078. Closes: bgo#634754

 .../empathy-individual-information-dialog.c        |    2 +-
 libempathy-gtk/empathy-individual-store.c          |   42
 ++++++++++---------
 libempathy-gtk/empathy-individual-view.c           |    6 +-
 libempathy-gtk/empathy-linking-dialog.c            |    2 +-
 libempathy-gtk/empathy-ui-utils.c                  |    3 +-
 libempathy/empathy-individual-manager.c            |    2 +-
 6 files changed, 30 insertions(+), 27 deletions(-)

commit 2b1e108d1d4f19249c3fe666503e86df0da720dd
Author: Fran Diéguez <fran.dieguez@mabishu.com>
Date:   Sat Nov 13 01:11:19 2010 +0100

    Updated Galician translations

 po/gl.po |  394
 ++++++++++++++++++++++++++++++++++----------------------------
 1 files changed, 214 insertions(+), 180 deletions(-)

commit 875bf697d54f1c4ca98478ded849bc733828f758
Author: Vitaly Minko <vitaly.minko@gmail.com>
Date:   Fri Nov 12 17:47:51 2010 +0300

    Make AccountChooser-related code simpler and clearer (re #633481).

 libempathy-gtk/empathy-account-chooser.c    |   32 ++++++++++++++++++----
 libempathy-gtk/empathy-new-message-dialog.c |   33 +++-------------------
 src/empathy-new-chatroom-dialog.c           |   38
 ++++----------------------
 3 files changed, 37 insertions(+), 66 deletions(-)

commit eb67ffa2d04e73f078f969f751c45678dc35a430
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:   Fri Nov 12 11:10:19 2010 +0100

    cell-renderer-text: implement get_preferred_height_for_width instead
    of get_size (#628043)

 libempathy-gtk/empathy-cell-renderer-text.c |   52
 ++++++++++----------------
 1 files changed, 20 insertions(+), 32 deletions(-)

commit 618c05bffb618c1ce5321c354e605afbdcec5553
Author: Daniel Mustieles <daniel.mustieles@gmail.com>
Date:   Thu Nov 11 17:22:30 2010 +0100

    Updated Spanish translation

 po/es.po |  262
 ++++++++++++++++++++++++++++++++------------------------------
 1 files changed, 136 insertions(+), 126 deletions(-)

commit c87c03791366d2d038f2854c171e0c91e17207aa
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:   Thu Nov 11 15:03:46 2010 +0100

    input-text-view: use get_preferred_height instead of size_request

 libempathy-gtk/empathy-input-text-view.c |   25 +++++++++++--------------
 1 files changed, 11 insertions(+), 14 deletions(-)

commit 379f636d605a99f04fbd29481ff755e783f34707
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:   Thu Nov 11 14:41:05 2010 +0100

    move size-requst handling in input-text-view

 libempathy-gtk/empathy-chat.c            |   38 -----------------------
 libempathy-gtk/empathy-input-text-view.c |   49
 +++++++++++++++++++++++++++++-
 2 files changed, 48 insertions(+), 39 deletions(-)

commit 1c7e66a2a609bf5e956c6f76bf7db7e585860731
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:   Thu Nov 11 14:31:09 2010 +0100

    add EmpathyInputTextView

 libempathy-gtk/Makefile.am               |    2 +
 libempathy-gtk/empathy-chat.c            |   11 +----
 libempathy-gtk/empathy-input-text-view.c |   62
 ++++++++++++++++++++++++++++++
 libempathy-gtk/empathy-input-text-view.h |   62
 ++++++++++++++++++++++++++++++
 4 files changed, 129 insertions(+), 8 deletions(-)

commit b1ca9031bfee03b12d6a4002d223b96a03810c20
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:   Thu Nov 11 13:52:40 2010 +0100

    empathy-chat: remove the size-request hack (#633835)

    It just work with GTK+3 \o/

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

commit 3055c76a94c9628ef30da3bcdf1ca894cb671796
Author: Vitaly Minko <vitaly.mink@gmail.com>
Date:   Thu Nov 11 13:32:45 2010 +0100

    Display text in verbatim (#625745)

 libempathy-gtk/empathy-theme-adium.c |    6 ++++++
 1 files changed, 6 insertions(+), 0 deletions(-)

commit 18d649cbfd8eda7678957a3d2a76b9bb8681a981
Author: Vitaly Minko <vitaly.minko@gmail.com>
Date:   Wed Nov 10 20:23:39 2010 +0300

    Make AccountChooser filters asynchronous to let them handle newly
    connected accounts properly (#633481).

 libempathy-gtk/empathy-account-chooser.c         |   87
 ++++++++++++++-----
 libempathy-gtk/empathy-account-chooser.h         |   26 +++++-
 libempathy-gtk/empathy-contact-dialogs.c         |   16 ++--
 libempathy-gtk/empathy-contact-selector-dialog.c |   12 ++-
 libempathy-gtk/empathy-contact-selector-dialog.h |    6 +-
 libempathy-gtk/empathy-individual-dialogs.c      |   11 ++-
 libempathy-gtk/empathy-new-call-dialog.c         |   86
 ++++++++++++++----
 libempathy-gtk/empathy-new-message-dialog.c      |   85
 ++++++++++++++----
 src/empathy-new-chatroom-dialog.c                |  103
 ++++++++++++++++-----
 tests/interactive/test-empathy-account-chooser.c |    6 +-
 10 files changed, 336 insertions(+), 102 deletions(-)

commit c6cd722328a112e8f4b015ca57ffe8dc72f50cd8
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:   Tue Nov 9 09:59:32 2010 +0100

    about-dialog: add my email

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

commit 1cb5c43aef3aa182fa8b3b5aca74461ce7e90ab9
Merge: 13953e5 ccb133e
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:   Tue Nov 9 09:49:25 2010 +0100

    Merge branch 'subscription-msg-630707'

commit 13953e50b8935ffcec168ffee32697a76ebf3db0
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:   Tue Nov 9 09:39:10 2010 +0100

    init GTK+ before empathy-gtk

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

commit ccb133e0244bd3812c0d40661942f0e003a8ea03
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:   Tue Nov 9 09:18:04 2010 +0100

    pass message to empathy_subscription_dialog_show

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

commit e390a8a182a198b0e7a8f60a760773019f6d4e08
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:   Wed Oct 27 18:57:08 2010 +0200

    empathy_subscription_dialog_show: display user's message if any
    (#630707)

 libempathy-gtk/empathy-contact-dialogs.c |   25 ++++++++++++++++++++++++-
 libempathy-gtk/empathy-contact-dialogs.h |    1 +
 src/empathy-event-manager.c              |    2 +-
 3 files changed, 26 insertions(+), 2 deletions(-)

commit 877ea6bc7673b4a3a31be2528a3f6e4bcad4262e
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:   Thu Oct 28 15:08:18 2010 +0200

    Add Accept/Decline button in subscription notifications (#630706)

 src/empathy-status-icon.c |   54
 +++++++++++++++++++++++++++++++++++++++++++++
 1 files changed, 54 insertions(+), 0 deletions(-)

commit 2d91d86e1638f3c9a9be8be63ff974a8fc28d9ce
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:   Thu Oct 28 14:57:38 2010 +0200

    add empathy_event_remove()

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

commit a42effc9db9ad032587ded4d095bc8339b77a2ae
Author: Yaron Shahrabani <sh.yaron@gmail.com>
Date:   Mon Nov 8 23:21:19 2010 +0200

    Updated Hebrew translation.

 po/he.po |  106
 ++++++++++++++++++++++++++++++++++----------------------------
 1 files changed, 58 insertions(+), 48 deletions(-)

commit 8b856d4c77dd9dff397ff840ec318cab05c5bba7
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:   Mon Nov 8 16:31:38 2010 +0100

    remove released flag

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