I've attached a patch for gnomevfs to clear up the following.

* 64 bit HANDLE pointer problems in _tell and _seek, same as those
already fixed

* corrected entry in the gnome vfs config file fragment

* tweaks to configure.ac.in and bootstrap

* bug with url to a non-existent file/directory - type an arbitrary
synce:// url into nautilus and you'd get the device root with a new name

Mark

diff -Nur synce-gnomevfs-0.9.0.svn20070502.orig/bootstrap synce-gnomevfs-0.9.0.svn20070502/bootstrap
--- synce-gnomevfs-0.9.0.svn20070502.orig/bootstrap	2007-05-05 11:02:30.000000000 +0100
+++ synce-gnomevfs-0.9.0.svn20070502/bootstrap	2007-05-05 12:35:36.000000000 +0100
@@ -14,7 +14,7 @@
 	rm $ACFILE
 fi
 echo -n "Creating $ACFILE..."
-cat $ACFILE_IN | sed "s/\\(AM_INIT_AUTOMAKE(.*,\\).*)/\\1 $VERSION)/" > $ACFILE
+cat $ACFILE_IN | sed "s/@@VERSION@@/$VERSION/" > $ACFILE
 if [ -s $ACFILE ]; then
 	echo "done."
 else
diff -Nur synce-gnomevfs-0.9.0.svn20070502.orig/ChangeLog synce-gnomevfs-0.9.0.svn20070502/ChangeLog
--- synce-gnomevfs-0.9.0.svn20070502.orig/ChangeLog	2007-05-05 11:02:30.000000000 +0100
+++ synce-gnomevfs-0.9.0.svn20070502/ChangeLog	2007-05-05 12:39:10.000000000 +0100
@@ -1,3 +1,15 @@
+2007-05-05  Mark Ellis  <[EMAIL PROTECTED]>
+
+	* corrected gnome-vfs system config file
+	* fixed bug when url points to non-existent file
+	* updated configure.ac.in and corrected version handling
+	* fixed storage of HANDLE on non 64-bit platforms in _seek & _tell
+
+2007-05-02  Mark Ellis  <[EMAIL PROTECTED]>
+
+	* fixed incompatible pointer types
+	* fixed storage of HANDLE on non 64-bit platforms
+
 2003-12-31  Mattias Eriksson  <[EMAIL PROTECTED]>
 
 	* Added a ChangeLog and other files wanted by automake.
diff -Nur synce-gnomevfs-0.9.0.svn20070502.orig/configure.ac.in synce-gnomevfs-0.9.0.svn20070502/configure.ac.in
--- synce-gnomevfs-0.9.0.svn20070502.orig/configure.ac.in	2007-05-05 11:02:30.000000000 +0100
+++ synce-gnomevfs-0.9.0.svn20070502/configure.ac.in	2007-05-05 12:35:36.000000000 +0100
@@ -1,8 +1,8 @@
 AC_PREREQ(2.52)
-AC_INIT(gnome-vfs-synce-module, 0.1)
-AM_CONFIG_HEADER(config.h)
+AC_INIT(gnome-vfs-synce-module, @@VERSION@@)
+AC_CONFIG_HEADERS(config.h)
 AC_CONFIG_SRCDIR(src/libsyncevfs.c)
-AM_INIT_AUTOMAKE(AC_PACKAGE_NAME, AC_PACKAGE_VERSION)
+AM_INIT_AUTOMAKE
 
 AM_MAINTAINER_MODE
 
--- synce-gnomevfs-0.9.0.svn20070502.orig/src/libsyncevfs.c	2007-05-05 11:02:30.000000000 +0100
+++ synce-gnomevfs-0.9.0.svn20070502/src/libsyncevfs.c	2007-05-05 12:38:20.000000000 +0100
@@ -162,6 +162,11 @@
       result = INDEX_DEVICE;
       *location = NULL;
     }
+  else if (0 == strcmp(path[1], ""))
+    {
+      result = INDEX_DEVICE;
+      *location = NULL;
+    }
 #if SHOW_APPLICATIONS
   else if (0 == strcmp(path[1], NAME_APPLICATIONS))
     {
@@ -186,7 +191,7 @@
     }
   else
     {
-      result = INDEX_DEVICE;
+      result = INDEX_INVALID;
       *location = NULL;
     }
 
@@ -536,7 +541,7 @@
   if ((result = initialize_rapi ()) != GNOME_VFS_OK)
     return result;
 
-  handle = (HANDLE) method_handle;
+  handle = GPOINTER_TO_UINT(method_handle);
 
   switch (whence) {
     case GNOME_VFS_SEEK_START:
@@ -590,7 +595,7 @@
   if ((result = initialize_rapi ()) != GNOME_VFS_OK)
     return result;
 
-  handle = (HANDLE) method_handle;
+  handle = GPOINTER_TO_UINT(method_handle);
 
   D("CeSetFilePointer()\n");
 
diff -Nur synce-gnomevfs-0.9.0.svn20070502.orig/src/synce-module.conf synce-gnomevfs-0.9.0.svn20070502/src/synce-module.conf
--- synce-gnomevfs-0.9.0.svn20070502.orig/src/synce-module.conf	2007-05-05 11:02:30.000000000 +0100
+++ synce-gnomevfs-0.9.0.svn20070502/src/synce-module.conf	2007-05-05 12:35:36.000000000 +0100
@@ -1 +1 @@
-synce: syncevfs
+synce: libsyncevfs
-------------------------------------------------------------------------
This SF.net email is sponsored by DB2 Express
Download DB2 Express C - the FREE version of DB2 express and take
control of your XML. No limits. Just data. Click to get it now.
http://sourceforge.net/powerbar/db2/
_______________________________________________
SynCE-Devel mailing list
SynCE-Devel@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/synce-devel

Reply via email to