9 files changed, 130 insertions, 24 deletions
diff --git a/common/xfconf-types.c b/common/xfconf-types.c
index b3dcb22..0ae09ac 100644
--- a/common/xfconf-types.c
+++ b/common/xfconf-types.c
@@ -30,6 +30,20 @@
 
 #include <gobject/gvaluecollector.h>
 
+
+/**
+ * XFCONF_TYPE_UINT16:
+ *
+ * The registered #GType for a 16-bit unsigned type.
+ **/
+
+/**
+ * XFCONF_TYPE_INT16:
+ *
+ * The registered #GType for a 16-bit signed type.
+ **/
+
+
 static void
 gvalue_from_short(const GValue *src_value,
                   GValue *dest_value)
diff --git a/docs/reference/tmpl/xfconf-backend.sgml b/docs/reference/tmpl/xfconf-backend.sgml
index 908cff1..9970162 100644
--- a/docs/reference/tmpl/xfconf-backend.sgml
+++ b/docs/reference/tmpl/xfconf-backend.sgml
@@ -140,3 +140,13 @@ one could think of to store data.
 @Returns: 
 
 
+<!-- ##### FUNCTION xfconf_backend_register_property_changed_func ##### -->
+<para>
+
+</para>
+
+@backend: 
+@func: 
+@user_data: 
+
+
diff --git a/docs/reference/tmpl/xfconf-channel.sgml b/docs/reference/tmpl/xfconf-channel.sgml
index 7ea9b30..5246548 100644
--- a/docs/reference/tmpl/xfconf-channel.sgml
+++ b/docs/reference/tmpl/xfconf-channel.sgml
@@ -31,8 +31,9 @@ configuration keys with the same names.
 
 </para>
 
-@xfconfchannel: the object which received the signal.
-@arg1: 
+@channel: the object which received the signal.
+@property: 
+@value: 
 
 <!-- ##### ARG XfconfChannel:channel-name ##### -->
 <para>
@@ -108,6 +109,17 @@ configuration keys with the same names.
 @Returns: 
 
 
+<!-- ##### FUNCTION xfconf_channel_get_uint ##### -->
+<para>
+
+</para>
+
+@channel: 
+@property: 
+@default_value: 
+@Returns: 
+
+
 <!-- ##### FUNCTION xfconf_channel_get_uint64 ##### -->
 <para>
 
@@ -174,6 +186,17 @@ configuration keys with the same names.
 @Returns: 
 
 
+<!-- ##### FUNCTION xfconf_channel_set_uint ##### -->
+<para>
+
+</para>
+
+@channel: 
+@property: 
+@value: 
+@Returns: 
+
+
 <!-- ##### FUNCTION xfconf_channel_set_uint64 ##### -->
 <para>
 
diff --git a/docs/reference/tmpl/xfconf-errors.sgml b/docs/reference/tmpl/xfconf-errors.sgml
index 2ea0a0f..04cad31 100644
--- a/docs/reference/tmpl/xfconf-errors.sgml
+++ b/docs/reference/tmpl/xfconf-errors.sgml
@@ -38,4 +38,5 @@ use of #GError<!-- -->s.
 @XFCONF_ERROR_PERMISSION_DENIED: The user is not allowed to read or write to the channel or property
 @XFCONF_ERROR_INTERNAL_ERROR: An internal error (likely a bug in xfconf) occurred
 @XFCONF_ERROR_NO_BACKEND: No backends were found, or those found could not be loaded
+@XFCONF_ERROR_INVALID_PROPERTY: The property name specified was invalid
 
diff --git a/docs/reference/tmpl/xfconf-unused.sgml b/docs/reference/tmpl/xfconf-unused.sgml
index 2621d57..8486caf 100644
--- a/docs/reference/tmpl/xfconf-unused.sgml
+++ b/docs/reference/tmpl/xfconf-unused.sgml
@@ -53,6 +53,12 @@ stamp-xfconf-marshal
 
 @obj: 
 
+<!-- ##### MACRO XFCONF_TYPE_ERROR ##### -->
+<para>
+
+</para>
+
+
 <!-- ##### FUNCTION xfconf_backend_get_error_quark ##### -->
 <para>
 
diff --git a/docs/reference/xfconf-sections.txt b/docs/reference/xfconf-sections.txt
index 4049e5e..b0614d9 100644
--- a/docs/reference/xfconf-sections.txt
+++ b/docs/reference/xfconf-sections.txt
@@ -8,12 +8,14 @@ xfconf_channel_get_all
 xfconf_channel_get_string
 xfconf_channel_get_string_list
 xfconf_channel_get_int
+xfconf_channel_get_uint
 xfconf_channel_get_uint64
 xfconf_channel_get_double
 xfconf_channel_get_bool
 xfconf_channel_set_string
 xfconf_channel_set_string_list
 xfconf_channel_set_int
+xfconf_channel_set_uint
 xfconf_channel_set_uint64
 xfconf_channel_set_double
 xfconf_channel_set_bool
@@ -55,6 +57,7 @@ xfconf_backend_exists
 xfconf_backend_remove
 xfconf_backend_remove_channel
 xfconf_backend_flush
+xfconf_backend_register_property_changed_func
 <SUBSECTION Standard>
 XFCONF_BACKEND
 XFCONF_IS_BACKEND
@@ -74,6 +77,8 @@ xfconf_array_free
 <FILE>xfconf-errors</FILE>
 XFCONF_ERROR
 XfconfError
+<SUBSECTION Standard>
+XFCONF_TYPE_ERROR
 </SECTION>
 
 <SECTION>
@@ -82,6 +87,9 @@ xfconf_g_value_get_int16
 xfconf_g_value_get_uint16
 xfconf_g_value_set_int16
 xfconf_g_value_set_uint16
+<SUBSECTION Standard>
+XFCONF_TYPE_INT16
+XFCONF_TYPE_UINT16
 </SECTION>
 
 <SECTION>
diff --git a/po/POTFILES.in b/po/POTFILES.in
index e9d7fc2..a3c374c 100644
--- a/po/POTFILES.in
+++ b/po/POTFILES.in
@@ -2,6 +2,7 @@ common/xfconf-gvaluefuncs.c
 xfsettingsd/main.c
 xfconfd/xfconf-backend-perchannel-xml.c
 xfconfd/xfconf-backend-factory.c
+xfconfd/xfconf-backend.c
 xfconfd/main.c
 xfconfd/xfconf-daemon.c
 xfconf-query/main.c
diff --git a/po/xfconf.pot b/po/xfconf.pot
index 06bbc2e..123aaba 100644
--- a/po/xfconf.pot
+++ b/po/xfconf.pot
@@ -9,7 +9,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2008-04-11 00:33+0200\n"
+"POT-Creation-Date: 2008-04-23 23:57-0700\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -17,19 +17,19 @@ msgstr ""
 "Content-Type: text/plain; charset=CHARSET\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: common/xfconf-gvaluefuncs.c:208
+#: common/xfconf-gvaluefuncs.c:243
 msgid "true"
 msgstr ""
 
-#: common/xfconf-gvaluefuncs.c:209
+#: common/xfconf-gvaluefuncs.c:244
 msgid "false"
 msgstr ""
 
-#: xfsettingsd/main.c:50 xfconf-query/main.c:52
+#: xfsettingsd/main.c:50 xfconf-query/main.c:94
 msgid "Version information"
 msgstr ""
 
-#: xfsettingsd/main.c:54 xfconf-query/main.c:56
+#: xfsettingsd/main.c:54 xfconf-query/main.c:114
 msgid "Verbose output"
 msgstr ""
 
@@ -69,30 +69,30 @@ msgstr ""
 msgid "Unable to remove channel \"%s\": %s"
 msgstr ""
 
-#: xfconfd/xfconf-backend-perchannel-xml.c:1037
-#: xfconfd/xfconf-backend-perchannel-xml.c:1107
+#: xfconfd/xfconf-backend-perchannel-xml.c:1002
+#: xfconfd/xfconf-backend-perchannel-xml.c:1072
 #, c-format
 msgid "Invalid type for <%s>: \"%s\""
 msgstr ""
 
-#: xfconfd/xfconf-backend-perchannel-xml.c:1049
-#: xfconfd/xfconf-backend-perchannel-xml.c:1119
+#: xfconfd/xfconf-backend-perchannel-xml.c:1014
+#: xfconfd/xfconf-backend-perchannel-xml.c:1084
 #, c-format
 msgid "Unable to parse value of type \"%s\" from \"%s\""
 msgstr ""
 
-#: xfconfd/xfconf-backend-perchannel-xml.c:1098
+#: xfconfd/xfconf-backend-perchannel-xml.c:1063
 #, c-format
 msgid "The type attribute of <value> cannot be an array"
 msgstr ""
 
-#: xfconfd/xfconf-backend-perchannel-xml.c:1366
-#: xfconfd/xfconf-backend-perchannel-xml.c:1604
+#: xfconfd/xfconf-backend-perchannel-xml.c:1331
+#: xfconfd/xfconf-backend-perchannel-xml.c:1569
 #, c-format
 msgid "Channel \"%s\" does not exist"
 msgstr ""
 
-#: xfconfd/xfconf-backend-perchannel-xml.c:1649
+#: xfconfd/xfconf-backend-perchannel-xml.c:1614
 #, c-format
 msgid "Unable to write channel \"%s\": %s"
 msgstr ""
@@ -120,24 +120,62 @@ msgstr ""
 msgid "Report bugs to http://bugs.xfce.org/\n"
 msgstr ""
 
-#: xfconfd/xfconf-daemon.c:395
+#: xfconfd/xfconf-daemon.c:396
 #, c-format
 msgid "Another Xfconf daemon is already running"
 msgstr ""
 
-#: xfconfd/xfconf-daemon.c:431
+#: xfconfd/xfconf-daemon.c:432
 #, c-format
 msgid "No backends could be started"
 msgstr ""
 
-#: xfconf-query/main.c:60
+#: xfconf-query/main.c:98
 msgid "pick the channel"
 msgstr ""
 
-#: xfconf-query/main.c:64
+#: xfconf-query/main.c:102
 msgid "pick the property"
 msgstr ""
 
-#: xfconf-query/main.c:68
+#: xfconf-query/main.c:106
 msgid "set (change the value)"
 msgstr ""
+
+#: xfconf-query/main.c:110
+msgid "List properties"
+msgstr ""
+
+#: xfconf-query/main.c:118
+msgid "Create new entry"
+msgstr ""
+
+#: xfconf-query/main.c:122
+msgid "Specify the property value type"
+msgstr ""
+
+#: xfconf-query/main.c:126
+msgid "Remove property"
+msgstr ""
+
+#: xfconf-query/main.c:212
+#, c-format
+msgid "Unable to convert \"%s\" to type\n"
+msgstr ""
+
+#: xfconf-query/main.c:226
+#, c-format
+msgid "ERROR: Could not convert value\n"
+msgstr ""
+
+#: xfconf-query/main.c:233
+#, c-format
+msgid ""
+"ERROR: Property '%s' missing\n"
+"from channel '%s'\n"
+msgstr ""
+
+#: xfconf-query/main.c:249
+#, c-format
+msgid "Channel '%s' contains no properties\n"
+msgstr ""
diff --git a/xfconf/xfconf-channel.c b/xfconf/xfconf-channel.c
index 9bc06e4..0c56503 100644
--- a/xfconf/xfconf-channel.c
+++ b/xfconf/xfconf-channel.c
@@ -72,7 +72,6 @@ typedef struct _XfconfChannelClass
 {
     GObjectClass parent;
 
-    /*< signals >*/
     void (*property_changed)(XfconfChannel *channel,
                              const gchar *property,
                              const GValue *value);
@@ -126,10 +125,16 @@ xfconf_channel_class_init(XfconfChannelClass *klass)
 
     /**
      * XfconfChannel::property-changed:
-     * @channel: An #XfconfChannel.
-     * @property: A property name.
+     * @channel: The #XfconfChannel emitting the signal.
+     * @property: The property that changed.
+     * @value: The new value.
      *
-     * Emitted when a property on @channel has changed.
+     * Emitted whenever a property on @channel has changed.  If
+     * the change was caused by the removal of @property, @value
+     * will be unset; you should test this with
+     * <informalexample><programlisting>
+     * G_VALUE_TYPE(value) == G_TYPE_INVALID
+     * </programlisting></informalexample>
      **/
     signals[SIG_PROPERTY_CHANGED] = g_signal_new("property-changed",
                                                  XFCONF_TYPE_CHANNEL,