gconf-2.0: Fix GConf.Client.get_entry binding (bgo#589739)

The "locale" parameter in gconf_client_get_entry can be NULL.
Fixes GNOME Bug #589739.
Patch by Mark Lee <marklee@src.gnome.org>

diff --git a/vapi/gconf-2.0.vapi b/vapi/gconf-2.0.vapi
index f20e6e334f18cebdedea4f376242d4c5542edbd8..58a811c4fa1462a198c38662a109ba2cc9ee4519 100644 (file)
--- a/vapi/gconf-2.0.vapi
+++ b/vapi/gconf-2.0.vapi
@@ -12,7 +12,7 @@ namespace GConf {
                [CCode (has_construct_function = false)]
                public ChangeSet ();
                public void remove (string key);
-               public void set (string key, GConf.Value value);
+               public void @set (string key, GConf.Value value);
                public void set_bool (string key, bool val);
                public void set_float (string key, double val);
                public void set_int (string key, int val);
@@ -45,11 +45,11 @@ namespace GConf {
                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 unowned 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 unowned 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;
@@ -66,7 +66,7 @@ namespace GConf {
                public bool recursive_unset (string key, GConf.UnsetFlags flags) throws GLib.Error;
                public void remove_dir (string dir) throws GLib.Error;
                public unowned GConf.ChangeSet reverse_change_set (GConf.ChangeSet cs) throws GLib.Error;
-               public void set (string key, GConf.Value val) throws GLib.Error;
+               public void @set (string key, GConf.Value val) throws GLib.Error;
                public bool set_bool (string key, bool val) throws GLib.Error;
                public void set_error_handling (GConf.ClientErrorHandlingMode mode);
                public bool set_float (string key, double val) throws GLib.Error;
@@ -95,7 +95,7 @@ namespace GConf {
                public unowned GConf.ChangeSet change_set_from_currentv (string keys) throws GLib.Error;
                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 unowned GConf.Value @get (string key) throws GLib.Error;
                public bool get_bool (string key) throws GLib.Error;
                public static unowned GConf.Engine get_default ();
                public unowned GConf.Value get_default_from_schema (string key) throws GLib.Error;
@@ -116,7 +116,7 @@ namespace GConf {
                public void notify_remove (uint cnxn);
                public void remove_dir (string dir) throws GLib.Error;
                public unowned GConf.ChangeSet reverse_change_set (GConf.ChangeSet cs) throws GLib.Error;
-               public bool set (string key, GConf.Value value) throws GLib.Error;
+               public bool @set (string key, GConf.Value value) throws GLib.Error;
                public bool set_bool (string key, bool val) throws GLib.Error;
                public bool set_float (string key, double val) throws GLib.Error;
                public bool set_int (string key, int val) 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 a6788bb9f25a6b6268bae213c4cd4c3a861ff226..4cfc82057f6a6998c28cae585a2c75d7e4db5987 100644 (file)
--- a/vapi/packages/gconf-2.0/gconf-2.0.metadata
+++ b/vapi/packages/gconf-2.0/gconf-2.0.metadata
@@ -4,6 +4,7 @@ GConfClient::error has_emitter="1"
 GConfClient::unreturned_error has_emitter="1"
 GConfClient::value_changed has_emitter="1"
 GConfClient::error has_emitter="1"
+gconf_client_get_entry.locale 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"