Skip to content
This repository was archived by the owner on Apr 18, 2020. It is now read-only.

Fixes required for f-spot. #2

Open
dkoeb wants to merge 3 commits into
base: master
Choose a base branch
from
Open

Fixes required for f-spot. #2

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
8a504af
gmcs was replaced by mcs.
dkoeb Mar 4, 2017
9dea8c7
FileEnumerator needs to be closed on Dispose to close underlying file…
dkoeb Mar 4, 2017
4f6dc76
Replace obsolete GLib.CDeclCallback with UnmanagedFunctionPointer att…
dkoeb Mar 4, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion configure.ac.in
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ if test "x$MONO" = "xno" ; then
AC_PATH_PROG(CSC, csc.exe)
else
using_mono=yes
AC_PATH_PROG(CSC, gmcs)
AC_PATH_PROG(CSC, mcs)
fi
AM_CONDITIONAL(USING_MONO, [test $using_mono = yes])
AC_PATH_PROG(GACUTIL, gacutil, no)
Expand Down
2 changes: 1 addition & 1 deletion generator/CallbackGen.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -201,7 +201,7 @@ public string GenWrapper (GenerationInfo gen_info)
sw.WriteLine ("\tusing System.Runtime.InteropServices;");
sw.WriteLine ();
sw.WriteLine ("#region Autogenerated code");
sw.WriteLine ("\t[GLib.CDeclCallback]");
sw.WriteLine ("\t[UnmanagedFunctionPointer (CallingConvention.Cdecl)]");
sw.WriteLine ("\tinternal delegate " + retval.MarshalType + " " + wrapper + "(" + parms.ImportSignature + ");");
sw.WriteLine ();
GenInvoker (gen_info, sw);
Expand Down
4 changes: 2 additions & 2 deletions generator/Signal.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -260,7 +260,7 @@ public void GenCallback (StreamWriter sw)
if (IsEventHandler)
return;

sw.WriteLine ("\t\t[GLib.CDeclCallback]");
sw.WriteLine ("\t\t[UnmanagedFunctionPointer (CallingConvention.Cdecl)]");
sw.WriteLine ("\t\tdelegate " + retval.ToNativeType + " " + DelegateName + " (" + CallbackSig + ", IntPtr gch);");
sw.WriteLine ();
sw.WriteLine ("\t\tstatic " + retval.ToNativeType + " " + CallbackName + " (" + CallbackSig + ", IntPtr gch)");
Expand Down Expand Up @@ -488,7 +488,7 @@ private void GenDefaultHandlerDelegate (GenerationInfo gen_info, ClassBase imple
bool use_glue = gen_info.GlueEnabled && implementor == null && ClassFieldName.Length > 0;
string glue_name = String.Empty;
ManagedCallString call = new ManagedCallString (parms, true);
sw.WriteLine ("\t\t[GLib.CDeclCallback]");
sw.WriteLine ("\t\t[UnmanagedFunctionPointer (CallingConvention.Cdecl)]");
sw.WriteLine ("\t\tdelegate " + retval.ToNativeType + " " + Name + "VMDelegate (" + parms.ImportSignature + ");\n");

if (use_glue) {
Expand Down
2 changes: 1 addition & 1 deletion generator/VirtualMethod.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -79,7 +79,7 @@ public void GenerateCallback (StreamWriter sw)
else if (IsSetter)
call_string = "__obj." + Name.Substring (3) + " = " + call;

sw.WriteLine ("\t\t[GLib.CDeclCallback]");
sw.WriteLine ("\t\t[UnmanagedFunctionPointer (CallingConvention.Cdecl)]");
sw.WriteLine ("\t\tdelegate " + MarshalReturnType + " " + Name + "Delegate (" + parms.ImportSignature + ");");
sw.WriteLine ();
sw.WriteLine ("\t\tstatic " + MarshalReturnType + " " + Name + "Callback (" + parms.ImportSignature + ")");
Expand Down
8 changes: 8 additions & 0 deletions gio/FileEnumerator.custom
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -63,3 +63,11 @@ class Enumerator : IEnumerator
throw new NotImplementedException ();
}
}

public override void Dispose ()
{
if (!IsClosed) {
Close (null);
}
base.Dispose ();
}