diff options
| -rw-r--r-- | ChangeLog | 2 | ||||
| -rw-r--r-- | doc/gconf/tmpl/gconf-schema.sgml | 42 | ||||
| -rw-r--r-- | doc/gconf/tmpl/gconf-value.sgml | 2 | ||||
| -rw-r--r-- | gconf/Makefile.am | 2 | ||||
| -rw-r--r-- | po/ChangeLog | 2 |
5 files changed, 29 insertions, 21 deletions
@@ -1,3 +1,5 @@ +============================= 2.16.0 ====================== + 2006-08-15 Kjartan Maraas <kmaraas@gnome.org> * configure.in: Fix intltool req. diff --git a/doc/gconf/tmpl/gconf-schema.sgml b/doc/gconf/tmpl/gconf-schema.sgml index 70e2b00e..b1073ca9 100644 --- a/doc/gconf/tmpl/gconf-schema.sgml +++ b/doc/gconf/tmpl/gconf-schema.sgml @@ -68,7 +68,6 @@ Returns the type of the entry described by a #GConfSchema @schema: a #GConfSchema @Returns: the entry type. <!-- #Unused Parameters # --> -@x: <!-- ##### FUNCTION gconf_schema_get_locale ##### --> @@ -79,10 +78,10 @@ is <emphasis>not</emphasis> a copy, so don't try to free it. It is is destroyed. </para> -@schema: a #GConfSchema +@schema: a #GConfSchema @Returns: the locale <!-- # Unused parameters # --> -@x: + <!-- ##### FUNCTION gconf_schema_get_short_desc ##### --> <para> @@ -92,10 +91,9 @@ is <emphasis>not</emphasis> a copy, don't try to free it. It is is destroyed. </para> -@schema: a #GConfSchema. +@schema: a #GConfSchema. @Returns: the short description. -<!-- # Unused Parameters # --> -@x: + <!-- ##### FUNCTION gconf_schema_get_long_desc ##### --> <para> @@ -105,10 +103,9 @@ is <emphasis>not</emphasis> a copy, don't try to free it. It is is destroyed. </para> -@schema: a #GConfSchema +@schema: a #GConfSchema @Returns: the long description. -<!-- # Unused Parameters # --> -@x: + <!-- ##### FUNCTION gconf_schema_get_owner ##### --> <para> @@ -120,8 +117,7 @@ is destroyed. @schema: a #GConfSchema. @Returns: the owner. -<!-- # Unused Parameters # --> -@x: + <!-- ##### FUNCTION gconf_schema_get_default_value ##### --> <para> @@ -130,8 +126,7 @@ Returns the default value of the entry that is described by a #GConfSchema. @schema: a #GConfSchema. @Returns: the default value of the entry. -<!-- # Unused Parameters # --> -@x: + <!-- ##### FUNCTION gconf_schema_get_car_type ##### --> <para> @@ -141,8 +136,7 @@ Returns the default type of the first member of the pair in the entry @schema: a #GConfSchema. @Returns: the type of the first member of the pair element of the entry. -<!-- # Unused Parameters # --> -@x: + <!-- ##### FUNCTION gconf_schema_get_cdr_type ##### --> <para> @@ -152,8 +146,7 @@ Returns the default type of the second member of the pair in the entry @schema: a #GConfSchema. @Returns: the type of the second member of the pair element of the entry. -<!-- # Unused Parameters # --> -@x: + <!-- ##### FUNCTION gconf_schema_get_list_type ##### --> <para> @@ -163,8 +156,10 @@ of default type %GCONF_VALUE_LIST) described by @schema. +@schema: a #GConfSchema. +@Returns: the type of the list elements of the entry. -<!-- # Unused Parameters # --> -@x: + +@schema: +@Returns: + <!-- ##### FUNCTION gconf_schema_set_type ##### --> <para> @@ -174,6 +169,7 @@ Sets the #GConfValueType of the #GConfSchema to @type. @sc: a #GConfSchema. @type: the type. + <!-- ##### FUNCTION gconf_schema_set_locale ##### --> <para> Sets the locale for a #GConfSchema to @locale. @locale is copied. @@ -182,6 +178,7 @@ Sets the locale for a #GConfSchema to @locale. @locale is copied. @sc: a #GConfSchema. @locale: the locale. + <!-- ##### FUNCTION gconf_schema_set_short_desc ##### --> <para> Sets the short description of a #GConfSchema to @desc. @desc is copied. @@ -190,6 +187,7 @@ Sets the short description of a #GConfSchema to @desc. @desc is copied. @sc: a #GConfSchema. @desc: the short description. + <!-- ##### FUNCTION gconf_schema_set_long_desc ##### --> <para> Sets the long description of a #GConfSchema to @desc. @desc is copied. @@ -198,6 +196,7 @@ Sets the long description of a #GConfSchema to @desc. @desc is copied. @sc: a #GConfSchema. @desc: the long description. + <!-- ##### FUNCTION gconf_schema_set_owner ##### --> <para> Sets the "owner" of the #GConfSchema, where the owner is the @@ -207,6 +206,7 @@ name of the application that created the entry. @sc: a #GConfSchema. @owner: the name of the creating application. + <!-- ##### FUNCTION gconf_schema_set_default_value ##### --> <para> Sets the default value for the entry described by the #GConfSchema. @@ -217,6 +217,7 @@ gconf_schema_set_default_value_nocopy(). @sc: a #GConfSchema. @val: the default value. + <!-- ##### FUNCTION gconf_schema_set_default_value_nocopy ##### --> <para> Sets the default value for the entry described by the #GConfSchema. @@ -227,6 +228,7 @@ Alternatively, use gconf_schema_set_default_value(). @sc: a #GConfSchema. @val: the default value. + <!-- ##### FUNCTION gconf_schema_set_car_type ##### --> <para> Sets the #GConfValueType of the first member (car) of the entry (which @@ -246,6 +248,7 @@ should be of type %GCONF_VALUE_PAIR) described by #GConfSchema to @type. @sc: a #GConfSchema. @type: the type. + <!-- ##### FUNCTION gconf_schema_set_list_type ##### --> <para> Sets the #GConfValueType of the list elements of the entry (which @@ -255,3 +258,4 @@ should be of type %GCONF_VALUE_LIST) described by #GConfSchema to @type. @sc: a #GConfSchema. @type: the type. + diff --git a/doc/gconf/tmpl/gconf-value.sgml b/doc/gconf/tmpl/gconf-value.sgml index df84b837..7607959f 100644 --- a/doc/gconf/tmpl/gconf-value.sgml +++ b/doc/gconf/tmpl/gconf-value.sgml @@ -638,8 +638,6 @@ Sets the value field to @val after freeing the already existing value. @entry: a #GConfEntry. @val: the #GConfValue to be set. -<!-- # Unused Parameters # --> -@Returns: <!-- ##### FUNCTION gconf_entry_set_schema_name ##### --> diff --git a/gconf/Makefile.am b/gconf/Makefile.am index 5581d7df..97c10f4b 100644 --- a/gconf/Makefile.am +++ b/gconf/Makefile.am @@ -45,6 +45,8 @@ $(libgconf_2_la_OBJECTS) $(gconftool_2_OBJECTS) $(gconfd_2_OBJECTS): $(built_sou CLEANFILES = $(BUILT_SOURCES) +DISTCLEANFILES = default.path + dist-hook: cd $(distdir) ; rm -f $(CLEANFILES) diff --git a/po/ChangeLog b/po/ChangeLog index e06fee40..e983e7f5 100644 --- a/po/ChangeLog +++ b/po/ChangeLog @@ -1,3 +1,5 @@ +============================ 2.16.0 ======================= + 2006-09-14 Priit Laes <plaes@cvs.gnome.org> * et.po: Translation updated by Ivar Smolin. |