commit 8b66333ace95cb356140b2c31f4b8d9f83a69162
Author: Guillaume Desmottes <[email protected]>
Date:   Mon Apr 30 17:21:34 2012 +0200

   Prepare 3.5.1

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

commit c182c4dc507b2b6c9a79bf93d31aa52925b0908a
Merge: 4115e48 36f10a0
Author: Guillaume Desmottes <[email protected]>
Date:   Mon Apr 30 17:11:11 2012 +0200

   Merge branch 'gnome-3-4'

commit 4115e48c310707ef52d683ea6dae14518bd5ea27
Author: Kjartan Maraas <[email protected]>
Date:   Mon Apr 30 10:17:11 2012 +0200

   Updated Norwegian bokmål translation

po/nb.po |  239
++++++++++++++++++++++++++++++++------------------------------
1 files changed, 122 insertions(+), 117 deletions(-)

commit d7d7fe528295ca08e1da2efbd07d42b9f5a4e965
Author: Guillaume Desmottes <[email protected]>
Date:   Mon Apr 23 16:45:13 2012 +0200

   POTFILES.in: set type gsettings

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

commit 9f2b7eb8484ed134431a526b651dbf1627da6342
Author: Guillaume Desmottes <[email protected]>
Date:   Mon Apr 23 14:17:49 2012 +0200

   Stop generating gschema from .in file

   intltool now supports translating gschema files properly so we don't
   need to
   do this crack any more.

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

configure.ac                          |    2 +-
data/.gitignore                       |    1 -
data/Makefile.am                      |    8 +-
data/org.gnome.Empathy.gschema.xml    |  303
+++++++++++++++++++++++++++++++++
data/org.gnome.Empathy.gschema.xml.in |  302
--------------------------------
po/POTFILES.in                        |    2 +-
6 files changed, 307 insertions(+), 311 deletions(-)

commit d710f1ef048c2eb98d6cb93186947c966d82ad58
Author: Guillaume Desmottes <[email protected]>
Date:   Mon Apr 23 15:00:58 2012 +0200

   add tests/certificates/Makefile.am

   certificates needs to be in EXTRA_DIST so empathy-tls-test passes when
   distchecking.

configure.ac                   |    1 +
tests/Makefile.am              |    2 +-
tests/certificates/Makefile.am |    3 +++
3 files changed, 5 insertions(+), 1 deletions(-)

commit a808e2c70febb9cc8e80cc17cad8fe17a78070a8
Author: Matej Urbančič <[email protected]>
Date:   Sat Apr 21 13:01:01 2012 +0200

   Updated Slovenian translation

po/sl.po |  966
++++++++++++++++++++++++++++++++------------------------------
1 files changed, 493 insertions(+), 473 deletions(-)

commit 91cbaef3f9b5d111d76fb68e786c33059355fd8c
Author: Fran Diéguez <[email protected]>
Date:   Fri Apr 20 15:32:06 2012 +0200

   Updated Galician translations

po/gl.po |   24 ++++++++++++++----------
1 files changed, 14 insertions(+), 10 deletions(-)

commit 0304b597824e1a37640fc17ec378b5a382c56aa6
Author: Daniel Mustieles <[email protected]>
Date:   Fri Apr 20 14:29:54 2012 +0200

   Updated Spanish translation

po/es.po |  510
+++++++++++++++++++++++++++++++-------------------------------
1 files changed, 257 insertions(+), 253 deletions(-)

commit 4551d97be43ff1bee62c4a8ff68887ce8c083e26
Author: Guillaume Desmottes <[email protected]>
Date:   Fri Apr 20 11:39:24 2012 +0200

   strip the new group name

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

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

commit b5063fd8122ca1f5fcfbd93b7d495554d900f7f5
Author: Guillaume Desmottes <[email protected]>
Date:   Thu Apr 5 14:35:27 2012 +0200

   live-search: don't forward shift keys

   Not doing so cancel any group renaming operation.

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

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

commit 5405e5fc520318e12ed6a252cef37a2bb281928b
Author: Guillaume Desmottes <[email protected]>
Date:   Mon Feb 13 09:55:28 2012 +0100

   individual-view: add menu item to rename groups

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

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

commit 69f4cb22dcefd39cadcbe274b1896b06a3eadc15
Author: Guillaume Desmottes <[email protected]>
Date:   Mon Feb 13 14:19:28 2012 +0100

   add empathy_connection_aggregator_rename_group()

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

libempathy/empathy-connection-aggregator.c |   41
++++++++++++++++++++++++++++
libempathy/empathy-connection-aggregator.h |    5 +++
2 files changed, 46 insertions(+), 0 deletions(-)

commit eb6f86cc365f373851b52a11e06578374d0af9d2
Author: Guillaume Desmottes <[email protected]>
Date:   Fri Apr 20 10:03:48 2012 +0200

   roster-window: set a default height

   600 seems to be a decent default height and that's already the one
   we use for
   the log viewer window.

   We continue relying on Gtk+ to pick the best width as there is no
   point making
   the window wider as long as all the menus are displayed.

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

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

commit fed480fa086cba30816a5345499ceeb00ddd6d6c
Author: Fran Diéguez <[email protected]>
Date:   Thu Apr 19 19:36:21 2012 +0200

   Updated Galician translations

po/gl.po |  486
++++++++++++++++++++++++++++++++------------------------------
1 files changed, 249 insertions(+), 237 deletions(-)

commit b0de75186e8e529e427aae231b334a3e40e5bffd
Author: Stef Walter <[email protected]>
Date:   Thu Apr 19 07:56:49 2012 +0200

   tls-test: Use a proper PKCS#11 mock module for testing

    * In empathy-tls-test.c use a proper PKCS#11 mock module,
      which we can place certificate anchors and pinned certificates in.
    * Fix EmpathyTlsVerifier to check for server trust assertions
      not client ones, this was a bug highlighted by fixing tests.

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

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

libempathy/empathy-tls-verifier.c                |    4 +-
tests/Makefile.am                                |    4 +-
tests/certificates/collabora-ca.cer              |  Bin 0 -> 1536 bytes
tests/certificates/collabora-ca/collabora-ca.cer |  Bin 1536 -> 0 bytes
tests/empathy-tls-test.c                         |  157 ++-
tests/mock-pkcs11.c                              | 1351
++++++++++++++++++++++
tests/mock-pkcs11.h                              |  352 ++++++
7 files changed, 1823 insertions(+), 45 deletions(-)

commit 7c25066261498dd98fb6bd1260ffe12f2fb5b7ce
Author: Guillaume Desmottes <[email protected]>
Date:   Wed Apr 18 14:20:24 2012 +0200

   add tests to noinst_PROGRAMS

   Make sure tests are always build. This is how tp-glib is handling
   its tests as
   well.

tests/Makefile.am |    5 ++++-
1 files changed, 4 insertions(+), 1 deletions(-)

commit 6f1ad230e5666eb30d4952cb84d7d49852ae4705
Author: Guillaume Desmottes <[email protected]>
Date:   Thu Jan 19 13:21:11 2012 +0100

   Hook tests on 'make check' instead of 'make test'

   This is how it's supposed to be done and so has the nice side
   effect of
   actually using TESTS_ENVIRONMENT and so fix tests if EMPATHY_SRCDIR
   is not
   defined.

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

tests/Makefile.am |   10 ++++------
1 files changed, 4 insertions(+), 6 deletions(-)

commit 5cec6527d47562cc0e8fee9e525ed7fa2e3f680b
Author: Kjartan Maraas <[email protected]>
Date:   Wed Apr 18 19:58:31 2012 +0200

   Updated Norwegian bokmål translation

po/nb.po |  664
++++++++++++++++++++++++++++++++------------------------------
1 files changed, 338 insertions(+), 326 deletions(-)

commit abdcbd53e414579e5de04d631daa8e59ce5eacf3
Author: Sasi Bhushan <[email protected]>
Date:   Tue Apr 17 18:26:17 2012 +0530

   Updated Telugu Translation

po/te.po |  487
++++++++++++++++++++++++++++++++------------------------------
1 files changed, 249 insertions(+), 238 deletions(-)

commit a60725383b6507841098dfde1da6ad082cae37ef
Author: Andrej Žnidaršič <[email protected]>
Date:   Mon Apr 16 22:24:19 2012 +0200

   Updated Slovenian translation

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

commit 281935bdac21efcf0fbf6c41c16b93ea4b48279f
Author: Daniel Martinez Cucalon <[email protected]>
Date:   Mon Apr 16 20:20:16 2012 +0200

   Updated Aragonese translation

po/an.po | 4416
+++++++++++++++++++++++++++++++++++---------------------------
1 files changed, 2488 insertions(+), 1928 deletions(-)

commit 36f10a0030d0292111db9ca0b7c7b135f9738ab5
Author: Daniel Martinez Cucalon <[email protected]>
Date:   Mon Apr 16 20:20:16 2012 +0200

   Updated Aragonese translation

po/an.po | 4416
+++++++++++++++++++++++++++++++++++---------------------------
1 files changed, 2488 insertions(+), 1928 deletions(-)

commit 6094f6b6b5c56f50ffa65849537b310615498c1b
Merge: a26a516 a04eca8
Author: Guillaume Desmottes <[email protected]>
Date:   Mon Apr 16 14:00:41 2012 +0200

   Merge branch 'gnome-3-4'

   Conflicts:
       configure.ac
       po/sk.po
       po/zh_CN.po

commit a04eca8be3870bf8934a8360977d2cc6d275d2d6
Author: Guillaume Desmottes <[email protected]>
Date:   Mon Apr 16 13:57:58 2012 +0200

   remove released flag

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

commit 6f8d309d3ec49ced1323c3c223945f8bcae77045
Author: Pavol Klačanský <[email protected]>
Date:   Mon Apr 16 13:57:39 2012 +0200

   Updated Slovak translation

po/sk.po | 4240
+++++++++++++++++++++++++++++++++-----------------------------
1 files changed, 2244 insertions(+), 1996 deletions(-)

commit a26a5165bde37fad6db712cc96304c4b74ba732d
Author: Pavol Klačanský <[email protected]>
Date:   Mon Apr 16 13:56:06 2012 +0200

   Updated Slovak translation

po/sk.po | 4316
+++++++++++++++++++++++++++++++++-----------------------------
1 files changed, 2310 insertions(+), 2006 deletions(-)