[Mono-devel-list] gtk-sharp patch for DllImport mappings

Urs C Muff umuff at fc1.quark.com
Fri May 21 11:02:24 EDT 2004


Index: glib/DelegateWrapper.cs
===================================================================
RCS file: /mono/gtk-sharp/glib/DelegateWrapper.cs,v
retrieving revision 1.3
diff -u -r1.3 DelegateWrapper.cs
--- glib/DelegateWrapper.cs	18 Sep 2003 03:49:18 -0000	1.3
+++ glib/DelegateWrapper.cs	21 May 2004 15:02:09 -0000
@@ -63,7 +63,7 @@
 
 		private delegate void DestroyNotify (IntPtr data);
 
-		[DllImport("libgobject-2.0-0.dll")]
+		[DllImport("gobject-2.0")]
 		private static extern void g_object_set_data (IntPtr obj, string name, IntPtr data, DestroyNotify destroy);
 		
 		private void AddDestroyNotify (GLib.Object o) {
Index: glib/FileUtils.cs
===================================================================
RCS file: /mono/gtk-sharp/glib/FileUtils.cs,v
retrieving revision 1.3
diff -u -r1.3 FileUtils.cs
--- glib/FileUtils.cs	28 Nov 2003 05:29:34 -0000	1.3
+++ glib/FileUtils.cs	21 May 2004 15:02:09 -0000
@@ -12,7 +12,7 @@
 
 	public class FileUtils
 	{
-		[DllImport("libglib-2.0-0.dll")]
+		[DllImport("glib-2.0")]
 		extern static bool g_file_get_contents (string filename, out IntPtr contents, out int length, out IntPtr error);
 
 		public static string GetFileContents (string filename)
Index: glib/GException.cs
===================================================================
RCS file: /mono/gtk-sharp/glib/GException.cs,v
retrieving revision 1.6
diff -u -r1.6 GException.cs
--- glib/GException.cs	12 Mar 2004 21:18:07 -0000	1.6
+++ glib/GException.cs	21 May 2004 15:02:09 -0000
@@ -26,7 +26,7 @@
 			}
 		}
 
-		[DllImport("libglib-2.0-0.dll")]
+		[DllImport("glib-2.0")]
 		static extern void g_clear_error (ref IntPtr errptr);
 		~GException ()
 		{
Index: glib/Idle.cs
===================================================================
RCS file: /mono/gtk-sharp/glib/Idle.cs,v
retrieving revision 1.4
diff -u -r1.4 Idle.cs
--- glib/Idle.cs	24 Dec 2003 19:37:41 -0000	1.4
+++ glib/Idle.cs	21 May 2004 15:02:09 -0000
@@ -37,7 +37,7 @@
 		{
 		}
 		
-		[DllImport("libglib-2.0-0.dll")]
+		[DllImport("glib-2.0")]
 		static extern uint g_idle_add (IdleHandler d, IntPtr data);
 
 		public static uint Add (IdleHandler hndlr)
@@ -45,7 +45,7 @@
 			return g_idle_add (hndlr, IntPtr.Zero);
 		}
 		
-		[DllImport("libglib-2.0-0.dll")]
+		[DllImport("glib-2.0")]
 		static extern bool g_source_remove_by_funcs_user_data (IdleHandler d, IntPtr data);
                                                                                 
 		public static bool Remove (IdleHandler hndlr)
Index: glib/List.cs
===================================================================
RCS file: /mono/gtk-sharp/glib/List.cs,v
retrieving revision 1.7
diff -u -r1.7 List.cs
--- glib/List.cs	12 Mar 2004 21:18:07 -0000	1.7
+++ glib/List.cs	21 May 2004 15:02:09 -0000
@@ -19,7 +19,7 @@
 
 	public class List : ListBase {
 
-		[DllImport("libglib-2.0-0.dll")]
+		[DllImport("glib-2.0")]
 		static extern IntPtr g_list_copy (IntPtr l);
 		
 		public override object Clone ()
@@ -43,7 +43,7 @@
 			return gtksharp_list_get_next (current);
 		}
 
-		[DllImport("libglib-2.0-0.dll")]
+		[DllImport("glib-2.0")]
 		static extern int g_list_length (IntPtr l);
 		
 		internal override int Length (IntPtr list)
@@ -51,7 +51,7 @@
 			return g_list_length (list);
 		}
 		
-		[DllImport("libglib-2.0-0.dll")]
+		[DllImport("glib-2.0")]
 		static extern void g_list_free(IntPtr l);
 
 		internal override void Free (IntPtr list)
@@ -60,7 +60,7 @@
 				g_list_free (list);
 		}
 
-		[DllImport("libglib-2.0-0.dll")]
+		[DllImport("glib-2.0")]
 		static extern IntPtr g_list_append (IntPtr l, IntPtr raw);
 
 		internal override IntPtr Append (IntPtr list, IntPtr raw)
@@ -68,7 +68,7 @@
 			return g_list_append (list, raw);
 		}
 
-		[DllImport("libglib-2.0-0.dll")]
+		[DllImport("glib-2.0")]
 		static extern IntPtr g_list_prepend (IntPtr l, IntPtr raw);
 
 		internal override IntPtr Prepend (IntPtr list, IntPtr raw)
@@ -76,7 +76,7 @@
 			return g_list_prepend (list, raw);
 		}
 
-		[DllImport("libglib-2.0-0.dll")]
+		[DllImport("glib-2.0")]
 	        static extern IntPtr g_list_nth_data (IntPtr l, uint n);
 
 		internal override IntPtr NthData (uint n)
Index: glib/Log.cs
===================================================================
RCS file: /mono/gtk-sharp/glib/Log.cs,v
retrieving revision 1.5
diff -u -r1.5 Log.cs
--- glib/Log.cs	28 Nov 2003 05:29:34 -0000	1.5
+++ glib/Log.cs	21 May 2004 15:02:09 -0000
@@ -53,7 +53,7 @@
 				handlers = new Hashtable ();
 		}
 
-		[DllImport("libglib-2.0-0.dll")]
+		[DllImport("glib-2.0")]
 		static extern void g_logv (string log_domain, LogLevelFlags flags, string message);
 		
 		public void WriteLog (string logDomain, LogLevelFlags flags, string format, params object [] args)
@@ -61,7 +61,7 @@
 			g_logv (logDomain, flags, String.Format (format, args));
 		}
 
-		[DllImport("libglib-2.0-0.dll")]
+		[DllImport("glib-2.0")]
 		static extern uint g_log_set_handler (string log_domain,
 						      LogLevelFlags flags,
 						      LogFunc log_func,
@@ -79,7 +79,7 @@
 			return result;
 		}
 
-		[DllImport("libglib-2.0-0.dll")]
+		[DllImport("glib-2.0")]
 		static extern uint g_log_remove_handler (string log_domain, uint handler_id);
 
 		public static void RemoveLogHandler (string logDomain, uint handlerID)
@@ -91,7 +91,7 @@
 		}
 
 
-		[DllImport("libglib-2.0-0.dll")]
+		[DllImport("glib-2.0")]
 		static extern PrintFunc g_set_print_handler (PrintFunc handler);
 
 		public static PrintFunc SetPrintHandler (PrintFunc handler)
@@ -102,7 +102,7 @@
 			return g_set_print_handler (handler);
 		}
 		
-		[DllImport("libglib-2.0-0.dll")]
+		[DllImport("glib-2.0")]
 		static extern PrintFunc g_set_printerr_handler (PrintFunc handler);
 
 		public static PrintFunc SetPrintErrorHandler (PrintFunc handler)
@@ -113,7 +113,7 @@
 			return g_set_printerr_handler (handler);
 		}
 		
-		[DllImport("libglib-2.0-0.dll")]
+		[DllImport("glib-2.0")]
 		static extern void g_log_default_handler (string log_domain,
 							  LogLevelFlags log_level,
 							  string message,
@@ -127,7 +127,7 @@
 			g_log_default_handler (logDomain, logLevel, message, IntPtr.Zero);
 		}
 
-		[DllImport("libglib-2.0-0.dll")]
+		[DllImport("glib-2.0")]
 		extern static LogLevelFlags g_log_set_always_fatal (LogLevelFlags fatal_mask);
 		
 		public static LogLevelFlags SetAlwaysFatal (LogLevelFlags fatalMask)
@@ -135,7 +135,7 @@
 			return g_log_set_always_fatal (fatalMask);
 		}
 
-		[DllImport("libglib-2.0-0.dll")]
+		[DllImport("glib-2.0")]
 		extern static LogLevelFlags g_log_set_fatal_mask (string log_domain, LogLevelFlags fatal_mask);
 		
 		public static LogLevelFlags SetAlwaysFatal (string logDomain, LogLevelFlags fatalMask)
Index: glib/MainContext.cs
===================================================================
RCS file: /mono/gtk-sharp/glib/MainContext.cs,v
retrieving revision 1.2
diff -u -r1.2 MainContext.cs
--- glib/MainContext.cs	22 Feb 2003 04:34:55 -0000	1.2
+++ glib/MainContext.cs	21 May 2004 15:02:09 -0000
@@ -11,7 +11,7 @@
 
         public class MainContext {
 		
-		[DllImport("libglib-2.0-0.dll")]
+		[DllImport("glib-2.0")]
 		static extern bool g_main_context_iteration (IntPtr Raw, bool MayBlock);
 
 		public static bool Iteration ()
@@ -24,7 +24,7 @@
 			return g_main_context_iteration (IntPtr.Zero, MayBlock);
 		}
 
-		[DllImport("libglib-2.0-0.dll")]
+		[DllImport("glib-2.0")]
 		static extern bool g_main_context_pending (IntPtr Raw);
 		
 		public static bool Pending ()
Index: glib/ManagedValue.cs
===================================================================
RCS file: /mono/gtk-sharp/glib/ManagedValue.cs,v
retrieving revision 1.4
diff -u -r1.4 ManagedValue.cs
--- glib/ManagedValue.cs	3 Feb 2004 06:24:42 -0000	1.4
+++ glib/ManagedValue.cs	21 May 2004 15:02:09 -0000
@@ -40,7 +40,7 @@
 		private static FreeFunc free;
 		private static GType boxed_type = GType.Invalid;
 
-		[DllImport("libgobject-2.0-0.dll")]
+		[DllImport("gobject-2.0")]
 		private static extern IntPtr g_boxed_type_register_static (string typename, CopyFunc copy_func, FreeFunc free_func);
 		
 		public static GType GType {
Index: glib/Markup.cs
===================================================================
RCS file: /mono/gtk-sharp/glib/Markup.cs,v
retrieving revision 1.4
diff -u -r1.4 Markup.cs
--- glib/Markup.cs	19 May 2004 18:57:27 -0000	1.4
+++ glib/Markup.cs	21 May 2004 15:02:09 -0000
@@ -15,7 +15,7 @@
 	public class Markup {
 		private Markup () {}
 		
-		[DllImport("libglib-2.0-0.dll")]
+		[DllImport("glib-2.0")]
 		static extern IntPtr g_markup_escape_text (string text, int len);
 		
 		static public string EscapeText (string s)
Index: glib/Marshaller.cs
===================================================================
RCS file: /mono/gtk-sharp/glib/Marshaller.cs,v
retrieving revision 1.5
diff -u -r1.5 Marshaller.cs
--- glib/Marshaller.cs	19 May 2004 18:57:27 -0000	1.5
+++ glib/Marshaller.cs	21 May 2004 15:02:09 -0000
@@ -14,7 +14,7 @@
 
 		private Marshaller () {}
 		
-		[DllImport("libglib-2.0-0.dll")]
+		[DllImport("glib-2.0")]
 		static extern void g_free (IntPtr mem);
 
 		public static string PtrToStringGFree (IntPtr ptr) {
@@ -23,7 +23,7 @@
 			return ret;
 		}
 
-		[DllImport("libglib-2.0-0.dll")]
+		[DllImport("glib-2.0")]
 		static extern void g_strfreev (IntPtr mem);
 
 		public static string[] PtrToStringGFree (IntPtr[] ptrs) {
@@ -36,7 +36,7 @@
 			return ret;
 		}
 
-		[DllImport("libglib-2.0-0.dll")]
+		[DllImport("glib-2.0")]
 		static extern IntPtr g_strdup (string str);
 
 		public static IntPtr StringToPtrGStrdup (string str) {
@@ -52,7 +52,7 @@
 		// transparently, since we need to alloc buffers of
 		// [native pointer size] * [count] bytes.
 
-		[DllImport("libglib-2.0-0.dll")]
+		[DllImport("glib-2.0")]
 		static extern IntPtr g_malloc(ulong size);
 
 		static bool check_sixtyfour () {
Index: glib/Object.cs
===================================================================
RCS file: /mono/gtk-sharp/glib/Object.cs,v
retrieving revision 1.64
diff -u -r1.64 Object.cs
--- glib/Object.cs	18 May 2004 05:06:10 -0000	1.64
+++ glib/Object.cs	21 May 2004 15:02:09 -0000
@@ -27,7 +27,7 @@
 			Dispose ();
 		}
 
-		[DllImport("libgobject-2.0-0.dll")]
+		[DllImport("gobject-2.0")]
 		static extern void g_object_unref (IntPtr raw);
 		
 		static bool PerformQueuedUnrefs ()
@@ -71,7 +71,7 @@
 			GC.SuppressFinalize (this);
 		}
 
-		[DllImport("libgobject-2.0-0.dll")]
+		[DllImport("gobject-2.0")]
 		static extern void g_object_ref (IntPtr raw);
 
 		public static Object GetObject(IntPtr o, bool owned_ref)
@@ -161,7 +161,7 @@
 			Raw = raw;
 		}
 
-		[DllImport("libgobject-2.0-0.dll")]
+		[DllImport("gobject-2.0")]
 		static extern IntPtr g_object_new (IntPtr gtype, IntPtr dummy);
 
 		protected Object (GType gtype)
@@ -267,7 +267,7 @@
 			}
 		}
 
-		[DllImport("libgobject-2.0-0.dll")]
+		[DllImport("gobject-2.0")]
 		static extern void g_object_get_property (IntPtr obj, string name, ref GLib.Value val);
 
 		protected GLib.Value GetProperty (string name)
@@ -277,7 +277,7 @@
 			return val;
 		}
 
-		[DllImport("libgobject-2.0-0.dll")]
+		[DllImport("gobject-2.0")]
 		static extern void g_object_set_property (IntPtr obj, string name, ref GLib.Value val);
 
 		protected void SetProperty (string name, GLib.Value val)
@@ -293,7 +293,7 @@
 			gtksharp_override_virtual_method (gtype.Val, name, cb);
 		}
 
-		[DllImport("libgobject-2.0-0.dll")]
+		[DllImport("gobject-2.0")]
 		protected static extern void g_signal_chain_from_overridden (IntPtr args, ref GLib.Value retval);
 
 		[DllImport("glibsharpglue")]
Index: glib/SList.cs
===================================================================
RCS file: /mono/gtk-sharp/glib/SList.cs,v
retrieving revision 1.15
diff -u -r1.15 SList.cs
--- glib/SList.cs	12 Mar 2004 21:18:07 -0000	1.15
+++ glib/SList.cs	21 May 2004 15:02:09 -0000
@@ -19,7 +19,7 @@
 
 	public class SList : ListBase {
 
-		[DllImport("libglib-2.0-0.dll")]
+		[DllImport("glib-2.0")]
 		static extern IntPtr g_slist_copy (IntPtr l);
 		
 		public override object Clone ()
@@ -43,7 +43,7 @@
 			return gtksharp_slist_get_next (current);
 		}
 
-		[DllImport("libglib-2.0-0.dll")]
+		[DllImport("glib-2.0")]
 		static extern int g_slist_length (IntPtr l);
 		
 		internal override int Length (IntPtr list)
@@ -51,7 +51,7 @@
 			return g_slist_length (list);
 		}
 		
-		[DllImport("libglib-2.0-0.dll")]
+		[DllImport("glib-2.0")]
 		static extern void g_slist_free(IntPtr l);
 
 		internal override void Free (IntPtr list)
@@ -60,7 +60,7 @@
 				g_slist_free (list);
 		}
 
-		[DllImport("libglib-2.0-0.dll")]
+		[DllImport("glib-2.0")]
 		static extern IntPtr g_slist_append (IntPtr l, IntPtr raw);
 
 		internal override IntPtr Append (IntPtr list, IntPtr raw)
@@ -68,7 +68,7 @@
 			return g_slist_append (list, raw);
 		}
 
-		[DllImport("libglib-2.0-0.dll")]
+		[DllImport("glib-2.0")]
 		static extern IntPtr g_slist_prepend (IntPtr l, IntPtr raw);
 
 		internal override IntPtr Prepend (IntPtr list, IntPtr raw)
@@ -77,7 +77,7 @@
 		}
 
 
-		[DllImport("libglib-2.0-0.dll")]
+		[DllImport("glib-2.0")]
 	        static extern IntPtr g_slist_nth_data (IntPtr l, uint n);
 
 		internal override IntPtr NthData (uint n)
Index: glib/SignalCallback.cs
===================================================================
RCS file: /mono/gtk-sharp/glib/SignalCallback.cs,v
retrieving revision 1.8
diff -u -r1.8 SignalCallback.cs
--- glib/SignalCallback.cs	5 May 2004 18:24:04 -0000	1.8
+++ glib/SignalCallback.cs	21 May 2004 15:02:09 -0000
@@ -44,7 +44,7 @@
 			_handler = Delegate.Remove (_handler, d);
 		}
 
-		[DllImport("libgobject-2.0-0.dll")]
+		[DllImport("gobject-2.0")]
 		static extern uint g_signal_connect_data(IntPtr obj, string name, Delegate cb, int key, IntPtr p, int flags);
 
 		protected void Connect (string name, Delegate cb, int flags)
@@ -52,10 +52,10 @@
 			_HandlerID = g_signal_connect_data(_obj.Handle, name, cb, _key, new IntPtr(0), flags);
 		}
 
-		[DllImport("libgobject-2.0-0.dll")]
+		[DllImport("gobject-2.0")]
 		static extern void g_signal_handler_disconnect (IntPtr instance, uint handler);
 
-		[DllImport("libgobject-2.0-0.dll")]
+		[DllImport("gobject-2.0")]
 		static extern bool g_signal_handler_is_connected (IntPtr instance, uint handler);
 
 		protected void Disconnect ()
Index: glib/Source.cs
===================================================================
RCS file: /mono/gtk-sharp/glib/Source.cs,v
retrieving revision 1.3
diff -u -r1.3 Source.cs
--- glib/Source.cs	28 Nov 2003 05:29:34 -0000	1.3
+++ glib/Source.cs	21 May 2004 15:02:09 -0000
@@ -12,7 +12,7 @@
         public class Source {
 		private Source () {}
 		
-		[DllImport("libglib-2.0-0.dll")]
+		[DllImport("glib-2.0")]
 		static extern bool g_source_remove (uint tag);
 
 		public static bool Remove (uint tag)
Index: glib/Thread.cs
===================================================================
RCS file: /mono/gtk-sharp/glib/Thread.cs,v
retrieving revision 1.3
diff -u -r1.3 Thread.cs
--- glib/Thread.cs	28 Nov 2003 05:29:34 -0000	1.3
+++ glib/Thread.cs	21 May 2004 15:02:09 -0000
@@ -13,7 +13,7 @@
 	{
 		private Thread () {}
 		
-		[DllImport("libgthread-2.0-0.dll")]
+		[DllImport("gthread-2.0")]
 		static extern void g_thread_init (IntPtr i);
 
 		public static void Init ()
Index: glib/Timeout.cs
===================================================================
RCS file: /mono/gtk-sharp/glib/Timeout.cs,v
retrieving revision 1.3
diff -u -r1.3 Timeout.cs
--- glib/Timeout.cs	28 Nov 2003 05:29:34 -0000	1.3
+++ glib/Timeout.cs	21 May 2004 15:02:09 -0000
@@ -33,7 +33,7 @@
 	public class Timeout {
 
 		private Timeout () {} 
-		[DllImport("libglib-2.0-0.dll")]
+		[DllImport("glib-2.0")]
 		static extern uint g_timeout_add (uint interval, TimeoutHandler d, IntPtr data);
 
 		public static uint Add (uint interval, TimeoutHandler hndlr)
Index: glib/Value.cs
===================================================================
RCS file: /mono/gtk-sharp/glib/Value.cs,v
retrieving revision 1.46
diff -u -r1.46 Value.cs
--- glib/Value.cs	17 May 2004 17:52:00 -0000	1.46
+++ glib/Value.cs	21 May 2004 15:02:09 -0000
@@ -21,10 +21,10 @@
 
 		public static Value Empty;
 
-		[DllImport("libgobject-2.0-0.dll")]
+		[DllImport("gobject-2.0")]
 		static extern void g_value_init (ref GLib.Value val, IntPtr gtype);
 
-		[DllImport("libgobject-2.0-0.dll")]
+		[DllImport("gobject-2.0")]
 		static extern void g_value_unset (ref GLib.Value val);
 
 		[DllImport("glibsharpglue")]
@@ -57,7 +57,7 @@
 			gtksharp_value_create_from_property (ref this, obj.Handle, prop_name);
 		}
 
-		[DllImport("libgobject-2.0-0.dll")]
+		[DllImport("gobject-2.0")]
 		static extern void g_value_set_boolean (ref Value val, bool data);
 
 		public Value (bool val) : this (GType.Boolean)
@@ -65,7 +65,7 @@
 			g_value_set_boolean (ref this, val);
 		}
 
-		[DllImport("libgobject-2.0-0.dll")]
+		[DllImport("gobject-2.0")]
 		static extern void g_value_set_boxed (ref Value val, IntPtr data);
 
 /*
@@ -90,7 +90,7 @@
 			g_value_set_boxed (ref this, val.Handle);
 		}
 
-		[DllImport("libgobject-2.0-0.dll")]
+		[DllImport("gobject-2.0")]
 		static extern void g_value_set_double (ref Value val, double data);
 
 		public Value (double val) : this (GType.Double)
@@ -98,7 +98,7 @@
 			g_value_set_double (ref this, val);
 		}
 
-		[DllImport("libgobject-2.0-0.dll")]
+		[DllImport("gobject-2.0")]
 		static extern void g_value_set_float (ref Value val, float data);
 
 		public Value (float val) : this (GType.Float)
@@ -106,7 +106,7 @@
 			g_value_set_float (ref this, val);
 		}
 
-		[DllImport("libgobject-2.0-0.dll")]
+		[DllImport("gobject-2.0")]
 		static extern void g_value_set_int (ref Value val, int data);
 
 		public Value (int val) : this (GType.Int)
@@ -114,7 +114,7 @@
 			g_value_set_int (ref this, val);
 		}
 
-		[DllImport("libgobject-2.0-0.dll")]
+		[DllImport("gobject-2.0")]
 		static extern void g_value_set_object (ref Value val, IntPtr data);
 
 		public Value (GLib.Object val) : this (val.NativeType)
@@ -122,7 +122,7 @@
 			g_value_set_object (ref this, val.Handle);
 		}
 
-		[DllImport("libgobject-2.0-0.dll")]
+		[DllImport("gobject-2.0")]
 		static extern void g_value_set_pointer (ref Value val, IntPtr data);
 
 		public Value (IntPtr val) : this (GType.Pointer)
@@ -130,7 +130,7 @@
 			g_value_set_pointer (ref this, val); 
 		}
 
-		[DllImport("libgobject-2.0-0.dll")]
+		[DllImport("gobject-2.0")]
 		static extern void g_value_set_string (ref Value val, string data);
 
 		public Value (string val) : this (GType.String)
@@ -138,7 +138,7 @@
 			g_value_set_string (ref this, val); 
 		}
 
-		[DllImport("libgobject-2.0-0.dll")]
+		[DllImport("gobject-2.0")]
 		static extern void g_value_set_uint (ref Value val, uint data);
 
 		public Value (uint val) : this (GType.UInt)
@@ -151,11 +151,11 @@
 			g_value_set_uint (ref this, val); 
 		}
 
-		[DllImport("libgobject-2.0-0.dll")]
+		[DllImport("gobject-2.0")]
 		static extern void g_value_set_enum (ref Value val, int data);
-		[DllImport("libgobject-2.0-0.dll")]
+		[DllImport("gobject-2.0")]
 		static extern void g_value_set_flags (ref Value val, uint data);
-		[DllImport("libgobject-2.0-0.dll")]
+		[DllImport("gobject-2.0")]
 		static extern void g_value_set_char (ref Value val, char data);
 		
 		public Value (GLib.Object obj, string prop_name, EnumWrapper wrap)
@@ -186,7 +186,7 @@
 			Val = obj;
 		}
 
-		[DllImport("libgobject-2.0-0.dll")]
+		[DllImport("gobject-2.0")]
 		static extern bool g_value_get_boolean (ref Value val);
 
 		public static explicit operator bool (Value val)
@@ -194,7 +194,7 @@
 			return g_value_get_boolean (ref val);
 		}
 
-		[DllImport("libgobject-2.0-0.dll")]
+		[DllImport("gobject-2.0")]
 		static extern IntPtr g_value_get_boxed (ref Value val);
 
 		public static explicit operator GLib.Opaque (Value val)
@@ -207,7 +207,7 @@
 			return new GLib.Boxed (g_value_get_boxed (ref val));
 		}
 
-		[DllImport("libgobject-2.0-0.dll")]
+		[DllImport("gobject-2.0")]
 		static extern double g_value_get_double (ref Value val);
 
 		public static explicit operator double (Value val)
@@ -215,7 +215,7 @@
 			return g_value_get_double (ref val);
 		}
 
-		[DllImport("libgobject-2.0-0.dll")]
+		[DllImport("gobject-2.0")]
 		static extern float g_value_get_float (ref Value val);
 
 		public static explicit operator float (Value val)
@@ -223,7 +223,7 @@
 			return g_value_get_float (ref val);
 		}
 
-		[DllImport("libgobject-2.0-0.dll")]
+		[DllImport("gobject-2.0")]
 		static extern int g_value_get_int (ref Value val);
 
 		public static explicit operator int (Value val)
@@ -231,7 +231,7 @@
 			return g_value_get_int (ref val);
 		}
 
-		[DllImport("libgobject-2.0-0.dll")]
+		[DllImport("gobject-2.0")]
 		static extern IntPtr g_value_get_object (ref Value val);
 
 		public static explicit operator GLib.Object (Value val)
@@ -244,7 +244,7 @@
 			return new UnwrappedObject(g_value_get_object (ref val));
 		}
 
-		[DllImport("libgobject-2.0-0.dll")]
+		[DllImport("gobject-2.0")]
 		static extern IntPtr g_value_get_pointer (ref Value val);
 
 		public static explicit operator IntPtr (Value val)
@@ -252,7 +252,7 @@
 			return g_value_get_pointer (ref val);
 		}
 
-		[DllImport("libgobject-2.0-0.dll")]
+		[DllImport("gobject-2.0")]
 		static extern IntPtr g_value_get_string (ref Value val);
 
 		public static explicit operator String (Value val)
@@ -261,7 +261,7 @@
 			return str == IntPtr.Zero ? null : Marshal.PtrToStringAnsi (str);
 		}
 
-		[DllImport("libgobject-2.0-0.dll")]
+		[DllImport("gobject-2.0")]
 		static extern uint g_value_get_uint (ref Value val);
 
 		public static explicit operator uint (Value val)
@@ -274,9 +274,9 @@
 			return (ushort) g_value_get_uint (ref val);
 		}
 
-		[DllImport("libgobject-2.0-0.dll")]
+		[DllImport("gobject-2.0")]
 		static extern int g_value_get_enum (ref Value val);
-		[DllImport("libgobject-2.0-0.dll")]
+		[DllImport("gobject-2.0")]
 		static extern uint g_value_get_flags (ref Value val);
 
 		public static explicit operator EnumWrapper (Value val)
@@ -288,7 +288,7 @@
 		[DllImport("glibsharpglue")]
 		static extern IntPtr gtksharp_value_get_value_type (ref Value val);
 
-		[DllImport("libgobject-2.0-0.dll")]
+		[DllImport("gobject-2.0")]
 		static extern bool g_type_is_a (IntPtr type, IntPtr is_a_type);
 		
 		public object Val
Index: glib/ValueArray.cs
===================================================================
RCS file: /mono/gtk-sharp/glib/ValueArray.cs,v
retrieving revision 1.3
diff -u -r1.3 ValueArray.cs
--- glib/ValueArray.cs	12 Apr 2004 15:54:57 -0000	1.3
+++ glib/ValueArray.cs	21 May 2004 15:02:09 -0000
@@ -14,7 +14,7 @@
 
 		private IntPtr handle = IntPtr.Zero;
 
-		[DllImport("libgobject-2.0-0.dll")]
+		[DllImport("gobject-2.0")]
 		static extern IntPtr g_value_array_new (uint n_preallocs);
 
 		public ValueArray (uint n_preallocs)
@@ -39,7 +39,7 @@
 			GC.SuppressFinalize (this);
 		}
 
-		[DllImport("libgobject-2.0-0.dll")]
+		[DllImport("gobject-2.0")]
 		static extern void g_value_array_free (IntPtr raw);
 
 		void Dispose (bool disposing)
@@ -66,7 +66,7 @@
 			}
 		}
 
-		[DllImport("libgobject-2.0-0.dll")]
+		[DllImport("gobject-2.0")]
 		static extern void g_value_array_append (IntPtr raw, ref GLib.Value val);
 
 		public void Append (GLib.Value val)
@@ -74,7 +74,7 @@
 			g_value_array_append (Handle, ref val);
 		}
 
-		[DllImport("libgobject-2.0-0.dll")]
+		[DllImport("gobject-2.0")]
 		static extern void g_value_array_insert (IntPtr raw, uint idx, ref GLib.Value val);
 
 		public void Insert (uint idx, GLib.Value val)
@@ -82,7 +82,7 @@
 			g_value_array_insert (Handle, idx, ref val);
 		}
 
-		[DllImport("libgobject-2.0-0.dll")]
+		[DllImport("gobject-2.0")]
 		static extern void g_value_array_prepend (IntPtr raw, ref GLib.Value val);
 
 		public void Prepend (GLib.Value val)
@@ -90,7 +90,7 @@
 			g_value_array_prepend (Handle, ref val);
 		}
 
-		[DllImport("libgobject-2.0-0.dll")]
+		[DllImport("gobject-2.0")]
 		static extern void g_value_array_remove (IntPtr raw, uint idx);
 
 		public void Remove (uint idx)
@@ -108,7 +108,7 @@
 			}
 		}
 
-		[DllImport("libgobject-2.0-0.dll")]
+		[DllImport("gobject-2.0")]
 		static extern IntPtr g_value_array_get_nth (IntPtr raw, uint idx);
 
 		public object this [int index] { 
@@ -183,7 +183,7 @@
 			return new ListEnumerator (this);
 		}
 
-		[DllImport("libgobject-2.0-0.dll")]
+		[DllImport("gobject-2.0")]
 		static extern IntPtr g_value_array_copy (IntPtr raw);
 
 		// ICloneable



More information about the Mono-devel-list mailing list