commit b7008342d67c47362b8ab55bcdf80b629acca8e3
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:   Tue Feb 21 16:38:34 2012 +0100

    prepare 3.3.90

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

commit f90421fd29108507c722c03e28bc16e4b5baf7c0
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:   Tue Feb 21 16:24:29 2012 +0100

    remove EMPATHY_AV_BUS_NAME*

 libempathy/empathy-request-util.h |    3 ---
 1 files changed, 0 insertions(+), 3 deletions(-)

commit 313fa40c9b9367af6c7b24cbf840054d4658bfbd
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:   Tue Feb 21 16:24:09 2012 +0100

    stop checking for empathy-av deps

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

commit 0633575cda1c01e75247da67c0405aabaac3adab
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:   Tue Feb 21 16:07:39 2012 +0100

    check coding style of all binaries

 src/Makefile.am |    8 +++++++-
 1 files changed, 7 insertions(+), 1 deletions(-)

commit 8499da09a2cd61da8c02b34f00112672007d13c8
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:   Tue Feb 21 16:07:04 2012 +0100

    remove ev-sidebar

    It's not used in empathy-call.

 src/Makefile.am  |    2 -
 src/ev-sidebar.c |  352
 ------------------------------------------------------
 src/ev-sidebar.h |   76 ------------
 3 files changed, 0 insertions(+), 430 deletions(-)

commit 558998c27217a0b92188d0870f8510e86194985b
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:   Tue Feb 21 16:01:56 2012 +0100

    debug-window: coding style fixes

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

commit b7f1fab64f9a59221b4d666cd788db4efe855b13
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:   Tue Feb 21 15:19:12 2012 +0100

    Stop requesting StreamedMedia channels

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

 libempathy-gtk/empathy-call-utils.c |   74
 ++--------------------------------
 1 files changed, 5 insertions(+), 69 deletions(-)

commit ba0a893b1d31cdb234bae72845e840a895b9d62a
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:   Tue Feb 21 15:18:45 2012 +0100

    Drop empathy-av

    So long and thanks for all the calling...

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

 data/Empathy.AudioVideo.client                     |   21 -
 data/Makefile.am                                   |    5 -
 ....Telepathy.Client.Empathy.AudioVideo.service.in |    3 -
 libempathy/Makefile.am                             |    2 -
 libempathy/empathy-tp-streamed-media.c             |  856 ------
 libempathy/empathy-tp-streamed-media.h             |  113 -
 po/POTFILES.in                                     |    4 -
 src/Makefile.am                                    |   32 +-
 src/empathy-av.c                                   |  172 --
 src/empathy-streamed-media-factory.c               |  269 --
 src/empathy-streamed-media-factory.h               |   69 -
 src/empathy-streamed-media-handler.c               |  903 ------
 src/empathy-streamed-media-handler.h               |  106 -
 src/empathy-streamed-media-window-fullscreen.c     |  309 --
 src/empathy-streamed-media-window-fullscreen.h     |   77 -
 src/empathy-streamed-media-window.c                | 3202
 --------------------
 src/empathy-streamed-media-window.h                |   65 -
 src/empathy-streamed-media-window.ui               |  861 ------
 18 files changed, 1 insertions(+), 7068 deletions(-)

commit c7dd14aef20e429135fba7c7a53a8d507b9579a3
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:   Tue Feb 21 15:46:02 2012 +0100

    Stop approve StreamedMedia channels

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

 src/empathy-event-manager.c          |   86
 +---------------------------------
 src/empathy-event-manager.h          |    1 -
 src/empathy-notifications-approver.c |    9 ----
 3 files changed, 2 insertions(+), 94 deletions(-)

commit b48a8176d050de2d03bed6c5f00b451f3ca5c750
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:   Tue Feb 21 15:13:17 2012 +0100

    always build empathy-call

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

 configure.ac                        |   42
 +++++++---------------------------
 data/Makefile.am                    |   12 +--------
 libempathy-gtk/empathy-call-utils.c |   35 -----------------------------
 src/Makefile.am                     |    4 ---
 4 files changed, 11 insertions(+), 82 deletions(-)

commit 988a99a9a54a20fff1846275f98a0c3b3c4c3469
Author: Kjartan Maraas <kmaraas@gnome.org>
Date:   Tue Feb 21 15:05:14 2012 +0100

    Updated Norwegian bokmål translation

 po/nb.po |  355
 ++++++++++++++++++++++++++++++++++----------------------------
 1 files changed, 195 insertions(+), 160 deletions(-)

commit dacccf3c68817345bffaeff830f911eceee95cf2
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:   Tue Feb 14 11:21:32 2012 +0100

    try installing telepathy-haze

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

commit e8dae499471d378eae7b0f1bff92b4b0788a0bc7
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:   Wed Nov 16 15:30:08 2011 +0100

    explain why the account has been disabled

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

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

commit f85fa9491bb42a9d01acda493d000cad1a2d1c80
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:   Wed Nov 16 15:04:46 2011 +0100

    accounts-dialog: hide the switch in butterfly accounts

    MC should migrate butterfly accounts. If it fails (typically
    because Haze
    isn't installed) then it disables the account. There is no point
    allowing user
    to re-enable it as it won't work properly with Empathy any way.

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

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

commit a5da0a70113dd6bd0abe0df3c353fbaf41a25fae
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:   Fri Nov 11 10:10:47 2011 +0100

    Use the MSN account widget with Haze

    The parameters supported by the UI have the same names as the
    Butterfly ones
    so no change needed.

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

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

commit 3826d723545ab2ecb4f11dce9e0e1b48275516c3
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:   Fri Nov 11 10:05:49 2011 +0100

    protocol-chooser: stop using Butterfly

    It doesn't implement any modern Telepathy API like ContactList for
    example and
    we now rely on it.

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

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

commit dc044ffa0a35375738cd79c9508dfa766e2d1953
Author: Daniel Mustieles <daniel.mustieles@gmail.com>
Date:   Tue Feb 21 14:17:54 2012 +0100

    Updated Spanish translation

 po/es.po |  332
 +++++++++++++++++++++++++++++++++-----------------------------
 1 files changed, 175 insertions(+), 157 deletions(-)

commit 109e8dda543685f0ef6be6bc24e76ffce7e8e9f2
Merge: 421b663 efbdd30
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:   Tue Feb 21 14:11:57 2012 +0100

    Merge remote-tracking branch
    'glassrose/debug-window-send-to-pastebin-button-658724'

commit 421b66326367a0cec07ca233ada0d675078f73bb
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:   Tue Feb 21 12:35:54 2012 +0100

    drag_data_received_individual_id: make sure manager is initialized

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

commit babedb4d20c94fcdb12f2318aafccfbf882faef8
Author: Fran Diéguez <fran.dieguez@mabishu.com>
Date:   Tue Feb 21 11:46:04 2012 +0100

    Updated Galician translations

 po/gl.po |  248
 +++++++++++++++++++++++++++++++-------------------------------
 1 files changed, 124 insertions(+), 124 deletions(-)

commit abb277867f74af71705f453e0db3f947d85b084a
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:   Tue Feb 21 10:13:44 2012 +0100

    tp_call_channel_add_content_async() now takes the direction

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

commit eeaacbd35af795c8a265716721e915fa28aa242c
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:   Tue Feb 21 08:28:51 2012 +0100

    Depend on tp-farstream 0.2.1

    That's the version of the last release.

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

commit 894b1f315b62499a5d305aff6b937093a20df1a4
Merge: 58574c8 1af2b9b
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:   Tue Feb 21 08:26:19 2012 +0100

    Merge remote-tracking branch 'origin/call1' into master+call

    Conflicts:
	configure.ac
	telepathy-yell

commit 58574c8dc2e5261d8c89b9a6b6fda41687a386ea
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Tue Feb 21 08:24:24 2012 +0100

    depend on tp-glib 0.17.5

    Needed for Call1.

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

commit efbdd30a2d83aa2ae03fd2cb678448e8f9ea83f5
Author: Chandni Verma <chandniverma2112@gmail.com>
Date:	Mon Feb 20 16:48:52 2012 +0530

    License to publish the author's pastebin API developer key in open

 PASTEBIN-API-KEY.txt	    |  110
 ++++++++++++++++++++++++++++++++++++++++++++
 src/empathy-debug-window.c |	 3 +-
 2 files changed, 112 insertions(+), 1 deletions(-)

commit 09835d2927a06eab67ece7dc2d1b66f52885024e
Author: Chandni Verma <chandniverma2112@gmail.com>
Date:	Sun Sep 11 07:29:55 2011 +0530

    "Send to pastebin" button in EmpathyDebugWindow

    For one-click posting of debug data to http://pastebin.com/

    To paste the currently displayed debug data directly to pastebin.
    Makes use of the pastebin API- http://pastebin.com/api
    which can be accessed by pastebin website members.

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

commit cdfc12c542db24dc688cb07c398e34114ec34796
Author: Kenneth Nielsen <k.nielsen81@gmail.com>
Date:	Mon Feb 20 22:56:13 2012 +0100

    Updated Danish translation

 po/da.po | 2649
 +++++++++++++++++++++++++++++++++-----------------------------
 1 files changed, 1418 insertions(+), 1231 deletions(-)

commit d8b81b7f1937c34db50d29f638452eac11cff622
Author: Ihar Hrachyshka <ihar.hrachyshka@gmail.com>
Date:	Mon Feb 20 17:08:36 2012 +0300

    Updated Belarusian translation.

 po/be.po |  348
 ++++++++++++++++++++------------------------------------------
 1 files changed, 110 insertions(+), 238 deletions(-)

commit 42d9964bab2f5f77189b657ac71c9a40b92ed93d
Author: Мирослав Николић <miroslavnikolic@rocketmail.com>
Date:	Mon Feb 20 10:45:27 2012 +0100

    Updated Serbian translation

 po/sr.po	|  463
 +++++++++++++++++++++++++++----------------------------
 po/sr@latin.po |  463
 +++++++++++++++++++++++++++----------------------------
 2 files changed, 454 insertions(+), 472 deletions(-)

commit 55c070709b48f3dd0fd13822493e21ffea1f1b75
Author: Fran Diéguez <fran.dieguez@mabishu.com>
Date:	Sun Feb 19 18:30:14 2012 +0100

    Updated Galician translations

 po/gl.po |  495
 ++++++++++++++++++++++++++++++--------------------------------
 1 files changed, 240 insertions(+), 255 deletions(-)

commit 3eb9c64567a736d411156cfa7019addde2c00596
Author: Kjartan Maraas <kmaraas@gnome.org>
Date:	Sun Feb 19 15:41:02 2012 +0100

    Updated Norwegian bokmål translation

 po/nb.po |  996
 ++++++++++++++++++++++++++------------------------------------
 1 files changed, 414 insertions(+), 582 deletions(-)

commit bacad5d42811f75a273556c31e46f6dcad47c8ed
Author: Christian Kirbach <Christian.Kirbach@googlemail.com>
Date:	Sun Feb 19 13:20:42 2012 +0100

    [l10n] Updated German doc translation

 help/de/de.po | 5359
 ++++++++++++++++++++++++++++-----------------------------
 1 files changed, 2677 insertions(+), 2682 deletions(-)

commit 300660278008b5e51a1fe9555cb717806fa1f0dd
Author: Mattias Põldaru <mahfiaz@gmail.com>
Date:	Sun Feb 19 12:21:06 2012 +0200

    [l10n] Updated Estonian translation

 po/et.po |   88
 +++++++++++++++++++------------------------------------------
 1 files changed, 28 insertions(+), 60 deletions(-)

commit f7d869a05b3f1ac75d164191e6a4595f83f4a7a9
Author: Daniel Nylander <po@danielnylander.se>
Date:	Sun Feb 19 00:56:57 2012 +0100

    Updated Swedish translation

 po/sv.po | 2706
 ++++++++++++++++++++++++++++++++------------------------------
 1 files changed, 1390 insertions(+), 1316 deletions(-)

commit e93b1f34fad4b25bf0415db0a764f79514a43f4d
Author: Anas Afif Emad <anas.e87@gmail.com>
Date:	Sat Feb 18 18:42:06 2012 +0100

    Updated Arabic translation

 po/ar.po | 2974
 ++++++++++++++++++++++++++++++++++++++++----------------------
 1 files changed, 1911 insertions(+), 1063 deletions(-)

commit b1558cbab31a7c1cbf80a098e15ac94f3f7c7bab
Author: Alexander Shopov <ash@kambanaria.org>
Date:	Sat Feb 18 07:10:06 2012 +0200

    Updated Bulgarian translation

 po/bg.po | 2343
 +++++++++++++++++++++++++++++---------------------------------
 1 files changed, 1101 insertions(+), 1242 deletions(-)

commit 2ecbbf2d18e9c3783047faa1c734f3287311e4f2
Author: Daniel Mustieles <daniel.mustieles@gmail.com>
Date:	Fri Feb 17 17:36:05 2012 +0100

    Updated Spanish translation

 help/es/es.po | 5207
 ++++++++++++++++++++++++++++++---------------------------
 1 files changed, 2722 insertions(+), 2485 deletions(-)

commit bee8947cf216c4ebc714c11ebb18b254b9a3eeba
Author: Javier Jardón <jjardon@gnome.org>
Date:	Tue Aug 16 17:11:07 2011 +0100

    Use new documentation infraestructure

 .gitignore	  |    1 -
 configure.ac	  |    3 ++-
 help/Makefile.am |   10 ++++------
 m4/.gitignore	  |    1 -
 4 files changed, 6 insertions(+), 9 deletions(-)

commit 9be0890e445a1d8bc28ceeea3bea1703f14cd5eb
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Fri Feb 17 15:13:28 2012 +0100

    chat-window: invite contacts using DnD

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

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

commit 4d3120f44e8b77f46d090cd4c9edb6b4036cd3ea
Author: Brian Curtis <bcurtiswx@ubuntu.com>
Date:	Fri Feb 17 14:44:55 2012 +0100

    Patch to change Yes/No to Accept/Reject

    This patch will change the Yes and No in the subscription request
    dialog box
    to Accept and Reject respectively.

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

 libempathy-gtk/empathy-contact-dialogs.ui |	4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

commit 3ffffaaf8c00e6ddc78e37dd9bfbc5f38365d4db
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Fri Feb 17 14:13:47 2012 +0100

    chat-window: display a phone icon in the tab label

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

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

commit cc596d0b62855faaaf110ad90bc6d54fdd804464
Author: Yaron Shahrabani <sh.yaron@gmail.com>
Date:	Fri Feb 17 15:19:20 2012 +0200

    Updated Hebrew translation.

 po/he.po | 1160
 +++++++++++++++++++++++++++++++++-----------------------------
 1 files changed, 610 insertions(+), 550 deletions(-)

commit 51842464fcf1aea50efef64ea711b10063462688
Author: Daniel Mustieles <daniel.mustieles@gmail.com>
Date:	Fri Feb 17 10:31:45 2012 +0100

    Updated Spanish translation

 po/es.po |  392
 ++++++++++++++++++++++++++++++--------------------------------
 1 files changed, 188 insertions(+), 204 deletions(-)

commit e7f57aeaf4c3433dc48fa953791ae6598b34ae3d
Merge: 299c10e 1a35f58
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Fri Feb 17 10:21:41 2012 +0100

    Merge remote-tracking branch
    'glassrose/add-All-service-selection-in-debug-window'

commit 299c10e3fd1696b5888e3f07336c4a2e64c08f68
Author: Piotr Drąg <piotrdrag@gmail.com>
Date:	Thu Feb 16 21:29:59 2012 +0100

    Updated POTFILES.in

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

commit 2bfe326976653cd35b6f4af943746df084a9dad2
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Thu Feb 16 18:20:45 2012 +0100

    local-xmpp-assistant-widget: increase row-spacing

 .../empathy-local-xmpp-assistant-widget.c	    |	 2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

commit 7cd8231ad035d840ce34569460425d766adfa62e
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Thu Feb 16 15:31:05 2012 +0100

    use the 48x48 version of the local-xmpp icon

    We don't have to scale up the icon any more and it looks good as it.

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

 .../empathy-local-xmpp-assistant-widget.c	    |	 2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

commit cc16ff0eebeeff9ddfe8fdb675471a28eea9f8cb
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Thu Feb 16 15:26:43 2012 +0100

    move the second part of the message at the end of the widget

    I rephrased it as well per Will's suggestion.

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

 .../empathy-local-xmpp-assistant-widget.c	    |	23
 +++++++++++++-------
 1 files changed, 15 insertions(+), 8 deletions(-)

commit 4e2b90ee32a86004446ec7bf9246916147cbc377
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Thu Feb 16 15:00:09 2012 +0100

    widget-local-xmpp: expand the entry fields

    We want them to take all the space available.

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

 .../empathy-account-widget-local-xmpp.ui	    |	 6 ++++++
 1 files changed, 6 insertions(+), 0 deletions(-)

commit 1b0f008d221ade82446926ccf6a5bd1e774b3026
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Thu Feb 16 14:50:37 2012 +0100

    local-xmpp-assistant-widget: inherit from a GtkGrid

    It simplifies widgets packing.

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

 .../empathy-local-xmpp-assistant-widget.c	    |	17
 ++++++-----------
 .../empathy-local-xmpp-assistant-widget.h	    |	 4 ++--
 2 files changed, 8 insertions(+), 13 deletions(-)

commit 3e85f81e365012a97b426225a4ffcc6156dbfd1b
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Thu Feb 16 14:42:42 2012 +0100

    salut-dialog: use 'Skip' instead of 'Ignore'

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

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

commit 208dcb12e4946d9c710eecdd1f11f0cc8acf8cbc
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Thu Feb 16 12:52:01 2012 +0100

    remove empathy-auto-salut-account-helper

    It was used only by the accounts assistant

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

 src/Makefile.am			 |    2 -
 src/empathy-accounts-common.c		 |    1 -
 src/empathy-accounts.c			 |    1 -
 src/empathy-auto-salut-account-helper.c |  103
 -------------------------------
 src/empathy-auto-salut-account-helper.h |   34 ----------
 tests/interactive/Makefile.am		 |   11 ---
 6 files changed, 0 insertions(+), 152 deletions(-)

commit a266c221f89cf764d6fe954f63ba61658b8d83e4
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Thu Feb 16 12:50:28 2012 +0100

    Remove empathy-account-assistant

    DIE DIE DIE!!!

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

 src/empathy-account-assistant.c		    | 1313
 --------------------
 src/empathy-account-assistant.h		    |	66 -
 tests/interactive/test-empathy-account-assistant.c |	42 -
 3 files changed, 0 insertions(+), 1421 deletions(-)

commit 6fc913d958a7569ce8848797b4d365776cc7af20
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Thu Feb 16 12:48:05 2012 +0100

    Stop using the accounts assistant

    Its features have been re-implemented in
    empathy-accounts-dialog. Thanks to
    Danielle for this new design.

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

 src/empathy-accounts-common.c |   67
 +++-------------------------------------
 1 files changed, 5 insertions(+), 62 deletions(-)

commit db8942598423d5dd11ea28cdfb4b2935f1e2a374
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Thu Feb 16 12:45:22 2012 +0100

    empathy-accounts: remove --assistant option

    It was only used when hacking on the accounts assistant which is
    going away.

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

 src/empathy-accounts-common.c |    3 +--
 src/empathy-accounts-common.h |    1 -
 src/empathy-accounts.c        |    9 ++-------
 3 files changed, 3 insertions(+), 10 deletions(-)

commit 1dc8418d9480d3545151b443b2d43b1861a9d832
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Thu Feb 16 12:15:22 2012 +0100

    accounts-dialog: suggest to create a salut account

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

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

commit fe9e5a3cac6397054f984a10916378792ce583ca
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Thu Feb 16 12:14:16 2012 +0100

    Move should_create_salut_account to local-xmpp-assistant-widget

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

 .../empathy-local-xmpp-assistant-widget.c	    |	25
 +++++++++++++++++++
 .../empathy-local-xmpp-assistant-widget.h	    |	 5 ++++
 src/empathy-account-assistant.c		    |	 3 +-
 src/empathy-auto-salut-account-helper.c	    |	26
 --------------------
 src/empathy-auto-salut-account-helper.h	    |	 2 -
 5 files changed, 32 insertions(+), 29 deletions(-)

commit fea6df61fd35261aeebe2a94128d472e284a7280
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Thu Feb 16 11:56:01 2012 +0100

    add empathy-local-xmpp-assistant-widget

    All of this is duplicated code from empathy-account-assistant and
    empathy-auto-salut-account-helper but those are going away so I
    didn't bother
    refactoring them.

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

 libempathy-gtk/Makefile.am			    |	 4 +
 .../empathy-local-xmpp-assistant-widget.c	    |  282
 ++++++++++++++++++++
 .../empathy-local-xmpp-assistant-widget.h	    |	58 ++++
 po/POTFILES.in					    |	 1 +
 4 files changed, 345 insertions(+), 0 deletions(-)

commit 692672af8d6a30c6550571a424b4546a0dea98f7
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Wed Feb 15 15:28:18 2012 +0100

    accounts-dialog: display the import dialog if there is no account

    This is the first step of merging the accounts-dialog and assistant.

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

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

commit 49b69761e064aa1b43d6aa01af60bc9f2e536277
Author: Daniel Mustieles <daniel.mustieles@gmail.com>
Date:	Thu Feb 16 17:28:08 2012 +0100

    Updated Spanish translation

 po/es.po |  150
 ++++++++++++++++++++++++++++++++------------------------------
 1 files changed, 77 insertions(+), 73 deletions(-)

commit 3c51d10155a9bc4500cb3d559fff80cade6ac5b4
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Thu Feb 16 13:01:14 2012 +0100

    accounts-dialog: improve the 'no protocol installed' message

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

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

commit 4adfd6f5bf317845bed8b421c284ebb44097b5c5
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Wed Feb 15 16:16:18 2012 +0100

    accounts_dialog_add_account: select if that's the first account added

    This ensures we'll select the first imported account.

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

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

commit 55fab807184bdb0d30c43d2de6e91532cfdf8ccf
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Wed Feb 15 16:04:49 2012 +0100

    accounts-dialog: move the 'no protocol' message to a different page

    It's cleaner that way

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

 src/empathy-accounts-dialog.c	|   12 ++---
 src/empathy-accounts-dialog.ui |   80
 +++++++++++++++++++++------------------
 2 files changed, 48 insertions(+), 44 deletions(-)

commit 7b55432a729422e2eb2cd3b5d2e6d0b8219769db
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Wed Feb 15 15:37:28 2012 +0100

    accounts-dialog: remove hbox_protocol

    It's not used any more since we moved adding account to a separated
    dialog.

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

 src/empathy-accounts-dialog.c	|    4 ----
 src/empathy-accounts-dialog.ui |   25 -------------------------
 2 files changed, 0 insertions(+), 29 deletions(-)

commit ce4c4dc698850f54dfa2409b790b2e1c747a66a6
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Wed Feb 15 15:26:33 2012 +0100

    accounts-dialog: don't automatically open the add account

    This legacy code isn't used since a while as the assistant is
    displayed if
    there is no account.

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

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

commit 8586e87ddfa2b09b31aa6fe2f98bede2be4769c5
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Thu Feb 16 12:01:40 2012 +0100

    import-dialog: set a verb on the 'Ok' button

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

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

commit bb7c70ed25061844341318d3f96c2b56beefcb5f
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Wed Feb 15 15:22:10 2012 +0100

    import-dialog: expand and fill the import widget

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

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

commit 9e91ccd4f78115f3a57a1d678ef10f6325aeaa1c
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Wed Feb 15 12:43:38 2012 +0100

    Pass EmpathyConnectionManagers to the import widget

    The widget doesn't have to prepare EmpathyConnectionManagers itself
    any more
    and so can populate its treeview right away. By doing so it will
    request a
    more decent size and so the dialog will actually display the
    accounts which
    can be imported without forcing user to resize it.

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

 src/empathy-account-assistant.c |    3 +-
 src/empathy-accounts-dialog.c	 |    3 +-
 src/empathy-import-dialog.c	 |   40
 +++++++++++++++++++++++++++++++----
 src/empathy-import-dialog.h	 |    5 +++-
 src/empathy-import-widget.c	 |   44
 ++++++++++++++++++++------------------
 src/empathy-import-widget.h	 |    5 +++-
 6 files changed, 70 insertions(+), 30 deletions(-)

commit 540ebef23ea20077e8b5d275c6114ef8bf15e05e
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Wed Feb 15 12:05:55 2012 +0100

    factor out display_import_dialog()

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

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

commit 4fe19e7071092a3f886706ab185bf30bff776fce
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Wed Feb 15 11:33:47 2012 +0100

    remove useless include

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

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

commit 9b3306a89a8419217e9c2350d7c32c1a83704eca
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Thu Feb 16 12:43:28 2012 +0100

    coding style fixes

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

commit 09c17d1e767b8459ff23158f35f795d16aac6a0b
Author: Wylmer Wang <wantinghard@gmail.com>
Date:	Thu Feb 16 10:06:00 2012 +0000

    Update Simplified Chinese translation.

 po/zh_CN.po | 3109
 ++++++++++++++++++++++++++++++-----------------------------
 1 files changed, 1588 insertions(+), 1521 deletions(-)

commit 1e6989eb0d805cd27b47e3d705614d1583e30a23
Author: Yuri Myasoedov <omerta13@yandex.ru>
Date:	Thu Feb 16 01:21:04 2012 +0400

    Updated Russian translation

 po/ru.po | 2424
 ++++++++++++++++++++++++++++++++------------------------------
 1 files changed, 1263 insertions(+), 1161 deletions(-)

commit 5cee8ed2af554bcf03e04438dd5a47bdedadf677
Author: Ihar Hrachyshka <ihar.hrachyshka@gmail.com>
Date:	Wed Feb 15 21:52:10 2012 +0300

    Updated Belarusian translation.

 po/be.po |  277
 ++++++++++++++++++++++++++++++++-----------------------------
 1 files changed, 145 insertions(+), 132 deletions(-)

commit 84e286a84d838896a0dc4e1a1ee9104f8c9dbabb
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Fri Feb 10 14:54:19 2012 +0100

    empathy-chat: keep the individual manager alive as a cache

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

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

commit fac52e2c170e94ecad67f3087a462baf9ba5f49e
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Fri Feb 10 14:53:40 2012 +0100

    empathy-chat: use empathy_ensure_individual_from_tp_contact()

    This ensures we'll pass the right individual ID to gnome-contacts
    when opening
    a meta-contact.

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

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

commit 54bd693510f9aa2c1791d8ccf51f2b0371c66a3a
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Fri Feb 10 14:52:28 2012 +0100

    add empathy_ensure_individual_from_tp_contact()

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

 libempathy/empathy-utils.c |	20 ++++++++++++++++++++
 libempathy/empathy-utils.h |	 3 +++
 2 files changed, 23 insertions(+), 0 deletions(-)

commit 894ce49de11658ae2b66907bf609f0e6810acb3e
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Fri Feb 10 14:40:28 2012 +0100

    add empathy_individual_manager_lookup_by_contact()

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

 libempathy/empathy-individual-manager.c |   52
 +++++++++++++++++++++++++++++++
 libempathy/empathy-individual-manager.h |    4 ++
 2 files changed, 56 insertions(+), 0 deletions(-)

commit 5fd8bf412017f07d25459b0efd72c88a420bd50f
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Fri Jan 6 15:06:47 2012 +0100

    set the presence message as a tooltip on its label

    So user can still read the full message if it has been ellipsized.

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

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

commit be6cefc64d3893274dd907dcc094d6209b54352a
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Fri Jan 6 15:03:58 2012 +0100

    accounts-dialog: ellipsize presence message

    Long messages make this dialog looks weird and that's not really
    the point of
    this UI to display it anyway.

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

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

commit d0dd004dda7783348d186cee7a4b344cdb6f5a6c
Author: Fran Diéguez <fran.dieguez@mabishu.com>
Date:	Tue Feb 14 22:00:44 2012 +0100

    Updated Galician translations

 po/gl.po |  700
 ++++++++++++++++++++++++++++++++------------------------------
 1 files changed, 357 insertions(+), 343 deletions(-)

commit c2e269778d7e4506dd673fb1cbabe74e69c2c279
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Mon Feb 6 14:16:55 2012 +0100

    Display a spinner while loading contacts from Folks

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

 src/empathy-roster-window.c  |   79
 ++++++++++++++++++++++++++++++++++-------
 src/empathy-roster-window.ui |   20 ++++++++++
 2 files changed, 85 insertions(+), 14 deletions(-)

commit 6ef0203c6af78e37a6e7de79dd2bae7de870d62d
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Fri Feb 3 16:11:47 2012 +0100

    individual-manager: add API to know when contacts have been loaded
    from folks

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

 libempathy/empathy-individual-manager.c |   43
 +++++++++++++++++++++++++++++++
 libempathy/empathy-individual-manager.h |    3 ++
 2 files changed, 46 insertions(+), 0 deletions(-)

commit 45fea3c1ff003d49510819a9dd713b5d23a18244
Author: Мирослав Николић <miroslavnikolic@rocketmail.com>
Date:	Tue Feb 14 10:33:25 2012 +0100

    Updated Serbian translation

 po/sr.po	|  305
 +++++++++++++++++++++++++++++---------------------------
 po/sr@latin.po |  305
 +++++++++++++++++++++++++++++---------------------------
 2 files changed, 316 insertions(+), 294 deletions(-)

commit 311d64031eb43286a1c209a6fc582b897f427733
Author: Daniel Mustieles <daniel.mustieles@gmail.com>
Date:	Mon Feb 13 17:13:17 2012 +0100

    Updated Spanish translation

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

commit e08f36f30007713c60630d735d6b724380c138fa
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Mon Feb 13 14:31:09 2012 +0100

    tls-dialog: add accessor on the 'Continue' button

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

commit 0b36472493f281e5fecead64e7afb38d4cc994f7
Author: Daniel Mustieles <daniel.mustieles@gmail.com>
Date:	Mon Feb 13 12:43:40 2012 +0100

    Updated Spanish translation

 po/es.po |  290
 ++++++++++++++++++++++++++++++++------------------------------
 1 files changed, 150 insertions(+), 140 deletions(-)

commit f728987ff14494033cde4afa432c58671bf2615c
Author: Patrick F. Allen <pallenpost@gmail.com>
Date:	Sat Feb 11 08:52:14 2012 -0500

    Toggle telling others you are typing to them

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

 data/org.gnome.Empathy.gschema.xml.in |    5 +++++
 libempathy-gtk/empathy-chat.c	       |   16 +++++++++++++++-
 libempathy/empathy-gsettings.h        |    1 +
 3 files changed, 21 insertions(+), 1 deletions(-)

commit 052ad91afd77f267d3ddedc0f32f2378d73f9897
Author: Мирослав Николић <miroslavnikolic@rocketmail.com>
Date:	Sun Feb 12 16:21:41 2012 +0100

    Updated Serbian translation

 po/sr.po	|  212
 ++++++++++++++++++++++++--------------------------------
 po/sr@latin.po |  212
 ++++++++++++++++++++++++--------------------------------
 2 files changed, 180 insertions(+), 244 deletions(-)

commit 43647b4dcac0e383a88f2ad5f9e0b101de2d1831
Author: Bruno Brouard <annoa.b@gmail.com>
Date:	Sun Feb 12 11:05:39 2012 +0100

    Updated French doc translation

 help/fr/fr.po | 3858
 ++++++++++-----------------------------------------------
 1 files changed, 632 insertions(+), 3226 deletions(-)

commit b3999ece5197b67edaeb07a2faa814f9cf4a5a79
Author: Ihar Hrachyshka <ihar.hrachyshka@gmail.com>
Date:	Sat Feb 11 22:02:59 2012 +0300

    Updated Belarusian translation.

 po/be.po | 2444
 +++++++++++++++++++++++++++++++------------------------------
 1 files changed, 1242 insertions(+), 1202 deletions(-)

commit a8e8bd5d88bdb4a02bd40ab559bcd62612b63f9c
Author: Will Thompson <will.thompson@collabora.co.uk>
Date:	Fri Feb 10 17:47:47 2012 +0000

    Don't unhighlight chat tabs when more messages are received

    Travis noticed that if you receive a message in which you are not
    mentioned after one in which you are, the highlight on the chat tab is
    cleared. This turned out to be because the text of the chat tab label
    was set in two different places in empathy-chat-window.c: one which
    takes should_highlight into account, and one which does not.

    This patch makes EmpathyChat keep track of whether it should be
    highlighted (reusing empathy_chat_messages_read(), which is called to
    acknowledge messages as having been seen by the user, to clear the
    flag), and then uses that from one of the label-updating code
    paths and
    deletes the other.

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

 libempathy-gtk/empathy-chat.c |   21 +++++++++++++++++++++
 libempathy-gtk/empathy-chat.h |    2 +-
 src/empathy-chat-window.c     |   39
 +++++++++++----------------------------
 3 files changed, 33 insertions(+), 29 deletions(-)

commit c9c63f5412fbf6f7927c857c7f8f04082abbccde
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Fri Feb 10 12:58:38 2012 +0100

    start_gnome_contacts: make sure individual is valid

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

commit c9add0b7c2ef61469af3ba77fd6fc03dccd6733a
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Fri Feb 10 12:58:20 2012 +0100

    fix individual_info_menu_item_activate_cb signature

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

commit 91d37340b5b2495cf8eed1f53482aa4e046964ae
Author: Will Thompson <will.thompson@collabora.co.uk>
Date:	Wed Feb 8 17:48:07 2012 +0000

    ContactInfo: always escape IRC channel names in markup

    For some reason, I chose to escape the channel name for the
    contents of
    the href='' attribute but not in the body of the tag. Thus, channel
    names like "#r&d" made Pango refuse to coöperate.

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

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

commit cb1bb584bccd7138fa1b5c27c254d01ca21c472c
Author: Daniel Mustieles <daniel.mustieles@gmail.com>
Date:	Thu Feb 9 17:29:26 2012 +0100

    Updated Spanish translation

 po/es.po |  158
 ++++++++++++++++++++++++++++++++-----------------------------
 1 files changed, 83 insertions(+), 75 deletions(-)

commit 2cdb20a345bc961dcd3dc3fca4e7731486c22aeb
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Thu Feb 9 16:02:44 2012 +0100

    empathy-call: call XInitThreads()

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

commit 31debb1f437fc32ebeb389cae1eab92388be6bea
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Thu Feb 9 15:29:03 2012 +0100

    stop using clutter_gst_video_sink_new()

    It has been deprecated.

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

commit b02e1667ba8c6e2af128ae461de082ea839dff56
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Fri Nov 25 14:44:09 2011 +0100

    Add a gsetting key to show/hide groups

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

 data/org.gnome.Empathy.gschema.xml.in |    5 +++++
 libempathy/empathy-gsettings.h        |    1 +
 src/empathy-roster-window.c	       |    3 +++
 3 files changed, 9 insertions(+), 0 deletions(-)

commit 5c9ffe720041257034f8d85d1ae5298bbdf10492
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Thu Feb 9 12:51:47 2012 +0100

    account-widget-jabber: doesn't allow negative priority

    Setting a negative priority secretly mean "don't send me any message"
    which
    can be very confusing.

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

 libempathy-gtk/empathy-account-widget-jabber.ui |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

commit 53d30bf2e665665de83a13555694371e0142467f
Author: Daniel Mustieles <daniel.mustieles@gmail.com>
Date:	Thu Feb 9 12:32:06 2012 +0100

    Updated Spanish translation

 po/es.po |  259
 +++++++++++++++++++++++++++++---------------------------------
 1 files changed, 122 insertions(+), 137 deletions(-)

commit 3a918bcb64fe3dd8b6cc1c6be6f74bd940a32ac4
Author: Мирослав Николић <miroslavnikolic@rocketmail.com>
Date:	Thu Feb 9 11:58:59 2012 +0100

    Updated Serbian translation

 po/sr.po	| 3778
 ++++++++++++++++++++++++++++++--------------------------
 po/sr@latin.po | 3778
 ++++++++++++++++++++++++++++++--------------------------
 2 files changed, 4026 insertions(+), 3530 deletions(-)

commit 65f66ac784b3be605d4470b940ec39c0d5b4c41e
Author: Tiffany Antopolski <tiffany.antopolski@gmail.com>
Date:	Wed Feb 8 19:31:32 2012 -0500

    po: Updated en_CA.po

 po/en_CA.po | 5866
 +++++++++++++++++++++++++++++++++++++++++------------------
 1 files changed, 4103 insertions(+), 1763 deletions(-)

commit 49e6e5ce115d2c6792ad16b56fcb23c0f7a1984f
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Wed Feb 8 16:29:19 2012 +0100

    contact-widget: use 'Personal Details' when editing our own info

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

 libempathy-gtk/empathy-contact-widget.c  |    9 +++++++++
 libempathy-gtk/empathy-contact-widget.ui |    2 +-
 2 files changed, 10 insertions(+), 1 deletions(-)

commit df46e07c93dec1d9cb3e3bee9c67f22918f40312
Author: Mako N <mako@pasero.net>
Date:	Thu Feb 9 00:25:00 2012 +0900

    [l10n] Update Japanese translation

 po/ja.po | 4347
 +++++++++++++++++++++++++++++++-------------------------------
 1 files changed, 2188 insertions(+), 2159 deletions(-)

commit 67f7211242e9982cf17f17ac9a5483155941312a
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Wed Feb 8 15:12:16 2012 +0100

    Remove unused persona store/view

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

 libempathy-gtk/Makefile.am		|    4 -
 libempathy-gtk/empathy-persona-store.c | 1215
 --------------------------------
 libempathy-gtk/empathy-persona-store.h |  108 ---
 libempathy-gtk/empathy-persona-view.c	|  844 ----------------------
 libempathy-gtk/empathy-persona-view.h	|   87 ---
 5 files changed, 0 insertions(+), 2258 deletions(-)

commit a71aa49346ee9a6ea4c7ceb14850d58824fb36de
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Wed Feb 8 14:52:10 2012 +0100

    remove linking UI

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

 libempathy-gtk/Makefile.am		    |	 4 -
 libempathy-gtk/empathy-individual-linker.c |  779
 ----------------------------
 libempathy-gtk/empathy-individual-linker.h |	76 ---
 libempathy-gtk/empathy-linking-dialog.c    |  276 ----------
 libempathy-gtk/empathy-linking-dialog.h    |	66 ---
 po/POTFILES.in				    |	 2 -
 6 files changed, 0 insertions(+), 1203 deletions(-)

commit 4bd4dca988dcd4680c9a381ebe7aed881006c556
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Wed Feb 8 14:48:33 2012 +0100

    individual-menu: remove link-contacts-activated signal

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

 libempathy-gtk/empathy-individual-menu.c |   14 --------------
 libempathy-gtk/empathy-individual-view.c |   20 --------------------
 2 files changed, 0 insertions(+), 34 deletions(-)

commit f0ca8ccc9e04507a25812e7d7e4a80500daf9569
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Wed Feb 8 14:42:36 2012 +0100

    Remove 'Link Contact' menu item

    We want to use gnome-contacts and the 'Informations' menu item
    already starts
    it.

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

 libempathy-gtk/empathy-individual-menu.c |   52
 +-----------------------------
 libempathy-gtk/empathy-individual-menu.h |    9 ++---
 src/empathy-roster-window.c		  |    1 -
 3 files changed, 5 insertions(+), 57 deletions(-)

commit 1e10d537d22441f35ad57164e2231835a85698ed
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Wed Feb 8 15:04:55 2012 +0100

    disable clutter deprecation warnings for now

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

commit a7d8fb33fc1173ee4414d956a12e311ba3ec4c8b
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Wed Feb 8 15:04:24 2012 +0100

    add missing config.h

 src/empathy-rounded-actor.c	 |    1 +
 src/empathy-rounded-rectangle.c |    2 ++
 2 files changed, 3 insertions(+), 0 deletions(-)

commit 05f8bd96c6fc3cc62995c24678730b9fcdda9112
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Tue Feb 7 17:12:15 2012 +0100

    Try installing gnome-contacts using PackageKit

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

 libempathy-gtk/empathy-individual-menu.c |   52
 +++++++++++++++++++++++++++---
 1 files changed, 47 insertions(+), 5 deletions(-)

commit 7429c7622ffad91a96df4d729637184c3044fed1
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Wed Feb 8 11:57:05 2012 +0100

    add empathy-pkg-kit

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

 libempathy/Makefile.am       |    2 +
 libempathy/empathy-pkg-kit.c |  161
 ++++++++++++++++++++++++++++++++++++++++++
 libempathy/empathy-pkg-kit.h |   38 ++++++++++
 3 files changed, 201 insertions(+), 0 deletions(-)

commit 1c0fc43564b2e9ca3f8a2052bb1b71e908792817
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Wed Feb 8 12:06:41 2012 +0100

    factor out start_gnome_contacts()

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

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

commit 8f3dc843ed74c9b7dac57d3a6ce62b9f148eb791
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Tue Feb 7 15:45:36 2012 +0100

    Factor out show_gnome_contacts_error_dialog()

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

 libempathy-gtk/empathy-individual-menu.c |   33
 +++++++++++++++++------------
 1 files changed, 19 insertions(+), 14 deletions(-)

commit eb3bf07c3c1544f03c7c37cbe3fe8ef24ae5143b
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Wed Feb 8 13:26:25 2012 +0100

    improve TP_ERROR_STR_ALREADY_CONNECTED displayed error string

    'ressource' is XMPP specific and not clear to most users.

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

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

commit a62b307ffba7b2b4f241ffeca381fee14f19a7b9
Author: Mattias Põldaru <mahfiaz@gmail.com>
Date:	Wed Feb 8 11:06:40 2012 +0200

    [l10n] Updated Estonian translation

 po/et.po | 1247
 +++++++++++++++++++++++++++++++++-----------------------------
 1 files changed, 657 insertions(+), 590 deletions(-)

commit 803a6c26146c716dcef8b131ac06df0808195d10
Author: Daniel Mustieles <daniel.mustieles@gmail.com>
Date:	Tue Feb 7 17:57:38 2012 +0100

    Updated Spanish translation

 po/es.po | 1800
 +++++++++++++++++++++++++++++++-------------------------------
 1 files changed, 903 insertions(+), 897 deletions(-)

commit 8c56829f3fa97640abf47ced7d39aa618fffe07f
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Tue Feb 7 13:48:03 2012 +0100

    remove empathy-individual-information-dialog

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

 libempathy-gtk/Makefile.am			    |	 2 -
 .../empathy-individual-information-dialog.c	    |  318
 --------------------
 .../empathy-individual-information-dialog.h	    |	60 ----
 po/POTFILES.in					    |	 1 -
 4 files changed, 0 insertions(+), 381 deletions(-)

commit 13940bc1a76addecce46f38446b4e39fe330e982
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Tue Feb 7 13:42:00 2012 +0100

    Use gnome-contacts instead of the information dialog

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

 libempathy-gtk/empathy-individual-menu.c |   58
 ++++++++++++++++++++++++++++-
 1 files changed, 56 insertions(+), 2 deletions(-)

commit bcde40a830ec9ec30aabaf1a188847f0001dbfb4
Author: Mario Blättermann <mario.blaettermann@gmail.com>
Date:	Tue Feb 7 14:55:25 2012 +0100

    [l10n] Updated German doc translation

 help/de/de.po |  519
 ++++++++++++++++++++++++++++++---------------------------
 1 files changed, 270 insertions(+), 249 deletions(-)

commit 0dcd0fc2081385dbe020e03a031af65372556c0c
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Tue Feb 7 12:54:55 2012 +0100

    add missing config.h

    Need to disable GLib deprecation warnings.

 libempathy/empathy-account-settings.c	|    1 +
 libempathy/empathy-tp-streamed-media.c |    2 ++
 2 files changed, 3 insertions(+), 0 deletions(-)

commit 914b18075a53425c03771e62bdfdf7431f43369f
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Tue Feb 7 11:49:55 2012 +0100

    remove released flag

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