From: Evan Nemerson <evan@coeus-group.com>
Date: Wed, 13 Jan 2010 09:43:37 +0000 (-0800)
Subject: gconf-2.0: several ownership and nullability fixes.
X-Git-Tag: 0.7.10~100
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=4498389f1624392ff0f073a6e367e518cc9d42f0;p=thirdparty%2Fvala.git

gconf-2.0: several ownership and nullability fixes.

Based on patch by Michal Hruby, fixes bug 605449.
---

diff --git a/vapi/gconf-2.0.vapi b/vapi/gconf-2.0.vapi
index 0c54594f1..bd32b2828 100644
--- a/vapi/gconf-2.0.vapi
+++ b/vapi/gconf-2.0.vapi
@@ -38,26 +38,26 @@ namespace GConf {
 		public int pad2;
 		public int pending_notify_count;
 		public void add_dir (string dir, GConf.ClientPreloadType preload) throws GLib.Error;
-		public unowned GLib.SList all_dirs (string dir) throws GLib.Error;
-		public unowned GLib.SList all_entries (string dir) throws GLib.Error;
+		public GLib.SList<string> all_dirs (string dir) throws GLib.Error;
+		public GLib.SList<GConf.Entry> all_entries (string dir) throws GLib.Error;
 		public unowned GConf.ChangeSet change_set_from_current (...) throws GLib.Error;
 		public unowned GConf.ChangeSet change_set_from_currentv (string keys) throws GLib.Error;
 		public void clear_cache ();
 		public bool commit_change_set (GConf.ChangeSet cs, bool remove_committed) throws GLib.Error;
 		public bool dir_exists (string dir) throws GLib.Error;
-		public unowned GConf.Value @get (string key) throws GLib.Error;
+		public GConf.Value? @get (string key) throws GLib.Error;
 		public bool get_bool (string key) throws GLib.Error;
 		public static unowned GConf.Client get_default ();
-		public unowned GConf.Value get_default_from_schema (string key) throws GLib.Error;
-		public unowned GConf.Entry get_entry (string key, string? locale, bool use_schema_default) throws GLib.Error;
+		public GConf.Value? get_default_from_schema (string key) throws GLib.Error;
+		public GConf.Entry get_entry (string key, string? locale, bool use_schema_default) throws GLib.Error;
 		public double get_float (string key) throws GLib.Error;
 		public static unowned GConf.Client get_for_engine (GConf.Engine engine);
 		public int get_int (string key) throws GLib.Error;
-		public unowned GLib.SList get_list (string key, GConf.ValueType list_type) throws GLib.Error;
+		public GLib.SList get_list (string key, GConf.ValueType list_type) throws GLib.Error;
 		public bool get_pair (string key, GConf.ValueType car_type, GConf.ValueType cdr_type, void* car_retloc, void* cdr_retloc) throws GLib.Error;
-		public unowned GConf.Schema get_schema (string key) throws GLib.Error;
-		public unowned string get_string (string key) throws GLib.Error;
-		public GConf.Value get_without_default (string key) throws GLib.Error;
+		public GConf.Schema? get_schema (string key) throws GLib.Error;
+		public string? get_string (string key) throws GLib.Error;
+		public GConf.Value? get_without_default (string key) throws GLib.Error;
 		public bool key_is_writable (string key) throws GLib.Error;
 		public void notify (string key);
 		public uint notify_add (string namespace_section, owned GConf.ClientNotifyFunc func) throws GLib.Error;
diff --git a/vapi/packages/gconf-2.0/gconf-2.0.metadata b/vapi/packages/gconf-2.0/gconf-2.0.metadata
index 703381204..d1dcc29a8 100644
--- a/vapi/packages/gconf-2.0/gconf-2.0.metadata
+++ b/vapi/packages/gconf-2.0/gconf-2.0.metadata
@@ -4,10 +4,18 @@ GConfClient::error has_emitter="1"
 GConfClient::unreturned_error has_emitter="1"
 GConfClient::value_changed has_emitter="1"
 GConfClient::error has_emitter="1"
+gconf_client_all_dirs type_arguments="string" transfer_ownership="1"
+gconf_client_all_entries type_arguments="Entry" transfer_ownership="1"
+gconf_client_get transfer_ownership="1" nullable="1"
+gconf_client_get_default_from_schema transfer_ownership="1" nullable="1"
+gconf_client_get_entry transfer_ownership="1"
 gconf_client_get_entry.locale nullable="1"
+gconf_client_get_list transfer_ownership="1"
+gconf_client_get_schema transfer_ownership="1" nullable="1"
+gconf_client_get_string transfer_ownership="1" nullable="1"
 gconf_client_notify_add.func transfer_ownership="1"
 gconf_client_notify_add.destroy_notify hidden="1"
-gconf_client_get_without_default transfer_ownership="1"
+gconf_client_get_without_default transfer_ownership="1" nullable="1"
 gconf_entry_copy transfer_ownership="1"
 gconf_schema_copy transfer_ownership="1"
 gconf_value_copy transfer_ownership="1"