gnome-keyring r1722 - in branches/gnome-2-26: . docs/reference/gcr docs/reference/gnome-keyring docs/reference/gp11 po

[stefw svn gnome org]

Author: stefw
Date: Sun Apr 12 14:23:22 2009
New Revision: 1722
URL: http://svn.gnome.org/viewvc/gnome-keyring?rev=1722&view=rev

Log:
Release 2.26.1


Modified:
   branches/gnome-2-26/ChangeLog
   branches/gnome-2-26/NEWS
   branches/gnome-2-26/docs/reference/gcr/Makefile.am
   branches/gnome-2-26/docs/reference/gnome-keyring/Makefile.am
   branches/gnome-2-26/docs/reference/gp11/Makefile.am
   branches/gnome-2-26/po/ChangeLog

Modified: branches/gnome-2-26/NEWS
==============================================================================
--- branches/gnome-2-26/NEWS	(original)
+++ branches/gnome-2-26/NEWS	Sun Apr 12 14:23:22 2009
@@ -1,3 +1,15 @@
+Changes in version 2.26.1 are:
+* Fix many problems with the new secure memory allocator.
+* DBus now automatically starts the gnome-keyring service properly.
+* When auto activating the gnome-keyring DBus service, check for an 
+  already running daemon.
+* Don't print critical warnings when registering with DBus fails.
+* Bump glib dependency.
+* Add DBus method for getting the gnome-keyring environment variables.
+* Fix crash when prompting to unlock the keyring.
+* Initialize daemon with LOGNAME and USERNAME environment variables.
+* Build fixes [Ed Schouten]
+
 Changes in version 2.26.0 are:
 * Implement support for running gnome-keyring-daemon under valgrind.
 * Checks for asn1Parser tool when configuring. [Alberto Ruiz].

Modified: branches/gnome-2-26/docs/reference/gcr/Makefile.am
==============================================================================
--- branches/gnome-2-26/docs/reference/gcr/Makefile.am	(original)
+++ branches/gnome-2-26/docs/reference/gcr/Makefile.am	Sun Apr 12 14:23:22 2009
@@ -79,7 +79,7 @@
 # e.g. GTKDOC_CFLAGS=-I$(top_srcdir) -I$(top_builddir) $(GTK_DEBUG_FLAGS)
 # e.g. GTKDOC_LIBS=$(top_builddir)/gtk/$(gtktargetlib)
 GTKDOC_CFLAGS= -I$(top_srcdir) -I$(top_builddir) $(GOBJECT_CFLAGS) -Wno-error
-GTKDOC_LIBS= $(GOBJECT_LIBS) $(top_srcdir)/$(DOC_MODULE)/lib$(DOC_MODULE).la
+GTKDOC_LIBS= $(GOBJECT_LIBS) $(top_builddir)/$(DOC_MODULE)/lib$(DOC_MODULE).la
 
 # This includes the standard gtk-doc make rules, copied by gtkdocize.
 include $(top_srcdir)/gtk-doc.make

Modified: branches/gnome-2-26/docs/reference/gnome-keyring/Makefile.am
==============================================================================
--- branches/gnome-2-26/docs/reference/gnome-keyring/Makefile.am	(original)
+++ branches/gnome-2-26/docs/reference/gnome-keyring/Makefile.am	Sun Apr 12 14:23:22 2009
@@ -79,7 +79,7 @@
 # e.g. GTKDOC_CFLAGS=-I$(top_srcdir) -I$(top_builddir) $(GTK_DEBUG_FLAGS)
 # e.g. GTKDOC_LIBS=$(top_builddir)/gtk/$(gtktargetlib)
 GTKDOC_CFLAGS= -I$(top_srcdir) -I$(top_builddir) $(GOBJECT_CFLAGS) -Wno-error
-GTKDOC_LIBS= $(GOBJECT_LIBS) $(top_srcdir)/library/libgnome-keyring.la
+GTKDOC_LIBS= $(GOBJECT_LIBS) $(top_builddir)/library/libgnome-keyring.la
 
 # This includes the standard gtk-doc make rules, copied by gtkdocize.
 include $(top_srcdir)/gtk-doc.make

Modified: branches/gnome-2-26/docs/reference/gp11/Makefile.am
==============================================================================
--- branches/gnome-2-26/docs/reference/gp11/Makefile.am	(original)
+++ branches/gnome-2-26/docs/reference/gp11/Makefile.am	Sun Apr 12 14:23:22 2009
@@ -79,7 +79,7 @@
 # e.g. GTKDOC_CFLAGS=-I$(top_srcdir) -I$(top_builddir) $(GTK_DEBUG_FLAGS)
 # e.g. GTKDOC_LIBS=$(top_builddir)/gtk/$(gtktargetlib)
 GTKDOC_CFLAGS= -I$(top_srcdir) -I$(top_builddir) $(GOBJECT_CFLAGS) -Wno-error
-GTKDOC_LIBS= $(GOBJECT_LIBS) $(top_srcdir)/$(DOC_MODULE)/lib$(DOC_MODULE).la
+GTKDOC_LIBS= $(GOBJECT_LIBS) $(top_builddir)/$(DOC_MODULE)/lib$(DOC_MODULE).la
 
 # This includes the standard gtk-doc make rules, copied by gtkdocize.
 include $(top_srcdir)/gtk-doc.make