commit 892df9ab54d3d4c5d14f7e77a2f40e288f13d059
Author: Stef Walter <stefw@collabora.co.uk>
Date: 2011-11-21
Release version 3.3.2
NEWS | 7 +++++++
1 files changed, 7 insertions(+), 0 deletions(-)
commit d2128ffc09d4c9b4aa6b5a0ed2d81819a0a2af1d
Merge: 01d4e6d 81f51c7
Author: Stef Walter <stefw@collabora.co.uk>
Date: 2011-11-21
Merge branch 'gnome-3-2'
commit 81f51c700996c770c1743340baa39c4108757f9f
Author: Stef Walter <stefw@collabora.co.uk>
Date: 2011-11-14
Release version 3.2.2
* Disable requirement to distcheck without warnings, since glib
has changed significantly.
Makefile.am | 2 +-
NEWS | 9 +++++++++
configure.ac | 2 +-
3 files changed, 11 insertions(+), 2 deletions(-)
commit 30915a6fc4b95bbe6a5da224f731480e78bbaf83
Author: Stef Walter <stefw@collabora.co.uk>
Date: 2011-10-26
Build correctly with glib 2.31
* Link to gthread correctly.
configure.ac | 3 +++
daemon/Makefile.am | 12 +-----------
daemon/gpg-agent/Makefile.am | 10 ++--------
daemon/ssh-agent/Makefile.am | 8 ++------
pkcs11/gkm/tests/Makefile.am | 3 ++-
pkcs11/xdg-store/tests/Makefile.am | 1 +
6 files changed, 11 insertions(+), 26 deletions(-)
commit 01d4e6de0c827d3c2644b589fdc0f18a0a991887
Author: Vincent Untz <vuntz@gnome.org>
Date: 2011-11-08
Do not make label selectionnable in prompt dialog
https://bugzilla.gnome.org/show_bug.cgi?id=660108
ui/gku-prompt.ui | 4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)
commit 15bf6c05a9ed4148ed212735a735c2fbe7289908
Author: Stef Walter <stefw@collabora.co.uk>
Date: 2011-11-14
ui: Fix problem with 'unsafe storage' prompt deadlocking
* The grab handler wasn't being removed before showing the
'unsafe storage' prompt.
* This deadlock would occur when the user pressed <Enter> in
a password field.
https://bugzilla.gnome.org/show_bug.cgi?id=661277
ui/gku-prompt-tool.c | 18 ++++++++++++------
ui/tests/files/prompt-create | 12 ++++++++++++
2 files changed, 24 insertions(+), 6 deletions(-)
commit 404b0616db15a0fe4934e9f88db282ad699b7ffb
Author: Kjartan Maraas <kmaraas@gnome.org>
Date: 2011-11-13
Updated Norwegian bokmål translation
po/nb.po | 80 +++++++++++++++++++++++++++++++++++++++++++++++--------------
1 files changed, 61 insertions(+), 19 deletions(-)
commit 6b3ac9cfaad7f7303e58b6277e129583281893e1
Author: Fran Diéguez <fran.dieguez@mabishu.com>
Date: 2011-11-10
Updated Galician translations
po/gl.po | 78 +++++++++++++++++++++++++++++++++++++++++++++++--------------
1 files changed, 60 insertions(+), 18 deletions(-)
commit 8bfe82ad35dcb18a8c7b3f2bd24c3f8c2715756b
Author: Daniel Mustieles <daniel.mustieles@gmail.com>
Date: 2011-11-08
Updated Spanish translation
po/es.po | 1089 ++++++++++++++++++++++++++++++++------------------------------
1 files changed, 566 insertions(+), 523 deletions(-)
commit fa7e6c389d92a2ab829da348bad751da545682d6
Author: Guido Berhörster <gber@opensuse.org>
Date: 2011-11-06
Remove XFCE & LXDE from OnlyShowIn for autostart files
Since XFCE and LXDE don't support the dbus interface used by gnome-keyring in
autostart to set the right environment variables for ssh agent, gpg agent,
etc., XFCE and LXDE should not appear in OnlyShowIn.
We might want to add XFCE back in the future, since XFCE devs might implement
the dbus interface.
https://bugzilla.gnome.org/show_bug.cgi?id=660240
daemon/gnome-keyring-gpg.desktop.in.in | 2 +-
daemon/gnome-keyring-pkcs11.desktop.in.in | 2 +-
daemon/gnome-keyring-secrets.desktop.in.in | 2 +-
daemon/gnome-keyring-ssh.desktop.in.in | 2 +-
4 files changed, 4 insertions(+), 4 deletions(-)
commit 280d4393173535fa2d73d97122c92cd946f4a8df
Author: Piotr DrÄ…g <piotrdrag@gmail.com>
Date: 2011-11-06
Updated POTFILES.in
po/POTFILES.in | 7 ++++---
1 files changed, 4 insertions(+), 3 deletions(-)
commit 9e7777200be971e9cf028b92232dd17bc0d82f7b
Author: Werner Koch <wk@gnupg.org>
Date: 2011-10-28
Replace flock by dot file locking.
flock as a couple of problems. For example it does not work reliable
on remote file systems. In particular not with CIFS. It does also
not work with FAT systems (i.e. vfat). A solution to this is to use a
separate lock file and either use hardlinks or open(O_EXCL) to check
for the existence of this file. For details see the remarks in dotlock.c.
The implementation uses a portable implementation named dotlock.c
which is in its basic form in use for more than a decade. It was
recently enhanced to properly detect file systems without hardlink
support and then fallback to a O_EXCL style locking. It has been
tested on ext3, ufs, nfs, cifs and on vfat.
To keep the changes simple the implementation creates and locks
immediately and does not separate lock file template creation from
actual locking. This can be improved by either using hacks in
dotlock.c to re-use existing lock file templates or by integrating it
closer into the gnome2-store.
https://bugzilla.gnome.org/show_bug.cgi?id=657234
configure.ac | 8 +
egg/Makefile.am | 1 +
egg/dotlock.c | 1301 ++++++++++++++++++++++++++++++
egg/dotlock.h | 112 +++
pkcs11/gnome2-store/gkm-gnome2-storage.c | 147 ++--
5 files changed, 1481 insertions(+), 88 deletions(-)
commit 052fa8ebf4296b31df8c0424c4e85f9213eee159
Author: Stef Walter <stefw@collabora.co.uk>
Date: 2011-11-01
gnome2-store: Add additional tests for locking
https://bugzilla.gnome.org/show_bug.cgi?id=657234
pkcs11/gnome2-store/gkm-gnome2-storage.c | 72 +++++------
pkcs11/gnome2-store/tests/test-gnome2-storage.c | 159 +++++++++++++++++++++--
2 files changed, 176 insertions(+), 55 deletions(-)
commit b29036a753e08e03d364f054d980e192563c772c
Author: Travis Reiter <travis.reitter@collabora.co.uk>
Date: 2011-11-01
gcr: Fix build, link against glib
https://bugzilla.gnome.org/show_bug.cgi?id=662647
gcr/Makefile.am | 2 ++
1 files changed, 2 insertions(+), 0 deletions(-)
commit cbd06e76aa3ff1292537aacb8ff2e5c933ec951c
Author: Nilamdyuti Goswami <ngoswami@ngoswami.csb>
Date: 2011-10-31
Assamese translation updated
po/as.po | 112 +++++++++++++++++++++++++++-----------------------------------
1 files changed, 49 insertions(+), 63 deletions(-)
commit af30db1a08d7ec0435dd47a91967d601b638fedd
Author: Nilamdyuti Goswami <ngoswami@ngoswami.csb>
Date: 2011-10-31
Assamese translation updated
po/as.po | 1293 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++---
1 files changed, 1249 insertions(+), 44 deletions(-)
commit 83f3e698ce33146ff4d7bf945ebb168a2c002328
Author: Stef Walter <stefw@collabora.co.uk>
Date: 2011-10-26
Bump version number
configure.ac | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)