diff --git a/applications/gobject-introspection/girnamespaces.pas b/applications/gobject-introspection/girnamespaces.pas index b94721976..dcf312724 100644 --- a/applications/gobject-introspection/girnamespaces.pas +++ b/applications/gobject-introspection/girnamespaces.pas @@ -471,7 +471,7 @@ begin NS := Self; // some basic fixes PlainCType:=StringReplace(StripPointers(ACType, @PointerLevel), ' ', '_', [rfReplaceAll]); - if (PlainCType = 'gchar') or (PlainCType = 'guchar') or (PlainCType = 'char') then + if (PlainCType = 'gchar') or {(PlainCType = 'guchar') or} (PlainCType = 'char') then AName := 'GLib.utf8'; if (PlainCType = 'GType') {or (AName = 'Type')} or (AName = 'GType')then diff --git a/applications/gobject-introspection/girpascalwriter.pas b/applications/gobject-introspection/girpascalwriter.pas index e1f1da823..31df9efed 100644 --- a/applications/gobject-introspection/girpascalwriter.pas +++ b/applications/gobject-introspection/girpascalwriter.pas @@ -1175,7 +1175,8 @@ var otUnion: Exit; // these will be done on the second pass. this is to avoid duplicate names if they are the same as some function or property. giving the function priority of the original name - otGlibSignal :;// signals are external to the object and not 'part' of them + otGlibSignal : if AObjectType = gtInterface then // signals are external to the object and not 'part' of them + TypeDecl.Add(IndentText(WriteCallBack(TgirCallback(Field),True, UsedNames),4,0)); //WriteFunction(AFunction, AItem, AIsMethod, AWantWrapperForObject, AFunctionList): String; otFunction : TypeFuncs.Add(IndentText(WriteFunction(TgirFunction(Field), AItem, False, True, UnitFuncs, UsedNames),4,0));