commit f19b15f91e90c02ae0e2bf815a9bbf5444db1987
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date: Mon Oct 17 16:32:34 2011 +0200
prepare 3.2.1
NEWS | 32 ++++++++++++++++++++++++++++++++
configure.ac | 6 +++---
2 files changed, 35 insertions(+), 3 deletions(-)
commit 83f9dd20c3238784c46072aa134741d9fe7ee3b6
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date: Mon Oct 17 16:40:12 2011 +0200
Revert "TpChat: remove support for old Properties"
This reverts commit 0e053c39298d88afa1645c0d95a8aa43b662cc38.
libempathy/empathy-tp-chat.c | 268
+++++++++++++++++++++++++++++++++++++++++-
1 files changed, 263 insertions(+), 5 deletions(-)
commit 019f7e6ea56c0967427f5f2d6932dafa4bd80445
Author: Andrej Žnidaršič <andrej.znidarsic@gmail.com>
Date: Mon Oct 17 15:08:41 2011 +0200
Updated Slovenian translation
po/sl.po | 172
++++++++++++++++++++++++++++++++------------------------------
1 files changed, 88 insertions(+), 84 deletions(-)
commit ed792a58d2f3cfc75bc51de7f32f4a81145bde37
Author: Nguyễn Thái Ngọc Duy <pclouds@gmail.com>
Date: Mon Oct 17 19:51:26 2011 +1100
Updated Vietnamese translation
po/vi.po | 78
++++++++++++++++++++++++++-----------------------------------
1 files changed, 33 insertions(+), 45 deletions(-)
commit f251900d74839eb820eaad29e0a8ff5cc9bf4d91
Author: Nguyễn Thái Ngọc Duy <pclouds@gmail.com>
Date: Mon Oct 17 19:45:34 2011 +1100
po/vi: import from Damned Lies
po/vi.po | 1409
++++++++++++++++++++++++++++++++++----------------------------
1 files changed, 780 insertions(+), 629 deletions(-)
commit 7a91ffcf78bcdb2da8370466182ae5a257d737d9
Author: Luca Ferretti <lferrett@gnome.org>
Date: Mon Oct 17 10:14:45 2011 +0200
l10n: updated Italian translation
po/it.po | 363
++++++++++++++++++++++++++++++++------------------------------
1 files changed, 185 insertions(+), 178 deletions(-)
commit 9b9feed43af4bf58593014b3ad618379b4c42473
Author: Daniel Nylander <po@danielnylander.se>
Date: Mon Oct 17 06:30:57 2011 +0200
Updated Swedish translation
po/sv.po | 601
++++++++++++++++++++++++++++++++++++++++++--------------------
1 files changed, 412 insertions(+), 189 deletions(-)
commit 213bd65762841b5d31ffebaf44c6dbae2aeae805
Author: Changwoo Ryu <cwryu@debian.org>
Date: Mon Oct 17 03:04:05 2011 +0900
Updated Korean translation
po/ko.po | 380
++++++++++++++++++++++++++++++++------------------------------
1 files changed, 195 insertions(+), 185 deletions(-)
commit 86ee57a1c1018f6b7920d3be14250e5118a1c1ca
Author: Bruce Cowan <bruce@bcowan.me.uk>
Date: Sun Oct 16 14:47:21 2011 +0100
Updated British English translation
po/en_GB.po | 286
++++++++++++++++++++++++++++++-----------------------------
1 files changed, 145 insertions(+), 141 deletions(-)
commit cc9bd3ff79854e6f050e41a20a33e8a078ea3230
Author: Bruno Brouard <annoa.b@gmail.com>
Date: Sun Oct 16 13:15:17 2011 +0200
Updated French translation
po/fr.po | 370
+++++++++++++++++++++++++++++++-------------------------------
1 files changed, 187 insertions(+), 183 deletions(-)
commit 740100cc8c1b277083a6337fcc407aaa108e354b
Author: Jorge González <jorgegonz@svn.gnome.org>
Date: Sun Oct 16 12:02:03 2011 +0200
Updated Spanish translation
po/es.po | 379
+++++++++++++++++++++++++++++++-------------------------------
1 files changed, 188 insertions(+), 191 deletions(-)
commit 147edee1a9335b7cc1c6a2e28e70417711b7196b
Author: Fran Dieguez <fran@openhost.es>
Date: Sun Oct 16 00:12:21 2011 +0200
Updaged Galician translations
po/gl.po | 368
+++++++++++++++++++++++++++++++-------------------------------
1 files changed, 186 insertions(+), 182 deletions(-)
commit 71b56d1e89da50dd7a74534db468edf1050a955d
Author: Aurimas Černius <aurisc4@gmail.com>
Date: Sat Oct 15 22:24:19 2011 +0300
Updated Lithuanian translation
po/lt.po | 410
++++++++++++++++++++++++++++++--------------------------------
1 files changed, 201 insertions(+), 209 deletions(-)
commit 78e9015ded0882bc5d06279f20d24806ac15888d
Author: Gil Forcada <gforcada@gnome.org>
Date: Sat Oct 15 19:26:48 2011 +0200
[l10n]Updated Catalan translation
po/ca.po | 175
++++++++++++++++++++++++++++++++------------------------------
1 files changed, 90 insertions(+), 85 deletions(-)
commit 8503bd0bbb1b6bd8acaeffc780bc613886fd4f41
Author: Alexander Shopov <ash@kambanaria.org>
Date: Sat Oct 15 10:02:58 2011 +0300
Updated Bulgarian translation
po/bg.po | 176
++++++++++++++++++++++++++++++++------------------------------
1 files changed, 90 insertions(+), 86 deletions(-)
commit cf3d6059678980d21d5091bf15ef6225836dd249
Author: Mario Blättermann <mariobl@gnome.org>
Date: Fri Oct 14 21:35:12 2011 +0200
[l10n] Updated German translation
po/de.po | 441
+++++++++++++++++++++++++++++++-------------------------------
1 files changed, 218 insertions(+), 223 deletions(-)
commit 57c6cfe67824bba7997573d5071ee1aba0c06176
Author: Gabor Kelemen <kelemeng@gnome.hu>
Date: Fri Oct 14 20:17:25 2011 +0200
Updated Hungarian translation
po/hu.po | 377
+++++++++++++++++++++++++++++---------------------------------
1 files changed, 176 insertions(+), 201 deletions(-)
commit eb7b0a14c7efcbae183b58bb5ead188ad0e6fd1a
Author: Piotr Drąg <piotrdrag@gmail.com>
Date: Fri Oct 14 19:53:09 2011 +0200
Updated Polish translation
po/pl.po | 368
+++++++++++++++++++++++++++++++-------------------------------
1 files changed, 186 insertions(+), 182 deletions(-)
commit 370db7f9e32fb2f41452ffe752382bfcd3a53a42
Author: Gabor Kelemen <kelemeng@gnome.hu>
Date: Fri Oct 14 13:25:00 2011 +0200
Mark a forgotten string for translation.
https://bugzilla.gnome.org/show_bug.cgi?id=661756
src/empathy-preferences.ui | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
commit 0bf6ee3a15d15cb80c5835d33bf899b2404da053
Merge: 470d731 e623416
Author: Will Thompson <will.thompson@collabora.co.uk>
Date: Fri Oct 14 18:07:42 2011 +0100
Merge branch 'subjective' into gnome-3-2
commit e623416a51aca9f813208a0691585d6fb0dbbb1b
Author: Will Thompson <will.thompson@collabora.co.uk>
Date: Fri Oct 14 16:22:54 2011 +0100
adium themes: crash less hard when Template.html is missing
If Template.html is missing, then you haven't installed Empathy
properly
(or set EMPATHY_SRCDIR or whatever in my case). But previously
we would
just crash later down this function when passing template_html to
string_with_format() without checking if it's NULL. This patch makes
it fail a little less inscrutably.
libempathy-gtk/empathy-theme-adium.c | 10 +++++++++-
1 files changed, 9 insertions(+), 1 deletions(-)
commit 0e053c39298d88afa1645c0d95a8aa43b662cc38
Author: Will Thompson <will.thompson@collabora.co.uk>
Date: Thu Sep 8 12:17:31 2011 +0100
TpChat: remove support for old Properties
Change notification for this is broken in the CMs *anyway*.
libempathy/empathy-tp-chat.c | 268
+-----------------------------------------
1 files changed, 5 insertions(+), 263 deletions(-)
commit 2318a627d32dbb4dc0671f2abe64217668fe27d1
Author: Will Thompson <will.thompson@collabora.co.uk>
Date: Thu Sep 8 11:34:36 2011 +0100
TpChat: Use RoomConfig1 and Subject if available
Fixes https://bugzilla.gnome.org/show_bug.cgi?id=658542
libempathy/empathy-tp-chat.c | 143
++++++++++++++++++++++++++++++++++++++++--
1 files changed, 138 insertions(+), 5 deletions(-)
commit 889baf4dc3542769286c38e582eb2b9c823920be
Author: Will Thompson <will.thompson@collabora.co.uk>
Date: Fri Oct 14 15:31:59 2011 +0100
configure: depend on tp-glib with Subject.
Actually, a slightly earlier version of telepathy-glib, on the
unstable
0.15.x branch, includes Subject, but we may as well depend on
the stable
branch: it includes fixes for Empathy bugs.
configure.ac | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
commit 8e32f31c9bb13885ff23ee4ef11787f82886ce2e
Author: Will Thompson <will.thompson@collabora.co.uk>
Date: Thu Sep 8 10:48:03 2011 +0100
TpChat: track subject and title explicitly.
This will allow us to also use the new API (and, ultimately, delete
the Telepathy.Properties code cleanly).
libempathy/empathy-tp-chat.c | 87
++++++++++++++++++------------------------
1 files changed, 37 insertions(+), 50 deletions(-)
commit 23afe1c84b4567a8dac9e9cf2caa99596679d1de
Author: Will Thompson <will.thompson@collabora.co.uk>
Date: Thu Sep 8 08:07:08 2011 +0100
TpChat: hide guts of Telepathy properties.
This will make it easier to replace these with new stuff. The funky
indentation in the callbacks for the subject and title changing is to
make it clear that I didn't change that code; I'll reindent it in
another patch.
libempathy-gtk/empathy-chat.c | 68 +++++++++---------------
libempathy/empathy-tp-chat.c | 121
+++++++++++++++++++++++++++++++++++------
libempathy/empathy-tp-chat.h | 22 +++-----
3 files changed, 136 insertions(+), 75 deletions(-)
commit 470d73148cee8632b0268a0277f3b29e083b804d
Author: Sjoerd Simons <sjoerd.simons@collabora.co.uk>
Date: Wed Oct 12 18:12:53 2011 +0100
Make sure we have our settings before we want to use them
src/empathy-call-window.c | 4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)
commit 4ec40a51cb71576e253c162a61d07e8b6cca78a1
Author: Sjoerd Simons <sjoerd.simons@collabora.co.uk>
Date: Wed Oct 12 18:12:05 2011 +0100
Don't try to access non-existing properties
src/empathy-audio-src.c | 25 ++++++++++++++++++++-----
1 files changed, 20 insertions(+), 5 deletions(-)
commit a2776503c54bbd5cf4dec7cb7fd962b641145d50
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date: Tue Oct 11 17:01:23 2011 -0400
preferences: don't display variants checkbox if there is no variant
https://bugzilla.gnome.org/show_bug.cgi?id=660586
src/empathy-preferences.c | 15 ++++++++++++---
1 files changed, 12 insertions(+), 3 deletions(-)
commit 3b152eee315b32c0e8d844137843bb3f9a0c554b
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date: Tue Oct 11 16:46:23 2011 -0400
Use default variant if we can't find any variants
We use to crash here trying to get the first element of an empty
GPtrArray.
https://bugzilla.gnome.org/show_bug.cgi?id=660586
libempathy-gtk/empathy-theme-adium.c | 5 ++++-
1 files changed, 4 insertions(+), 1 deletions(-)
commit c7c9bf5beb4b2186a58c204fad97a375aa51f17c
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date: Sun Oct 9 15:07:58 2011 -0400
remove released flag
configure.ac | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)