[Galago-commits] r2669 - in trunk/galago-sharp: . galago tests

[galago-commits at freedesktop.org]

Author: chipx86
Date: 2006-04-04 01:14:39 -0700 (Tue, 04 Apr 2006)
New Revision: 2669

Added:
   trunk/galago-sharp/galago/Object.custom
Modified:
   trunk/galago-sharp/ChangeLog
   trunk/galago-sharp/galago/Global.custom
   trunk/galago-sharp/galago/galago-sharp.metadata
   trunk/galago-sharp/tests/presence-feed.cs
Log:
Fix up the C# bindings to compile again.


Modified: trunk/galago-sharp/ChangeLog
===================================================================
--- trunk/galago-sharp/ChangeLog	2006-04-04 04:25:49 UTC (rev 2668)
+++ trunk/galago-sharp/ChangeLog	2006-04-04 08:14:39 UTC (rev 2669)
@@ -1,3 +1,11 @@
+Tue Apr 04 01:14:22 PDT 2006  Christian Hammond <chipx86 at chipx86.com>
+
+	A galago/Object.custom:
+	* galago/galago-sharp.metadata:
+	* galago/Global.custom:
+	* tests/presence-feed.cs:
+	  - Fix up the C# bindings to compile again.
+
 Mon Mar 27 12:04:14 PST 2006  Christian Hammond <chipx86 at chipx86.com>
 
 	A galago/Account.custom:

Modified: trunk/galago-sharp/galago/Global.custom
===================================================================
--- trunk/galago-sharp/galago/Global.custom	2006-04-04 04:25:49 UTC (rev 2668)
+++ trunk/galago-sharp/galago/Global.custom	2006-04-04 08:14:39 UTC (rev 2669)
@@ -1,17 +1,17 @@
 		[DllImport("libgalago")]
-		static extern bool galago_init(IntPtr name, bool feed);
+		static extern bool galago_init(IntPtr name, int flags);
 
-		public static bool Init(string name, bool feed)
+		public static bool Init(string name, Galago.InitFlags flags)
 		{
 			IntPtr name_as_native = GLib.Marshaller.StringToPtrGStrdup(name);
-			bool ret = galago_init(name_as_native, feed);
+			bool ret = galago_init(name_as_native, (int)flags);
 			GLib.Marshaller.Free(name_as_native);
 			return ret;
 		}
 
 		public static bool Init(string name)
 		{
-			return Init(name, false);
+			return Init(name, Galago.InitFlags.Client);
 		}
 
 		public static Galago.Person GetMe(Galago.Origin origin)

Added: trunk/galago-sharp/galago/Object.custom
===================================================================
--- trunk/galago-sharp/galago/Object.custom	2006-04-04 04:25:49 UTC (rev 2668)
+++ trunk/galago-sharp/galago/Object.custom	2006-04-04 08:14:39 UTC (rev 2669)
@@ -0,0 +1,27 @@
+		public void SetAttribute(string key, string value)
+		{
+			SetAttrString(key, value);
+		}
+
+		public void SetAttribute(string key, int value)
+		{
+			SetAttrInt(key, value);
+		}
+
+		public void SetAttribute(string key, double value)
+		{
+			SetAttrDouble(key, value);
+		}
+
+		public void SetAttribute(string key, bool value)
+		{
+			SetAttrBool(key, value);
+		}
+
+		[DllImport("libgalago")]
+		static extern void galago_object_destroy(IntPtr raw);
+
+		public virtual void Destroy()
+		{
+			galago_object_destroy(Handle);
+		}

Modified: trunk/galago-sharp/galago/galago-sharp.metadata
===================================================================
--- trunk/galago-sharp/galago/galago-sharp.metadata	2006-04-04 04:25:49 UTC (rev 2668)
+++ trunk/galago-sharp/galago/galago-sharp.metadata	2006-04-04 08:14:39 UTC (rev 2669)
@@ -27,6 +27,8 @@
  <!-- GalagoObject -->
  <attr path="/api/namespace/object[@cname='GalagoObject']/method[@name='GetAttribute']" name="hidden">1</attr>
  <attr path="/api/namespace/object[@cname='GalagoObject']/method[@name='SetAttribute']" name="hidden">1</attr>
+ <attr path="/api/namespace/object[@cname='GalagoObject']/method[@name='Destroy']" name="hidden">1</attr>
+ <attr path="/api/namespace/object[@cname='GalagoObject']/signal[@name='Destroy']" name="name">Destroyed</attr>
 
  <!-- GalagoPerson -->
 

Modified: trunk/galago-sharp/tests/presence-feed.cs
===================================================================
--- trunk/galago-sharp/tests/presence-feed.cs	2006-04-04 04:25:49 UTC (rev 2668)
+++ trunk/galago-sharp/tests/presence-feed.cs	2006-04-04 08:14:39 UTC (rev 2669)
@@ -10,7 +10,7 @@
 		{
 			MainLoop mainloop = new MainLoop();
 
-			if (!Galago.Global.Init("test-feed", true))
+			if (!Galago.Global.Init("test-feed", Galago.InitFlags.Feed))
 			{
 				Console.WriteLine("Unable to initialize Galago");