summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKjartan Maraas <kmaraas@gnome.org>2008-01-08 15:26:02 +0000
committerKjartan Maraas <kmaraas@src.gnome.org>2008-01-08 15:26:02 +0000
commite3e1b3573e8e44cb77807fdcae696bc2b9900d5f (patch)
treeca8a4f5f3e729aa0f378b8d94e4f0e0ca6c8401b
parent8f7ee645946ab27cea88af5f88772beda61f2aec (diff)
downloadgconf-e3e1b3573e8e44cb77807fdcae696bc2b9900d5f.tar.gz
Update more. Docs adjustment. Move orbit-2.0 to Requires.private and add
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. svn path=/trunk/; revision=2505
-rw-r--r--ChangeLog7
-rw-r--r--NEWS7
-rw-r--r--doc/gconf/tmpl/gconf-client.sgml10
-rw-r--r--gconf-2.0.pc.in3
4 files changed, 21 insertions, 6 deletions
diff --git a/ChangeLog b/ChangeLog
index df1f1790..7225537b 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,12 @@
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.
+
+2008-01-08 Kjartan Maraas <kmaraas@gnome.org>
+
* NEWS: Update some.
* gconf/gconf.c: (gconf_valid_key):
Fix some more strings. Closes bug #429679.
diff --git a/NEWS b/NEWS
index 8e54704c..7242654f 100644
--- a/NEWS
+++ b/NEWS
@@ -1,3 +1,10 @@
+2.21.1
+======
+
+ Misc
+ - Lots of string fixes (Christian Rose, Adam Weinberger, Clytie Siddall)
+ - Documentation fixes
+
2.20.1
======
diff --git a/doc/gconf/tmpl/gconf-client.sgml b/doc/gconf/tmpl/gconf-client.sgml
index 6f318e65..7848980c 100644
--- a/doc/gconf/tmpl/gconf-client.sgml
+++ b/doc/gconf/tmpl/gconf-client.sgml
@@ -155,11 +155,11 @@ documentation, g_signal_stop_emission_by_name() for example).
<!-- ##### 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.
diff --git a/gconf-2.0.pc.in b/gconf-2.0.pc.in
index 04c3003f..a2e557eb 100644
--- a/gconf-2.0.pc.in
+++ b/gconf-2.0.pc.in
@@ -8,6 +8,7 @@ gconf_serverdir=@libexecdir@
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@