nemo r76 - in trunk: . dbus

[arj svn gnome org]

Author: arj
Date: Tue Feb  5 16:50:19 2008
New Revision: 76
URL: http://svn.gnome.org/viewvc/nemo?rev=76&view=rev

Log:
Add older GLib bindings for dbus to fix compilation with other GLib bindings



Added:
   trunk/dbus/GLib.IO.cs
Modified:
   trunk/dbus/GLib.cs
   trunk/nemo.mdp

Added: trunk/dbus/GLib.IO.cs
==============================================================================
--- (empty file)
+++ trunk/dbus/GLib.IO.cs	Tue Feb  5 16:50:19 2008
@@ -0,0 +1,222 @@
+// Copyright 2006 Alp Toker <alp atoker com>
+// This software is made available under the MIT License
+// See COPYING for details
+
+using System;
+using System.Collections;
+using System.Runtime.InteropServices;
+
+namespace NDesk.GLib
+{
+	/*
+	Specifies the type of function which is called when a data element is destroyed. It is passed the pointer to the data element and should free any memory and resources allocated for it.
+
+	@data: the data element.
+	*/
+	delegate void DestroyNotify (IntPtr data);
+
+	/*
+	Specifies the type of function passed to g_io_add_watch() or g_io_add_watch_full(), which is called when the requested condition on a GIOChannel is satisfied.
+
+	@source: the GIOChannel event source.
+	@condition: the condition which has been satisfied.
+	@data: user data set in g_io_add_watch() or g_io_add_watch_full().
+
+	Returns: the function should return FALSE if the event source should be removed.
+	*/
+	delegate bool IOFunc (IntPtr source, IOCondition condition, IntPtr data);
+
+	struct IOChannel
+	{
+		const string GLIB = "libglib-2.0-0.dll";
+
+		public IntPtr Handle;
+
+		[DllImport(GLIB)]
+			static extern IntPtr g_io_channel_unix_new (int fd);
+
+		public IOChannel (int fd)
+		{
+			Handle = g_io_channel_unix_new (fd);
+		}
+
+		[DllImport(GLIB)]
+			static extern int g_io_channel_unix_get_fd (IntPtr channel);
+
+		public int UnixFd
+		{
+			get {
+				return g_io_channel_unix_get_fd (Handle);
+			}
+		}
+
+		[DllImport(GLIB)]
+			public static extern IntPtr g_io_channel_win32_new_fd (int fd);
+
+		[DllImport(GLIB)]
+			public static extern IntPtr g_io_channel_win32_new_socket (int socket);
+
+		[DllImport(GLIB)]
+			public static extern IntPtr g_io_channel_win32_new_messages (uint hwnd);
+
+
+		[DllImport(GLIB)]
+			public static extern uint g_io_channel_get_buffer_size (IntPtr channel);
+
+		[DllImport(GLIB)]
+			public static extern void g_io_channel_set_buffer_size (IntPtr channel, uint size);
+
+		public uint BufferSize
+		{
+			get {
+				return g_io_channel_get_buffer_size (Handle);
+			} set {
+				g_io_channel_set_buffer_size (Handle, value);
+			}
+		}
+
+		[DllImport(GLIB)]
+			public static extern IOCondition g_io_channel_get_buffer_condition (IntPtr channel);
+
+		public IOCondition BufferCondition
+		{
+			get {
+				return g_io_channel_get_buffer_condition (Handle);
+			}
+		}
+
+		[DllImport(GLIB)]
+			public static extern IOFlags g_io_channel_get_flags (IntPtr channel);
+
+		[DllImport(GLIB)]
+			static extern short g_io_channel_set_flags (IntPtr channel, IOFlags flags, IntPtr error);
+
+		public IOFlags Flags
+		{
+			get {
+				return g_io_channel_get_flags (Handle);
+			} set {
+				//TODO: fix return and error
+				g_io_channel_set_flags (Handle, value, IntPtr.Zero);
+			}
+		}
+	}
+
+	class IO
+	{
+		const string GLIB = "libglib-2.0-0.dll";
+
+		//TODO: better memory management
+		public static ArrayList objs = new ArrayList ();
+
+		/*
+		Adds the GIOChannel into the main event loop with the default priority.
+
+		@channel: a GIOChannel.
+		@condition: the condition to watch for.
+		@func: the function to call when the condition is satisfied.
+		@user_data: user data to pass to func.
+
+		Returns: the event source id.
+		*/
+		[DllImport(GLIB)]
+			protected static extern uint g_io_add_watch (IntPtr channel, IOCondition condition, IOFunc func, IntPtr user_data);
+
+		public static uint AddWatch (IOChannel channel, IOCondition condition, IOFunc func)
+		{
+			objs.Add (func);
+
+			return g_io_add_watch (channel.Handle, condition, func, IntPtr.Zero);
+		}
+
+		/*
+		Adds the GIOChannel into the main event loop with the given priority.
+
+		@channel: a GIOChannel.
+		@priority: the priority of the GIOChannel source.
+		@condition: the condition to watch for.
+		@func: the function to call when the condition is satisfied.
+		@user_data: user data to pass to func.
+		@notify: the function to call when the source is removed.
+
+		Returns: the event source id.
+		*/
+		[DllImport(GLIB)]
+			protected static extern uint g_io_add_watch_full (IntPtr channel, int priority, IOCondition condition, IOFunc func, IntPtr user_data, DestroyNotify notify);
+
+		public static uint AddWatch (IOChannel channel, int priority, IOCondition condition, IOFunc func, DestroyNotify notify)
+		{
+			objs.Add (func);
+			objs.Add (notify);
+
+			return g_io_add_watch_full (channel.Handle, priority, condition, func, IntPtr.Zero, notify);
+		}
+
+		[DllImport(GLIB)]
+			protected static extern IntPtr g_main_context_default ();
+
+		public static IntPtr MainContextDefault ()
+		{
+			return g_main_context_default ();
+		}
+
+		[DllImport(GLIB)]
+			protected static extern void g_main_context_wakeup (IntPtr context);
+
+		public static void MainContextWakeup (IntPtr context)
+		{
+			g_main_context_wakeup (context);
+		}
+	}
+
+	//From Mono.Unix and poll(2)
+	[Flags]
+	enum PollEvents : short {
+		POLLIN      = 0x0001, // There is data to read
+		POLLPRI     = 0x0002, // There is urgent data to read
+		POLLOUT     = 0x0004, // Writing now will not block
+		POLLERR     = 0x0008, // Error condition
+		POLLHUP     = 0x0010, // Hung up
+		POLLNVAL    = 0x0020, // Invalid request; fd not open
+		// XPG4.2 definitions (via _XOPEN_SOURCE)
+		POLLRDNORM  = 0x0040, // Normal data may be read
+		POLLRDBAND  = 0x0080, // Priority data may be read
+		POLLWRNORM  = 0x0100, // Writing now will not block
+		POLLWRBAND  = 0x0200, // Priority data may be written
+	}
+
+	//A bitwise combination representing a condition to watch for on an event source.
+	[Flags]
+	enum IOCondition : short
+	{
+		//There is data to read.
+		In = PollEvents.POLLIN,
+		//Data can be written (without blocking).
+		Out = PollEvents.POLLOUT,
+		//There is urgent data to read.
+		Pri = PollEvents.POLLPRI,
+		//Error condition.
+		Err = PollEvents.POLLERR,
+		//Hung up (the connection has been broken, usually for pipes and sockets).
+		Hup = PollEvents.POLLHUP,
+		//Invalid request. The file descriptor is not open.
+		Nval = PollEvents.POLLNVAL,
+	}
+
+	[Flags]
+	enum IOFlags : short
+	{
+		Append = 1 << 0,
+		Nonblock = 1 << 1,
+		//Read only flag
+		IsReadable = 1 << 2,
+		//Read only flag
+		isWriteable = 1 << 3,
+		//Read only flag
+		IsSeekable = 1 << 4,
+		//?
+		Mask = (1 << 5) - 1,
+		GetMask = Mask,
+		SetMask = Append | Nonblock,
+	}
+}

Modified: trunk/dbus/GLib.cs
==============================================================================
--- trunk/dbus/GLib.cs	(original)
+++ trunk/dbus/GLib.cs	Tue Feb  5 16:50:19 2008
@@ -4,7 +4,7 @@
 
 using System;
 using NDesk.DBus;
-using GLib;
+using NDesk.GLib;
 using org.freedesktop.DBus;
 
 namespace NDesk.DBus
@@ -27,7 +27,7 @@
 
 		public static void Init (Connection conn)
 		{
-			IOFunc dispatchHandler = delegate (IOChannel source, IOCondition condition) {
+			IOFunc dispatchHandler = delegate (IntPtr source, IOCondition condition, IntPtr data) {
 				if ((condition & IOCondition.Hup) == IOCondition.Hup) {
 					if (Protocol.Verbose)
 						Console.Error.WriteLine ("Warning: Connection was probably hung up (" + condition + ")");
@@ -47,7 +47,7 @@
 		static void Init (Connection conn, IOFunc dispatchHandler)
 		{
 			IOChannel channel = new IOChannel ((int)conn.Transport.SocketHandle);
-			channel.AddWatch(0, IOCondition.In | IOCondition.Hup, dispatchHandler);
+			IO.AddWatch (channel, IOCondition.In | IOCondition.Hup, dispatchHandler);
 		}
 	}
 }

Modified: trunk/nemo.mdp
==============================================================================
--- trunk/nemo.mdp	(original)
+++ trunk/nemo.mdp	Tue Feb  5 16:50:19 2008
@@ -104,6 +104,7 @@
     <File name="gtk-gui/Nemo.Indexing.cs" subtype="Code" buildaction="Compile" />
     <File name="images/blue_guy.png" subtype="Code" buildaction="EmbedAsResource" />
     <File name="gtk/OSSpecific.cs" subtype="Code" buildaction="Compile" />
+    <File name="dbus/GLib.IO.cs" subtype="Code" buildaction="Compile" />
   </Contents>
   <References>
     <ProjectReference type="Gac" localcopy="True" refto="System, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" />