commit 9d302c6e465e559367dc70087894fc57cd5e1af4
Author: Xavier Claessens <xclaesse@gmail.com>
Date:   Mon Jul 25 16:46:42 2011 +0200

    prepare release

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

commit 20dd5c1f01cff2c523ce74bc02a57c8e53b2aa65
Merge: 5a56118 5beda72
Author: Xavier Claessens <xclaesse@gmail.com>
Date:   Tue Jul 26 10:19:50 2011 +0200

    Merge remote-tracking branch 'danni/populate-popup-654669'

commit 5a56118ce05c8b0579e4a7397d9c57fdd3b01937
Merge: e10a065 d954376
Author: Xavier Claessens <xclaesse@gmail.com>
Date:   Tue Jul 26 10:19:39 2011 +0200

    Merge remote-tracking branch 'danni/drag-n-drop-558942'

commit d954376bde5deb4cadfc55e510b703d946ede93f
Author: Danielle Madeley <danielle.madeley@collabora.co.uk>
Date:   Tue Jul 26 13:50:21 2011 +1000

    Apply the same fix to EmpathyContactListView

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

commit 5beda725e1aff0da12703e2f51cdb4b95c63b321
Author: Danielle Madeley <danielle.madeley@collabora.co.uk>
Date:   Tue Jul 26 13:36:18 2011 +1000

    Assume GDK_KEY_PRESS in the default case

    Warn if making this assumption.

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

commit e10a0655a4eb8c36f232d533078bcf6b8e7fdbd0
Author: Jorge González <jorgegonz@svn.gnome.org>
Date:   Mon Jul 25 21:36:31 2011 +0200

    Updated Spanish translation

 po/es.po |  248
 ++++++++++++++++++++++++++++++++------------------------------
 1 files changed, 127 insertions(+), 121 deletions(-)

commit 1005e9de9fc06a00818cc75e491181eb96801bf3
Author: Emilio Pozuelo Monfort <emilio.pozuelo@collabora.co.uk>
Date:   Fri Jul 22 11:23:48 2011 +0100

    CallWindow: fix comments

    We no longer show the self avatar

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

commit 7b4e9b313ba24d01853ef93f893fdc3a26b0b1ba
Author: Emilio Pozuelo Monfort <emilio.pozuelo@collabora.co.uk>
Date:   Fri Jul 22 11:22:48 2011 +0100

    CallWindow: fix typo

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

commit c4906c89433cdd5dff9f500579c580799fe77dca
Author: Emilio Pozuelo Monfort <emilio.pozuelo@collabora.co.uk>
Date:   Fri Jul 22 12:08:39 2011 +0100

    CallWindow: ignore events in the data probe callback

    We only want to show the remote video again if we receive
    video frames, not if we receive an event for whatever reason.

    That's in fact what we get when we start sending our own video,
    and so we don't want to display the remote video if it was
    hidden because we're not receiving it anymore.

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

commit 5a591d49c2ce331c79247fa868a856fa2494196d
Author: Emilio Pozuelo Monfort <emilio.pozuelo@collabora.co.uk>
Date:   Fri Jul 22 11:40:51 2011 +0100

    CallWindow: check the video exists before showing it

    Since empathy_call_window_show_video_output_cb() is called
    in an idle thread, it's possible that the video is removed
    before the function is executed, so check if it's still there
    before showing it.

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

commit 2a84ffe088258126169ae7d91806d32cab199286
Author: Emilio Pozuelo Monfort <emilio.pozuelo@collabora.co.uk>
Date:   Mon Jun 13 12:07:31 2011 +0100

    CallWindow: show the remote avatar when video stops coming

    If we don't get incoming video for a few seconds, show the
    remote contact avatar instead of the frozen video, and show
    the video back if it starts coming again.

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

commit d9bb5b999731c247b845ba7e97393d2e25bcfeca
Merge: dcd8d50 bed17cf
Author: Will Thompson <will.thompson@collabora.co.uk>
Date:   Mon Jul 25 12:43:10 2011 +0100

    Merge branch 'irc-dialog'

    Fixes: <https://bugzilla.gnome.org/show_bug.cgi?id=654552>
    Reviewed-by: Xavier Claessens <xavier.claessens@collabora.co.uk>

commit bed17cf9d003db8ecea2fc012cb53ff38554654d
Author: Will Thompson <will.thompson@collabora.co.uk>
Date:   Tue Jul 19 13:09:49 2011 +0100

    IRC accounts: top-justify the password hint.

    As mentioned on
    <https://bugzilla.gnome.org/show_bug.cgi?id=654552#c13>,
    this makes the password hint text be right up against the field it's
    hinting about, at the cost of even more ugly space between it and
    the Advanced expander. I think this is the lesser of two evils.

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

commit dcd8d507b617e5b8fb6cea5a23d61d922bcca3ba
Author: Emilio Pozuelo Monfort <emilio.pozuelo@collabora.co.uk>
Date:   Thu Jul 21 13:01:10 2011 +0100

    CallWindow: remove unused box

    It was taking horizontal space even if it was empty, causing
    the video widget to not take the full width when returning
    from fullscreen.

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

commit 0587937dc09abbd56d36ca395c82f64098903937
Author: Emilio Pozuelo Monfort <emilio.pozuelo@collabora.co.uk>
Date:   Wed Jul 20 18:04:26 2011 +0100

    Set the video widget for the fullscreen window

    Otherwise the mouse cursor won't be hidden after a timeout
    and the 'Leave fullscreen' button won't dissapear when we
    unfullscreen the call window.

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

commit f544815fbc8ccc9e0f35bfbcdbed4692ef1ab8e6
Author: Danielle Madeley <danielle.madeley@collabora.co.uk>
Date:   Wed Jul 20 17:06:33 2011 +1000

    Don't generate critical when dragging with no contact selected

    This also fixes the problem where dragging with no contact selected
    drags the
    previously selected contact.

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

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

commit 00c4753fa9cf2431a6d35c28cb6a0b1e94670a89
Author: Matej Urbančič <mateju@svn.gnome.org>
Date:   Tue Jul 19 22:26:32 2011 +0200

    Updated Slovenian translation

 po/sl.po |  407
 +++++++++++++++++++++++++++++++++-----------------------------
 1 files changed, 218 insertions(+), 189 deletions(-)

commit 3d3452cab15ac7dcc8dee37edef9faffadded3a1
Author: Will Thompson <will.thompson@collabora.co.uk>
Date:   Tue Jul 19 09:22:26 2011 +0100

    IRC: validate 'username' parameter.

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

commit 926cc3f303b944e46a2398c51a220cde48f9b46d
Author: Will Thompson <will.thompson@collabora.co.uk>
Date:   Tue Jul 19 09:15:11 2011 +0100

    IRC: rename “user_name” regex to “nick_name”

    The 'account’ parameter in Telepathy, to which this regex applies,
    is
    the ‘nickname’ in IRC parlance.

    (I'm about to add a regex for what IRC calls ‘usernames’.)

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

commit 98182d81df41790db37ec222e598bfef1cd8d85b
Author: Will Thompson <will.thompson@collabora.co.uk>
Date:   Tue Jul 19 08:55:15 2011 +0100

    IRC accounts: make labels the same width.

    This addresses Nick's concern on
    https://bugzilla.gnome.org/show_bug.cgi?id=654552

 libempathy-gtk/empathy-account-widget-irc.ui |   10 ++++++++++
 1 files changed, 10 insertions(+), 0 deletions(-)

commit 6ad8cdf6622aa204b4f7cef2f44433637099f175
Author: Rob Sharp <robrobrobsharp@gmail.com>
Date:   Tue Jul 19 09:03:42 2011 +0100

    Add an advanced section to the IRC configuration page

    -Move the Real Name and Quit Message to the advanced section
    -Add a new Username field to the advanced section

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

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

commit 2af8f317369b987e5ae1492bd597bb741df7dcc3
Author: Emilio Pozuelo Monfort <emilio.pozuelo@collabora.co.uk>
Date:   Tue Jul 19 10:16:29 2011 +0100

    Revert "empathy_call_new_with_streams: prefer StreamedMedia over Call"

    Default to Call channels again.

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

    This reverts commit 1cacc0945f81e0513013b83ca7488589dd6c61f7.

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

commit a32ce8185b6600c7c26111ee3b64e6fd8912c567
Author: Daniel Nylander <po@danielnylander.se>
Date:   Mon Jul 18 23:10:00 2011 +0200

    Updated Swedish translation

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

commit 3b225294da4fb6f57d147f83c7ed78c8a44f0aec
Author: Danielle Madeley <danielle.madeley@collabora.co.uk>
Date:   Mon Jul 18 14:20:05 2011 +1000

    Populate spelling suggestions when menu key is pressed

    Track what kind of event generated the populate-popup event and then
    use the
    cursor position or mouse position as appropriate.

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

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

commit b7c238e691a8f2a171b9efa2e5f38af0f0c2a56f
Author: Daniel Nylander <po@danielnylander.se>
Date:   Fri Jul 15 13:13:11 2011 +0200

    Updated Swedish translation

 po/sv.po | 2231
 ++++++++++++++++++++++++++++++++++++++++---------------------
 1 files changed, 1463 insertions(+), 768 deletions(-)

commit b4175711fb0b0cb34b51f049ff4eeb2cff7eec86
Author: Yaron Shahrabani <sh.yaron@gmail.com>
Date:   Fri Jul 15 10:21:26 2011 +0300

    Updated Hebrew translation.

 po/he.po |  399
 +++++++++++++++++++++++++++++++++-----------------------------
 1 files changed, 214 insertions(+), 185 deletions(-)

commit 39ea5fe2605a9f02a74683cf0be9856217b38cc7
Author: Rob Sharp <robrobrobsharp@gmail.com>
Date:   Wed Jul 13 11:33:53 2011 +0100

    Debug logs will now be saved in the user's home directory rather
    than /tmp

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

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

commit 560d11b069f159a27b3a0e258842028ff705d612
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:   Wed Jul 13 12:09:19 2011 +0200

    release.py: detect bug numbers using their full URL

    git-bz uses the full address of the bug so best to support that
    format as
    well.

 release.py |    5 +++--
 1 files changed, 3 insertions(+), 2 deletions(-)

commit a76fee797c59738c7f9e932fa5bfac16c49f66fe
Author: Daniel Mustieles <daniel.mustieles@gmail.com>
Date:   Wed Jul 13 10:53:58 2011 +0200

    Updated Spanish translation

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

commit d3620a6f0eb0632c4ef96c48bcdb7adace8c1ff2
Author: Rudolfs Mazurs <rudolfs.mazurs@gmail.com>
Date:   Tue Jul 12 15:04:25 2011 +0300

    Updated Latvian translation.

 po/lv.po | 2054
 +++++++++++++++++++++++++++++++++++++-------------------------
 1 files changed, 1233 insertions(+), 821 deletions(-)

commit d786fd74bda1df1067d71897f525f2a0e0fa50f7
Author: Kjartan Maraas <kmaraas@gnome.org>
Date:   Tue Jul 12 12:50:05 2011 +0200

    Updated Norwegian bokmål translation

 po/nb.po |  398
 +++++++++++++++++++++++++++++++++-----------------------------
 1 files changed, 212 insertions(+), 186 deletions(-)

commit 55d7a944fa0783718a69e4d1b5e574f326befa58
Author: Emilio Pozuelo Monfort <emilio.pozuelo@collabora.co.uk>
Date:   Tue Jul 12 10:26:17 2011 +0100

    LogWindow: stop retrieving logs if the window is closed

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

commit 4305ae9d96e4a6b3fb749b64d6d0c4b0045ab1fc
Author: Emilio Pozuelo Monfort <emilio.pozuelo@collabora.co.uk>
Date:   Fri May 13 11:54:49 2011 +0100

    Only follow available cameras if the contact can do Video calls

 libempathy-gtk/empathy-individual-menu.c |   13 +++++++++----
 libempathy/empathy-contact.c             |   14 ++------------
 2 files changed, 11 insertions(+), 16 deletions(-)

commit c463ca2f1aa7ba43248b8f07879c4268cb536670
Author: Emilio Pozuelo Monfort <emilio.pozuelo@collabora.co.uk>
Date:   Wed May 11 10:37:43 2011 +0100

    LogWindow: disable Video calls if no camera connected

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

commit fe7e98c6222fae967005ca81042963118953fd43
Author: Emilio Pozuelo Monfort <emilio.pozuelo@collabora.co.uk>
Date:   Tue May 10 13:14:45 2011 +0100

    CallWindow: disable Video functionality if there's no camera

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

commit 622469eebd6cee91e1c0a27c3532ecb836fa14fb
Author: Emilio Pozuelo Monfort <emilio.pozuelo@collabora.co.uk>
Date:   Thu May 12 15:19:39 2011 +0100

    Bind 'Video call' menu items to available cameras

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

commit 11b3e6e941f3407de410308191cbe5088cc074e4
Author: Emilio Pozuelo Monfort <emilio.pozuelo@collabora.co.uk>
Date:   Tue May 10 13:14:05 2011 +0100

    A contact doesn't support video if we have no camera

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

commit e12ee6f8126a10fb0789e634dfd4251f246e2b90
Author: Emilio Pozuelo Monfort <emilio.pozuelo@collabora.co.uk>
Date:   Tue May 10 13:13:12 2011 +0100

    NewCallDialog: make 'Enable video' unsensitive when there's no camera

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

commit 3a54e248335203c6979ef733adc7b07a25660613
Author: Emilio Pozuelo Monfort <emilio.pozuelo@collabora.co.uk>
Date:   Tue May 10 11:48:35 2011 +0100

    Add empathy_camera_monitor_get_available

 libempathy/empathy-camera-monitor.c |    7 +++++++
 libempathy/empathy-camera-monitor.h |    2 ++
 2 files changed, 9 insertions(+), 0 deletions(-)

commit 20fe4d7b990d32e70fcdb9fd46cde2ed00c6d71d
Author: Emilio Pozuelo Monfort <emilio.pozuelo@collabora.co.uk>
Date:   Tue May 10 11:33:29 2011 +0100

    Optionally check for gudev for camera monitoring

 configure.ac           |   26 ++++++++++++++++++++++++++
 libempathy/Makefile.am |    4 +++-
 2 files changed, 29 insertions(+), 1 deletions(-)

commit c1465c5133df557ff5e0f5f3e7463e0fdc0eae1e
Author: Emilio Pozuelo Monfort <emilio.pozuelo@collabora.co.uk>
Date:   Wed May 11 10:47:55 2011 +0100

    Don't disable video calls when built without udev

 libempathy/empathy-camera-monitor.c |    5 +++++
 1 files changed, 5 insertions(+), 0 deletions(-)

commit 5c5890caba5e3ddc4298f138f3bb802993b21b4d
Author: Emilio Pozuelo Monfort <emilio.pozuelo@collabora.co.uk>
Date:   Tue May 10 10:32:33 2011 +0100

    Add EmpathyCameraMonitor

 libempathy/Makefile.am              |    6 +-
 libempathy/empathy-camera-monitor.c |  174
 +++++++++++++++++++++++++++++++++++
 libempathy/empathy-camera-monitor.h |   54 +++++++++++
 3 files changed, 232 insertions(+), 2 deletions(-)

commit eba2a3dba40cab986589bac073d16627b3f9bf90
Author: Emilio Pozuelo Monfort <emilio.pozuelo@collabora.co.uk>
Date:   Tue May 10 09:48:06 2011 +0100

    Add CheeseCameraDeviceMonitor from libcheese

 libempathy/Makefile.am                    |    9 +-
 libempathy/cheese-camera-device-monitor.c |  412
 +++++++++++++++++++++++++++++
 libempathy/cheese-camera-device-monitor.h |   67 +++++
 3 files changed, 485 insertions(+), 3 deletions(-)

commit 7271692646a1212cce6d55731e38c7825b4e494e
Author: Emilio Pozuelo Monfort <emilio.pozuelo@collabora.co.uk>
Date:   Mon Jul 11 18:29:28 2011 +0100

    StreamedMediaWindow: don't use `call-window' for the geometry

    Use av-window instead, so Call and StreamedMedia windows'
    geometry isn't mixed as the windows are quite different now.

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

commit ee432f2c641a383ad8b32cb1ef7d2d2c2ee9c880
Author: Emilio Pozuelo Monfort <emilio.pozuelo@collabora.co.uk>
Date:   Mon Jul 11 18:27:52 2011 +0100

    CallWindow: save the window geometry without the sidebar

    Since we don't show the sidebar when creating new call windows,
    we should not take the sidebar into account when saving the
    window geometry.

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

 libempathy-gtk/empathy-geometry.c |   47
 ++++++++++++++++++++++++------------
 libempathy-gtk/empathy-geometry.h |    7 +++++
 src/empathy-call-window.c         |   47
 +++++++++++++++++++++++++++++++++++++
 3 files changed, 85 insertions(+), 16 deletions(-)

commit 3535c55225076c649883aa4a497893b1f165a110
Author: Emilio Pozuelo Monfort <emilio.pozuelo@collabora.co.uk>
Date:   Mon Jul 11 16:04:47 2011 +0100

    CallWindow: properly determine the sidebar width

    The first time we show the sidebar, gtk_widget_get_allocation()
    doesn't return the correct width as the allocation hasn't been
    done yet. So use gtk_widget_get_preferred_width() as the minimum
    width is what is actually allocated.

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

commit 70fc920514af12b5c96e928a3178dfd9ddd8ed9e
Author: Emilio Pozuelo Monfort <emilio.pozuelo@collabora.co.uk>
Date:   Fri Jul 8 15:45:27 2011 +0100

    CallWindow: add a dialpad tool button

    Rename the dialpad menu entry to Sidebar and move it to
    the View menu at the same time.

 src/empathy-call-window.c  |   49
 +++++++++++++++++++++++++++++++++----------
 src/empathy-call-window.ui |   19 +++++++++++++---
 2 files changed, 52 insertions(+), 16 deletions(-)

commit f0c80062b0fcdec789a478ed58528ec6fdd14622
Author: Emilio Pozuelo Monfort <emilio.pozuelo@collabora.co.uk>
Date:   Thu Jul 7 10:21:01 2011 +0100

    CallWindow: allow to show/hide the video preview

    There's now a button next to the video preview when it's shown
    and in a corner when it's hidden that allows to hide and show
    it.

 src/empathy-call-window.c  |  103
 ++++++++++++++++++++++++++++++++++++++++++-
 src/empathy-call-window.ui |   26 +++++++++++
 2 files changed, 126 insertions(+), 3 deletions(-)

commit 538d987eb2e525e957caf9b05e6233ed7541c1d8
Author: Emilio Pozuelo Monfort <emilio.pozuelo@collabora.co.uk>
Date:   Thu Jul 7 08:30:47 2011 +0100

    CallWindow: only show one button to control the camera

    Having three buttons to control the camera clutters the
    UI. Displaying the video preview but not sending video is
    not very useful, and we'll add a way of sending video without
    displaying the preview by clicking on the preview itself.

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

 src/empathy-call-window.c  |  251
 +++-----------------------------------------
 src/empathy-call-window.ui |   79 +-------------
 2 files changed, 18 insertions(+), 312 deletions(-)

commit 9c44255b53f38c60bb65eb799e0245a6e49e3613
Author: Emilio Pozuelo Monfort <emilio.pozuelo@collabora.co.uk>
Date:   Wed Jul 6 16:31:37 2011 +0100

    CallWindow: remove the Sidebar button

 src/empathy-call-window.c |   38 ++++++--------------------------------
 1 files changed, 6 insertions(+), 32 deletions(-)

commit db8f9ed9b022e72ae2471c52268b9147ca4e3003
Author: Emilio Pozuelo Monfort <emilio.pozuelo@collabora.co.uk>
Date:   Wed Jul 6 15:18:46 2011 +0100

    CallWindow: flip the video preview

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

commit 6aa94458db8c15961cb0a489cdde5ef59d6f6928
Author: Emilio Pozuelo Monfort <emilio.pozuelo@collabora.co.uk>
Date:   Wed Jul 6 12:26:19 2011 +0100

    CallWindow: add a little offset to the video preview

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

commit 519ed53f758fdbcde07089275dfcb94e76f0aaf2
Author: Emilio Pozuelo Monfort <emilio.pozuelo@collabora.co.uk>
Date:   Wed Jul 6 10:31:45 2011 +0100

    CallWindow: set the video container background color

    ...to match the rest of the window.

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

commit 8dfbb6d5db069cd31e5c5223b0dee5841b1845fe
Author: Emilio Pozuelo Monfort <emilio.pozuelo@collabora.co.uk>
Date:   Wed Jul 6 10:31:01 2011 +0100

    CallWindow: keep the aspect ratio of the remote video

 src/empathy-call-window.c |    8 +++++---
 1 files changed, 5 insertions(+), 3 deletions(-)

commit 287973c0299353802f52b330c1050b03476e892d
Author: Emilio Pozuelo Monfort <emilio.pozuelo@collabora.co.uk>
Date:   Wed Jul 6 09:41:57 2011 +0100

    CallWindow: remove self avatar code

    We don't display the self avatar anymore.

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

commit a1e502f0e583e02e8e826d6d74bafd988378f3f5
Author: Emilio Pozuelo Monfort <emilio.pozuelo@collabora.co.uk>
Date:   Fri Jun 24 16:50:55 2011 +0100

    CallWindow: set video preview on top of remote video

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

 src/empathy-call-window.c |  131
 ++++++++++++++++++++++-----------------------
 1 files changed, 65 insertions(+), 66 deletions(-)

commit 6e1547e28b0139bd87a216790db1d067a88d387e
Author: Emilio Pozuelo Monfort <emilio.pozuelo@collabora.co.uk>
Date:   Thu Jun 23 16:46:00 2011 +0100

    CallWindow: use clutter to draw the remote video

 src/empathy-call-window.c |   46
 ++++++++++++++++++++++++--------------------
 1 files changed, 25 insertions(+), 21 deletions(-)

commit 2303f45817ba0960bbf4c3458781414c31561a91
Author: Emilio Pozuelo Monfort <emilio.pozuelo@collabora.co.uk>
Date:   Thu Jun 23 16:24:37 2011 +0100

    CallWindow: use clutter to draw the video preview

 src/empathy-call-window.c |   53
 ++++++++++++++++++++++++--------------------
 1 files changed, 29 insertions(+), 24 deletions(-)

commit 7e3203f4a7c1e8684c350ab96917057c2a83dbe4
Author: Emilio Pozuelo Monfort <emilio.pozuelo@collabora.co.uk>
Date:   Thu Jun 23 16:24:19 2011 +0100

    empathy-call: initialize clutter

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

commit a34ff2ef492de9b74bdc1d4f55758d389586d032
Author: Emilio Pozuelo Monfort <emilio.pozuelo@collabora.co.uk>
Date:   Thu Jun 23 16:23:26 2011 +0100

    Require clutter for empathy-call

    It will be used to display video output.

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

commit a79f4193bb6958ebd620f437b0d786e4449d9eed
Author: Emilio Pozuelo Monfort <emilio.pozuelo@collabora.co.uk>
Date:   Mon Jul 11 10:45:41 2011 +0100

    EmpathyContact: don't crash if a contact doesn't have an account

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

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

commit 342a4344f7f62d7b55e64f6f708b4b696b0765c3
Author: Emilio Pozuelo Monfort <emilio.pozuelo@collabora.co.uk>
Date:   Mon Jul 11 10:32:40 2011 +0100

    CallWindow: don't add calls to searches if they don't match

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

commit 61b92614a738e8fefc9376aa66fe14b00167e30c
Author: Emilio Pozuelo Monfort <emilio.pozuelo@collabora.co.uk>
Date:   Mon Jul 11 10:06:51 2011 +0100

    LogWindow: select 'Anyone' when searching

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

commit 3a19d359f1cae8b2b4e6b4c31aaa193bd31a8720
Author: Emilio Pozuelo Monfort <emilio.pozuelo@collabora.co.uk>
Date:   Mon Jul 11 09:39:38 2011 +0100

    LogWindow: don't crash when searching

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

commit eb2ef7bb98d193402e372efba43a7212d8e5127c
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:   Mon Jul 11 16:02:08 2011 +0200

    use tp_text_channel_ack_all_pending_messages_async()

 libempathy-gtk/empathy-chat.c |    3 ++-
 libempathy/empathy-tp-chat.c  |   35 -----------------------------------
 libempathy/empathy-tp-chat.h  |    3 ---
 3 files changed, 2 insertions(+), 39 deletions(-)

commit 4644a9d69f070df504925902e7692fa1bc731dfa
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:   Tue Jun 14 10:12:45 2011 +0100

    Set the DelegateToPreferredHandler hint

    This ensures that Empathy will always handle and display the channel,
    even if
    GNOME Shel is already handling it.

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

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

commit a446f3ec4f2259f651de668e27563e3717226f04
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:   Mon Jun 13 15:22:23 2011 +0200

    coding style fixes

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

 libempathy/empathy-request-util.c |    8 ++++----
 1 files changed, 4 insertions(+), 4 deletions(-)

commit 5155eb52821b6fd1951ef01513a5110135adc9f3
Author: A S Alam <aalam@users.sf.net>
Date:   Sun Jul 10 20:48:39 2011 +0530

    update Punjabi Translation

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

commit c5efee19e257658a47b74e5113dfc046b4b31bcc
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:   Wed Jul 6 15:58:05 2011 +0200

    theme-adium: use the pending-message-id instead of message-token
    in x-empathy-message-id

    message-token is not guaranteed to be implemented by all CMs while
    pending-message-id is (for incoming messages).

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

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

commit 6fcaaa418bffeb06c81f1bf1d581e7d2e323fabe
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:   Fri Jul 8 13:19:43 2011 +0200

    bump tp-glib dep to 0.15.3

    We need it for tp_message_get_pending_message_id()

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

commit 9b4ae4814f0fd18fce4aefed2ee351485f0b18b1
Author: Daniel Mustieles <daniel.mustieles@gmail.com>
Date:   Wed Jul 6 09:41:15 2011 +0200

    Updated Spanish translation

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

commit a0c74363c0617abaa5522c2e0ffeb0a9372349d1
Author: Emilio Pozuelo Monfort <emilio.pozuelo@collabora.co.uk>
Date:   Tue Jul 5 12:30:53 2011 +0100

    Call: flip video preview horizontally

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

 src/empathy-call-window.c           |    6 +++++-
 src/empathy-streamed-media-window.c |    6 +++++-
 src/empathy-video-widget.c          |   30 +++++++++++++++++++++++++++---
 3 files changed, 37 insertions(+), 5 deletions(-)

commit ab952e9d0b189663c0b723e2dfcc3f50ec19b98a
Author: Emilio Pozuelo Monfort <emilio.pozuelo@collabora.co.uk>
Date:   Tue Jul 5 11:11:44 2011 +0100

    LogWindow: make type filters unsensitive as necessary

    If there are no events of one type, make its row in the What
    pane unsensitive.

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

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

commit e213b939886dac6778e421b8b55be9453d72f6a6
Author: Jorge González <jorgegonz@svn.gnome.org>
Date:   Tue Jul 5 16:38:48 2011 +0200

    Updated Spanish translation

 po/es.po |  106
 ++++++++++++++++++++++++++++++++-----------------------------
 1 files changed, 56 insertions(+), 50 deletions(-)

commit 395f226c197ba97bd5c1bfa3b2f47c3866a37bb9
Author: Emilio Pozuelo Monfort <emilio.pozuelo@collabora.co.uk>
Date:   Mon Jul 4 17:43:59 2011 +0100

    LogWindow: expand/collapse events when a row is activated

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

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

commit 1fe8edf35901e82ad858876af84f75f5352ebef3
Author: Fran Dieguez <fran@openhost.es>
Date:   Mon Jul 4 21:07:35 2011 +0200

    Updated Galician translations

 po/gl.po |  309
 +++++++++++++++++++++++++++++++++++---------------------------
 1 files changed, 174 insertions(+), 135 deletions(-)

commit 7835dd6c948517d422ef793afa84e7e331426c5f
Author: Emilio Pozuelo Monfort <emilio.pozuelo@collabora.co.uk>
Date:   Mon Jul 4 16:11:02 2011 +0100

    Display `Chat in ...' for MUCs

    Instead of `Chat with ...'.

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

 libempathy-gtk/empathy-log-window.c |   34
 +++++++++++++++++++++-------------
 1 files changed, 21 insertions(+), 13 deletions(-)

commit 5e782bf815c2bd9fb2ae05812c1cd946260c8a1b
Author: Emilio Pozuelo Monfort <emilio.pozuelo@collabora.co.uk>
Date:   Tue Jun 21 17:53:28 2011 +0100

    LogWindow: really show the users' alias in the Who pane

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

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

commit 858a4d27abd2f040d44eaeda17f618a1a63b1631
Author: Emilio Pozuelo Monfort <emilio.pozuelo@collabora.co.uk>
Date:   Tue Jun 21 17:53:07 2011 +0100

    empathy_contact_from_tpl_contact: don't override the alias

    Add a logged-alias property instead, which can be used by
    those who need the old alias.

    And use it in chat themes for the backlog.

 libempathy-gtk/empathy-theme-adium.c |    2 +-
 libempathy-gtk/empathy-theme-boxes.c |    4 +-
 libempathy-gtk/empathy-theme-irc.c   |    4 +-
 libempathy/empathy-contact.c         |   45
 +++++++++++++++++++++++++--------
 libempathy/empathy-contact.h         |    1 +
 5 files changed, 40 insertions(+), 16 deletions(-)

commit 247f9a497a9dee8eb62d08cb161b9a5e1d7a6562
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:   Mon Jul 4 16:49:06 2011 +0200

    remove released flag

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