commit 2fa738e0b080215563a5da9805d98dba89ba5554
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:   Mon Aug 30 17:46:23 2010 +0200

    coding style fixes

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

commit e060d3b2d0033e4a20eec2389c798872404d5fea
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:   Mon Aug 30 17:45:11 2010 +0200

    add empathy-irc-network-chooser-dialog.c to POTFILES.in

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

commit 49d08bdaa01855db315563c8cac613f524c3c91c
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:   Mon Aug 30 17:25:23 2010 +0200

    prepare 2.31.91 release

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

commit 37d6905510d419e22e024adb05decddbc4595af3
Author: Philip Withnall <philip.withnall@collabora.co.uk>
Date:   Mon Aug 30 16:28:37 2010 +0100

    Choose an best_contact even if it isn't sensitive in the
    EmpathyIndividualMenu

    This fixes the "Send File" entry not working.

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

commit 59333ef35fe969e67e3a9da55f2bd5856d878e3a
Author: Philip Withnall <philip.withnall@collabora.co.uk>
Date:   Mon Aug 30 15:05:42 2010 +0100

    Change the sensitivity of the Link button if changes have been made

    Closes: bgo#628320

 libempathy-gtk/empathy-linking-dialog.c |   23 ++++++++++++++++++++---
 1 files changed, 20 insertions(+), 3 deletions(-)

commit dfcab5196d9ba84e4cce84ac31750495e4b36f06
Author: Philip Withnall <philip.withnall@collabora.co.uk>
Date:   Mon Aug 30 15:04:51 2010 +0100

    Add a has-changed property to EmpathyIndividualLinker

    This exposes information about whether the new Individual has changed
    from the start Individual, to allow for widget sensitivities to be
    changed appropriately. Helps: bgo#628320

 libempathy-gtk/empathy-individual-linker.c |   56
 ++++++++++++++++++++++++++++
 libempathy-gtk/empathy-individual-linker.h |    3 +
 2 files changed, 59 insertions(+), 0 deletions(-)

commit 32905fa2cb9fb3419f50c5894ac7507fb9330f8f
Author: Frédéric Péters <fpeters@0d.be>
Date:   Mon Aug 30 16:59:33 2010 +0200

    Check for gcr-1 when building against GTK+ 3 (GNOME bug #628092)

 configure.ac               |    6 +++++-
 libempathy-gtk/Makefile.am |    2 ++
 2 files changed, 7 insertions(+), 1 deletions(-)

commit 5ea7f6cfbc591afac428bffbff513ccb77db3d63
Author: Philip Withnall <philip.withnall@collabora.co.uk>
Date:   Fri Aug 27 15:41:50 2010 +0100

    Bug 628121 — Should pick an online persona when starting a chat

    Change the EmpathyIndividualMenu and EmpathyIndividualView code
    for starting
    chats with Individuals to choose the most available Persona to chat
    to, rather
    than just the first available one. Helps: bgo#628121

 libempathy-gtk/empathy-individual-menu.c |   48
 +++++++++++++++++++++--------
 libempathy-gtk/empathy-individual-view.c |   28 +++++++++++++++++-
 2 files changed, 62 insertions(+), 14 deletions(-)

commit eaa8c0029aa90c33d415a000342354bb2fe771d4
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:   Fri Aug 27 16:17:05 2010 +0200

    yahoo and icq widget: change the accelerator of the Character
    set widget

    It conflicts with the Close button.

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

commit 1113b0de4d21dd60a57b893f8a4a2fce4012e9a0
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:   Fri Aug 27 16:13:58 2010 +0200

    account-widget-jabber: change the accelerator of the Priority widget

    It clash with the Login button.

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

commit 2457c2bc21a88f2f5cbeaa9ca64412ec0cef72ee
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:   Fri Aug 27 16:10:35 2010 +0200

    account-widget-jabber: change accelerator of the encryption widget

    'E' is used by Enabled now.

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

commit a736b53700bb6394f666834728754d032a1906ae
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:   Fri Aug 27 16:10:03 2010 +0200

    account-widget-local-xmpp: change accelerator of the email widget

    'E' i's used by Enabled now.

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

commit 6fa2cd9457ec3434677a18862ed47f1ab0e382cd
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:   Fri Aug 27 16:07:20 2010 +0200

    account-widget: add accelerator on Enabled

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

commit 9935cd88e7ecb4bf5ccc6f708735b735b06ea2fa
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:   Fri Aug 27 16:04:36 2010 +0200

    jabber and yahoo widget: change the accelerator of the Ignore widget

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

commit 30cfef02ad93f671b6d0cfff401e881d58c2d57f
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:   Fri Aug 27 16:01:15 2010 +0200

    account-widget-local-xmpp: change the accelerator of the Nickname
    widget

    'n' is used by the Cancel button now.

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

commit fc35b678523bc01e1475345a9e339f52eb5637a1
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:   Fri Aug 27 16:00:03 2010 +0200

    fix accelerator conflict with the Cancel button (#623164)

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

commit 7bd4c5d096a48c7488774a9e0cc7f1f41e5b1e82
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:   Fri Aug 27 15:55:13 2010 +0200

    fix accelerator conflict with the Apply button (#623164)

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

commit 73a8a1b248293643aaca7afe40480d2cf6de64e9
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:   Fri Aug 27 15:48:53 2010 +0200

    factor out set_apply_button()

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

commit 6fab1a3f3a374bbb914898ce7ddb7b5d80b09cf8
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:   Mon Aug 30 13:22:13 2010 +0200

    chat_window_detach_hook: move the window *after* showing it

    Showing the window fire the "map" signal which is catched in
    empathy-geometry
    to move the window to its saved position. (#608140)

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

commit 6d4a28c88bc0a70af8f0fe97943199b010d9870e
Author: GLSJPN_Etsuko <etsuko.murozono@ptiglobal.net>
Date:   Mon Aug 30 20:16:44 2010 +0900

    Updated Japanese translation (from gnome-2-28 branch)

 po/ja.po | 3060
 ++++++++++++++++++++++++++++++++++++++++++--------------------
 1 files changed, 2101 insertions(+), 959 deletions(-)

commit 054086355fe0cb29c40c08da0e9b1f106ff5407a
Author: Philip Withnall <philip.withnall@collabora.co.uk>
Date:   Mon Aug 30 10:58:40 2010 +0100

    Fix a logic error when expanding groups in EmpathyIndividualView

    This prevents use of uninitialised memory in the second part of the
    expression, and should cause groups to be added to the table of
    groups to
    expand/contract more frequently (correctly). Helps: bgo#628106

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

commit 788b62fd3efbfefcd2788772693af497d0123dc6
Author: Philip Withnall <philip.withnall@collabora.co.uk>
Date:   Mon Aug 30 10:06:03 2010 +0100

    Force all toggle buttons in the linking UI to update on each toggle
    event

    This ensures that the toggle buttons for different instances of
    the same
    Individual in the list always display in the correct state. Closes:
    bgo#628123

 libempathy-gtk/empathy-individual-linker.c |   44
 ++++++++++++++++++++++++---
 1 files changed, 39 insertions(+), 5 deletions(-)

commit 7373f750b996baae4d229952a4e2a0140820487c
Author: Philip Withnall <philip.withnall@collabora.co.uk>
Date:   Fri Aug 27 14:34:39 2010 +0100

    Fix calculation of the number of new personas in
    EmpathyIndividualWidget

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

commit e1d5083710cbafe299f37ce280e48005eaf85dca
Author: Philip Withnall <philip.withnall@collabora.co.uk>
Date:   Mon Aug 23 11:41:48 2010 +0100

    Port EmpathyPersonaStore to use Individual.personas_changed

    This makes the notification of changed Personas a lot more efficient
    in the
    store. Closes: bgo#627706

 libempathy-gtk/empathy-persona-store.c |   44
 ++++++++------------------------
 1 files changed, 11 insertions(+), 33 deletions(-)

commit 09116852afa9a1379d1dac957f787918432c1767
Author: Philip Withnall <philip.withnall@collabora.co.uk>
Date:   Mon Aug 23 11:32:22 2010 +0100

    Port EmpathyIndividualWidget to use Individual.personas_changed

    This makes the notification of changed Personas a lot more efficient
    in
    the widget. Helps: bgo#627706

 libempathy-gtk/empathy-individual-widget.c |  119
 ++++++++++++++--------------
 1 files changed, 61 insertions(+), 58 deletions(-)

commit a2130e671045ce703e2f06647ceaac786aaf47a1
Author: Ivar Smolin <okul@linux.ee>
Date:   Mon Aug 30 12:31:04 2010 +0300

    [l10n] Updated Estonian translation

 po/et.po |    6 +++---
 1 files changed, 3 insertions(+), 3 deletions(-)

commit eba7c8345b08ab112e0b68445cbec6833fd92516
Author: Philip Withnall <philip.withnall@collabora.co.uk>
Date:   Fri Aug 27 15:53:03 2010 +0100

    Bug 628124 — Disallow activating group rows in the linking dialogue

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

commit 7b68f5928812d926d27bb0a6fa8550629ef23a2c
Author: Branko Kokanović <branko.kokanovic@gmail.com>
Date:   Sun Aug 29 20:21:39 2010 +0200

    Updated Serbian translation

 po/sr.po       | 1947
 ++++++++++++++++++++++++++++++++------------------------
 po/sr@latin.po | 1947
 ++++++++++++++++++++++++++++++++------------------------
 2 files changed, 2216 insertions(+), 1678 deletions(-)

commit ee26288e23806e1f9cbc346d773959f2a91f3ef5
Author: Mattias Põldaru <mahfiaz gmail com>
Date:   Sun Aug 29 11:47:23 2010 +0300

    [l10n] Updated Estonian translation

 po/et.po |  597
 +++++++++++++++++++++++++++++++++++++++++++++++++++----------
 1 files changed, 499 insertions(+), 98 deletions(-)

commit c524de9194894f5ced26cfb334ed61ab4fc794c7
Author: Philip Withnall <philip@tecnocode.co.uk>
Date:   Sat Aug 28 14:11:30 2010 +0100

    Update British English translation

 po/en_GB.po |  203
 ++++++++++++++++++++++++++++++++---------------------------
 1 files changed, 110 insertions(+), 93 deletions(-)

commit 4618baec28e21d5a710a6d419a9a7fae28d15321
Author: Bruno Brouard <annoa.b@gmail.com>
Date:   Sat Aug 28 16:05:52 2010 +0200

    Updated doc French translation

 help/fr/fr.po |  332
 ++++++++++++++++++++++++++++++---------------------------
 1 files changed, 177 insertions(+), 155 deletions(-)

commit 00c3a65b897714cf0dcd0299ef572c9c943d31b5
Author: Gabor Kelemen <kelemeng@gnome.hu>
Date:   Sat Aug 28 10:40:32 2010 +0200

    Updated Hungarian translation

 po/hu.po |  284
 +++++++++++++++++++++++++++++++++-----------------------------
 1 files changed, 153 insertions(+), 131 deletions(-)

commit 301f5b9989b61b067fcf6d628f38c536529c7eb6
Author: Jorge González <jorgegonz@svn.gnome.org>
Date:   Sat Aug 28 10:05:41 2010 +0200

    Updated Spanish translation

 po/es.po |  223
 ++++++++++++++++++++++++++++++++++++--------------------------
 1 files changed, 130 insertions(+), 93 deletions(-)

commit 4a142ae419c2c6c4ac0b0f2171e23b7b0ef64798
Author: Gabor Kelemen <kelemeng@gnome.hu>
Date:   Fri Aug 27 23:03:52 2010 +0200

    Updated Hungarian translation

 po/hu.po | 1776
 +++++++++++++++++++++++++++++++++++++------------------------
 1 files changed, 1077 insertions(+), 699 deletions(-)

commit 75792c4923298aba3b45802f3c82b66cdd0cdb54
Author: Fran Diéguez <fran.dieguez@mabishu.com>
Date:   Fri Aug 27 17:36:27 2010 +0200

    Update Galician translations

 po/gl.po |  305
 ++++++++++++++++++++++++++++++++++----------------------------
 1 files changed, 167 insertions(+), 138 deletions(-)

commit 1d0676cf03884445f11b29b9d06df547a836e95f
Author: Khaled Hosny <khaledhosny@eglug.org>
Date:   Fri Aug 27 15:41:29 2010 +0200

    Updated Arabic translation

 po/ar.po |  377
 +++++++++++++++++++++++++++++++++++++++-----------------------
 1 files changed, 240 insertions(+), 137 deletions(-)

commit ab866567be1702e6811f7c6d5827b446a29d7d83
Author: Yaron Shahrabani <sh.yaron@gmail.com>
Date:   Fri Aug 27 15:54:28 2010 +0300

    Updated Hebrew translation.

 po/he.po |  384
 ++++++++++++++++++++++++++++++++++++++++----------------------
 1 files changed, 246 insertions(+), 138 deletions(-)

commit 410d7f6e391a3b88961fd4002a6048ca79640384
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:   Thu Aug 5 10:57:39 2010 +0200

    nautilus-sendto-plugin: depend on 2.31.7 when building with GTK+2

    This version will have the same API that 2.90.0 so we don't have
    to stay
    compatible with the old API.

 configure.ac                                     |    4 +---
 nautilus-sendto-plugin/empathy-nautilus-sendto.c |   18
 ------------------
 2 files changed, 1 insertions(+), 21 deletions(-)

commit 973ebccf5c1ba3664677a8c5d1bdfe52009f82be
Author: Philip Withnall <philip.withnall@collabora.co.uk>
Date:   Fri Aug 27 12:33:20 2010 +0100

    Bug 628064 — Miscellaneous string fixes

 data/empathy.desktop.in.in                   |    2 +-
 data/org.gnome.Empathy.gschema.xml.in        |    6 +++---
 libempathy-gtk/empathy-account-widget-irc.ui |    2 +-
 libempathy-gtk/empathy-log-window.ui         |    4 ++--
 libempathy-gtk/empathy-tls-dialog.c          |    4 ++--
 libempathy/empathy-utils.c                   |    4 ++--
 src/empathy-accounts.c                       |    2 +-
 7 files changed, 12 insertions(+), 12 deletions(-)

commit ed67c7eca44a3d9891197aa02a14410e66227a1d
Author: Philip Withnall <philip.withnall@collabora.co.uk>
Date:   Fri Aug 27 12:22:35 2010 +0100

    Bug 628062 — Add translator comments

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

commit 7b31c4e8aec4e800fef27bbe25b90a26186f2b20
Author: Philip Withnall <philip.withnall@collabora.co.uk>
Date:   Fri Aug 27 12:18:38 2010 +0100

    Unmark strings as translatable which aren't shown to the user

    Helps: bgo#628062

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

commit df0638989774934a9553d3355decd3e5ccaece83
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:   Fri Aug 27 13:28:09 2010 +0200

    new-chatroom-dialog: remove markup from transltable string

 src/empathy-new-chatroom-dialog.c |    7 +++++--
 1 files changed, 5 insertions(+), 2 deletions(-)

commit cb6f0691b1129d7ba2e5d88147733b8e87241ad5
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:   Fri Aug 27 12:49:31 2010 +0200

    remove markups around 'Location'

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

commit 70159532bf83cb1e8210155b2e968f833fa4dd7e
Author: Philip Withnall <philip.withnall@collabora.co.uk>
Date:   Wed Aug 25 19:39:19 2010 +0100

    Add an EmpathyIndividualView::show-untrusted property

    This allows the view to filter out untrusted Individuals (such
    as link-local
    XMPP contacts). This is used in the linking dialogue to disallow
    selection
    of link-local XMPP contacts for linking. Closes: bgo#627930

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

commit 2c7fdebf7a7cea6efbc0a305e681b7e7d158d821
Author: Philip Withnall <philip.withnall@collabora.co.uk>
Date:   Wed Aug 25 19:35:06 2010 +0100

    Move all individual view visibility logic into is_visible_individual()

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

commit a0d79de6f5151ee14b25364060e5dd2338f800a9
Author: Philip Withnall <philip.withnall@collabora.co.uk>
Date:   Wed Aug 25 19:04:09 2010 +0100

    Desensitise the "Link…" menu entry for untrusted Individuals

    This prevents the linking dialogue from being opened for local-xmpp
    contacts,
    who cannot be trusted.

    This bumps Empathy's dependency on libfolks to 0.1.15. Helps:
    bgo#627930

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

commit b4a1d5606e68916a99ca672818bcbebb5c2a8ee0
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:   Fri Aug 27 09:43:23 2010 +0200

    accounts-dialog.ui: set pango properties in the UI file (#628063)

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

commit 5e28683dab504d1b1c4d4d4a3bbcdb17519f335e
Merge: 17d3840 7504002
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:   Fri Aug 27 11:57:14 2010 +0200

    Merge branch 'trivia'

commit 17d384008361384be53a2466fcd9a7e837e10d09
Author: Travis Reitter <travis.reitter@collabora.co.uk>
Date:   Thu Aug 26 16:39:42 2010 -0700

    Don't filter out Individual removal at the IndividualManager level.

    The IndividualManager sometimes falsely filters out members of
    FolksIndividualAggregator:individuals-changed:removed that should
    be passed
    along to its users.

 libempathy/empathy-individual-manager.c |   13 ++++---------
 1 files changed, 4 insertions(+), 9 deletions(-)

commit 270a982f2cf19635a61f41e6cc49f7d6e8cfd016
Author: Philip Withnall <philip.withnall@collabora.co.uk>
Date:   Tue Aug 24 17:54:34 2010 +0100

    Bug 627715 — Linking dialog: move personas using DnD

    Add support for dragging Individuals from the EmpathyIndividualView
    to the
    EmpathyPersonaView in the linking dialogue, and for dragging Personas
    in the
    reverse direction, linking and unlinking the appropriate Individuals,
    respectively. Closes: bgo#627715

 libempathy-gtk/empathy-individual-linker.c |   86
 +++++++++++++++++++++++++++-
 1 files changed, 84 insertions(+), 2 deletions(-)

commit 86d76dc3d8e58b52749756f498648307fb513465
Author: Philip Withnall <philip.withnall@collabora.co.uk>
Date:   Tue Aug 24 17:54:26 2010 +0100

    Add drag and drop support to EmpathyPersonaView

    This includes an EmpathyPersonaView::drag-individual-received
    signal, to
    allow for notification that an Individual has been dropped onto
    the view.
    Helps: bgo#627715

 libempathy-gtk/empathy-persona-view.c |  225
 +++++++++++++++++++++++++++++++++
 libempathy-gtk/empathy-persona-view.h |    8 +-
 2 files changed, 232 insertions(+), 1 deletions(-)

commit 1337c4e6f42da41d1da84f32586f33812b8ec2b5
Author: Philip Withnall <philip.withnall@collabora.co.uk>
Date:   Tue Aug 24 14:57:56 2010 +0100

    Add feature support for EmpathyPersonaView

 libempathy-gtk/empathy-individual-linker.c |    3 +-
 libempathy-gtk/empathy-persona-view.c      |   43
 ++++++++++++++++++++++++++-
 libempathy-gtk/empathy-persona-view.h      |    9 +++++-
 3 files changed, 51 insertions(+), 4 deletions(-)

commit 5e9eff1788ca0344be6cb09a304a89add7002248
Author: Philip Withnall <philip.withnall@collabora.co.uk>
Date:   Wed Aug 25 12:34:35 2010 +0100

    Accept text/plain drops as file transfers, rather than as Individuals

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

commit 8c812cfbd960392d2acee585c3d7d3030d3e3fa8
Author: Philip Withnall <philip.withnall@collabora.co.uk>
Date:   Wed Aug 25 12:08:02 2010 +0100

    Add an EmpathyIndividualView feature for receiving Persona drops

    This is necessary to avoid Personas being droppable on the main
    contact list,
    which makes no sense (for the time being). Helps: bgo#627715

 libempathy-gtk/empathy-individual-view.c |  119
 ++++++++++++++---------------
 libempathy-gtk/empathy-individual-view.h |    5 +-
 src/empathy-main-window.c                |    5 +-
 3 files changed, 64 insertions(+), 65 deletions(-)

commit e2f43f8e42064400f777e52937b845f804331b26
Author: Philip Withnall <philip.withnall@collabora.co.uk>
Date:   Tue Aug 24 17:54:14 2010 +0100

    Add an EmpathyIndividualView::drag-persona-received signal

    This allows notification of drops of personas on the individual view.
    Helps: bgo#627715

 libempathy-gtk/empathy-individual-view.c |   86
 +++++++++++++++++++++++++++++-
 libempathy-gtk/empathy-individual-view.h |    5 ++
 2 files changed, 89 insertions(+), 2 deletions(-)

commit 9bee6ee28d745736a6c5c9b0cd26041575da9b73
Author: Philip Withnall <philip.withnall@collabora.co.uk>
Date:   Tue Aug 24 14:34:00 2010 +0100

    Add an EmpathyIndividualView::drag-individual-received signal

    Subclasses or users of the widget can then override this and stop
    the signal
    emission to do new and interesting things with dropped Individuals,
    rather
    than just changing their groups.

 libempathy-gtk/empathy-individual-view.c |   84
 +++++++++++++++++------------
 libempathy-gtk/empathy-individual-view.h |    6 ++
 2 files changed, 55 insertions(+), 35 deletions(-)

commit 3f23b6d1c7a04cf288872cf975cdb81da1325289
Author: Philip Withnall <philip.withnall@collabora.co.uk>
Date:   Tue Aug 24 14:08:46 2010 +0100

    Use EmpathyIndividualFeatureFlags consistently in
    EmpathyIndividualView

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

commit 751691d4e019a00b7ee52de97b259fee3d9c8af3
Author: Philip Withnall <philip.withnall@collabora.co.uk>
Date:   Tue Aug 24 14:03:25 2010 +0100

    Use text/individual-id instead of text/contact-id for dragging
    Individuals

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

commit 7c2d23958c938a73eefbd35c2ecfb74fc57c1421
Author: Philip Withnall <philip.withnall@collabora.co.uk>
Date:   Tue Aug 24 13:54:57 2010 +0100

    Rename EMPATHY_INDIVIDUAL_VIEW_FEATURE_CONTACT_* to
    *_FEATURE_INDIVIDUAL_*

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

commit 5b5f330cef05c8ebaa5ded6c74992910d7d85999
Author: Philip Withnall <philip.withnall@collabora.co.uk>
Date:   Tue Aug 24 12:57:37 2010 +0100

    Add an EmpathyIndividualView feature for changing Individuals' groups

    This separates drag and drop support from changing groups, so that
    EmpathyIndividualView instances (such as the one in the linking
    dialogue)
    may support dragging and dropping Individuals to and from another
    tree view,
    but not support dragging them between groups inside the
    EmpathyIndividualView
    instance. Helps: bgo#627715

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

commit a1aea4b698a537c046e53215d2a64259b97cd935
Author: Philip Withnall <philip.withnall@collabora.co.uk>
Date:   Tue Aug 24 12:37:45 2010 +0100

    Fix memory leaks in EmpathyIndividualView drop handling code

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

commit 56e80c63b33bff7d82cd43bc8e1dc02f1a10a1d4
Author: Philip Withnall <philip.withnall@collabora.co.uk>
Date:   Tue Aug 24 12:31:10 2010 +0100

    Move individual_view_handle_drag() to
    individual_view_contact_drag_received()

    This will make refactoring easier. Helps: bgo#627715

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

commit 4b17d88ae214bc8b9b74d7fd6c0c01e14f206478
Author: Philip Withnall <philip.withnall@collabora.co.uk>
Date:   Tue Aug 24 12:22:38 2010 +0100

    Add an EmpathyIndividualView feature for dropping files on Individuals

    This allows drag and drop to be enabled for the linking dialogue
    without
    allowing files to be dropped onto the dialogue, which wouldn't
    make sense.
    Helps: bgo#627715

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

commit 750400297f05dd45369f2bb77c7a351c4561a585
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:   Fri Aug 27 10:05:28 2010 +0200

    main-window: define an enum for pages

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

commit 7c95784276fa35bb9d0c91189ebfbb8be50f6564
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:   Fri Aug 27 10:02:42 2010 +0200

    Increase the size of the 'No Match Found' label

    It looks less crap that way.

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

commit ab97f58c9a4bf3b0230693f09c76e6de5a23d3fe
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:   Fri Aug 27 10:00:27 2010 +0200

    no need to use a #define

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

commit c9bc158a8897e4ab2f0758d87084f048e51de165
Author: Jiří Techet <techet@gmail.com>
Date:   Thu Aug 26 22:01:41 2010 +0200

    Use libchamplain 0.7.1 or newer for the map plugin

    Signed-off-by: Jiří Techet <techet@gmail.com>

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

commit f2c8ce84037c1dd9afcd6114b9df366995e2c1be
Author: Philip Withnall <philip@tecnocode.co.uk>
Date:   Thu Aug 26 20:53:25 2010 +0100

    Fix British English translation

 po/en_GB.po |    6 +++---
 1 files changed, 3 insertions(+), 3 deletions(-)

commit 3bdcc8ded8e80167626ef22a89c85455f36b50c4
Author: Philip Withnall <philip@tecnocode.co.uk>
Date:   Thu Aug 26 20:44:23 2010 +0100

    Update British English translation

 po/en_GB.po | 1824
 ++++++++++++++++++++++++++++++++++++-----------------------
 1 files changed, 1119 insertions(+), 705 deletions(-)

commit 197d3f143f4ad7980bc651d9b643334d1dac910d
Author: Jorge González <jorgegonz@svn.gnome.org>
Date:   Thu Aug 26 19:43:54 2010 +0200

    Updated Spanish translation, fixes bug #627996

 po/es.po |  174
 +++++++++++++++++++++++++++++++++-----------------------------
 1 files changed, 93 insertions(+), 81 deletions(-)

commit 6db1a23b9956518d8c33443611960fe850e42872
Author: Philip Withnall <philip.withnall@collabora.co.uk>
Date:   Thu Aug 26 17:48:50 2010 +0100

    Fix row toggling on activation in EmpathyIndividualLinker

    Previously, row toggling was only working when activating rows at
    the end of a
    live search. This makes it work for all row activation events
    (i.e. selecting
    a row and pressing "enter").

 libempathy-gtk/empathy-individual-linker.c |   37
 +++++++++-------------------
 1 files changed, 12 insertions(+), 25 deletions(-)

commit d58a372562b1de6bd73bd521bd6dfcf4276bdcec
Author: Michael Kotsarinis <mk73628@hotmail.com>
Date:   Thu Aug 26 18:38:14 2010 +0300

    l10n: Updated Greek translation for empathy

 po/el.po | 1850
 +++++++++++++++++++++++++++++++++++++++-----------------------
 1 files changed, 1157 insertions(+), 693 deletions(-)

commit aef5465e619c75eb8b310ebd38a511c1cb6f924b
Author: Philip Withnall <philip.withnall@collabora.co.uk>
Date:   Thu Aug 26 16:28:00 2010 +0100

    Fix selectable labels in EmpathyIndividualWidget

    Ensure that labels in EmpathyIndividualWidget are only selectable
    if the
    widget isn't in tooltip mode. Closes: bgo#627917

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

commit d5872cec74644d7e3c53a65433271ca05c67c4b9
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:   Thu Aug 26 17:15:30 2010 +0200

    unsensitive the remove button while loading

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

commit c43467a6cc9dbc9f1e9eab28ce9bfd2feed3f998
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:   Thu Aug 26 16:59:27 2010 +0200

    insensitive treeview while loading

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

commit f3d884d8ddc2fbe3e2db3d333f41f03036ab71a4
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:   Thu Aug 26 15:38:18 2010 +0200

    accounts-dialog: display loading page while loading accounts (#611701)

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

commit 5352fa2563809bcb5fc80ec4192dab28569130e6
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:   Thu Aug 26 14:41:13 2010 +0200

    accounts-dialog: add a GtkNotebook

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

commit d311e01d703d6040560e1edf913c5d612d0a5ad5
Author: Philip Withnall <philip.withnall@collabora.co.uk>
Date:   Thu Aug 26 15:40:25 2010 +0100

    Fix the "Show Protocols" option with linked contacts

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

commit 3962499d4caedcce812fe1ce9b09b7a775e33a86
Author: Felix Kaser <f.kaser@gmx.net>
Date:   Thu Aug 26 16:04:47 2010 +0200

    allow to choose irc network with ENTER

    while searching, the enter key allows you to select an irc network

 .../empathy-irc-network-chooser-dialog.c           |   12 ++++++++++++
 1 files changed, 12 insertions(+), 0 deletions(-)

commit 692cee58aba936f5df2c791b89b697c1b05d208c
Merge: d02dfde 08c4500
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:   Thu Aug 26 15:39:43 2010 +0200

    Merge branch 'irc-wizard-596086'

commit d02dfde3919057b552cf8ba505495d73a8644ae6
Merge: 77a7cae 7a0749f
Author: Felix Kaser <f.kaser@gmx.net>
Date:   Thu Aug 26 15:00:03 2010 +0200

    Merge branch 'irc-network-selection-fix'

commit 7a0749f54ef5cb3ef3074940f08753c53e53de37
Author: Felix Kaser <f.kaser@gmx.net>
Date:   Thu Aug 26 14:52:23 2010 +0200

    fix selection problems in irc networks

 .../empathy-irc-network-chooser-dialog.c           |   26
 ++++++++++++++++----
 1 files changed, 21 insertions(+), 5 deletions(-)

commit 77a7caeaf8ce5d3c83b8f61d9eea6efe15c5886f
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:   Thu Aug 26 14:33:03 2010 +0200

    accounts-dialog: insensitive 'add' and 'import' buttons while loading
    (#624353)

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

commit 08c450056e0bb41e7ecc10f505ae0e6fea6dc6ea
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:   Wed Aug 25 15:24:24 2010 +0200

    account-assistant: stop blacklisting IRC (#596086)

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

commit 975f45f447bb3ceea7a467766a513b301c4b36c2
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:   Wed Aug 25 15:24:01 2010 +0200

    use the simple variant of the IRC widget if needed

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

commit 94895f1acb08a01dc28dae1f423abe43e8f6afbd
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:   Wed Aug 25 15:23:42 2010 +0200

    account-widget-irc: add simple version of the widget

 libempathy-gtk/empathy-account-widget-irc.c  |   41 +++++++++++++++++
 libempathy-gtk/empathy-account-widget-irc.h  |    3 +
 libempathy-gtk/empathy-account-widget-irc.ui |   63
 ++++++++++++++++++++++++++
 3 files changed, 107 insertions(+), 0 deletions(-)

commit 2de3bc4c03f97f1ceea44f43a1b86dedcb7e6893
Merge: f7a63b4 e624601
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:   Thu Aug 26 14:03:11 2010 +0200

    Merge branch 'irc-widget-588243'

commit e62460125c8a90e0f77f18326d597868ca01a42c
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:   Thu Aug 26 13:59:36 2010 +0200

    grab focus on the treeview after adding, editing or removing network

 .../empathy-irc-network-chooser-dialog.c           |    4 ++++
 1 files changed, 4 insertions(+), 0 deletions(-)

commit 3ba9a682ce49528af7db7a6d7e5b5baddd475618
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:   Thu Aug 26 13:54:01 2010 +0200

    irc-network-chooser-dialog: make it transient and modal

 .../empathy-irc-network-chooser-dialog.c           |    6 +++++-
 .../empathy-irc-network-chooser-dialog.h           |    3 ++-
 libempathy-gtk/empathy-irc-network-chooser.c       |    5 ++++-
 3 files changed, 11 insertions(+), 3 deletions(-)

commit f7a63b4c249208122cfa17f668a19d853d158dfa
Author: Philip Withnall <philip.withnall@collabora.co.uk>
Date:   Thu Aug 26 11:28:11 2010 +0100

    Don't let the GtkCellRendererToggle get activated by clicking on a
    tree row

    GtkTreeView activates a row when it's clicked or double-clicked,
    which ends
    up toggling the GtkCellRendererToggle in the linking dialogue even
    if it's
    insensitive, allowing the start Individual to be removed from the
    link, and
    causing chaos. See bgo#567481. Closes: bgo#628011

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

commit c48ad853488aed4cd28eeb20d6c4614f01b4b2f0
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:   Thu Aug 26 12:20:18 2010 +0200

    search_text_notify_cb: select first matching only if we are still
    searching

    Also scroll to the selected network when cancelling the search.

 .../empathy-irc-network-chooser-dialog.c           |   23
 ++++++++++++++++++-
 1 files changed, 21 insertions(+), 2 deletions(-)

commit acc900cd828e7883436fe41ca68d5de3b27cf1df
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:   Thu Aug 26 11:50:11 2010 +0200

    Hide the search after picking the network to get the right one

 .../empathy-irc-network-chooser-dialog.c           |    5 +++--
 1 files changed, 3 insertions(+), 2 deletions(-)

commit 83d9b1cb0f1b3ff248b24e0b25a1139e475677ef
Author: Philip Withnall <philip.withnall@collabora.co.uk>
Date:   Wed Aug 25 17:34:02 2010 +0100

    Disconnect from the group-changed signal when destroying
    EmpathyGroupsWidget

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

commit deddbb95eba55352658572a9a3c9293fed4842c2
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:   Wed Aug 25 16:41:35 2010 +0200

    properly set table_common_settings

    account-widget needs it to add the "Enabled" checkbox.

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

commit c9815085eed66cf02ab8dfb40fbf0aab393ccd4d
Author: Philip Withnall <philip.withnall@collabora.co.uk>
Date:   Wed Aug 25 12:50:41 2010 +0100

    Don't expand rows if the tree view has been destroyed

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

commit f8c7011a571c35d976e00526491d499ec623acb9
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:   Wed Aug 25 16:30:15 2010 +0200

    cance live search when adding/removing a network

 .../empathy-irc-network-chooser-dialog.c           |    4 ++++
 1 files changed, 4 insertions(+), 0 deletions(-)

commit 469e9ea6d1e007265f7a5ec518e27052be9305a3
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:   Wed Aug 25 16:28:09 2010 +0200

    search_text_notify_cb: rename iter to filter_iter to avoid confusion

 .../empathy-irc-network-chooser-dialog.c           |    7 ++++---
 1 files changed, 4 insertions(+), 3 deletions(-)

commit 0ead72dafcd03ac8db7b854cf883bea7a8394616
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:   Wed Aug 25 16:25:19 2010 +0200

    factor out iter_to_filter_iter()

 .../empathy-irc-network-chooser-dialog.c           |   35
 ++++++++++++--------
 1 files changed, 21 insertions(+), 14 deletions(-)

commit 98318894ea8217020e29be42b2cae209831b179c
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:   Wed Aug 25 16:16:31 2010 +0200

    scroll_to_iter: need a filter iter

 .../empathy-irc-network-chooser-dialog.c           |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

commit d4e129c0d66340a755a9cb14f91e92539426e76d
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:   Wed Aug 25 16:14:30 2010 +0200

    assert that iter convert don't fail

    If they do we did something wrong.

 .../empathy-irc-network-chooser-dialog.c           |   12 ++++++------
 1 files changed, 6 insertions(+), 6 deletions(-)

commit e12b292643c831d8e35ddeca8aed4d24269cfe7f
Author: Matej Urbančič <mateju@svn.gnome.org>
Date:   Wed Aug 25 15:14:31 2010 +0200

    Updated Slovenian translation

 po/sl.po |   19 +++----------------
 1 files changed, 3 insertions(+), 16 deletions(-)

commit af80486a7408355ede05b131af5e848b84e62d5e
Author: Matej Urbančič <mateju@svn.gnome.org>
Date:   Wed Aug 25 15:12:08 2010 +0200

    Updated Slovenian translation

 po/sl.po |  133
 +++++++++++++++++++++++++++++++++++++++++++++++++++++---------
 1 files changed, 114 insertions(+), 19 deletions(-)

commit 88cdfb884de9b2e288d07924624083a8fabe643f
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:   Wed Aug 25 15:00:12 2010 +0200

    select_iter: set the cursor as well

 .../empathy-irc-network-chooser-dialog.c           |   10 ++++++++++
 1 files changed, 10 insertions(+), 0 deletions(-)

commit 102c526be04a1356d1935844f293431fd864d9fe
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:   Wed Aug 25 14:23:07 2010 +0200

    make title clearer

 .../empathy-irc-network-chooser-dialog.c           |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

commit c196520a0117248010140b0612e7d2726d135afc
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:   Wed Aug 25 14:18:06 2010 +0200

    don't allow to select a network if none is actually selected

 .../empathy-irc-network-chooser-dialog.c           |    9 +++++++--
 1 files changed, 7 insertions(+), 2 deletions(-)

commit 75f7bc8ce00e28a84d19bf036382e2566b60f9e8
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:   Wed Aug 25 14:17:50 2010 +0200

    replace the close button by 'Select'

 .../empathy-irc-network-chooser-dialog.c           |    5 ++++-
 1 files changed, 4 insertions(+), 1 deletions(-)

commit cc260a6fe68be18a935dbc81caf25107325b5563
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:   Wed Aug 25 14:12:22 2010 +0200

    select the first matching network when searching

 .../empathy-irc-network-chooser-dialog.c           |    6 ++++++
 1 files changed, 6 insertions(+), 0 deletions(-)

commit fd86b3c72bcc01a3592cc5beec052526c098e1bd
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:   Wed Aug 25 14:10:10 2010 +0200

    pass filter iter to select_iter() and scroll_to_iter()

 .../empathy-irc-network-chooser-dialog.c           |   46
 +++++++++++--------
 1 files changed, 27 insertions(+), 19 deletions(-)

commit 1d030ae9e63bbaac4fcd805dae61e22e3b1f5592
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:   Wed Aug 25 11:17:11 2010 +0200

    irc-network-chooser: use network accessors

 libempathy-gtk/empathy-irc-network-chooser.c |   11 ++++-------
 1 files changed, 4 insertions(+), 7 deletions(-)

commit a687feb900220a231b63bce08f43743488dc6bbe
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:   Wed Aug 25 11:14:59 2010 +0200

    irc-network-chooser-dialog: use network accessors

 .../empathy-irc-network-chooser-dialog.c           |   22
 +++----------------
 1 files changed, 4 insertions(+), 18 deletions(-)

commit c7c68087a5a17cb270ac120e631cf4dbe7339fa4
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:   Wed Aug 25 11:12:47 2010 +0200

    irc-network-chooser-dialog: add live search support

 .../empathy-irc-network-chooser-dialog.c           |   98
 ++++++++++++++++++--
 1 files changed, 91 insertions(+), 7 deletions(-)

commit e1513fcc6cebe513e0b3b0778b5cfe18097fe576
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:   Wed Aug 25 10:55:46 2010 +0200

    irc-network: add accessors for name and charset

 libempathy/empathy-irc-network.c |   16 ++++++++++++++++
 libempathy/empathy-irc-network.h |    4 ++++
 2 files changed, 20 insertions(+), 0 deletions(-)

commit ba36ddff81ce9f228f150246069ceb76425cfee5
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:   Tue Aug 24 16:11:42 2010 +0200

    account-widget-irc: use EmpathyIrcNetworkChooser

    This avoid having a huge list in a combo box (#588243)

 libempathy-gtk/empathy-account-widget-irc.c  |  405
 ++------------------------
 libempathy-gtk/empathy-account-widget-irc.ui |   78 +-----
 2 files changed, 24 insertions(+), 459 deletions(-)

commit f867ae2b8bbe9b885419f9748465d96ce70755d9
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:   Tue Aug 24 16:10:28 2010 +0200

    irc-network-chooser: popup network chooser dialog when clicked

 libempathy-gtk/empathy-irc-network-chooser.c |   63
 +++++++++++++++++++++++++-
 1 files changed, 62 insertions(+), 1 deletions(-)

commit 8f678a31a63eccb4fc086a8caddb37b1a0e7de91
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:   Tue Aug 24 16:09:24 2010 +0200

    add empathy-irc-network-chooser-dialog

    Some of the code has been copied from empathy-account-widget-irc.c.

 libempathy-gtk/Makefile.am                         |    2 +
 .../empathy-irc-network-chooser-dialog.c           |  487
 ++++++++++++++++++++
 .../empathy-irc-network-chooser-dialog.h           |   70 +++
 3 files changed, 559 insertions(+), 0 deletions(-)

commit 4b08cbd1605f1671a9d90ffa7f3a3a1776e5a61a
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:   Mon Aug 23 17:24:59 2010 +0200

    add empathy-irc-network-chooser

 libempathy-gtk/Makefile.am                   |    2 +
 libempathy-gtk/empathy-irc-network-chooser.c |  299
 ++++++++++++++++++++++++++
 libempathy-gtk/empathy-irc-network-chooser.h |   61 ++++++
 3 files changed, 362 insertions(+), 0 deletions(-)

commit 860c26554e90126287adcba3ae9dc536bdfbb622
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:   Tue Aug 24 14:20:23 2010 +0200

    add empathy_irc_network_manager_dup_default()

 libempathy/empathy-irc-network-manager.c |   34
 ++++++++++++++++++++++++++++++
 libempathy/empathy-irc-network-manager.h |    2 +
 2 files changed, 36 insertions(+), 0 deletions(-)

commit 1ceaa6d1ee7135f6a578eecb12686493fac88d6c
Author: Felix Kaser <f.kaser@gmx.net>
Date:   Wed Aug 25 10:41:28 2010 +0200

    added some files to gitignore

    they were introduced by the interactive tls certificate verification
    patches.

 data/.gitignore |    1 +
 src/.gitignore  |    1 +
 2 files changed, 2 insertions(+), 0 deletions(-)

commit 656ba0f01d0a55af0c07d2d76e8e9d17502b12b6
Author: Sjoerd Simons <sjoerd.simons@collabora.co.uk>
Date:   Tue Aug 24 21:38:04 2010 +0200

    Use gmodule-export-2.0 so introspecting ourselves works

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

commit 05166126df1b96b26a7fb2c9eb6c344214878371
Author: Saleem Abdulrasool <compnerd@compnerd.org>
Date:   Wed Mar 3 20:30:24 2010 +0000

    allow building empathy without eds

 configure.ac                            |   13 ++++++++++++-
 src/Makefile.am                         |    6 ++++--
 src/empathy-auto-salut-account-helper.c |    7 +++++++
 tests/interactive/Makefile.am           |    8 +++++---
 4 files changed, 28 insertions(+), 6 deletions(-)

commit 3b8d776ba062864878dc5901f080bccbdd440c7e
Author: Fran Diéguez <fran.dieguez@mabishu.com>
Date:   Tue Aug 24 21:03:13 2010 +0200

    Update Galician translations

 po/gl.po |  126
 +++++++++++++++++++++++++++++++++++++++++++++++++++++--------
 1 files changed, 109 insertions(+), 17 deletions(-)

commit 927ccfb98fa72539dee8e3a418faff1be49751b9
Author: Jorge González <jorgegonz@svn.gnome.org>
Date:   Tue Aug 24 20:56:42 2010 +0200

    Updated Spanish translation

 po/es.po |  129
 +++++++++++++++++++++++++++++++++++++++++++++++++++++---------
 1 files changed, 111 insertions(+), 18 deletions(-)

commit 56bcabd8df3185bca2805f1e4945c3adf28f0be1
Author: Travis Reitter <travis.reitter@collabora.co.uk>
Date:   Mon Aug 23 11:39:12 2010 -0700

    Don't leak a reference when updating an IndividualWidget.

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

commit 4f79cd98c0501367570bc140776b5ec40bfee49c
Author: Travis Reitter <travis.reitter@collabora.co.uk>
Date:   Mon Aug 23 11:37:42 2010 -0700

    When setting an EmpathyContact's Persona, disconnect existing
    signal handler

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

commit 3bd33b4812d0b909a8a44b12791fcac75fcf365d
Merge: 180d834 dc73f3d
Author: Cosimo Cecchi <cosimoc@gnome.org>
Date:   Tue Aug 24 15:24:38 2010 +0200

    Merge branch 'tls-connection'

commit dc73f3d3e51958edaf3b0508c4205c387e735547
Author: Cosimo Cecchi <cosimoc@gnome.org>
Date:   Tue Aug 24 15:20:06 2010 +0200

    Properly handle corner cases of _prepare_async() called twice

    - If it's called twice before the first call returned, emit an error.
    - If it's called twice on an already-prepared object, just
    successfully
      return.

 libempathy/empathy-tls-certificate.c |   26 ++++++++++++++++++++++++++
 1 files changed, 26 insertions(+), 0 deletions(-)

commit 76d38803e7992e50333c1054c48bb789ff63c699
Author: Cosimo Cecchi <cosimoc@gnome.org>
Date:   Tue Aug 24 11:54:17 2010 +0200

    Don't leak certificate data

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

commit b76f9bf45aca489bfe40c333a048be513410f36c
Author: Cosimo Cecchi <cosimoc@gnome.org>
Date:   Tue Aug 24 11:53:59 2010 +0200

    Use new certificate API in EmpathyServerTLSHandler

 libempathy/empathy-server-tls-handler.c |   43
 +++++++++++++++++++++----------
 1 files changed, 29 insertions(+), 14 deletions(-)

commit 1426cd161d371c161e1e6e66ed7b66a163d5bdaa
Author: Cosimo Cecchi <cosimoc@gnome.org>
Date:   Tue Aug 24 11:53:11 2010 +0200

    Make EmpathyTLSCertificate a TpProxy subclass

 libempathy/empathy-tls-certificate.c |  201
 +++++++++-------------------------
 libempathy/empathy-tls-certificate.h |   16 ++-
 2 files changed, 65 insertions(+), 152 deletions(-)

commit 180d83485a0d10d8c45760852d8d588e20a7d3e2
Author: Philip Withnall <philip.withnall@collabora.co.uk>
Date:   Mon Aug 23 13:12:49 2010 +0100

    Remove EmpathyAvatar->token

 libempathy-gtk/empathy-avatar-chooser.c |    4 ++--
 libempathy/empathy-contact.c            |   13 +++----------
 libempathy/empathy-contact.h            |    1 -
 3 files changed, 5 insertions(+), 13 deletions(-)

commit 77646a2826689c6f171e5a80eb1cf4702b458494
Author: Philip Withnall <philip.withnall@collabora.co.uk>
Date:   Mon Aug 23 13:11:30 2010 +0100

    Use the avatar filename rather than token for change detection

    The filename includes the token, so this allows us to remove the
    token field
    from EmpathyAvatar.

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

commit 597f34ccdbe2000aad148147d9ecafb3e17c9e0a
Author: Philip Withnall <philip.withnall@collabora.co.uk>
Date:   Mon Aug 23 12:33:32 2010 +0100

    Remove empathy_contact_new_for_log()

    It was unused.

 libempathy/empathy-contact.c |   17 -----------------
 libempathy/empathy-contact.h |    2 --
 2 files changed, 0 insertions(+), 19 deletions(-)

commit c71c43c5756061e2e3d877aa47078140b518e3fa
Author: Philip Withnall <philip.withnall@collabora.co.uk>
Date:   Mon Aug 23 12:23:18 2010 +0100

    Make empathy_contact_load_avatar_cache() private

 libempathy/empathy-contact.c |   10 ++++++----
 libempathy/empathy-contact.h |    2 --
 2 files changed, 6 insertions(+), 6 deletions(-)

commit d2d137673a575a54d51a1501d243f852e6723ab2
Author: Philip Withnall <philip.withnall@collabora.co.uk>
Date:   Mon Aug 23 12:09:53 2010 +0100

    Make empathy_contact_set_avatar() private

 libempathy/empathy-contact.c |   19 +++++++++----------
 libempathy/empathy-contact.h |    2 --
 2 files changed, 9 insertions(+), 12 deletions(-)

commit ceb6c0312d3b6f2933b06ff866accd7e1bf22e6d
Author: Felix Kaser <f.kaser@gmx.net>
Date:   Tue Aug 24 10:44:32 2010 +0200

    use proper model in linking ui

    when searching in the linking-ui-treeview the filtered model has to
    be used. fixes bug #627500

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

commit 503e6b771b4ba4455dc47483af9f6502a3447ae1
Author: Khaled Hosny <khaledhosny@eglug.org>
Date:   Tue Aug 24 04:10:48 2010 +0200

    Updated Arabic translation

 po/ar.po | 1530
 +++++++++++++++++++++++++++++++++++++-------------------------
 1 files changed, 920 insertions(+), 610 deletions(-)

commit e3f2c5cbd45c8c7974062e4bdd845db9b833bc8e
Author: Petr Kovar <pknbe@volny.cz>
Date:   Mon Aug 23 22:51:45 2010 +0200

    Update Czech translation by Marek Cernocky

 po/cs.po | 1525
 ++++++++++++++++++++++++++++++++++++++------------------------
 1 files changed, 931 insertions(+), 594 deletions(-)

commit 9145d78fe35ab4accec07c899c5dcc89e3fc566d
Author: Jorge González <jorgegonz@svn.gnome.org>
Date:   Mon Aug 23 17:40:25 2010 +0200

    Updated Spanish translation

 po/es.po |   18 +++++++++++-------
 1 files changed, 11 insertions(+), 7 deletions(-)

commit 248e2de94a951d5e0727c0d5ab87a707c853b4da
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:   Mon Aug 23 15:02:21 2010 +0200

    linker: add some padding in the 2 part of the pane

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

commit a39128b04df75da0965452c9c74b902c633e25ee
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:   Mon Aug 23 14:39:08 2010 +0200

    individual-widget: adapt number of rows to the features needed

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

commit 9609495ef4dedb1c80a39faeb780fe1f660cc411
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:   Mon Aug 23 14:22:32 2010 +0200

    linker: add a label explaining how to use the dialog

 libempathy-gtk/empathy-individual-linker.c |   20 ++++++++++++++++++--
 1 files changed, 18 insertions(+), 2 deletions(-)

commit 3ecae374709ef76a984656f90f360e5f42831fc0
Author: Cheng-Chia Tseng <pswo10680@gmail.com>
Date:   Mon Aug 23 20:03:21 2010 +0800

    Updated Traditional Chinese translation(Hong Kong and Taiwan)

 po/zh_HK.po |  826
 +++++++++++++++++++++++++++++++++++++----------------------
 po/zh_TW.po |  826
 +++++++++++++++++++++++++++++++++++++----------------------
 2 files changed, 1030 insertions(+), 622 deletions(-)

commit 2aab3515e97c67ab6704f5c49e91a8be6114400a
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:   Mon Aug 23 13:40:19 2010 +0200

    Display the number of personas only in tooltips

 libempathy-gtk/empathy-individual-widget.c |   44
 ++++++++++++++++------------
 1 files changed, 25 insertions(+), 19 deletions(-)

commit 784b4a32084df08c173e6ca63a8d270e01cc81eb
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:   Mon Aug 23 13:22:43 2010 +0200

    pass NULL instead of "" to gtk_label_new()

    This saves us a strdup.

 src/empathy-account-assistant.c |    2 +-
 src/empathy-sidebar.c           |    2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

commit f78f4f123ab01a70e7f8c7bb659e39bb0a4bc9ae
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:   Mon Aug 23 11:47:50 2010 +0200

    linker: display titles in bold

 libempathy-gtk/empathy-individual-linker.c |   11 +++++++++--
 1 files changed, 9 insertions(+), 2 deletions(-)

commit db05ed13ac1bb1e4b58d7b3c14e382679ea5f92d
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:   Mon Aug 23 10:25:47 2010 +0200

    Consider contact without presence as online (#627587)

    That what we use to do but f8c37da731af9f6cd74e7a0ef08fa02059d981ac
    breaked
    it. If we don't consider such contacts as online, IRC contacts don't
    appear in
    the room contact list.

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

commit aa3556ffa5eb1571b928918cf8995705db4754a1
Author: Fran Diéguez <fran.dieguez@mabishu.com>
Date:   Mon Aug 23 02:16:50 2010 +0200

    Updated galician translations

 po/gl.po |  131
 ++++++++++++++++++++++++++++++++++---------------------------
 1 files changed, 73 insertions(+), 58 deletions(-)

commit 7a499be36ac62d1321f80ec7e3578ebed0aee3b1
Author: Kenneth Nielsen <k.nielsen81@gmail.com>
Date:   Sun Aug 22 15:09:24 2010 +0200

    Updated Danish translation

 po/da.po | 1546
 +++++++++++++++++++++++++++++++++++++-------------------------
 1 files changed, 915 insertions(+), 631 deletions(-)

commit 00bc52c3017d481d64a78c1dad1fe06c0014a1f3
Author: Jorge González <jorgegonz@svn.gnome.org>
Date:   Sat Aug 21 12:17:44 2010 +0200

    Updated Spanish translation

 po/es.po |  147
 +++++++++++++++++++++++++++++++++----------------------------
 1 files changed, 79 insertions(+), 68 deletions(-)

commit f7e35697066068b2e95fddf5221a22cce5dd8239
Author: Kjartan Maraas <kmaraas@gnome.org>
Date:   Sat Aug 21 11:56:49 2010 +0200

    Updated Norwegian bokmål translation

 po/nb.po |  858
 ++++++++++++++++++++++++++++++++++++++------------------------
 1 files changed, 526 insertions(+), 332 deletions(-)

commit eb2bc994c92ff8f5682394d3c08efc52f048e97a
Author: Matej Urbančič <mateju@svn.gnome.org>
Date:   Sat Aug 21 08:34:33 2010 +0200

    Updated Slovenian translation

 po/sl.po |  249
 ++++++++++++++++++++++++++++++++++++++------------------------
 1 files changed, 153 insertions(+), 96 deletions(-)

commit 1d2734c7c782359266dc824b12945883ec11c761
Author: Yaron Shahrabani <sh.yaron@gmail.com>
Date:   Sat Aug 21 02:32:59 2010 +0300

    Updated Hebrew translation.

 po/he.po |  241
 +++++++++++++++++++++++++++++++++++++++-----------------------
 1 files changed, 153 insertions(+), 88 deletions(-)

commit 485836b9e046d420bc349749ac15c82b0dbd6261
Author: Philip Withnall <philip.withnall@collabora.co.uk>
Date:   Fri Aug 20 15:40:33 2010 +0100

    Add a "Linked Contacts" label at the top of the Information dialogue

 .../empathy-individual-information-dialog.c        |   38
 ++++++++++++++++++--
 po/POTFILES.in                                     |    1 +
 2 files changed, 36 insertions(+), 3 deletions(-)

commit b713ffc898aaa18edee52c0ef0c499d632ade836
Author: Philip Withnall <philip.withnall@collabora.co.uk>
Date:   Fri Aug 20 15:26:36 2010 +0100

    Allow EmpathyIndividualInformationDialog to be resized

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

commit 598d4c4821575442bb87329cb9d8b0b61db51dee
Author: Philip Withnall <philip.withnall@collabora.co.uk>
Date:   Fri Aug 20 14:37:54 2010 +0100

    Fix some visual breakage of EmpathyIndividualWidget in tooltips

    It was expanding too much and leaking out of the tooltip balloon.

 libempathy-gtk/empathy-individual-widget.c  |   17 +++++++++++------
 libempathy-gtk/empathy-individual-widget.ui |    1 +
 2 files changed, 12 insertions(+), 6 deletions(-)

commit 320771c43432260d55c1a32d127fdaa0dabfa1fe
Author: Philip Withnall <philip.withnall@collabora.co.uk>
Date:   Fri Aug 20 14:02:22 2010 +0100

    Bug 627360 — "Information" of a meta contact is too big for
    the screen

    Add a GtkScrolledWindow to EmpathyIndividualWidget in the case
    that it's
    showing personas. Closes: bgo#627360

 libempathy-gtk/empathy-individual-widget.c  |   39
 +++++++++++++++++++++++++++
 libempathy-gtk/empathy-individual-widget.ui |   20 +++++++++++--
 2 files changed, 56 insertions(+), 3 deletions(-)

commit 00b878b87455a47494ef640c0b5fd2cab4e6b66c
Author: Philip Withnall <philip.withnall@collabora.co.uk>
Date:   Fri Aug 20 15:19:59 2010 +0100

    Display Personas' accounts in the linking dialogue

    Display the account name instead of the Persona's presence message
    on the
    right-hand side of the linking dialogue. Closes: bgo#626715

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

commit a63a58b777180d1b5c9eee39faab5edd891ac80d
Author: Philip Withnall <philip.withnall@collabora.co.uk>
Date:   Fri Aug 20 15:10:01 2010 +0100

    Add an "account" column to EmpathyPersonaStore

    This stores the display name of the PersonaStore for each Persona.

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

commit 4c7d5bbab4325fbfae01a0d2ef58756403c18fb7
Author: Will Thompson <will.thompson@collabora.co.uk>
Date:   Fri Aug 20 12:31:56 2010 +0100

    Avoid conflicting accelerators in New Call dialog.

    _Call conflicts with the stock _Cancel button.

    Reviewed-by: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>

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

commit 5fa714c470951e828f8dab44856b8cc2d4c30340
Author: Philip Withnall <philip.withnall@collabora.co.uk>
Date:   Wed Aug 18 11:04:06 2010 +0100

    Add EmpathyIndividualEditDialog

    This replaces the edit dialogue from empathy-contact-dialogs.c,
    and is now
    used from the EmpathyIndividualMenu. Closes: bgo#626544

 libempathy-gtk/Makefile.am                      |    2 +
 libempathy-gtk/empathy-individual-edit-dialog.c |  273
 +++++++++++++++++++++++
 libempathy-gtk/empathy-individual-edit-dialog.h |   59 +++++
 libempathy-gtk/empathy-individual-menu.c        |    8 +-
 po/POTFILES.in                                  |    1 +
 5 files changed, 337 insertions(+), 6 deletions(-)

commit e445d9d5b2781ef59e1a07e97853f232c94d0dc2
Author: Philip Withnall <philip.withnall@collabora.co.uk>
Date:   Tue Aug 10 11:54:48 2010 +0100

    Allow unlinking individuals through EmpathyIndividualManager

    Wrap the FolksIndividualAggregator individual unlinking API in
    EmpathyIndividualManager with some basic error reporting (it isn't
    expected
    that unlinking will fail).

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

commit e09695146f8ac0fad504ead9e080b70fe70d3b9b
Author: Fran Diéguez <fran.dieguez@mabishu.com>
Date:   Fri Aug 20 13:32:43 2010 +0200

    Updated galician translations

 po/gl.po |  236
 +++++++++++++++++++++++++++++++++++++++-----------------------
 1 files changed, 148 insertions(+), 88 deletions(-)

commit 23566ca74cbdca4b237f9fd0758493bee26e95a9
Author: Philip Withnall <philip.withnall@collabora.co.uk>
Date:   Fri Aug 20 11:04:40 2010 +0100

    Don't try to expand groups if the EmpathyIndividualView's store
    is unset

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

commit 7906c05973b29175938775fa5fabc3e3f347b372
Author: Philip Withnall <philip.withnall@collabora.co.uk>
Date:   Thu Aug 19 14:44:22 2010 +0100

    Bug 627219 — Link dialog search doesn't work

    Allow the store of an EmpathyIndividualView to be changed after
    construction,
    and cope with recreating the filter when this happens. Closes:
    bgo#627219

 libempathy-gtk/empathy-individual-linker.c |    6 +-
 libempathy-gtk/empathy-individual-view.c   |   95
 +++++++++++++++++++++-------
 libempathy-gtk/empathy-individual-view.h   |    5 ++
 3 files changed, 81 insertions(+), 25 deletions(-)

commit 4a38890ece9f9e0ef045c689d79d13e00515d98c
Author: Jorge González <jorgegonz@svn.gnome.org>
Date:   Thu Aug 19 21:13:39 2010 +0200

    Updated Spanish translation

 po/es.po |  241
 ++++++++++++++++++++++++++++++++++++++------------------------
 1 files changed, 149 insertions(+), 92 deletions(-)

commit b992a04452d574d1afb5787499ee0498b74210d3
Author: Philip Withnall <philip.withnall@collabora.co.uk>
Date:   Mon Jul 5 17:09:35 2010 +0100

    Use EmpathyIndividualWidget in EmpathyIndividualInformationDialog

 .../empathy-individual-information-dialog.c        |   38
 +++++--------------
 1 files changed, 10 insertions(+), 28 deletions(-)

commit 4c6aa4d6c9ffa412fa0cf1513dab34af6aedc7e9
Author: Philip Withnall <philip.withnall@collabora.co.uk>
Date:   Wed Aug 11 18:51:28 2010 +0100

    Use EmpathyIndividualWidget in EmpathyIndividualView tooltips

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

commit b733c20124b92b6dedec267eee6b586b312e5d5b
Author: Philip Withnall <philip.withnall@collabora.co.uk>
Date:   Thu Aug 19 13:03:56 2010 +0100

    Fix the flags given to the widget in EmpathyIndividualLinker

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

commit 48417775ef19cdb1ebe2ecd631953f431aa144b4
Author: Philip Withnall <philip.withnall@collabora.co.uk>
Date:   Thu Aug 19 13:05:36 2010 +0100

    Expand EmpathyIndividualWidget

    It's now a fully-fledged widget of its own, rather than a thin wrapper
    around EmpathyContactWidget. Closes: bgo#626728

 libempathy-gtk/Makefile.am                  |    3 +-
 libempathy-gtk/empathy-individual-widget.c  | 1836
 ++++++++++++++++++++++++++-
 libempathy-gtk/empathy-individual-widget.h  |   42 +-
 libempathy-gtk/empathy-individual-widget.ui |  173 +++
 po/POTFILES.in                              |    2 +
 5 files changed, 1984 insertions(+), 72 deletions(-)

commit 8da7760544ee3c592f9a884a13b13103b3b5a674
Author: Philip Withnall <philip.withnall@collabora.co.uk>
Date:   Tue Aug 10 19:43:54 2010 +0100

    Split the group editing widgets out of EmpathyContactWidget

    They can be shared between EmpathyContactWidget and a new
    EmpathyIndividualWidget, once it's written.

 libempathy-gtk/Makefile.am               |    2 +
 libempathy-gtk/empathy-contact-widget.c  |  307 +--------------
 libempathy-gtk/empathy-contact-widget.ui |  104 +-----
 libempathy-gtk/empathy-groups-widget.c   |  600
 ++++++++++++++++++++++++++++++
 libempathy-gtk/empathy-groups-widget.h   |   66 ++++
 po/POTFILES.in                           |    1 +
 6 files changed, 688 insertions(+), 392 deletions(-)

commit 1599c6961f70341daf755d28857f155c86ba8f39
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:   Thu Aug 19 16:22:28 2010 +0200

    live-search: fix typo

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

commit d077181fac75859a864eede51d28c9517127afd8
Author: Matej Urbančič <mateju@svn.gnome.org>
Date:   Thu Aug 19 14:33:22 2010 +0200

    Updated Slovenian translation

 po/sl.po |   84
 +++++++++++++++++++++++++++++++++++++------------------------
 1 files changed, 51 insertions(+), 33 deletions(-)

commit f2a86e5a6df46be0ce54d5a379f4c9c934c90f58
Author: Yaron Shahrabani <sh.yaron@gmail.com>
Date:   Thu Aug 19 09:25:22 2010 +0300

    Updated Hebrew translation.

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

commit 2a5ce3706d080bec3c949bda07e9b926659b7e77
Author: Daniel Nylander <po@danielnylander.se>
Date:   Wed Aug 18 22:23:39 2010 +0200

    Updated Swedish translation

 po/sv.po |  179
 +++++++++++++++++++++++++++++++++++---------------------------
 1 files changed, 101 insertions(+), 78 deletions(-)

commit 433ed2c918f81aeac6fd7eb1dacfbeb2d82a6f6d
Author: Philip Withnall <philip.withnall@collabora.co.uk>
Date:   Wed Aug 18 18:32:29 2010 +0100

    Ensure we disconnect signals from all Personas in an Individual

 libempathy-gtk/empathy-individual-store.c |   77
 ++++++++++++++++++++++-------
 1 files changed, 58 insertions(+), 19 deletions(-)

commit 015070caec0ec80ac53127c619bde516081670e6
Author: Philip Withnall <philip.withnall@collabora.co.uk>
Date:   Wed Aug 18 18:13:02 2010 +0100

    Allow cancellation of avatar load operations

    Automatically cancel all pending avatar load operations when
    disposing of
    an EmpathyIndividualStore. This prevents crashes when linking
    individuals in
    the case that the EmpathyIndividualStore in the linking dialogue gets
    notified of the new linked individual just before it's destroyed.

 libempathy-gtk/empathy-individual-store.c |   57
 ++++++++++++++++++++++++-----
 libempathy-gtk/empathy-ui-utils.c         |    7 ++--
 libempathy-gtk/empathy-ui-utils.h         |    3 +-
 3 files changed, 54 insertions(+), 13 deletions(-)

commit 4472cbd53db695b41146ec4c9345ee4ab3197b04
Author: Cosimo Cecchi <cosimoc@gnome.org>
Date:   Wed Aug 18 19:28:25 2010 +0200

    Use _complete instead of _complete_in_idle()

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

commit ea19d00b74b36acc40115a3b48218ccc6af54d04
Author: Cosimo Cecchi <cosimoc@gnome.org>
Date:   Wed Aug 18 19:07:17 2010 +0200

    Don't show the error if user-requested is set

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

commit 92aee43c95f51aa828c34c828c18c38a3e1fdcb6
Author: Cosimo Cecchi <cosimoc@gnome.org>
Date:   Wed Aug 18 19:06:59 2010 +0200

    Use new API in EmpathyAccountsDialog

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

commit 5b7271c8f3c349637516c6b5bdb442aa9a480925
Author: Cosimo Cecchi <cosimoc@gnome.org>
Date:   Wed Aug 18 19:06:27 2010 +0200

    Add an usre_requested param to _account_get_error()

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

commit 61e8bd3c9fec6cef2aa65cdaef98a383f346dcf1
Author: Cosimo Cecchi <cosimoc@gnome.org>
Date:   Wed Aug 18 18:11:42 2010 +0200

    Use the hostname properties in the dialog

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

commit d7d8916076c8dcca1b1d95f090444cc6e7a05cd6
Author: Cosimo Cecchi <cosimoc@gnome.org>
Date:   Wed Aug 18 18:01:45 2010 +0200

    Fill 'user-requested' when we reject the certificate

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

commit 6c3c7278e4d1716342d1d222891c33e98d829691
Author: Cosimo Cecchi <cosimoc@gnome.org>
Date:   Wed Aug 18 18:01:15 2010 +0200

    Use the hash table directly as a parameter to reject ()

    Clients will have to fill it anyway

 libempathy/empathy-tls-certificate.c |    7 +------
 libempathy/empathy-tls-certificate.h |    2 +-
 2 files changed, 2 insertions(+), 7 deletions(-)

commit 37d64d2ec686d48a88db3f94b92e88df213b11b7
Author: Cosimo Cecchi <cosimoc@gnome.org>
Date:   Wed Aug 18 17:54:34 2010 +0200

    Remove whitespace

 libempathy/empathy-server-tls-handler.c |    2 +-
 libempathy/empathy-tls-certificate.c    |    6 +++---
 libempathy/empathy-tls-verifier.c       |    4 ++--
 3 files changed, 6 insertions(+), 6 deletions(-)

commit 460043daa52d76ffdc90b2f9cf6432b12c850a0f
Author: Cosimo Cecchi <cosimoc@gnome.org>
Date:   Wed Aug 18 17:53:42 2010 +0200

    Add new files to extensions/Makefile.am

 extensions/Makefile.am |    2 ++
 1 files changed, 2 insertions(+), 0 deletions(-)

commit 709119042e1c45e0aafb38659ac6ea7396c8aa0c
Author: Cosimo Cecchi <cosimoc@gnome.org>
Date:   Wed Aug 18 17:53:29 2010 +0200

    Add new files to POTFILES.in

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

commit 526dbcddf5a3969a8714b49441e4dd62927837f3
Author: Cosimo Cecchi <cosimoc@gnome.org>
Date:   Wed Aug 18 16:55:03 2010 +0200

    Implement a timeout machinery for the auth client

    Similar to the one used in empathy-av.c

 src/empathy-auth-client.c |   64
 ++++++++++++++++++++++++++++++++++++++++++++-
 1 files changed, 63 insertions(+), 1 deletions(-)

commit 5286587e932047f9b32001429a395d8caf193b26
Author: Cosimo Cecchi <cosimoc@gnome.org>
Date:   Wed Aug 18 16:47:02 2010 +0200

    Rename empathy-auth-helper->empathy-auth-client

 ...esktop.Telepathy.Client.Empathy.Auth.service.in |    2 +-
 src/Makefile.am                                    |    6 +-
 src/empathy-auth-client.c                          |  198
 ++++++++++++++++++++
 src/empathy-auth-helper.c                          |  198
 --------------------
 4 files changed, 202 insertions(+), 202 deletions(-)

commit 9005c6a1357b612d9a3bce36dd6326da487ab728
Author: Cosimo Cecchi <cosimoc@gnome.org>
Date:   Wed Aug 18 16:44:30 2010 +0200

    Don't allow calling verify_async() twice

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

commit a272c04575698908bff1363f3d652cc67876e599
Author: Cosimo Cecchi <cosimoc@gnome.org>
Date:   Wed Aug 18 16:43:17 2010 +0200

    Use tp_clear_pointer() where possible

 libempathy/empathy-tls-verifier.c |   10 +++-------
 1 files changed, 3 insertions(+), 7 deletions(-)

commit 53966af9c627e5217fb247b64ef62bf40541c5f8
Author: Cosimo Cecchi <cosimoc@gnome.org>
Date:   Wed Aug 18 16:41:22 2010 +0200

    Push the details table to the dialog after verification

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

commit 86eac228724f7a4c45b8bc58254af77bdad1e766
Author: Cosimo Cecchi <cosimoc@gnome.org>
Date:   Wed Aug 18 16:40:50 2010 +0200

    Add a details hash table to the dialog properties

 libempathy-gtk/empathy-tls-dialog.c |   29 ++++++++++++++++++++++++++++-
 libempathy-gtk/empathy-tls-dialog.h |    3 ++-
 2 files changed, 30 insertions(+), 2 deletions(-)

commit f0793af4b460ffcde3df89f77590f6130c2b8b9e
Author: Cosimo Cecchi <cosimoc@gnome.org>
Date:   Wed Aug 18 16:40:21 2010 +0200

    Add a details hash table as an out param of the verification

 libempathy/empathy-tls-verifier.c |   35
 +++++++++++++++++++++++++++++------
 libempathy/empathy-tls-verifier.h |    1 +
 2 files changed, 30 insertions(+), 6 deletions(-)

commit 0a173bc247669513992889723e93eb2de4cc0de9
Author: Cosimo Cecchi <cosimoc@gnome.org>
Date:   Wed Aug 18 16:18:10 2010 +0200

    Make it more clear which snippets are taken from GnuTLS

 libempathy/empathy-tls-verifier.c |    8 +++++++-
 1 files changed, 7 insertions(+), 1 deletions(-)

commit f735801461c5748ee212eaba80c894f33ecf3f10
Author: Cosimo Cecchi <cosimoc@gnome.org>
Date:   Wed Aug 18 16:11:20 2010 +0200

    Assert when we have an invalid pointer

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

commit 69983e8165de21075d7e9102fa855c99ffa2290b
Author: Cosimo Cecchi <cosimoc@gnome.org>
Date:   Wed Aug 18 16:09:22 2010 +0200

    Update to the new EmpathyTLSCertificate async API

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

commit d20fcc3aedd0b76b3ea0307bb69324121f49b555
Author: Cosimo Cecchi <cosimoc@gnome.org>
Date:   Wed Aug 18 16:08:49 2010 +0200

    Make _accept/_reject real async methods

 libempathy/empathy-tls-certificate.c |   69
 +++++++++++++++++++++++++++++----
 libempathy/empathy-tls-certificate.h |   17 +++++++-
 2 files changed, 74 insertions(+), 12 deletions(-)

commit 92c282488352fd9067fdfbd1d9e96b668a2ff19c
Author: Cosimo Cecchi <cosimoc@gnome.org>
Date:   Wed Aug 18 15:41:49 2010 +0200

    Use _borrow_immutable_properties instead of GetAll()

    This also simplifies the code somewhat

 libempathy/empathy-server-tls-handler.c |   65
 ++++++++++---------------------
 1 files changed, 21 insertions(+), 44 deletions(-)

commit d9428d22891d01b25b08f23278317daa78871274
Author: Cosimo Cecchi <cosimoc@gnome.org>
Date:   Wed Aug 18 15:41:01 2010 +0200

    Properly use errors when handling channels

 libempathy/empathy-auth-factory.c |   70
 +++++++++++++++++++++++++++++-------
 1 files changed, 56 insertions(+), 14 deletions(-)

commit 41c88d2a8b3670901473061dd53eb83e6f7ad34c
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:   Wed Aug 18 15:20:56 2010 +0200

    Display invite dialog even if we don't know the inviter (#627228)

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

commit 35cde642055edd0334283ad63224608e0f388fdb
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:   Wed Aug 18 15:19:11 2010 +0200

    display_invite_room_dialog: deal with contact being NULL

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

commit 12edcf477eaf0bd6a2c9307e2d82a0c1383646d8
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:   Wed Aug 18 15:14:44 2010 +0200

    factor out display_invite_room_dialog

 src/empathy-event-manager.c |   37 ++++++++++++++++++++++---------------
 1 files changed, 22 insertions(+), 15 deletions(-)

commit 2b47047e4493f4ea950d9ecbe4174a0553812d3e
Author: Baurzhan Muftakhidinov <baurthefirst@gmail.com>
Date:   Wed Aug 18 14:30:58 2010 +0300

    l10n: Added Kazakh translation for empathy

 po/kk.po | 3557
 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
 1 files changed, 3557 insertions(+), 0 deletions(-)

commit 29770cf3aedfe6c55016cf3428fd55b6fa246798
Author: Baurzhan Muftakhidinov <baurthefirst@gmail.com>
Date:   Wed Aug 18 14:30:45 2010 +0300

    l10n: Added Kazakh (kk) to po/LINGUAS for empathy

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

commit 03c9af3782b65f1d9d549c1b6326d36705a4900a
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:   Wed Aug 18 12:24:50 2010 +0200

    remove released flag

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