diff options
| author | Kjartan Maraas <kmaraas@gnome.org> | 2005-12-08 20:07:40 +0000 |
|---|---|---|
| committer | Kjartan Maraas <kmaraas@src.gnome.org> | 2005-12-08 20:07:40 +0000 |
| commit | 4c9eae02e1067f8e74335009da0cb386946597fe (patch) | |
| tree | 8ee840a1fe905b3a741d2619eaceb375b4c978ca | |
| parent | 771c20ca14a6438ed344a53a810b28025476f445 (diff) | |
| download | gconf-4c9eae02e1067f8e74335009da0cb386946597fe.tar.gz | |
Make this function work for schemas too. Patch from Nicolas PeninguyGNOME_2_12_BRANCHPOINT
2005-12-08 Kjartan Maraas <kmaraas@gnome.org>
* gconf/gconf-internals.c: (gconf_value_decode): Make
this function work for schemas too. Patch from Nicolas Peninguy
<npeniguy@gmail.com>. Closes bug #323509.
| -rw-r--r-- | ChangeLog | 6 | ||||
| -rw-r--r-- | gconf/gconf-internals.c | 7 |
2 files changed, 12 insertions, 1 deletions
@@ -1,3 +1,9 @@ +2005-12-08 Kjartan Maraas <kmaraas@gnome.org> + + * gconf/gconf-internals.c: (gconf_value_decode): Make + this function work for schemas too. Patch from Nicolas Peninguy + <npeniguy@gmail.com>. Closes bug #323509. + 2005-12-08 Dan Williams <dcbw@redhat.com> * gconf/gconf.c: (gconf_unescape_string): Don't stomp on diff --git a/gconf/gconf-internals.c b/gconf/gconf-internals.c index 03b396fc..d2a06eb6 100644 --- a/gconf/gconf-internals.c +++ b/gconf/gconf-internals.c @@ -1921,7 +1921,7 @@ gconf_value_decode (const gchar* encoded) const gchar* end = NULL; gchar* unquoted; - gconf_value_set_schema(val, sc); + gconf_value_set_schema_nocopy(val, sc); gconf_schema_set_type(sc, byte_type(*s)); ++s; @@ -1932,6 +1932,11 @@ gconf_value_decode (const gchar* encoded) gconf_schema_set_cdr_type(sc, byte_type(*s)); ++s; + if (*end != ',') + g_warning("no comma after types in schema"); + + ++s; + /* locale */ unquoted = gconf_unquote_string(s, &end, NULL); |