2005-06-08 Mike Kestner <mkestner@novell.com>

* generator/SimpleBase.cs : off-by-one in namespace join.
	* glib/ListBase.cs : support IntPtr element_type.
	* gnomevfs/FileInfo.cs : make it ManualGen friendly.
	* gnomevfs/*.cs : rework for FileInfo api changes.
	* gnomevfs/Gnomevfs.metadata : make FileInfo a manual symbol.
	* gnomevfs/Uri.custom : rework for FileInfo api changes.
	* gnome/Makefile.am : add gnomevfs dependency to pick up some more api
	symbols.
	* gnome/gnome-sharp-2.0.pc.in : advertise the vfs dep.
	[Fixes #71060]

svn path=/trunk/gtk-sharp/; revision=45702
This commit is contained in:
Mike Kestner 2005-06-09 14:27:48 +00:00
parent e24d72317a
commit 463618c958
21 changed files with 456 additions and 69 deletions

View file

@ -1,3 +1,16 @@
2005-06-08 Mike Kestner <mkestner@novell.com>
* generator/SimpleBase.cs : off-by-one in namespace join.
* glib/ListBase.cs : support IntPtr element_type.
* gnomevfs/FileInfo.cs : make it ManualGen friendly.
* gnomevfs/*.cs : rework for FileInfo api changes.
* gnomevfs/Gnomevfs.metadata : make FileInfo a manual symbol.
* gnomevfs/Uri.custom : rework for FileInfo api changes.
* gnome/Makefile.am : add gnomevfs dependency to pick up some more api
symbols.
* gnome/gnome-sharp-2.0.pc.in : advertise the vfs dep.
[Fixes #71060]
2005-06-08 Mike Kestner <mkestner@novell.com>
* generator/ReturnValue.cs : don't write a sem in FromNative.

View file

@ -1,5 +1,5 @@
<Type Name="AsyncSetFileInfoCallback" FullName="Gnome.Vfs.AsyncSetFileInfoCallback">
<TypeSignature Language="C#" Value="public delegate void AsyncSetFileInfoCallback();" />
<TypeSignature Language="C#" Value="public delegate void AsyncSetFileInfoCallback(Gnome.Vfs.AsyncHandle handle, Gnome.Vfs.Result result, Gnome.Vfs.FileInfo file_info);" />
<AssemblyInfo>
<AssemblyName>gnome-vfs-sharp</AssemblyName>
<AssemblyVersion>2.0.0.0</AssemblyVersion>
@ -7,11 +7,18 @@
<Base>
<BaseTypeName>System.Delegate</BaseTypeName>
</Base>
<Parameters />
<Parameters>
<Parameter Name="handle" Type="Gnome.Vfs.AsyncHandle" />
<Parameter Name="result" Type="Gnome.Vfs.Result" />
<Parameter Name="file_info" Type="Gnome.Vfs.FileInfo" />
</Parameters>
<ReturnValue>
<ReturnType>System.Void</ReturnType>
</ReturnValue>
<Docs>
<param name="handle">To be added.</param>
<param name="result">To be added.</param>
<param name="file_info">To be added.</param>
<summary>To be added.</summary>
<remarks>To be added.</remarks>
</Docs>

View file

@ -1,5 +1,5 @@
<Type Name="DirectoryVisitFunc" FullName="Gnome.Vfs.DirectoryVisitFunc">
<TypeSignature Language="C#" Value="public delegate bool DirectoryVisitFunc();" />
<TypeSignature Language="C#" Value="public delegate bool DirectoryVisitFunc(string rel_path, Gnome.Vfs.FileInfo info, bool recursing_will_loop, IntPtr data, out bool recurse);" />
<AssemblyInfo>
<AssemblyName>gnome-vfs-sharp</AssemblyName>
<AssemblyVersion>2.0.0.0</AssemblyVersion>
@ -7,11 +7,22 @@
<Base>
<BaseTypeName>System.Delegate</BaseTypeName>
</Base>
<Parameters />
<Parameters>
<Parameter Name="rel_path" Type="System.String" />
<Parameter Name="info" Type="Gnome.Vfs.FileInfo" />
<Parameter Name="recursing_will_loop" Type="System.Boolean" />
<Parameter Name="data" Type="System.IntPtr" />
<Parameter Name="recurse" Type="System.Boolean&amp;" RefType="out" />
</Parameters>
<ReturnValue>
<ReturnType>System.Boolean</ReturnType>
</ReturnValue>
<Docs>
<param name="rel_path">To be added.</param>
<param name="info">To be added.</param>
<param name="recursing_will_loop">To be added.</param>
<param name="data">To be added.</param>
<param name="recurse">To be added.</param>
<summary>To be added.</summary>
<returns>To be added.</returns>
<remarks>To be added.</remarks>

View file

@ -378,5 +378,50 @@
<remarks>To be added</remarks>
</Docs>
</Member>
<Member MemberName=".ctor">
<MemberSignature Language="C#" Value="public FileInfo ();" />
<MemberType>Constructor</MemberType>
<Parameters />
<Docs>
<summary>To be added.</summary>
<remarks>To be added.</remarks>
</Docs>
</Member>
<Member MemberName=".ctor">
<MemberSignature Language="C#" Value="public FileInfo (IntPtr handle);" />
<MemberType>Constructor</MemberType>
<Parameters>
<Parameter Name="handle" Type="System.IntPtr" />
</Parameters>
<Docs>
<param name="handle">To be added.</param>
<summary>To be added.</summary>
<remarks>To be added.</remarks>
</Docs>
</Member>
<Member MemberName="Clear">
<MemberSignature Language="C#" Value="public void Clear ();" />
<MemberType>Method</MemberType>
<ReturnValue>
<ReturnType>System.Void</ReturnType>
</ReturnValue>
<Parameters />
<Docs>
<summary>To be added.</summary>
<remarks>To be added.</remarks>
</Docs>
</Member>
<Member MemberName="Handle">
<MemberSignature Language="C#" Value="public IntPtr Handle { get; };" />
<MemberType>Property</MemberType>
<ReturnValue>
<ReturnType>System.IntPtr</ReturnType>
</ReturnValue>
<Docs>
<summary>To be added.</summary>
<value>To be added.</value>
<remarks>To be added.</remarks>
</Docs>
</Member>
</Members>
</Type>

View file

@ -456,6 +456,212 @@
<remarks>To be added.</remarks>
</Docs>
</Member>
<Member MemberName="SetFileInfo">
<MemberSignature Language="C#" Value="public static Gnome.Vfs.Result SetFileInfo (string text_uri, Gnome.Vfs.FileInfo info, Gnome.Vfs.SetFileInfoMask mask);" />
<MemberType>Method</MemberType>
<ReturnValue>
<ReturnType>Gnome.Vfs.Result</ReturnType>
</ReturnValue>
<Parameters>
<Parameter Name="text_uri" Type="System.String" />
<Parameter Name="info" Type="Gnome.Vfs.FileInfo" />
<Parameter Name="mask" Type="Gnome.Vfs.SetFileInfoMask" />
</Parameters>
<Docs>
<param name="text_uri">To be added.</param>
<param name="info">To be added.</param>
<param name="mask">To be added.</param>
<summary>To be added.</summary>
<returns>To be added.</returns>
<remarks>To be added.</remarks>
</Docs>
</Member>
<Member MemberName="SetFileInfoUri">
<MemberSignature Language="C#" Value="public static Gnome.Vfs.Result SetFileInfoUri (Gnome.Vfs.Uri uri, Gnome.Vfs.FileInfo info, Gnome.Vfs.SetFileInfoMask mask);" />
<MemberType>Method</MemberType>
<ReturnValue>
<ReturnType>Gnome.Vfs.Result</ReturnType>
</ReturnValue>
<Parameters>
<Parameter Name="uri" Type="Gnome.Vfs.Uri" />
<Parameter Name="info" Type="Gnome.Vfs.FileInfo" />
<Parameter Name="mask" Type="Gnome.Vfs.SetFileInfoMask" />
</Parameters>
<Docs>
<param name="uri">To be added.</param>
<param name="info">To be added.</param>
<param name="mask">To be added.</param>
<summary>To be added.</summary>
<returns>To be added.</returns>
<remarks>To be added.</remarks>
</Docs>
</Member>
<Member MemberName="GetFileInfoUri">
<MemberSignature Language="C#" Value="public static Gnome.Vfs.Result GetFileInfoUri (Gnome.Vfs.Uri uri, Gnome.Vfs.FileInfo info, Gnome.Vfs.FileInfoOptions options);" />
<MemberType>Method</MemberType>
<ReturnValue>
<ReturnType>Gnome.Vfs.Result</ReturnType>
</ReturnValue>
<Parameters>
<Parameter Name="uri" Type="Gnome.Vfs.Uri" />
<Parameter Name="info" Type="Gnome.Vfs.FileInfo" />
<Parameter Name="options" Type="Gnome.Vfs.FileInfoOptions" />
</Parameters>
<Docs>
<param name="uri">To be added.</param>
<param name="info">To be added.</param>
<param name="options">To be added.</param>
<summary>To be added.</summary>
<returns>To be added.</returns>
<remarks>To be added.</remarks>
</Docs>
</Member>
<Member MemberName="SetFileInfoCancellable">
<MemberSignature Language="C#" Value="public static Gnome.Vfs.Result SetFileInfoCancellable (Gnome.Vfs.Uri a, Gnome.Vfs.FileInfo info, Gnome.Vfs.SetFileInfoMask mask, Gnome.Vfs.Context context);" />
<MemberType>Method</MemberType>
<ReturnValue>
<ReturnType>Gnome.Vfs.Result</ReturnType>
</ReturnValue>
<Parameters>
<Parameter Name="a" Type="Gnome.Vfs.Uri" />
<Parameter Name="info" Type="Gnome.Vfs.FileInfo" />
<Parameter Name="mask" Type="Gnome.Vfs.SetFileInfoMask" />
<Parameter Name="context" Type="Gnome.Vfs.Context" />
</Parameters>
<Docs>
<param name="a">To be added.</param>
<param name="info">To be added.</param>
<param name="mask">To be added.</param>
<param name="context">To be added.</param>
<summary>To be added.</summary>
<returns>To be added.</returns>
<remarks>To be added.</remarks>
</Docs>
</Member>
<Member MemberName="SetMetaForList">
<MemberSignature Language="C#" Value="public static Gnome.Vfs.Result SetMetaForList (Gnome.Vfs.FileInfo info, string file_name, GLib.List meta_keys);" />
<MemberType>Method</MemberType>
<ReturnValue>
<ReturnType>Gnome.Vfs.Result</ReturnType>
</ReturnValue>
<Parameters>
<Parameter Name="info" Type="Gnome.Vfs.FileInfo" />
<Parameter Name="file_name" Type="System.String" />
<Parameter Name="meta_keys" Type="GLib.List" />
</Parameters>
<Docs>
<param name="info">To be added.</param>
<param name="file_name">To be added.</param>
<param name="meta_keys">To be added.</param>
<summary>To be added.</summary>
<returns>To be added.</returns>
<remarks>To be added.</remarks>
</Docs>
</Member>
<Member MemberName="SetMeta">
<MemberSignature Language="C#" Value="public static Gnome.Vfs.Result SetMeta (Gnome.Vfs.FileInfo info, string file_name, string meta_key);" />
<MemberType>Method</MemberType>
<ReturnValue>
<ReturnType>Gnome.Vfs.Result</ReturnType>
</ReturnValue>
<Parameters>
<Parameter Name="info" Type="Gnome.Vfs.FileInfo" />
<Parameter Name="file_name" Type="System.String" />
<Parameter Name="meta_key" Type="System.String" />
</Parameters>
<Docs>
<param name="info">To be added.</param>
<param name="file_name">To be added.</param>
<param name="meta_key">To be added.</param>
<summary>To be added.</summary>
<returns>To be added.</returns>
<remarks>To be added.</remarks>
</Docs>
</Member>
<Member MemberName="GetFileInfoFromHandleCancellable">
<MemberSignature Language="C#" Value="public static Gnome.Vfs.Result GetFileInfoFromHandleCancellable (Gnome.Vfs.Handle handle, Gnome.Vfs.FileInfo info, Gnome.Vfs.FileInfoOptions options, Gnome.Vfs.Context context);" />
<MemberType>Method</MemberType>
<ReturnValue>
<ReturnType>Gnome.Vfs.Result</ReturnType>
</ReturnValue>
<Parameters>
<Parameter Name="handle" Type="Gnome.Vfs.Handle" />
<Parameter Name="info" Type="Gnome.Vfs.FileInfo" />
<Parameter Name="options" Type="Gnome.Vfs.FileInfoOptions" />
<Parameter Name="context" Type="Gnome.Vfs.Context" />
</Parameters>
<Docs>
<param name="handle">To be added.</param>
<param name="info">To be added.</param>
<param name="options">To be added.</param>
<param name="context">To be added.</param>
<summary>To be added.</summary>
<returns>To be added.</returns>
<remarks>To be added.</remarks>
</Docs>
</Member>
<Member MemberName="GetFileInfoFromHandle">
<MemberSignature Language="C#" Value="public static Gnome.Vfs.Result GetFileInfoFromHandle (Gnome.Vfs.Handle handle, Gnome.Vfs.FileInfo info, Gnome.Vfs.FileInfoOptions options);" />
<MemberType>Method</MemberType>
<ReturnValue>
<ReturnType>Gnome.Vfs.Result</ReturnType>
</ReturnValue>
<Parameters>
<Parameter Name="handle" Type="Gnome.Vfs.Handle" />
<Parameter Name="info" Type="Gnome.Vfs.FileInfo" />
<Parameter Name="options" Type="Gnome.Vfs.FileInfoOptions" />
</Parameters>
<Docs>
<param name="handle">To be added.</param>
<param name="info">To be added.</param>
<param name="options">To be added.</param>
<summary>To be added.</summary>
<returns>To be added.</returns>
<remarks>To be added.</remarks>
</Docs>
</Member>
<Member MemberName="GetFileInfoUriCancellable">
<MemberSignature Language="C#" Value="public static Gnome.Vfs.Result GetFileInfoUriCancellable (Gnome.Vfs.Uri uri, Gnome.Vfs.FileInfo info, Gnome.Vfs.FileInfoOptions options, Gnome.Vfs.Context context);" />
<MemberType>Method</MemberType>
<ReturnValue>
<ReturnType>Gnome.Vfs.Result</ReturnType>
</ReturnValue>
<Parameters>
<Parameter Name="uri" Type="Gnome.Vfs.Uri" />
<Parameter Name="info" Type="Gnome.Vfs.FileInfo" />
<Parameter Name="options" Type="Gnome.Vfs.FileInfoOptions" />
<Parameter Name="context" Type="Gnome.Vfs.Context" />
</Parameters>
<Docs>
<param name="uri">To be added.</param>
<param name="info">To be added.</param>
<param name="options">To be added.</param>
<param name="context">To be added.</param>
<summary>To be added.</summary>
<returns>To be added.</returns>
<remarks>To be added.</remarks>
</Docs>
</Member>
<Member MemberName="GetFileInfo">
<MemberSignature Language="C#" Value="public static Gnome.Vfs.Result GetFileInfo (string text_uri, Gnome.Vfs.FileInfo info, Gnome.Vfs.FileInfoOptions options);" />
<MemberType>Method</MemberType>
<ReturnValue>
<ReturnType>Gnome.Vfs.Result</ReturnType>
</ReturnValue>
<Parameters>
<Parameter Name="text_uri" Type="System.String" />
<Parameter Name="info" Type="Gnome.Vfs.FileInfo" />
<Parameter Name="options" Type="Gnome.Vfs.FileInfoOptions" />
</Parameters>
<Docs>
<param name="text_uri">To be added.</param>
<param name="info">To be added.</param>
<param name="options">To be added.</param>
<summary>To be added.</summary>
<returns>To be added.</returns>
<remarks>To be added.</remarks>
</Docs>
</Member>
</Members>
<Docs>
<summary>To be added.</summary>

View file

@ -1,5 +1,5 @@
<Type Name="MethodGetFileInfoFromHandleFunc" FullName="Gnome.Vfs.MethodGetFileInfoFromHandleFunc">
<TypeSignature Language="C#" Value="public delegate Gnome.Vfs.Result MethodGetFileInfoFromHandleFunc();" />
<TypeSignature Language="C#" Value="public delegate Gnome.Vfs.Result MethodGetFileInfoFromHandleFunc(Gnome.Vfs.Method method, IntPtr method_handle, Gnome.Vfs.FileInfo file_info, Gnome.Vfs.FileInfoOptions options, Gnome.Vfs.Context context);" />
<AssemblyInfo>
<AssemblyName>gnome-vfs-sharp</AssemblyName>
<AssemblyVersion>2.0.0.0</AssemblyVersion>
@ -7,11 +7,22 @@
<Base>
<BaseTypeName>System.Delegate</BaseTypeName>
</Base>
<Parameters />
<Parameters>
<Parameter Name="method" Type="Gnome.Vfs.Method" />
<Parameter Name="method_handle" Type="System.IntPtr" />
<Parameter Name="file_info" Type="Gnome.Vfs.FileInfo" />
<Parameter Name="options" Type="Gnome.Vfs.FileInfoOptions" />
<Parameter Name="context" Type="Gnome.Vfs.Context" />
</Parameters>
<ReturnValue>
<ReturnType>Gnome.Vfs.Result</ReturnType>
</ReturnValue>
<Docs>
<param name="method">To be added.</param>
<param name="method_handle">To be added.</param>
<param name="file_info">To be added.</param>
<param name="options">To be added.</param>
<param name="context">To be added.</param>
<summary>To be added.</summary>
<returns>To be added.</returns>
<remarks>To be added.</remarks>

View file

@ -1,5 +1,5 @@
<Type Name="MethodGetFileInfoFunc" FullName="Gnome.Vfs.MethodGetFileInfoFunc">
<TypeSignature Language="C#" Value="public delegate Gnome.Vfs.Result MethodGetFileInfoFunc();" />
<TypeSignature Language="C#" Value="public delegate Gnome.Vfs.Result MethodGetFileInfoFunc(Gnome.Vfs.Method method, Gnome.Vfs.Uri uri, Gnome.Vfs.FileInfo file_info, Gnome.Vfs.FileInfoOptions options, Gnome.Vfs.Context context);" />
<AssemblyInfo>
<AssemblyName>gnome-vfs-sharp</AssemblyName>
<AssemblyVersion>2.0.0.0</AssemblyVersion>
@ -7,11 +7,22 @@
<Base>
<BaseTypeName>System.Delegate</BaseTypeName>
</Base>
<Parameters />
<Parameters>
<Parameter Name="method" Type="Gnome.Vfs.Method" />
<Parameter Name="uri" Type="Gnome.Vfs.Uri" />
<Parameter Name="file_info" Type="Gnome.Vfs.FileInfo" />
<Parameter Name="options" Type="Gnome.Vfs.FileInfoOptions" />
<Parameter Name="context" Type="Gnome.Vfs.Context" />
</Parameters>
<ReturnValue>
<ReturnType>Gnome.Vfs.Result</ReturnType>
</ReturnValue>
<Docs>
<param name="method">To be added.</param>
<param name="uri">To be added.</param>
<param name="file_info">To be added.</param>
<param name="options">To be added.</param>
<param name="context">To be added.</param>
<summary>To be added.</summary>
<returns>To be added.</returns>
<remarks>To be added.</remarks>

View file

@ -1,5 +1,5 @@
<Type Name="MethodReadDirectoryFunc" FullName="Gnome.Vfs.MethodReadDirectoryFunc">
<TypeSignature Language="C#" Value="public delegate Gnome.Vfs.Result MethodReadDirectoryFunc();" />
<TypeSignature Language="C#" Value="public delegate Gnome.Vfs.Result MethodReadDirectoryFunc(Gnome.Vfs.Method method, IntPtr method_handle, Gnome.Vfs.FileInfo file_info, Gnome.Vfs.Context context);" />
<AssemblyInfo>
<AssemblyName>gnome-vfs-sharp</AssemblyName>
<AssemblyVersion>2.0.0.0</AssemblyVersion>
@ -7,11 +7,20 @@
<Base>
<BaseTypeName>System.Delegate</BaseTypeName>
</Base>
<Parameters />
<Parameters>
<Parameter Name="method" Type="Gnome.Vfs.Method" />
<Parameter Name="method_handle" Type="System.IntPtr" />
<Parameter Name="file_info" Type="Gnome.Vfs.FileInfo" />
<Parameter Name="context" Type="Gnome.Vfs.Context" />
</Parameters>
<ReturnValue>
<ReturnType>Gnome.Vfs.Result</ReturnType>
</ReturnValue>
<Docs>
<param name="method">To be added.</param>
<param name="method_handle">To be added.</param>
<param name="file_info">To be added.</param>
<param name="context">To be added.</param>
<summary>To be added.</summary>
<returns>To be added.</returns>
<remarks>To be added.</remarks>

View file

@ -1,5 +1,5 @@
<Type Name="MethodSetFileInfo" FullName="Gnome.Vfs.MethodSetFileInfo">
<TypeSignature Language="C#" Value="public delegate Gnome.Vfs.Result MethodSetFileInfo();" />
<TypeSignature Language="C#" Value="public delegate Gnome.Vfs.Result MethodSetFileInfo(Gnome.Vfs.Method method, Gnome.Vfs.Uri a, Gnome.Vfs.FileInfo info, Gnome.Vfs.SetFileInfoMask mask, Gnome.Vfs.Context context);" />
<AssemblyInfo>
<AssemblyName>gnome-vfs-sharp</AssemblyName>
<AssemblyVersion>2.0.0.0</AssemblyVersion>
@ -7,11 +7,22 @@
<Base>
<BaseTypeName>System.Delegate</BaseTypeName>
</Base>
<Parameters />
<Parameters>
<Parameter Name="method" Type="Gnome.Vfs.Method" />
<Parameter Name="a" Type="Gnome.Vfs.Uri" />
<Parameter Name="info" Type="Gnome.Vfs.FileInfo" />
<Parameter Name="mask" Type="Gnome.Vfs.SetFileInfoMask" />
<Parameter Name="context" Type="Gnome.Vfs.Context" />
</Parameters>
<ReturnValue>
<ReturnType>Gnome.Vfs.Result</ReturnType>
</ReturnValue>
<Docs>
<param name="method">To be added.</param>
<param name="a">To be added.</param>
<param name="info">To be added.</param>
<param name="mask">To be added.</param>
<param name="context">To be added.</param>
<summary>To be added.</summary>
<returns>To be added.</returns>
<remarks>To be added.</remarks>

View file

@ -1,11 +1,14 @@
<Type Name="GdkPixbufLoadCallback" FullName="Gnome.GdkPixbufLoadCallback">
<TypeSignature Language="C#" Maintainer="auto" Value="public delegate void GdkPixbufLoadCallback();" />
<TypeSignature Language="C#" Maintainer="auto" Value="public delegate void GdkPixbufLoadCallback(Gnome.GdkPixbufAsyncHandle handle, Gnome.Vfs.Result error, Gdk.Pixbuf pixbuf);" />
<AssemblyInfo>
<AssemblyName>gnome-sharp</AssemblyName>
<AssemblyVersion>2.0.0.0</AssemblyVersion>
</AssemblyInfo>
<ThreadSafetyStatement>Gtk# is thread aware, but not thread safe; See the <link location="node:gtk-sharp/programming/threads">Gtk# Thread Programming</link> for details.</ThreadSafetyStatement>
<Docs>
<param name="handle">To be added.</param>
<param name="error">To be added.</param>
<param name="pixbuf">To be added.</param>
<summary>To be added</summary>
<remarks>To be added</remarks>
</Docs>
@ -14,6 +17,9 @@
</Base>
<Members />
<Parameters>
<Parameter Name="handle" Type="Gnome.GdkPixbufAsyncHandle" />
<Parameter Name="error" Type="Gnome.Vfs.Result" />
<Parameter Name="pixbuf" Type="Gdk.Pixbuf" />
</Parameters>
<ReturnValue>
<ReturnType>System.Void</ReturnType>

View file

@ -52,5 +52,35 @@
<remarks>To be added</remarks>
</Docs>
</Member>
<Member MemberName="Lookup">
<MemberSignature Language="C#" Value="public static string Lookup (Gtk.IconTheme icon_theme, Gnome.ThumbnailFactory thumbnail_factory, string file_uri, string custom_icon, Gnome.Vfs.FileInfo file_info, string mime_type, Gnome.IconLookupFlags flags, out Gnome.IconLookupResultFlags result);" />
<MemberType>Method</MemberType>
<ReturnValue>
<ReturnType>System.String</ReturnType>
</ReturnValue>
<Parameters>
<Parameter Name="icon_theme" Type="Gtk.IconTheme" />
<Parameter Name="thumbnail_factory" Type="Gnome.ThumbnailFactory" />
<Parameter Name="file_uri" Type="System.String" />
<Parameter Name="custom_icon" Type="System.String" />
<Parameter Name="file_info" Type="Gnome.Vfs.FileInfo" />
<Parameter Name="mime_type" Type="System.String" />
<Parameter Name="flags" Type="Gnome.IconLookupFlags" />
<Parameter Name="result" Type="Gnome.IconLookupResultFlags&amp;" RefType="out" />
</Parameters>
<Docs>
<param name="icon_theme">To be added.</param>
<param name="thumbnail_factory">To be added.</param>
<param name="file_uri">To be added.</param>
<param name="custom_icon">To be added.</param>
<param name="file_info">To be added.</param>
<param name="mime_type">To be added.</param>
<param name="flags">To be added.</param>
<param name="result">To be added.</param>
<summary>To be added.</summary>
<returns>To be added.</returns>
<remarks>To be added.</remarks>
</Docs>
</Member>
</Members>
</Type>

View file

@ -35,7 +35,7 @@ namespace GtkSharp.Generation {
this.ctype = ctype;
this.type = toks[toks.Length - 1];
if (toks.Length > 2)
this.ns = String.Join (".", toks, 0, toks.Length - 2);
this.ns = String.Join (".", toks, 0, toks.Length - 1);
else if (toks.Length == 2)
this.ns = toks[0];
}

View file

@ -147,6 +147,8 @@ namespace GLib {
ret = Marshaller.Utf8PtrToString (data);
else if (element_type == typeof (FilenameString))
ret = Marshaller.FilenamePtrToString (data);
else if (element_type == typeof (IntPtr))
ret = data;
else if (element_type.IsSubclassOf (typeof (GLib.Object)))
ret = GLib.Object.GetObject (data, false);
else if (element_type == typeof (int))

View file

@ -8,10 +8,10 @@ else
pkg =
endif
INCLUDE_API = ../pango/pango-api.xml ../atk/atk-api.xml ../gdk/gdk-api.xml ../gtk/gtk-api.xml ../art/art-api.xml
INCLUDE_API = ../pango/pango-api.xml ../atk/atk-api.xml ../gdk/gdk-api.xml ../gtk/gtk-api.xml ../art/art-api.xml ../gnomevfs/gnome-vfs-api.xml
METADATA = Gnome.metadata
SYMBOLS =
references = ../glib/glib-sharp.dll ../pango/pango-sharp.dll ../atk/atk-sharp.dll ../gdk/gdk-sharp.dll ../gtk/gtk-sharp.dll ../art/art-sharp.dll
references = ../glib/glib-sharp.dll ../pango/pango-sharp.dll ../atk/atk-sharp.dll ../gdk/gdk-sharp.dll ../gtk/gtk-sharp.dll ../art/art-sharp.dll ../gnomevfs/gnome-vfs-sharp.dll
glue_includes = gnome.h,libgnomeprint/gnome-print.h,libgnomeprint/gnome-print-paper.h
sources = \

View file

@ -7,6 +7,6 @@ gapidir=${prefix}/share/gapi-2.0
Name: Gnome#
Description: Gnome# - GNOME .NET Binding
Version: @VERSION@
Requires: gtk-sharp-2.0 art-sharp-2.0
Requires: gtk-sharp-2.0 art-sharp-2.0 gnome-vfs-sharp-2.0
Cflags: -I:${gapidir}/gnome-api.xml
Libs: -r:${libdir}/mono/@PACKAGE_VERSION@/gnome-sharp.dll

View file

@ -29,10 +29,11 @@ namespace Gnome.Vfs {
public void NativeCallback (IntPtr handle, Result result, IntPtr list, uint entries_read, IntPtr data)
{
GLib.List infos = new GLib.List (list, typeof (FileInfo.FileInfoNative));
GLib.List infos = new GLib.List (list, typeof (IntPtr));
FileInfo[] entries = new FileInfo [infos.Count];
for (int i = 0; i < infos.Count; i++)
entries[i] = new FileInfo ((FileInfo.FileInfoNative) infos [i]);
int i = 0;
foreach (IntPtr info in infos)
entries[i++] = new FileInfo (info);
_managed (result, entries, entries_read);
}

View file

@ -44,20 +44,18 @@ namespace Gnome.Vfs {
[DllImport ("gnomevfs-2")]
private static extern Result gnome_vfs_directory_list_load (out IntPtr list, string uri, FileInfoOptions options);
[DllImport ("gnomevfs-2")]
private static extern void gnome_vfs_file_info_list_free (IntPtr list);
public static FileInfo[] GetEntries (string text_uri, FileInfoOptions options)
{
IntPtr raw_ret;
Result result = gnome_vfs_directory_list_load (out raw_ret, text_uri, options);
Vfs.ThrowException (text_uri, result);
GLib.List list = new GLib.List (raw_ret, typeof (FileInfo.FileInfoNative));
GLib.List list = new GLib.List (raw_ret, typeof (IntPtr));
list.Managed = true;
FileInfo[] entries = new FileInfo [list.Count];
for (int i = 0; i < list.Count; i++)
entries[i] = new FileInfo ((FileInfo.FileInfoNative) list [i]);
gnome_vfs_file_info_list_free (raw_ret);
int i = 0;
foreach (IntPtr info in list)
entries[i++] = new FileInfo (info);
return entries;
}

View file

@ -51,21 +51,30 @@ namespace Gnome.Vfs {
public IntPtr reserved5;
}
// This needs to be internal so other Gnome.Vfs code can use it for native calls.
internal FileInfoNative info;
IntPtr handle;
bool needs_dispose = false;
[DllImport ("gnomevfs-2")]
private static extern FileInfoNative gnome_vfs_file_info_new ();
private static extern void gnome_vfs_file_info_unref (IntPtr handle);
[DllImport ("gnomevfs-2")]
private static extern void gnome_vfs_file_info_copy (ref FileInfoNative dest, ref FileInfoNative src);
[DllImport ("gnomevfs-2")]
private static extern Result gnome_vfs_get_file_info_uri (IntPtr uri, ref FileInfoNative info, FileInfoOptions options);
internal FileInfo (FileInfoNative info)
~FileInfo ()
{
gnome_vfs_file_info_copy (ref this.info, ref info);
if (needs_dispose)
gnome_vfs_file_info_unref (Handle);
}
[DllImport ("gnomevfs-2")]
private static extern IntPtr gnome_vfs_file_info_new ();
public FileInfo ()
{
needs_dispose = true;
handle = gnome_vfs_file_info_new ();
}
public FileInfo (IntPtr handle)
{
this.handle = handle;
}
public FileInfo (string uri) : this (uri, FileInfoOptions.Default) {}
@ -74,24 +83,30 @@ namespace Gnome.Vfs {
public FileInfo (Uri uri) : this (uri, FileInfoOptions.Default) {}
public FileInfo (Uri uri, FileInfoOptions options)
{
info = gnome_vfs_file_info_new ();
[DllImport ("gnomevfs-2")]
private static extern Result gnome_vfs_get_file_info_uri (IntPtr uri, IntPtr info, int options);
Result result = gnome_vfs_get_file_info_uri (uri.Handle, ref info, options);
public FileInfo (Uri uri, FileInfoOptions options) : this ()
{
Result result = gnome_vfs_get_file_info_uri (uri.Handle, Handle, (int) options);
Vfs.ThrowException (uri, result);
}
[DllImport ("gnomevfs-2")]
private static extern void gnome_vfs_file_info_clear (ref FileInfoNative info);
~FileInfo ()
{
gnome_vfs_file_info_clear (ref info);
FileInfoNative Native {
get {
return (FileInfoNative) Marshal.PtrToStructure (handle, typeof (FileInfoNative));
}
}
public IntPtr Handle {
get {
return handle;
}
}
public string Name {
get {
FileInfoNative info = Native;
if (info.name != IntPtr.Zero)
return GLib.Marshaller.Utf8PtrToString (info.name);
else
@ -101,14 +116,14 @@ namespace Gnome.Vfs {
public FileInfoFields ValidFields {
get {
return info.valid_fields;
return Native.valid_fields;
}
}
public FileType Type {
get {
if ((ValidFields & FileInfoFields.Type) != 0)
return info.type;
return Native.type;
else
throw new ArgumentException ("Type is not set");
}
@ -117,7 +132,7 @@ namespace Gnome.Vfs {
public FilePermissions Permissions {
get {
if ((ValidFields & FileInfoFields.Permissions) != 0)
return info.permissions;
return Native.permissions;
else
throw new ArgumentException ("Permissions is not set");
}
@ -126,7 +141,7 @@ namespace Gnome.Vfs {
public FileFlags Flags {
get {
if ((ValidFields & FileInfoFields.Flags) != 0)
return info.flags;
return Native.flags;
else
throw new ArgumentException ("Flags is not set");
}
@ -135,7 +150,7 @@ namespace Gnome.Vfs {
public long Device {
get {
if ((ValidFields & FileInfoFields.Device) != 0)
return info.dev_t;
return Native.dev_t;
else
throw new ArgumentException ("Device is not set");
}
@ -144,7 +159,7 @@ namespace Gnome.Vfs {
public long Inode {
get {
if ((ValidFields & FileInfoFields.Inode) != 0)
return info.inode;
return Native.inode;
else
throw new ArgumentException ("Inode is not set");
}
@ -153,7 +168,7 @@ namespace Gnome.Vfs {
public uint LinkCount {
get {
if ((ValidFields & FileInfoFields.LinkCount) != 0)
return info.link_count;
return Native.link_count;
else
throw new ArgumentException ("LinkCount is not set");
}
@ -161,20 +176,20 @@ namespace Gnome.Vfs {
public uint Uid {
get {
return info.uid;
return Native.uid;
}
}
public uint Gid {
get {
return info.gid;
return Native.gid;
}
}
public long Size {
get {
if ((ValidFields & FileInfoFields.Size) != 0)
return info.size;
return Native.size;
else
throw new ArgumentException ("Size is not set");
}
@ -183,7 +198,7 @@ namespace Gnome.Vfs {
public long BlockCount {
get {
if ((ValidFields & FileInfoFields.BlockCount) != 0)
return info.block_count;
return Native.block_count;
else
throw new ArgumentException ("BlockCount is not set");
}
@ -192,7 +207,7 @@ namespace Gnome.Vfs {
public uint IoBlockSize {
get {
if ((ValidFields & FileInfoFields.IoBlockSize) != 0)
return info.io_block_size;
return Native.io_block_size;
else
throw new ArgumentException ("IoBlockSize is not set");
}
@ -201,7 +216,7 @@ namespace Gnome.Vfs {
public System.DateTime Atime {
get {
if ((ValidFields & FileInfoFields.Atime) != 0)
return GLib.Marshaller.time_tToDateTime (info.atime);
return GLib.Marshaller.time_tToDateTime (Native.atime);
else
throw new ArgumentException ("Atime is not set");
}
@ -210,7 +225,7 @@ namespace Gnome.Vfs {
public System.DateTime Mtime {
get {
if ((ValidFields & FileInfoFields.Mtime) != 0)
return GLib.Marshaller.time_tToDateTime (info.mtime);
return GLib.Marshaller.time_tToDateTime (Native.mtime);
else
throw new ArgumentException ("Mtime is not set");
}
@ -219,7 +234,7 @@ namespace Gnome.Vfs {
public System.DateTime Ctime {
get {
if ((ValidFields & FileInfoFields.Ctime) != 0)
return GLib.Marshaller.time_tToDateTime (info.ctime);
return GLib.Marshaller.time_tToDateTime (Native.ctime);
else
throw new ArgumentException ("Ctime is not set");
}
@ -227,6 +242,7 @@ namespace Gnome.Vfs {
public string SymlinkName {
get {
FileInfoNative info = Native;
if ((ValidFields & FileInfoFields.SymlinkName) != 0 &&
info.symlink_name != IntPtr.Zero)
return GLib.Marshaller.Utf8PtrToString (info.symlink_name);
@ -237,6 +253,7 @@ namespace Gnome.Vfs {
public string MimeType {
get {
FileInfoNative info = Native;
if ((ValidFields & FileInfoFields.MimeType) != 0 &&
info.mime_type != IntPtr.Zero)
return GLib.Marshaller.Utf8PtrToString (info.mime_type);
@ -280,8 +297,17 @@ namespace Gnome.Vfs {
}
}
[DllImport ("gnomevfs-2")]
private static extern void gnome_vfs_file_info_clear (IntPtr info);
public void Clear ()
{
gnome_vfs_file_info_clear (Handle);
}
public override String ToString ()
{
FileInfoNative info = Native;
string result = "Name = " + Name + "\n" +
"ValidFields = " + info.valid_fields + "\n";
if ((ValidFields & FileInfoFields.Type) != 0)
@ -291,7 +317,7 @@ namespace Gnome.Vfs {
if ((ValidFields & FileInfoFields.Flags) != 0) {
result += "Flags = ";
bool flag = false;
if ((Flags & FileFlags.None) != 0) {
if (Flags == FileFlags.None) {
result += "None";
flag = true;
}

View file

@ -61,7 +61,7 @@
<attr path="/api/namespace/struct[@cname='GnomeVFSCancellation']" name="hidden">1</attr>
<attr path="/api/namespace/struct[@cname='GnomeVFSContext']" name="opaque">1</attr>
<attr path="/api/namespace/struct[@cname='GnomeVFSDirectoryHandle']" name="hidden">1</attr>
<attr path="/api/namespace/struct[@cname='GnomeVFSFileInfo']" name="hidden">1</attr>
<remove-node path="/api/namespace/struct[@cname='GnomeVFSFileInfo']" />
<attr path="/api/namespace/struct[@cname='GnomeVFSFindDirectoryResult']" name="hidden">1</attr>
<attr path="/api/namespace/struct[@cname='GnomeVFSGetFileInfoResult']" name="hidden">1</attr>
<attr path="/api/namespace/struct[@cname='GnomeVFSHandle']" name="opaque">1</attr>
@ -110,4 +110,5 @@
<attr path="/api/namespace/struct[@cname='GnomeVFSUnixMountPoint']" name="hidden">1</attr>
<attr path="/api/namespace/struct[@cname='XdgGlobHash']" name="hidden">1</attr>
<attr path="/api/namespace/struct[@cname='XdgMimeMagic']" name="hidden">1</attr>
<add-node path="/api"><symbol type="manual" cname="GnomeVFSFileInfo" name="Gnome.Vfs.FileInfo"/></add-node>
</metadata>

View file

@ -47,11 +47,11 @@
}
[DllImport("gnomevfs-2")]
static extern Result gnome_vfs_set_file_info_uri (IntPtr raw, ref FileInfo.FileInfoNative info, SetFileInfoMask mask);
static extern Result gnome_vfs_set_file_info_uri (IntPtr raw, IntPtr info, SetFileInfoMask mask);
public Result SetFileInfo (FileInfo info, SetFileInfoMask mask)
{
return gnome_vfs_set_file_info_uri (Handle, ref info.info, mask);
return gnome_vfs_set_file_info_uri (Handle, info.Handle, mask);
}
[DllImport("gnomevfs-2")]

View file

@ -306,7 +306,6 @@ namespace Gnome.Vfs {
}
this.mode = mode;
this.access = access;
this.canseek = true;
this.async = async;
}