gconf r2505 - in trunk: . doc/gconf/tmpl

[kmaraas svn gnome org]

Author: kmaraas
Date: Tue Jan  8 15:26:02 2008
New Revision: 2505
URL: http://svn.gnome.org/viewvc/gconf?rev=2505&view=rev

Log:
2008-01-08  Kjartan Maraas  <kmaraas gnome org>

	* NEWS: Update more.
	* doc/gconf/tmpl/gconf-client.sgml: Docs adjustment.
	* gconf-2.0.pc.in: Move orbit-2.0 to Requires.private
	and add glib under Requires instead.

Modified:
   trunk/ChangeLog
   trunk/NEWS
   trunk/doc/gconf/tmpl/gconf-client.sgml
   trunk/gconf-2.0.pc.in

Modified: trunk/NEWS
==============================================================================
--- trunk/NEWS	(original)
+++ trunk/NEWS	Tue Jan  8 15:26:02 2008
@@ -1,3 +1,10 @@
+2.21.1
+======
+
+  Misc
+  - Lots of string fixes (Christian Rose, Adam Weinberger, Clytie Siddall)
+  - Documentation fixes
+
 2.20.1
 ======
 

Modified: trunk/doc/gconf/tmpl/gconf-client.sgml
==============================================================================
--- trunk/doc/gconf/tmpl/gconf-client.sgml	(original)
+++ trunk/doc/gconf/tmpl/gconf-client.sgml	Tue Jan  8 15:26:02 2008
@@ -155,11 +155,11 @@
 <!-- ##### USER_FUNCTION GConfClientNotifyFunc ##### -->
 <para>
 This is the signature of a user function added with gconf_client_notify_add().
-The notify function is invoked when the value of a key changes. The @value
-argument is the new value, or <symbol>NULL</symbol> if the key was unset.  The
- value argument should not be modified, and should be copied if you want to keep
-it around (the #GConfClient will destroy it sometime after your notify function
-is called).
+The notify function is invoked when the value of a key changes. The @entry
+argument holds the new value, or <symbol>NULL</symbol> if the key was unset. The
+value in the @entry argument should not be modified, and should be copied if you
+want to keep it around (the #GConfClient will destroy it sometime after your
+notify function is called).
 </para>
 
 @client: the #GConfClient notifying us.

Modified: trunk/gconf-2.0.pc.in
==============================================================================
--- trunk/gconf-2.0.pc.in	(original)
+++ trunk/gconf-2.0.pc.in	Tue Jan  8 15:26:02 2008
@@ -8,6 +8,7 @@
 Name: gconf
 Description: GNOME Config System.
 Version: @VERSION@
-Requires: ORBit-2.0
+Requires: glib
+Requires.private: ORBit-2.0
 Libs: -L${libdir} -lgconf- MAJOR_VERSION@
 Cflags: -I${includedir}/gconf/@MAJOR_VERSION@