commit 2b7946a29c9d2f38f829e29eb8c452765b1c562e
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:   Mon Jul 16 16:59:35 2012 +0200

    prepare 3.5.4

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

commit 15e2a556e3e5c9efadc3153223d17d4cab8597e1
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:   Mon Jul 16 15:28:40 2012 +0200

    Display GOA_PKG_ERRORS if deps are missing

 configure.ac |    4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

commit 17466e4859d78642ba7f8319a4875cc29c4ca0ba
Author: Xavier Claessens <xavier.claessens@collabora.co.uk>
Date:   Mon Jul 16 14:18:47 2012 +0200

    Fix build warning: A string format is required

 libempathy-gtk/empathy-subscription-dialog.c |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

commit 0751b2d498a4fedde128f9a55bcb89d859794ee3
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:   Mon Jul 16 11:10:57 2012 +0200

    Use new tp_account_* getters

 libempathy-gtk/empathy-individual-store.c            |    4 ++--
 libempathy-gtk/empathy-local-xmpp-assistant-widget.c |    2 +-
 libempathy-gtk/empathy-theme-adium.c                 |    4 ++--
 libempathy/empathy-account-settings.c                |    4 ++--
 libempathy/empathy-contact.c                         |    4 ++--
 src/empathy-accounts-common.c                        |    2 +-
 src/empathy-accounts-dialog.c                        |    4 ++--
 src/empathy-debug-window.c                           |    4 ++--
 src/empathy-new-chatroom-dialog.c                    |    4 ++--
 src/empathy-roster-window.c                          |    4 ++--
 src/empathy-sanity-cleaning.c                        |    2 +-
 11 files changed, 19 insertions(+), 19 deletions(-)

commit 25c022091cf9527a80db041e554e8ec35b131bf2
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:   Mon Jul 16 11:10:19 2012 +0200

    preferences: use the factory to create the TpAccount

    tp_account_new() has been deprecated.

 src/empathy-preferences.c |   13 ++++++++-----
 1 file changed, 8 insertions(+), 5 deletions(-)

commit cf41b427508a00295ebbac0d05fbc744f44f8c6a
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:   Mon Jul 16 11:10:00 2012 +0200

    Depend on tp-glib 0.19.3

    Needed to fix deprecation warnings.

 configure.ac |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

commit dd7154f04328775592b0d3206ccc05e83a47ae25
Author: Ihar Hrachyshka <ihar.hrachyshka@gmail.com>
Date:   Sun Jul 15 14:42:22 2012 +0300

    Updated Belarusian translation.

 po/be.po | 1055
 +++++++++++++++++++++++++++++---------------------------------
 1 file changed, 491 insertions(+), 564 deletions(-)

commit fe6e6539e31484f8a4c5ec8b762c1964f59f9ffd
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:   Wed Jul 11 15:30:29 2012 +0200

    chat-window: use self->priv pattern

 src/empathy-chat-window.c |  877
 +++++++++++++++++++--------------------------
 src/empathy-chat-window.h |    3 +-
 2 files changed, 373 insertions(+), 507 deletions(-)

commit b1d3fec398564d8f4e46daa9e43ec3ccb25805fd
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:   Wed Jul 11 13:54:46 2012 +0200

    chat-window: port to new coding styles

 src/empathy-chat-window.c | 4364
 +++++++++++++++++++++++----------------------
 src/empathy-chat-window.h |   59 +-
 2 files changed, 2265 insertions(+), 2158 deletions(-)

commit cdd2887a1d29b6e8a4489980991dc5283e7065d7
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:   Wed Jul 11 11:50:45 2012 +0200

    new-chatroom-dialog: set default response

    We want to activate the dialog when user hits 'Enter' so he joins
    the room
    right away.

 src/empathy-new-chatroom-dialog.c |    2 ++
 1 file changed, 2 insertions(+)

commit 363703bb5b66dfa167b1f90670fd582678dc2a35
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:   Wed Jul 11 11:02:48 2012 +0200

    remove empathy-contact-dialogs

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

 libempathy-gtk/Makefile.am                |    3 -
 libempathy-gtk/empathy-contact-dialogs.c  |  234
 -----------------------------
 libempathy-gtk/empathy-contact-dialogs.h  |   39 -----
 libempathy-gtk/empathy-contact-dialogs.ui |  121 ---------------
 po/POTFILES.in                            |    2 -
 5 files changed, 399 deletions(-)

commit 1d63b3b7f03ec1508329894ab25113749a8a1403
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:   Wed Jul 11 11:31:46 2012 +0200

    remove useless includes

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

 libempathy-gtk/empathy-subscription-dialog.c |    1 -
 src/empathy-chat-window.c                    |    1 -
 src/empathy-roster-window.c                  |    1 -
 3 files changed, 3 deletions(-)

commit 791b7e8b3d1f67314170bbd743cb253385d937d7
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:   Wed Jul 11 11:30:09 2012 +0200

    individual-menu: use the individual version of the add dialog

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

 libempathy-gtk/empathy-individual-menu.c |   12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

commit 15b0acdc8cec7794f1112b243b2fadd3baf6a707
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:   Wed Jul 11 10:47:24 2012 +0200

    log-window: use empathy_display_individual_info()

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

 libempathy-gtk/empathy-log-window.c |   12 +++++++++---
 1 file changed, 9 insertions(+), 3 deletions(-)

commit 634a85b3d20ef79e77069ef93e4c9a6f45a12cf8
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:   Wed Jul 11 10:47:24 2012 +0200

    contact-search-dialog: use empathy_display_individual_info()

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

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

commit 3878f8cca1e145e30932823c4ea6d0de1ad4462c
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:   Wed Jul 11 10:47:24 2012 +0200

    chat: use empathy_display_individual_info()

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

 libempathy-gtk/empathy-chat.c |   13 ++++++-------
 1 file changed, 6 insertions(+), 7 deletions(-)

commit 60e19a5cd6acce9af9b19d013eb396f12ea42abe
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:   Tue Jul 10 16:03:17 2012 +0200

    factor out empathy_display_individual_info()

    It didn't want to put more misc stuffs to ui-utils so used this file.

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

 .../empathy-individual-information-dialog.c        |  138
 ++++++++++++++++++++
 .../empathy-individual-information-dialog.h        |    2 +
 libempathy-gtk/empathy-individual-menu.c           |  128
 +-----------------
 3 files changed, 141 insertions(+), 127 deletions(-)

commit 4ded9c80ba7a602cdf7bedc52e6cff57f507f943
Author: Yaron Shahrabani <sh.yaron@gmail.com>
Date:   Tue Jul 10 22:52:37 2012 +0300

    Updated Hebrew translation.

 po/he.po |  976
 +++++++++++++++++++++++++++++++-------------------------------
 1 file changed, 487 insertions(+), 489 deletions(-)

commit 181d9742d1159b33dcd5c126cb8593b2e77e0e74
Author: Žygimantas Beručka <uid0@akl.lt>
Date:   Tue Jul 10 19:03:20 2012 +0300

    Updated Lithuanian translation

 po/lt.po | 2972
 +++++++++++++++++++++++++++++++++-----------------------------
 1 file changed, 1579 insertions(+), 1393 deletions(-)

commit 84304062b65b80e20da92939da03e38c6232b87b
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:   Tue May 1 12:12:48 2012 +0200

    protocol-chooser: set pixbuf on the cell rather than the icon-name

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

 libempathy-gtk/empathy-protocol-chooser.c |   25
 +++++++++++++++++++------
 1 file changed, 19 insertions(+), 6 deletions(-)

commit 4757fce1713fc77538106c26493ba1255617b5cf
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:   Mon Jul 9 12:13:28 2012 +0200

    roster-view: export special group names

    Needed to special case the DnD code.

 libempathy-gtk/empathy-roster-view.c |   37
 +++++++++++++++++-----------------
 libempathy-gtk/empathy-roster-view.h |    4 ++++
 2 files changed, 22 insertions(+), 19 deletions(-)

commit 690d4bb2fb9ec033299a057483019253f859fecb
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:   Thu Jul 5 15:53:47 2012 +0200

    roster-view: add empathy_roster_view_get_group_at_y()

 libempathy-gtk/empathy-roster-view.c |   19 +++++++++++++++++++
 libempathy-gtk/empathy-roster-view.h |    4 ++++
 2 files changed, 23 insertions(+)

commit 276d529fb837238cba3f1f51ba47ec4ec45d90b9
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:   Thu Jul 5 15:52:58 2012 +0200

    add empathy_roster_contact_get_avatar_pixbuf()

 libempathy-gtk/empathy-roster-contact.c |    6 ++++++
 libempathy-gtk/empathy-roster-contact.h |    3 +++
 2 files changed, 9 insertions(+)

commit 20c864a24dce1b0f2781ea1cbbf75ce3d8c34495
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:   Mon Jul 9 10:11:57 2012 +0200

    call-window: use gdk_keyval_to_unicode()

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

 src/empathy-call-window.c |   79
 +++++++++++++--------------------------------
 1 file changed, 22 insertions(+), 57 deletions(-)

commit cc26255d60d53c56e42dffd8094d028d7cde112f
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:   Fri Jul 6 15:04:55 2012 +0200

    dialpad-widget: use EmpathyDialpadButton

    This will be needed if we want to stop using GtkButton in order to
    keep the
    key pressed while the keyboard key is.

    Anyway, it's good to have regardeless as that makes the code cleaner.

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

 libempathy-gtk/empathy-dialpad-button.c |   26 ++++++++++++++
 libempathy-gtk/empathy-dialpad-widget.c |   57
 +++++++++----------------------
 2 files changed, 43 insertions(+), 40 deletions(-)

commit 086cd424968bc5c4ef97f3b715bd26fd2a46e9ec
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:   Fri Jul 6 14:39:20 2012 +0200

    add empathy-dialpad-button

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

 libempathy-gtk/Makefile.am              |    2 +
 libempathy-gtk/empathy-dialpad-button.c |  202
 +++++++++++++++++++++++++++++++
 libempathy-gtk/empathy-dialpad-button.h |   85 +++++++++++++
 3 files changed, 289 insertions(+)

commit ada7b68f30ab88a3f142bf82cac790b98743ef23
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:   Fri Jul 6 14:29:48 2012 +0200

    call-window: allow user to enter dtmf events using his keyboard

    Ideally we should stop sending the DTMF event when the key is released
    but we
    can't easily do that in Gtk+; we'll have to write our own widget.
    I'm going to give it a shot but this is already a nice improvement
    so we
    shouldn't block on it.

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

 src/empathy-call-window.c |   63
 +++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 63 insertions(+)

commit 761ef25a05361cdc8ec484e12898b3aedda94fe5
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:   Fri Jul 6 14:29:25 2012 +0200

    add empathy_dialpad_widget_press_key()

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

 libempathy-gtk/empathy-dialpad-widget.c |   18 ++++++++++++++++++
 libempathy-gtk/empathy-dialpad-widget.h |    3 +++
 2 files changed, 21 insertions(+)

commit 7a2248d5a003ca685116076abb898857a8b40a60
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:   Fri Jul 6 14:28:32 2012 +0200

    dialpad-widget: store buttons in a hash table

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

 libempathy-gtk/empathy-dialpad-widget.c |   23 +++++++++++++++++++++++
 1 file changed, 23 insertions(+)

commit 1eb83c95020a883d01dca4dd09d1cf3e242866c1
Author: Kjartan Maraas <kmaraas@gnome.org>
Date:   Mon Jul 9 09:40:09 2012 +0200

    Updated Norwegian bokmål translation

 po/nb.po |  938
 +++++++++++++++++++++++++++++---------------------------------
 1 file changed, 432 insertions(+), 506 deletions(-)

commit 1c664bed2c3ab4ed1d2763eb80675949a6ff4ca1
Author: A S Alam <aalam@users.sf.net>
Date:   Mon Jul 9 07:10:46 2012 +0530

    Update Punjabi Translation

 po/pa.po | 2531
 +++++++++++++++++++++++++++++++-------------------------------
 1 file changed, 1274 insertions(+), 1257 deletions(-)

commit fd3fd34d534510b5a96b7559c0743e9efddb73c2
Author: Daniel Mustieles <daniel.mustieles@gmail.com>
Date:   Fri Jul 6 12:24:15 2012 +0200

    Updated Spanish translation

 po/es.po |  115
 +++++++++++++++++++++++++++++++++-----------------------------
 1 file changed, 62 insertions(+), 53 deletions(-)

commit 20a4ffc16a3eaf4ea5859ccd3d2f8c1d364441aa
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:   Fri Jun 29 14:35:45 2012 +0200

    individual-widget: don't display unknown presence

    Best to to not show anything than showing we don't know.

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

 libempathy-gtk/empathy-individual-widget.c |   25
 ++++++++++++++++++-------
 1 file changed, 18 insertions(+), 7 deletions(-)

commit 7615fb3d04356ebb2155a8e335db6eb995dac66d
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:   Fri Jun 29 14:25:39 2012 +0200

    inline block_contact_dialog_show() into subscription-dialog.c

    It's only used there now.

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

 libempathy-gtk/empathy-contact-dialogs.c     |   73
 -------------------------
 libempathy-gtk/empathy-contact-dialogs.h     |    4 --
 libempathy-gtk/empathy-subscription-dialog.c |   74
 +++++++++++++++++++++++++-
 3 files changed, 73 insertions(+), 78 deletions(-)

commit 001cd2ec66845de212ecb58c71a8f38e68834bfe
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:   Fri Jun 29 14:21:32 2012 +0200

    remove empathy_subscription_dialog_show()

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

 libempathy-gtk/empathy-contact-dialogs.c |  135
 ------------------------------
 libempathy-gtk/empathy-contact-dialogs.h |    3 -
 2 files changed, 138 deletions(-)

commit b020c790f9d30e23c34bc5a7fec1a4de4c2aa528
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:   Fri Jun 29 14:18:13 2012 +0200

    event-manager: use EmpathySubscriptionDialog

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

 src/empathy-event-manager.c |   15 ++++++++++++---
 1 file changed, 12 insertions(+), 3 deletions(-)

commit 875ec0d10b3042d2c40a7d0f288653adbdc281bf
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:   Fri Jun 29 12:39:32 2012 +0200

    add empathy-subscription-dialog

    This is copied from the similar dialog in empathy-account-dialogs.c
    which I'm
    about to remove.

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

 libempathy-gtk/Makefile.am                   |    2 +
 libempathy-gtk/empathy-subscription-dialog.c |  288
 ++++++++++++++++++++++++++
 libempathy-gtk/empathy-subscription-dialog.h |   75 +++++++
 po/POTFILES.in                               |    1 +
 4 files changed, 366 insertions(+)

commit 408c581426ea8df05cc2b1c1663aa8405334f2ac
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:   Wed Jul 4 15:44:43 2012 +0200

    empathy_adium_path_is_valid: check if the directory has the right
    format

    The Adium spec explicitely says that the root directory of the
    theme should
    end with ".AdiumMessageStyle".

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

 libempathy-gtk/empathy-theme-adium.c |   20 ++++++++++++++++++++
 1 file changed, 20 insertions(+)

commit 4e532114814f39740a5695c35fc02b465bbce2e1
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:   Wed Jul 4 14:11:09 2012 +0200

    roster-contact: force the size of the avatar

    This ensures that all the contacts are nicely aligned even if they
    have a
    smaller avatar.

 libempathy-gtk/empathy-roster-contact.c |    2 ++
 1 file changed, 2 insertions(+)

commit d3c53c44780da382ed2bf17fbcff9d71b234e48d
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:   Wed Jul 4 14:10:20 2012 +0200

    pixbuf_avatar_from_individual_closure_new: use the g_slice allocator

    We are likely to allocate a bunch of those so best to use the g_slice
    allocator.

 libempathy-gtk/empathy-ui-utils.c |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

commit a86f21ab5cf567281f3e22bfd4409bbfbbcf78e4
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:   Wed Jul 4 13:45:52 2012 +0200

    avatar_icon_load_cb: use gdk_pixbuf_new_from_stream_at_scale()

    Make all this code much simpler.

 libempathy-gtk/empathy-ui-utils.c |  139
 +++++++------------------------------
 1 file changed, 26 insertions(+), 113 deletions(-)

commit 3cc222d662bc96186bbd19fa75e44ac98e54cbb1
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:   Wed Jul 4 13:45:11 2012 +0200

    ui-utils: factor out pixbuf_round_corners()

 libempathy-gtk/empathy-ui-utils.c |   32 ++++++++++++++++++--------------
 1 file changed, 18 insertions(+), 14 deletions(-)

commit 2f6643d36031df340dc5b154be579d13bc0de58e
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:   Wed Jul 4 12:51:00 2012 +0200

    ui-utils: remove unused public functions

 libempathy-gtk/empathy-ui-utils.c |  687
 +------------------------------------
 libempathy-gtk/empathy-ui-utils.h |   19 -
 2 files changed, 7 insertions(+), 699 deletions(-)

commit 1b476eb4eb43f694bf8e2065b7d8f227af8d66ee
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:   Wed Jul 4 12:19:43 2012 +0200

    ui-utils: port to TP coding style

    Half of this file was already using the new style.

 libempathy-gtk/empathy-ui-utils.c | 3055
 +++++++++++++++++++------------------
 libempathy-gtk/empathy-ui-utils.h |  175 +--
 2 files changed, 1646 insertions(+), 1584 deletions(-)

commit 0c7c2343adf444cdbaf937ac088f9ccc2057a6cc
Author: Frédéric Péters <fpeters@0d.be>
Date:   Wed Jul 4 10:10:29 2012 +0200

    boxes theme: style actions like before

 .../Contents/Resources/Incoming/Content.html       |    2 +-
 .../Contents/Resources/Incoming/NextContent.html   |    2 +-
 .../Contents/Resources/main.css                    |   25
 ++++++++++++++++++++
 3 files changed, 27 insertions(+), 2 deletions(-)

commit 76028ac5745e8990968d24e7e4fa564d3521ff11
Author: Frédéric Péters <fpeters@0d.be>
Date:   Wed Jul 4 09:52:23 2012 +0200

    classic theme: style action lines like before

 .../Contents/Resources/main.css                    |   22
 ++++++++++++++++++++
 1 file changed, 22 insertions(+)

commit a21e213029f9d31b260d53d453fbbafebfeafe68
Author: Frédéric Péters <fpeters@0d.be>
Date:   Wed Jul 4 09:40:23 2012 +0200

    classic theme: more colour updates

 .../themes/Classic.AdiumMessageStyle/Contents/Resources/main.css |
 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

commit edfe8cf52156f2957155f110880f619d337d13e5
Author: Tom Tryfonidis <tomtryf@gmail.com>
Date:   Wed Jul 4 03:00:15 2012 +0300

    Updated Greek translations

 help/el/el.po | 3878
 +++++++++++++++++++++++++++++++--------------------------
 po/el.po      |  305 +++--
 2 files changed, 2226 insertions(+), 1957 deletions(-)

commit e5ef72f1a021f01946245641eae2a8e031d79d90
Author: Frédéric Péters <fpeters@0d.be>
Date:   Tue Jul 3 12:43:58 2012 +0200

    classic theme: update with colours from the old theme

    part of https://bugzilla.gnome.org/show_bug.cgi?id=679321

 data/themes/Classic.AdiumMessageStyle/Contents/Resources/main.css |
 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

commit 388c2bb5df92f6f3725755756d8e084b7a6fdbda
Author: Daniel Mustieles <daniel.mustieles@gmail.com>
Date:   Mon Jul 2 17:28:42 2012 +0200

    Updated Spanish translation

 po/es.po |  430
 +++++++++++++++++++++++++++++++-------------------------------
 1 file changed, 212 insertions(+), 218 deletions(-)

commit 7bba30aceaa023f04a59398697c65fc93dd8e55d
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:   Mon Jul 2 15:52:33 2012 +0200

    remove empathy-chat-view

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

 libempathy-gtk/Makefile.am         |    2 -
 libempathy-gtk/empathy-chat-view.c |  275
 ------------------------------------
 libempathy-gtk/empathy-chat-view.h |  128 -----------------
 3 files changed, 405 deletions(-)

commit 4b2e73040c8373a61e578382d79022a4fa57a3ef
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:   Mon Jul 2 15:54:58 2012 +0200

    remove useless chat-view.h includes

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

 libempathy-gtk/empathy-log-window.c |    1 -
 libempathy-gtk/empathy-ui-utils.h   |    2 --
 2 files changed, 3 deletions(-)

commit 87f41f93a0c79b428e0eff6f9f843fce005b82ae
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:   Mon Jul 2 15:40:16 2012 +0200

    Stop using EmpathyChatView

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

 libempathy-gtk/empathy-chat.c          |   66 +++++++--------
 libempathy-gtk/empathy-chat.h          |    4 +-
 libempathy-gtk/empathy-search-bar.c    |   18 ++--
 libempathy-gtk/empathy-search-bar.h    |    4 +-
 libempathy-gtk/empathy-theme-adium.c   |  146
 ++++++++++++--------------------
 libempathy-gtk/empathy-theme-adium.h   |   56 +++++++++++-
 libempathy-gtk/empathy-theme-manager.c |    5 +-
 libempathy-gtk/empathy-theme-manager.h |    4 +-
 libempathy-gtk/empathy-webkit-utils.c  |    3 +-
 src/empathy-chat-window.c              |    2 +-
 src/empathy-preferences.c              |    8 +-
 11 files changed, 165 insertions(+), 151 deletions(-)

commit 7f2b924f50433a6240bb8feaf95b423cb6124b12
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:   Mon Jul 2 15:21:30 2012 +0200

    theme-adium use self->priv pattern

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

 libempathy-gtk/empathy-theme-adium.c |  334
 ++++++++++++++++------------------
 libempathy-gtk/empathy-theme-adium.h |    4 +-
 2 files changed, 160 insertions(+), 178 deletions(-)

commit 254c6ef0192ee7bc70530987a5e359cb4a04148c
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:   Mon Jul 2 15:09:00 2012 +0200

    theme-adium: port to new coding styles

    Some part of this file was already using the new style so best to stay
    coherent.

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

 libempathy-gtk/empathy-theme-adium.c | 3219
 ++++++++++++++++++----------------
 libempathy-gtk/empathy-theme-adium.h |   88 +-
 2 files changed, 1721 insertions(+), 1586 deletions(-)

commit 234fbbca44a1726a1f150ada54690b1bcf9c010f
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:   Mon Jul 2 14:40:43 2012 +0200

    remove empathy-chat-text-view

    In Adium we trust.

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

 libempathy-gtk/Makefile.am              |    2 -
 libempathy-gtk/empathy-chat-text-view.c | 1485
 -------------------------------
 libempathy-gtk/empathy-chat-text-view.h |   88 --
 libempathy-gtk/empathy-theme-manager.c  |    1 -
 po/POTFILES.in                          |    1 -
 5 files changed, 1577 deletions(-)

commit ddb848bbfc956f79171ea141ce6dba6eea484aa7
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:   Mon Jul 2 14:08:01 2012 +0200

    theme-manager: don't leak info is 2 themes have the same name

 libempathy-gtk/empathy-theme-manager.c |    6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

commit 82b5dbb25241135989406c6514e0b84184606645
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:   Mon Jul 2 14:07:29 2012 +0200

    Depend on GLib 2.33.3

    Needed for g_list_copy_deep()

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

commit 284ff75925b329b0443338660480d392f53501e1
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:   Mon Jul 2 14:06:58 2012 +0200

    upgrade_chat_theme_settings: use
    empathy_theme_manager_dup_theme_name_from_path()

 src/empathy-sanity-cleaning.c |   18 +++++-------------
 1 file changed, 5 insertions(+), 13 deletions(-)

commit 2b8d7ebbdd40b55b72248c11600cd782d4ac7ab1
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:   Mon Jul 2 14:06:03 2012 +0200

    raise a DEBUG instead of WARNING if we can't find the theme

 libempathy-gtk/empathy-theme-manager.c |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

commit 38ad4dab9cd3d88a2f05fa7e1a37c74e3d361304
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:   Mon Jul 2 13:50:48 2012 +0200

    no need to call empathy_theme_manager_find_theme() twice

 libempathy-gtk/empathy-theme-manager.c |   11 +++--------
 1 file changed, 3 insertions(+), 8 deletions(-)

commit 9ea865f2b1e420d2a908cd0ac80e0c5d38a7ac4d
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:   Mon Jul 2 13:24:03 2012 +0200

    List themes from EMPATHY_SRCDIR as well

 libempathy-gtk/empathy-theme-manager.c |   57
 +++++++++++++++++++++++++-------
 1 file changed, 45 insertions(+), 12 deletions(-)

commit 9958d658c1c3eb7a4bd81a15a85d5d7658b4d85b
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:   Mon Jul 2 13:00:59 2012 +0200

    change default value of 'theme' key to 'Classic'

    That's the name of the Adium version.

 data/org.gnome.Empathy.gschema.xml |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

commit 9b222761cc9995a09f37b7537a12e4955b586323
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:   Mon Jul 2 12:58:56 2012 +0200

    Store the theme name in the 'theme' gsettings key

    The 'adium-path' key is now deprecated as we lookup the theme path
    from its
    name.

 data/org.gnome.Empathy.gschema.xml     |    2 +-
 libempathy-gtk/empathy-theme-manager.c |   47
 ++++++++++++++------------------
 src/empathy-preferences.c              |   46
 ++++++++++++++++---------------
 src/empathy-sanity-cleaning.c          |   47
 ++++++++++++++++++++++++--------
 4 files changed, 80 insertions(+), 62 deletions(-)

commit 5e112661cca767870225936428515a82b2f6f82c
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:   Mon Jul 2 12:57:36 2012 +0200

    add empathy_theme_manager_dup_theme_name_from_path()

 libempathy-gtk/empathy-theme-manager.c |   20 ++++++++++++++++++++
 libempathy-gtk/empathy-theme-manager.h |    2 ++
 2 files changed, 22 insertions(+)

commit 74895e8b815cbed7a041fcbc8e3234ae6df102ae
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:   Mon Jul 2 11:22:29 2012 +0200

    theme-manager: use self->priv pattern

 libempathy-gtk/empathy-theme-manager.c |  118
 ++++++++++++++------------------
 libempathy-gtk/empathy-theme-manager.h |    3 +-
 2 files changed, 55 insertions(+), 66 deletions(-)

commit 6c5c16265b6a862e3903e051cc251dab3c82d20d
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:   Mon Jul 2 11:13:52 2012 +0200

    theme-manager: port to new coding style

 libempathy-gtk/empathy-theme-manager.c |  524
 +++++++++++++++++---------------
 libempathy-gtk/empathy-theme-manager.h |   53 ++--
 2 files changed, 308 insertions(+), 269 deletions(-)

commit 193da58c9a4d7f6fc9ecb17b1d09c3a8fff56cdd
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:   Mon Jul 2 10:52:46 2012 +0200

    theme-manager: remove useless code

    None of this is still used.

 libempathy-gtk/empathy-theme-manager.c |   16 ----------------
 libempathy-gtk/empathy-theme-manager.h |    1 -
 2 files changed, 17 deletions(-)

commit 2daf6b4066dbde6fdcaa3aee6d85d67f3353bfac
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:   Mon Jul 2 10:32:01 2012 +0200

    move theme migration code to sanity-cleaning.c

    That's where this kind of code is meant to be.

 libempathy-gtk/empathy-theme-manager.c |   40 ---------------------------
 src/empathy-sanity-cleaning.c          |   46
 +++++++++++++++++++++++++++++++-
 2 files changed, 45 insertions(+), 41 deletions(-)

commit fa00d369ea01b464f62a7835e8f61d65f94bc29f
Author: Danielle Madeley <danielle.madeley@collabora.co.uk>
Date:   Fri Jun 29 14:14:45 2012 +1000

    theme-manager: we can now look up themes in the path

 libempathy-gtk/empathy-theme-manager.c |   11 ++---------
 1 file changed, 2 insertions(+), 9 deletions(-)

commit 518d54667e1934f0e339e3368d77cfc953a34314
Author: Danielle Madeley <danielle.madeley@collabora.co.uk>
Date:   Fri Jun 29 14:12:14 2012 +1000

    theme-manager: make it possible to look up theme by name

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

commit f433b0821c24fc7382bd289f2246b7b1e2039106
Author: Danielle Madeley <danielle.madeley@collabora.co.uk>
Date:   Mon Jun 25 15:15:48 2012 +1000

    Remove old themes from POTFILES.in

 po/POTFILES.in |    2 --
 1 file changed, 2 deletions(-)

commit 2bdbb3de1b5fda8f230ad144e8248472321920f1
Author: Danielle Madeley <danielle.madeley@collabora.co.uk>
Date:   Fri Jun 22 17:53:02 2012 +1000

    theme-manager: automatically migrate from legacy themes to Adium
    themes

    Because Adium themes are saved by path (urgh), adding a legacy theme
    called 'gnome' which can be used to set the default theme.

 libempathy-gtk/empathy-theme-manager.c |   47
 ++++++++++++++++++++++++++++++++
 1 file changed, 47 insertions(+)

commit 4a3ff2e68eb3c17488f9a12587b7e9eb95a51645
Author: Danielle Madeley <danielle.madeley@collabora.co.uk>
Date:   Thu Jun 21 13:04:19 2012 +1000

    Bring back 'theme' key

    We need it for migrating the settings to Adium-only

 data/org.gnome.Empathy.gschema.xml |    5 +++++
 libempathy/empathy-gsettings.h     |    1 +
 2 files changed, 6 insertions(+)

commit 10fc10c0be71a31064298776b7d1abc412157dc8
Author: Danielle Madeley <danielle.madeley@collabora.co.uk>
Date:   Wed Jun 20 20:14:39 2012 +1000

    theme-manager: clean up memory releasing

 libempathy-gtk/empathy-theme-manager.c |    7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

commit a743a48fa1d0f21882d6274f157310614182a431
Author: Danielle Madeley <danielle.madeley@collabora.co.uk>
Date:   Wed Jun 20 20:14:26 2012 +1000

    Rename 'Classic WK' to 'Classic'

 data/themes/Classic.AdiumMessageStyle/Contents/Info.plist |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

commit c7d5d6d78773d9e7cd933b326e7566a072b655d9
Author: Danielle Madeley <danielle.madeley@collabora.co.uk>
Date:   Wed Jun 20 19:42:22 2012 +1000

    Remove legacy themes code

 data/org.gnome.Empathy.gschema.xml     |    5 -
 libempathy-gtk/Makefile.am             |    4 -
 libempathy-gtk/empathy-theme-boxes.c   |  426
 --------------------------------
 libempathy-gtk/empathy-theme-boxes.h   |   61 -----
 libempathy-gtk/empathy-theme-irc.c     |  143 -----------
 libempathy-gtk/empathy-theme-irc.h     |   62 -----
 libempathy-gtk/empathy-theme-manager.c |  374
 +---------------------------
 libempathy/empathy-gsettings.h         |    1 -
 src/empathy-preferences.c              |   56 +----
 9 files changed, 13 insertions(+), 1119 deletions(-)

commit 7f6f5faf1a3ac7109b690d33555c54db05a692fe
Author: Danielle Madeley <danielle.madeley@collabora.co.uk>
Date:   Mon Jun 18 14:31:14 2012 +1000

    Add Planet GNOME chat theme

 data/themes/Makefile.am                            |   13 +++
 .../Contents/Info.plist                            |   41 ++++++++
 .../Contents/Resources/Images/corners.png          |  Bin 0 -> 806 bytes
 .../Contents/Resources/Images/horizontal.png       |  Bin 0 -> 280 bytes
 .../Contents/Resources/Images/nipple.png           |  Bin 0 -> 528 bytes
 .../Contents/Resources/Images/vertical.png         |  Bin 0 -> 151 bytes
 .../Contents/Resources/Incoming/Content.html       |   19 ++++
 .../Contents/Resources/Incoming/NextContent.html   |    4 +
 .../Contents/Resources/Status.html                 |    5 +
 .../Contents/Resources/main.css                    |  108
 ++++++++++++++++++++
 10 files changed, 190 insertions(+)

commit 3a8ab7a8bba633232ea9c335f8698ded5f763c17
Author: Danielle Madeley <danielle.madeley@collabora.co.uk>
Date:   Mon Jun 18 11:07:41 2012 +1000

    Add 'Classic' theme

    Currently called 'Classic WK' until the old theme is removed.

 .../Classic.AdiumMessageStyle/Contents/Info.plist  |   41
 ++++++++++++++++++++
 .../Contents/Resources/Content.html                |    5 +++
 .../Contents/Resources/Status.html                 |    5 +++
 .../Contents/Resources/main.css                    |   31 +++++++++++++++
 data/themes/Makefile.am                            |   10 ++++-
 5 files changed, 91 insertions(+), 1 deletion(-)

commit 7aaacb249dd73f815c028ce0b5a3ec5ca783f69b
Author: Danielle Madeley <danielle.madeley@collabora.co.uk>
Date:   Mon Jun 18 10:46:02 2012 +1000

    Install Boxes theme

    Uninstall needs work. Why is Automake so bad with directories?

 configure.ac            |    1 +
 data/Makefile.am        |    2 +-
 data/themes/Makefile.am |   35 +++++++++++++++++++++++++++++++++++
 3 files changed, 37 insertions(+), 1 deletion(-)

commit b4228fb1ec2180ae7e7df789df0287c67958c9ec
Author: Danielle Madeley <danielle.madeley@collabora.co.uk>
Date:   Sun Jun 17 16:40:16 2012 +1000

    Add Boxes as an Adium theme with variants Clean, Simple and Blue

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

 .../Boxes.AdiumMessageStyle/Contents/Info.plist    |   41 +++++++++++++++
 .../Contents/Resources/Incoming/Content.html       |   11 ++++
 .../Contents/Resources/Incoming/NextContent.html   |    4 ++
 .../Contents/Resources/Status.html                 |    5 ++
 .../Contents/Resources/Variants/Blue.css           |    9 ++++
 .../Contents/Resources/Variants/Clean.css          |    5 ++
 .../Contents/Resources/Variants/Simple.css         |    6 +++
 .../Contents/Resources/main.css                    |   55
 ++++++++++++++++++++
 8 files changed, 136 insertions(+)

commit 04d6f19f37961b2c6b866559eeae7cdad1068e16
Author: Cheng-Chia Tseng <pswo10680@gmail.com>
Date:   Sat Jun 30 22:56:24 2012 +0800

    Updated Traditional Chinese translation(Hong Kong and Taiwan)

 po/zh_HK.po | 2419
 ++++++++++++++++++++++++++++++----------------------------
 po/zh_TW.po | 2441
 +++++++++++++++++++++++++++++++----------------------------
 2 files changed, 2553 insertions(+), 2307 deletions(-)

commit a711c1e353bc84a0e97652fb22d39e34bd729f4e
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:   Thu Jun 28 11:07:37 2012 +0200

    accounts-dialog: don't show the avatar button if avatars are not
    supported

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

 src/empathy-accounts-dialog.c |   17 ++++++++++++-----
 1 file changed, 12 insertions(+), 5 deletions(-)

commit 847a2ea867f4006e75ee26ba16cc96ba6b26a5ed
Author: Will Thompson <will.thompson@collabora.co.uk>
Date:   Wed Jun 27 10:43:21 2012 +0100

    Boxes theme: implement set_show_avatars

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

 libempathy-gtk/empathy-theme-boxes.c |   25 ++++++++++++++++++++++---
 1 file changed, 22 insertions(+), 3 deletions(-)

commit db4d1607aa0ee6988399f99efc09bed5e7133dc8
Author: Will Thompson <will.thompson@collabora.co.uk>
Date:   Wed Jun 27 10:42:56 2012 +0100

    Adium themes: implement set_show_avatars()

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

 libempathy-gtk/empathy-theme-adium.c |   19 ++++++++++++++++---
 1 file changed, 16 insertions(+), 3 deletions(-)

commit 13a16f024f65bdfd899298d0278e0166ca781e7e
Author: Will Thompson <will.thompson@collabora.co.uk>
Date:   Wed Jun 27 10:40:52 2012 +0100

    EmpathyChat: tell view to show/hide avatars based on connection
    interfaces

    I believe that by the time we get here the EmpathyTpChat's
    TpConnection
    should be prepared enough to know its interfaces? It seems to be in my
    brief testing.

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

 libempathy-gtk/empathy-chat.c |   11 +++++++++++
 1 file changed, 11 insertions(+)

commit 36dc0639473930ac596bdbf08f6ea0a6a8471f7c
Author: Will Thompson <will.thompson@collabora.co.uk>
Date:   Wed Jun 27 10:29:16 2012 +0100

    EmpathyChatView: add vfunc for showing/hiding avatars

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

 libempathy-gtk/empathy-chat-view.c |   20 ++++++++++++++++++++
 libempathy-gtk/empathy-chat-view.h |    4 ++++
 2 files changed, 24 insertions(+)

commit 539cd8f46f384fd209f6f87aa1e1add2d8197436
Author: Laurent Contzen <lcontzen@gmail.com>
Date:   Mon Jun 25 16:31:00 2012 +0200

    empathy-nautilus-sendto now uses a RosterView instead of
    EmpathyContactChooser

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

 nautilus-sendto-plugin/empathy-nautilus-sendto.c |   56
 +++++++++++++++-------
 1 file changed, 40 insertions(+), 16 deletions(-)

commit dfa4c7069189ead061488b3057fd56f86f6d89a2
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:   Wed Jun 27 16:05:02 2012 +0200

    factor out empathy_chat_copy()

    Much easier to understand its logic that way.

 libempathy-gtk/empathy-chat.c |   95
 +++++++++++++++++++++++++----------------
 1 file changed, 58 insertions(+), 37 deletions(-)

commit a4f0fc24f06f82f4792836e8e37c5d9d97e92f07
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:   Wed Jun 27 15:37:08 2012 +0200

    build nautilus-sendto plugin with ERROR_CFLAGS

 nautilus-sendto-plugin/Makefile.am |    1 +
 1 file changed, 1 insertion(+)

commit c3c7502b206eb550c08e8a9271a4087d855038df
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:   Wed Jun 27 11:05:18 2012 +0200

    tp-chat: stop setting the TpAccount during construction

    It doesn't have to be a property any more, we can just get it from the
    TpConnection when we need it.

    Should fix a race crash when the TpAccount of the TpConnection is
    not set yet;
    see fdo#51444.

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

 libempathy/empathy-client-factory.c |    6 +----
 libempathy/empathy-tp-chat.c        |   46
 +++++++----------------------------
 libempathy/empathy-tp-chat.h        |    1 -
 3 files changed, 10 insertions(+), 43 deletions(-)

commit 81a65a9ab520396d5ba6eb4085b4ab653bec547c
Author: Laurent Contzen <lcontzen@gmail.com>
Date:   Wed Jun 27 11:23:11 2012 +0200

    Added new function to get selected individual

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

 libempathy-gtk/empathy-roster-view.c |   13 +++++++++++++
 libempathy-gtk/empathy-roster-view.h |    2 ++
 2 files changed, 15 insertions(+)

commit 81a7652d19e8921b233f53f21cd14655a567bab4
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:   Tue Jun 26 09:22:15 2012 +0200

    egg-list-box: update to master

 libempathy-gtk/egg-list-box |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

commit e4f305a86101b8f03a561a2ae4057a1eed386685
Author: Will Thompson <will.thompson@collabora.co.uk>
Date:   Tue Jun 26 10:08:51 2012 +0100

    Strip %senderPrefix% in Adium themes

    %senderPrefix% is not documented on
    <http://trac.adium.im/wiki/CreatingMessageStyles> but it's used in
    minimal_mod, the theme I use, in the tooltips for each speaker's name.
    Based on <http://hg.adium.im/adium/rev/b586b027de42>, it's supposed to
    be the IRC mode character (@, +, whatever). We don't have that
    information, so just get rid of it.

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

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

commit e321ce903efb091607161093ec490a8e22129059
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:   Fri Jun 22 10:07:59 2012 +0200

    roster-window: allow to send files using DnD

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

 src/empathy-roster-window.c |  170
 +++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 170 insertions(+)

commit 3a0dc8812d6c720499e34882b499f1cd9447c57c
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:   Fri Jun 22 09:40:15 2012 +0200

    roster-view: export empathy_roster_view_get_individual_at_y()

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

 libempathy-gtk/empathy-roster-view.c |   31
 ++++++++++++++++++++++++-------
 libempathy-gtk/empathy-roster-view.h |    5 +++++
 2 files changed, 29 insertions(+), 7 deletions(-)

commit 9b18c84ccde2ff7231baddab7dd53403fc4df2d9
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:   Thu Jun 21 12:42:52 2012 +0200

    ft-factory: ensure that the factory stays alive while
    empathy_ft_handler_new_outgoing() is running

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

 libempathy/empathy-ft-factory.c |    6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

commit 8d84c1728f9b1e5e41a281b6e8b1ee12020e18b0
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:   Mon Jun 25 15:16:07 2012 +0200

    chat-window: disable file transfer DnD

    It's not supported at the moment.

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

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

commit 13d6036bb4dd8adb673bd82a591fe1bbc449ca96
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:   Mon Jun 25 15:08:56 2012 +0200

    don't display 'Send file' menu item in empathy-chat

    We only support requesting FT channel in the same process as the
    FT handler.

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

 libempathy-gtk/empathy-individual-menu.c |   20 +++++++++++++-------
 libempathy-gtk/empathy-individual-menu.h |    1 +
 src/empathy-roster-window.c              |    3 ++-
 3 files changed, 16 insertions(+), 8 deletions(-)

commit e5342c2b0a781f5ba46060bf56829fb6d308663d
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:   Tue Jun 26 09:47:56 2012 +0200

    remove released flag

 configure.ac |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)