dbus/mono/DBusType ObjectPath.cs,1.3,1.4

[Owen Fraser-Green]

Update of /cvs/dbus/dbus/mono/DBusType
In directory pdx:/tmp/cvs-serv15109/mono/DBusType

Modified Files:
	ObjectPath.cs 
Log Message:
Changes in-line with new object_path param changes. Also bumped required mono version and use new -pkg flag.


Index: ObjectPath.cs
===================================================================
RCS file: /cvs/dbus/dbus/mono/DBusType/ObjectPath.cs,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- a/ObjectPath.cs	24 Mar 2004 13:15:20 -0000	1.3
+++ b/ObjectPath.cs	7 Jun 2004 11:40:20 -0000	1.4
@@ -12,7 +12,7 @@
   public class ObjectPath : IDBusType
   {
     public const char Code = 'o';
-    private string pathName = null;
+    private string path = null;
     private object val = null;
     private Service service = null;
     
@@ -29,25 +29,25 @@
     public ObjectPath(IntPtr iter, Service service)
     {
       
-      this.pathName = Marshal.PtrToStringAnsi(dbus_message_iter_get_object_path(iter));
+      this.path = Marshal.PtrToStringAnsi(dbus_message_iter_get_object_path(iter));
       this.service = service;
     }
 
-    private string PathName 
+    private string Path
     {
       get {
-	if (this.pathName == null && this.val != null) {
+	if (this.path == null && this.val != null) {
 	  Handler handler = this.service.GetHandler(this.val);
-	  this.pathName = handler.PathName;
+	  this.path = handler.Path;
 	}
 
-	return this.pathName;
+	return this.path;
       }
     }
 
     public void Append(IntPtr iter) 
     {
-      if (!dbus_message_iter_append_object_path(iter, Marshal.StringToHGlobalAnsi(PathName)))
+      if (!dbus_message_iter_append_object_path(iter, Marshal.StringToHGlobalAnsi(Path)))
 	throw new ApplicationException("Failed to append OBJECT_PATH argument:" + val);
     }
 
@@ -84,7 +84,7 @@
     public object Get(System.Type type)
     {
       try {
-	return this.service.GetObject(type, PathName);
+	return this.service.GetObject(type, Path);
       } catch(Exception ex) {
 	throw new ArgumentException("Cannot cast object pointed to by Object Path to type '" + type.ToString() + "': " + ex);
       }
@@ -94,6 +94,6 @@
     private extern static IntPtr dbus_message_iter_get_object_path(IntPtr iter);
  
     [DllImport("dbus-1")]
-    private extern static bool dbus_message_iter_append_object_path(IntPtr iter, IntPtr pathName);
+    private extern static bool dbus_message_iter_append_object_path(IntPtr iter, IntPtr path);
   }
 }