diff --git a/ChangeLog b/ChangeLog index 7d094baae..1a5c6b043 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,11 @@ +2003-05-27 Rachel Hestilow + + * gconf/GConf/ChangeSet.cs, Client.cs: Change SetValue + from protected to internal, as it references an internal type. + * gconf/GConf/ClientBase.cs: The same; additionally + remove some commented-out code. Change Initialize from + protected to internal. + 2003-05-22 Rachel Hestilow * glib/ManagedValue.cs, glib/Value.cs: A few old-style diff --git a/gconf/GConf/ChangeSet.cs b/gconf/GConf/ChangeSet.cs index a3ad60d37..fa5318f95 100644 --- a/gconf/GConf/ChangeSet.cs +++ b/gconf/GConf/ChangeSet.cs @@ -36,7 +36,7 @@ namespace GConf [DllImport("gconf-2")] static extern void gconf_change_set_set (IntPtr cs, string key, IntPtr val); - protected override void SetValue (string key, Value val) + internal override void SetValue (string key, Value val) { gconf_change_set_set (Raw, key, val.Handle); } diff --git a/gconf/GConf/Client.cs b/gconf/GConf/Client.cs index 01c2dc198..ce5946656 100644 --- a/gconf/GConf/Client.cs +++ b/gconf/GConf/Client.cs @@ -28,7 +28,7 @@ namespace GConf [DllImport("gconf-2")] static extern void gconf_client_set (IntPtr client, string key, IntPtr val, out IntPtr err); - protected override void SetValue (string key, Value val) + internal override void SetValue (string key, Value val) { IntPtr err; gconf_client_set (Raw, key, val.Handle, out err); diff --git a/gconf/GConf/ClientBase.cs b/gconf/GConf/ClientBase.cs index 1ab355e3b..75d92018b 100644 --- a/gconf/GConf/ClientBase.cs +++ b/gconf/GConf/ClientBase.cs @@ -6,28 +6,8 @@ namespace GConf public abstract class ClientBase { public abstract object Get (string key); - protected abstract void SetValue (string key, Value val); -/* - public void Set (string key, string val) - { - Set (key, new Value (val)); - } + internal abstract void SetValue (string key, Value val); - public void Set (string key, int val) - { - Set (key, new Value (val)); - } - - public void Set (string key, double val) - { - Set (key, new Value (val)); - } - - public void Set (string key, bool val) - { - Set (key, new Value (val)); - } -*/ public void Set (string key, object val) { SetValue (key, new Value (val)); @@ -39,7 +19,7 @@ namespace GConf [DllImport("gconf-2")] static extern bool gconf_init (int argc, IntPtr argv, out IntPtr err); - protected void Initialize () + internal void Initialize () { if (!gconf_is_initialized ()) {