commit b7da83a8160b59aa6375449c42f21d4ed9987d85
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date: Wed Oct 3 12:12:58 2012 +0200
prepare 3.6.0.1
NEWS | 39 +++++++++++++++++++++++++++++++++++++++
configure.ac | 4 ++--
2 files changed, 41 insertions(+), 2 deletions(-)
commit 5206421264c993ab34599c63b3744e4a7f9e075a
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date: Fri Sep 28 08:38:14 2012 +0200
chat-manager: cache the individual mgr
We want to keep it alive during the whole lifetime of empathy-chat.
src/empathy-chat-manager.c | 32 +++++++++++++++++++++++++++++++-
1 file changed, 31 insertions(+), 1 deletion(-)
commit 257011e356f9f293e5df5032159b9e79cf70d9d6
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date: Fri Sep 28 08:37:26 2012 +0200
chat-window: expose the individual mgr as a property
src/empathy-chat-window.c | 39 +++++++++++++++++++++++++++++++++++++++
src/empathy-chat-window.h | 3 +++
2 files changed, 42 insertions(+)
commit 22eab320c9669b7c6307bf202ca661e12ff8de57
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date: Thu Sep 27 12:39:44 2012 +0200
chat-window: update the contact menu when folks is loaded
src/empathy-chat-window.c | 16 ++++++++++++++++
1 file changed, 16 insertions(+)
commit 11e0514f64c70770393f22b410c9e23153c132b3
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date: Thu Sep 27 12:31:06 2012 +0200
chat-window: load the individual mgr when the chat window is
focused out
Dirty hack to cope with Folks being slow as hell and blocking the
main loop
while preparing.
src/empathy-chat-window.c | 46
+++++++++++++++++++++++++++++++++++-----------
1 file changed, 35 insertions(+), 11 deletions(-)
commit 197e45140f3d79cca9bb3290b094a7055de24f74
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date: Thu Sep 27 12:22:04 2012 +0200
move the individual mgr reference to empathy-chat-window
The chat window is the one actually using the manager so it makes
sense to
move it there. It's a singleton so the same instance will be shared
between
windows anyway.
src/empathy-chat-window.c | 20 +++++++++++++++-----
src/empathy-chat.c | 14 --------------
2 files changed, 15 insertions(+), 19 deletions(-)
commit d96f93b08a28fb0e19d035255c709bc09cdc5c7d
Author: Carles Ferrando <carles.ferrando@gmail.com>
Date: Wed Oct 3 00:50:34 2012 +0200
[l10n] Updated Catalan (Valencian) translation
po/ca@valencia.po | 136
++++++++++++++++++++++++++++--------------------------
1 file changed, 71 insertions(+), 65 deletions(-)
commit 74006567183f3781fbf68715558f4fd7c3e95534
Author: Gabor Kelemen <kelemeng@gnome.hu>
Date: Tue Oct 2 23:40:34 2012 +0200
Updated Hungarian translation
po/hu.po | 135
++++++++++++++++++++++++++++++++++-----------------------------
1 file changed, 72 insertions(+), 63 deletions(-)
commit 35c4220f495a85db3d32df86d0a62a1039cdc915
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date: Tue Oct 2 14:59:55 2012 +0200
roster-view: add some delay before actually starting the live search
This avoid stacking a bunch of useless searches while user is typing
as we
can't stop the old search before starting the new one.
https://bugzilla.gnome.org/show_bug.cgi?id=685278
libempathy-gtk/empathy-roster-view.c | 29 +++++++++++++++++++++++++++--
1 file changed, 27 insertions(+), 2 deletions(-)
commit ee2b89a5cbd5b5837488c7334a259bc356eccdc4
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date: Tue Oct 2 13:47:27 2012 +0200
cope with the top_group_members list being changed while iterating
over it
https://bugzilla.gnome.org/show_bug.cgi?id=685203
libempathy-gtk/empathy-roster-model-manager.c | 19 +++++++++++++------
1 file changed, 13 insertions(+), 6 deletions(-)
commit f72a036cce9ff7ce9d1e96f7c72e42e83c8c4452
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date: Tue Oct 2 13:31:10 2012 +0200
individual-manager: make sure the individual stays alive when
removing it
https://bugzilla.gnome.org/show_bug.cgi?id=685203
libempathy/empathy-individual-manager.c | 6 ++++++
1 file changed, 6 insertions(+)
commit 33b5753dab14d6f387fdb0346aac5c0998489477
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date: Tue Oct 2 10:44:17 2012 +0200
roster-model-manager: factor out
{add_to,remove_from}_top_group_members()
https://bugzilla.gnome.org/show_bug.cgi?id=685203
libempathy-gtk/empathy-roster-model-manager.c | 37
+++++++++++++++++----------
1 file changed, 23 insertions(+), 14 deletions(-)
commit 06dd24d2acae7b49fd72869fd265eb1144a32dc0
Author: Tom Tryfonidis <tomtryf@gmail.com>
Date: Tue Oct 2 10:06:51 2012 +0300
Updated Greek translation
po/el.po | 69
++++++++++++++++++++++++++++++++++++----------------------------
1 file changed, 39 insertions(+), 30 deletions(-)
commit 8964b3199d0415434948860c8ff78664aa40ae94
Author: Alexander Shopov <ash@kambanaria.org>
Date: Tue Oct 2 05:36:25 2012 +0300
Updated Bulgarian translation
po/bg.po | 133
++++++++++++++++++++++++++++++++++-----------------------------
1 file changed, 71 insertions(+), 62 deletions(-)
commit c9b12540e124f441c00d6b9e4be5d8b9d2a0fce1
Author: Fran Diéguez <fran.dieguez@mabishu.com>
Date: Mon Oct 1 15:13:23 2012 +0200
Updated Galician translations
po/gl.po | 87
++++++++++++++++++++++++++++++++--------------------------------
1 file changed, 43 insertions(+), 44 deletions(-)
commit ce49ad3e5a688ac22e52b1817123b44d82354f04
Author: Daniel Mustieles <daniel.mustieles@gmail.com>
Date: Sun Sep 30 13:06:35 2012 +0200
Updated Spanish translation
po/es.po | 74
+++++++++++++++++++++++++++++++++++-----------------------------
1 file changed, 40 insertions(+), 34 deletions(-)
commit e8f7c8963ebd17819bf5ff291bd1423c3407fb3d
Author: Žygimantas BeruÄka <uid0@akl.lt>
Date: Sun Sep 30 12:16:23 2012 +0300
Updated Lithuanian translation
po/lt.po | 695
++++++++++++++++++++++++++++++++++++++++-----------------------
1 file changed, 439 insertions(+), 256 deletions(-)
commit 5903fadcf9b61f8eb689343ccad27a72c5589504
Author: МироÑлав Ðиколић <miroslavnikolic@rocketmail.com>
Date: Sat Sep 29 19:52:48 2012 +0200
Updated Serbian translation
po/sr.po | 55
++++++++++++++++++++++++++++++++-----------------------
po/sr@latin.po | 55
++++++++++++++++++++++++++++++++-----------------------
2 files changed, 64 insertions(+), 46 deletions(-)
commit 7973dbc6eabb60c0618cf4fe83ebfdd784af852c
Author: Ihar Hrachyshka <ihar.hrachyshka@gmail.com>
Date: Sat Sep 29 18:15:12 2012 +0300
Updated Belarusian translation.
po/be.po | 53 +++++++++++++++++++++++++++++++----------------------
1 file changed, 31 insertions(+), 22 deletions(-)
commit bab2f093d6053a62736697021c16f937f1349cf1
Author: Daniel Martinez Cucalon <dmartinez@src.gnome.org>
Date: Sat Sep 29 00:29:32 2012 +0200
Updated Aragonese translation
po/an.po | 3797
+++++++++++++++++++++++++++++++-------------------------------
1 file changed, 1889 insertions(+), 1908 deletions(-)
commit adaa54917e24c04119eff75fa5fac7d8feb8805f
Author: Yaron Shahrabani <sh.yaron@gmail.com>
Date: Fri Sep 28 16:44:36 2012 +0200
Updated Hebrew translation.
po/he.po | 211
+++++++++++++++++++++++++++++++++------------------------------
1 file changed, 109 insertions(+), 102 deletions(-)
commit 3657e2642f635deca2e10695bba0dd8894613d68
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date: Fri Sep 28 12:05:33 2012 +0200
individual_menu_add_personas(): restore the persona.individual after
creating single_individual
https://bugzilla.gnome.org/show_bug.cgi?id=684971
libempathy-gtk/empathy-individual-menu.c | 5 +++++
1 file changed, 5 insertions(+)
commit 837375ce5a897ede2f219957eb9b9b4a4eaee6c8
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date: Thu Sep 27 12:48:30 2012 +0200
empathy_chat_window_present_chat: return the window presenting
the chat
src/empathy-chat-window.c | 9 +++++----
src/empathy-chat-window.h | 2 +-
2 files changed, 6 insertions(+), 5 deletions(-)
commit 863beae29119b3a230511c6968b245ae747f4181
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date: Thu Sep 27 12:39:17 2012 +0200
No need to pass twice the same param to
chat_window_contact_menu_update()
src/empathy-chat-window.c | 7 +++----
1 file changed, 3 insertions(+), 4 deletions(-)
commit 61c27ce3a19ab2b74ca1e0ef9ca058c10457f98f
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date: Thu Sep 27 11:57:20 2012 +0200
document when/how Folks is used in empathy-chat
src/empathy-chat.c | 9 ++++++++-
1 file changed, 8 insertions(+), 1 deletion(-)
commit 0ab3bd0797578847fe4f4967a3526333cb4a4e61
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date: Thu Sep 27 14:27:58 2012 +0200
make sure that chat_window_contact_menu_update is not called
recursively
Calling empathy_chat_get_contact_menu() may have as a side effect
to call
empathy_contact_set_persona() which will fire a 'notify' signal and
so trigger
another mennu update. There is no point doing a second one, and
creating a
second menu, so best to avoid recursive calls.
src/empathy-chat-window.c | 8 ++++++++
1 file changed, 8 insertions(+)
commit 3fd6aa7dcc3a209e4e0795b932efcf4cc1688e90
Author: Duarte Loreto <happyguy_pt@hotmail.com>
Date: Fri Sep 28 07:45:21 2012 +0100
Updated Portuguese translation
po/pt.po | 54 ++++++++++++++++++++++++++++++------------------------
1 file changed, 30 insertions(+), 24 deletions(-)
commit 13720e3d2bf9bddf8ca64f37e55f664855c0d282
Author: Gil Forcada <gforcada@gnome.org>
Date: Fri Sep 28 00:02:09 2012 +0200
[l10n] Minor update to Catalan translation
po/ca.po | 54 ++++++++++++++++++++++++++++++------------------------
1 file changed, 30 insertions(+), 24 deletions(-)
commit b008f24359395bf1985311a73e862310295658eb
Author: Aurimas ÄŒernius <aurisc4@gmail.com>
Date: Thu Sep 27 22:24:35 2012 +0300
Updated Lithuanian translation
po/lt.po | 210
+++++++++++++++++++++++++++++++++------------------------------
1 file changed, 110 insertions(+), 100 deletions(-)
commit fb160b06764647e12689c7396dd397cf22181a1a
Author: Piotr DrÄ…g <piotrdrag@gmail.com>
Date: Thu Sep 27 15:05:21 2012 +0200
Updated Polish translation
po/pl.po | 53 +++++++++++++++++++++++++++++++----------------------
1 file changed, 31 insertions(+), 22 deletions(-)
commit c8405ee3cf36bfa86314b8691d1bffc1c606fc80
Author: Andika Triwidada <andika@gmail.com>
Date: Thu Sep 27 19:38:07 2012 +0700
Updated Indonesian translation
po/id.po | 54 ++++++++++++++++++++++++++++++++----------------------
1 file changed, 32 insertions(+), 22 deletions(-)
commit 86f46dd468ac8bfc17e2faf8bf28e5e35a3dee11
Author: Yuri Myasoedov <omerta13@yandex.ru>
Date: Thu Sep 27 16:36:34 2012 +0400
Updated Russian translation
po/ru.po | 55 ++++++++++++++++++++++++++++++++-----------------------
1 file changed, 32 insertions(+), 23 deletions(-)
commit b9a083bf9217f1f8f8b60c02ef105560ef464a1a
Author: Fran Diéguez <fran.dieguez@mabishu.com>
Date: Thu Sep 27 12:48:18 2012 +0200
Updated Galician translations
po/gl.po | 57 ++++++++++++++++++++++++++++++++-------------------------
1 file changed, 32 insertions(+), 25 deletions(-)
commit fe2dcda548c0e72844368646eaf9c6b7dd54df1d
Author: Marek Černocký <marek@manet.cz>
Date: Thu Sep 27 12:47:37 2012 +0200
Updated Czech translation
po/cs.po | 51 ++++++++++++++++++++++++++++++---------------------
1 file changed, 30 insertions(+), 21 deletions(-)
commit 723aad75523566b6e6e0a71a80d7421435bfda08
Author: Milo Casagrande <milo@ubuntu.com>
Date: Thu Sep 27 12:36:53 2012 +0200
[l10n] Updated Italian translation.
po/it.po | 53 +++++++++++++++++++++++++++++++----------------------
1 file changed, 31 insertions(+), 22 deletions(-)
commit 568ed2e039a63ebaabe34cd4bf3aae4db6122568
Author: Nilamdyuti Goswami <nilamdyuti@gmail.com>
Date: Thu Sep 27 14:50:53 2012 +0530
Assamese translation updated
po/as.po | 58 ++++++++++++++++++++++++++++++++--------------------------
1 file changed, 32 insertions(+), 26 deletions(-)
commit d74fd79d1e8f0c9ae69d9a22871eaa27661ac257
Author: Matej UrbanÄiÄ <mateju@svn.gnome.org>
Date: Thu Sep 27 10:34:24 2012 +0200
Updated Slovenian translation
po/sl.po | 55 +++++++++++++++++++++++++++++++------------------------
1 file changed, 31 insertions(+), 24 deletions(-)
commit bcd83492be60b9d8244501dcf4d9213ac52653c0
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date: Thu Sep 27 10:14:18 2012 +0200
POTFILES.in: add empathy-roster-model.h
Some translated strings have been moved to this file but we forgot
to include
it in POTFILES.in. This is not a string break as those strings
were not
translated before.
po/POTFILES.in | 1 +
1 file changed, 1 insertion(+)
commit 5a2ab98b57182804fa6a04c21a9cb9fcbc79bf09
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date: Tue Sep 25 15:32:19 2012 +0200
server-tls-handler: fix the variant type when fetching
ServerCertificate
g_variant_lookup() fails if we don't specificy that this string is
secretly an
object path.
https://bugzilla.gnome.org/show_bug.cgi?id=684783
libempathy/empathy-server-tls-handler.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
commit 5bfe5733ac4e743ec7c025a3c9f6551739e334d5
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date: Fri Sep 21 10:13:07 2012 +0200
Say in the status message when the call has been terminated
This is not a string freeze break as this string is already used in
a bunch of
place in this file.
We could probably improve the phrasing a little bit but that's too
late for
this cycle.
https://bugzilla.gnome.org/show_bug.cgi?id=684528
src/empathy-call-window.c | 2 ++
1 file changed, 2 insertions(+)
commit b2bd57b5277f6a03d252f0abdb45bdd4fecdb8b4
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date: Fri Sep 21 10:06:32 2012 +0200
call_state is a CallState enum
src/empathy-call-window.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
commit b399609daf362b99ba73c10e91b3309d663f71d6
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date: Mon Sep 24 10:38:05 2012 +0200
tp-chat: set Private and InviteOnly props on conference channels
Only the person invited are suppose to join these channels so
tweak their
settings to make them more secure.
https://bugzilla.gnome.org/show_bug.cgi?id=684675
libempathy/empathy-tp-chat.c | 33 ++++++++++++++++++++++++++++++---
1 file changed, 30 insertions(+), 3 deletions(-)
commit d848cdc6f54c985f2f146387ccc7d3925eebedd7
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date: Tue Sep 25 09:25:00 2012 +0200
update last_tag_pattern
release.py | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
commit c2c8291941b19bd16a2875e7786599ac59f3392c
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date: Tue Sep 25 09:24:38 2012 +0200
remove released flag
configure.ac | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
commit 3c2383ed3b0c0820f093dd18c2ef6a174e9f763c
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date: Tue Sep 25 09:23:23 2012 +0200
fix ubuntu-online-accounts/Makefile.am
ubuntu-online-accounts/Makefile.am | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)