diff --git a/generator/InterfaceGen.cs b/generator/InterfaceGen.cs index c6cecdf16..7b66cc837 100644 --- a/generator/InterfaceGen.cs +++ b/generator/InterfaceGen.cs @@ -160,7 +160,7 @@ namespace GtkSharp.Generation { void GenerateCtors (StreamWriter sw) { // Native GObjects do not implement the *Implementor interfaces - sw.WriteLine ("\t\tGLib.Object implementor;", Name); + sw.WriteLine ("\t\tGLib.Object implementor;"); sw.WriteLine (); if (!IsConsumeOnly) { diff --git a/generator/Method.cs b/generator/Method.cs index 4e8e08161..14f0b65ec 100644 --- a/generator/Method.cs +++ b/generator/Method.cs @@ -90,7 +90,7 @@ namespace GtkSharp.Generation { } Parameters parms = Parameters; - is_get = ((((parms.IsAccessor && retval.IsVoid) || (parms.Count == 0 && !retval.IsVoid)) || (parms.Count == 0 && !retval.IsVoid)) && HasGetterName); + is_get = ((parms.IsAccessor && retval.IsVoid) || (parms.Count == 0 && !retval.IsVoid)) && HasGetterName; is_set = ((parms.IsAccessor || (parms.VisibleCount == 1 && retval.IsVoid)) && HasSetterName); call = "(" + (IsStatic ? "" : container_type.CallByName () + (parms.Count > 0 ? ", " : "")) + Body.GetCallString (is_set) + ")"; diff --git a/generator/ReturnValue.cs b/generator/ReturnValue.cs index 9815d0764..f700e668a 100644 --- a/generator/ReturnValue.cs +++ b/generator/ReturnValue.cs @@ -87,7 +87,7 @@ namespace GtkSharp.Generation { public string DefaultValue { get { - if (default_value != null && default_value.Length > 0) + if (!String.IsNullOrEmpty (default_value)) return default_value; if (IGen == null) return String.Empty; diff --git a/glib/Value.cs b/glib/Value.cs index c3a39d19d..cf653d6c7 100755 --- a/glib/Value.cs +++ b/glib/Value.cs @@ -552,7 +552,6 @@ namespace GLib { internal void Update (object val) { - Type t = GType.LookupType (type); if (GType.Is (type, GType.Boxed) && !(val is IWrapper)) { MethodInfo mi = val.GetType ().GetMethod ("Update", BindingFlags.NonPublic | BindingFlags.Instance); IntPtr boxed_ptr = g_value_get_boxed (ref this);