[maemo-commits] [maemo-commits] r9015 - in projects/haf/branches/osso-gnomevfs-extra/IT-2007/trunk: . debian obex-module/src

[From: subversion at stage.maemo.org]

Author: richard
Date: 2007-01-10 10:47:49 +0200 (Wed, 10 Jan 2007)
New Revision: 9015

Modified:
   projects/haf/branches/osso-gnomevfs-extra/IT-2007/trunk/ChangeLog
   projects/haf/branches/osso-gnomevfs-extra/IT-2007/trunk/configure.in
   projects/haf/branches/osso-gnomevfs-extra/IT-2007/trunk/debian/changelog
   projects/haf/branches/osso-gnomevfs-extra/IT-2007/trunk/obex-module/src/obex-method.c
Log:
Prepare for release.

Modified: projects/haf/branches/osso-gnomevfs-extra/IT-2007/trunk/ChangeLog
===================================================================
--- projects/haf/branches/osso-gnomevfs-extra/IT-2007/trunk/ChangeLog	2007-01-09 18:07:54 UTC (rev 9014)
+++ projects/haf/branches/osso-gnomevfs-extra/IT-2007/trunk/ChangeLog	2007-01-10 08:47:49 UTC (rev 9015)
@@ -1,3 +1,10 @@
+2007-01-10  Richard Hult  <richard at imendio.com>
+
+	* configure.in: Bump version.
+
+	* obex-module/src/obex-method.c: (do_create): Use the current
+	time, so we at least get a time set at all, NB#50390.
+
 2006-10-26  Richard Hult  <richard at imendio.com>
 
 	* file-module/src/dbus-file-method.c: (do_create): Don't use

Modified: projects/haf/branches/osso-gnomevfs-extra/IT-2007/trunk/configure.in
===================================================================
--- projects/haf/branches/osso-gnomevfs-extra/IT-2007/trunk/configure.in	2007-01-09 18:07:54 UTC (rev 9014)
+++ projects/haf/branches/osso-gnomevfs-extra/IT-2007/trunk/configure.in	2007-01-10 08:47:49 UTC (rev 9015)
@@ -1,7 +1,7 @@
 dnl Process this file with autoconf to produce a configure script.
 AC_PREREQ(2.52)
  
-AC_INIT(osso-gnomevfs-extra, 1.8.1)
+AC_INIT(osso-gnomevfs-extra, 1.8.2)
 AC_CONFIG_SRCDIR(obex-module/src/obex-method.c)
 AM_INIT_AUTOMAKE(AC_PACKAGE_NAME, AC_PACKAGE_VERSION)
 

Modified: projects/haf/branches/osso-gnomevfs-extra/IT-2007/trunk/debian/changelog
===================================================================
--- projects/haf/branches/osso-gnomevfs-extra/IT-2007/trunk/debian/changelog	2007-01-09 18:07:54 UTC (rev 9014)
+++ projects/haf/branches/osso-gnomevfs-extra/IT-2007/trunk/debian/changelog	2007-01-10 08:47:49 UTC (rev 9015)
@@ -1,3 +1,9 @@
+osso-gnomevfs-extra (1.8.2-1) unstable; urgency=low
+
+  * Fixes: NB#50390, Wrong date on files copied from device to S60 phones
+
+ -- Richard Hult <richard at imendio.com>  Wed, 10 Jan 2007 09:41:41 +0200
+
 osso-gnomevfs-extra (1.8.1-2) unstable; urgency=low
 
   * Fixes: M819, Added osso-uri-l10n-mr as an alternative of osso-uri-l10n-mr0

Modified: projects/haf/branches/osso-gnomevfs-extra/IT-2007/trunk/obex-module/src/obex-method.c
===================================================================
--- projects/haf/branches/osso-gnomevfs-extra/IT-2007/trunk/obex-module/src/obex-method.c	2007-01-09 18:07:54 UTC (rev 9014)
+++ projects/haf/branches/osso-gnomevfs-extra/IT-2007/trunk/obex-module/src/obex-method.c	2007-01-10 08:47:49 UTC (rev 9015)
@@ -24,6 +24,7 @@
 #include <fcntl.h>
 #include <errno.h>
 #include <string.h>
+#include <time.h>
 #include <libgnomevfs/gnome-vfs-method.h>
 #include <libgnomevfs/gnome-vfs-module.h>
 #include <libgnomevfs/gnome-vfs-module-shared.h>
@@ -848,7 +849,7 @@
 	
 	xfer = gw_obex_put_async (conn->obex, name, NULL, 
 				  GW_OBEX_UNKNOWN_LENGTH, /* Object size */
-				  -1, /* mtime */
+				  time (NULL), /* mtime */
 				  &error);
 
 	if (!xfer) {