[maemo-commits] [maemo-commits] r9445 - in projects/haf/trunk/osso-gnomevfs-extra: . debian obex-module/src

[From: subversion at stage.maemo.org]

Author: richard
Date: 2007-01-30 09:47:02 +0200 (Tue, 30 Jan 2007)
New Revision: 9445

Modified:
   projects/haf/trunk/osso-gnomevfs-extra/ChangeLog
   projects/haf/trunk/osso-gnomevfs-extra/configure.in
   projects/haf/trunk/osso-gnomevfs-extra/debian/changelog
   projects/haf/trunk/osso-gnomevfs-extra/obex-module/src/obex-method.c
Log:
Port fix for NB#50390 from stable.

Modified: projects/haf/trunk/osso-gnomevfs-extra/ChangeLog
===================================================================
--- projects/haf/trunk/osso-gnomevfs-extra/ChangeLog	2007-01-29 17:03:42 UTC (rev 9444)
+++ projects/haf/trunk/osso-gnomevfs-extra/ChangeLog	2007-01-30 07:47:02 UTC (rev 9445)
@@ -1,5 +1,15 @@
+2007-01-30  Richard Hult  <richard at imendio.com>
+
+	* obex-module/src/obex-method.c: (do_create): Use the current
+	time, so we at least get a time set at all, port of fix for
+	stable, NB#50390.
+
 2007-01-29  Richard Hult  <richard at imendio.com>
 
+	* Release 1.9.1 (added marker after release).
+	
+2007-01-29  Richard Hult  <richard at imendio.com>
+
 	* configure.in: Bump version. Also remove lots of things that were
 	only needed for the now removed parts: dbus daemon, file module,
 	filechooser backend.

Modified: projects/haf/trunk/osso-gnomevfs-extra/configure.in
===================================================================
--- projects/haf/trunk/osso-gnomevfs-extra/configure.in	2007-01-29 17:03:42 UTC (rev 9444)
+++ projects/haf/trunk/osso-gnomevfs-extra/configure.in	2007-01-30 07:47:02 UTC (rev 9445)
@@ -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.9.1)
+AC_INIT(osso-gnomevfs-extra, 1.9.2)
 AC_CONFIG_SRCDIR(obex-module/src/obex-method.c)
 AM_INIT_AUTOMAKE(AC_PACKAGE_NAME, AC_PACKAGE_VERSION)
 

Modified: projects/haf/trunk/osso-gnomevfs-extra/debian/changelog
===================================================================
--- projects/haf/trunk/osso-gnomevfs-extra/debian/changelog	2007-01-29 17:03:42 UTC (rev 9444)
+++ projects/haf/trunk/osso-gnomevfs-extra/debian/changelog	2007-01-30 07:47:02 UTC (rev 9445)
@@ -1,3 +1,10 @@
+osso-gnomevfs-extra (1.9.2-1) unstable; urgency=low
+
+  * FIXME: UNRELEASED
+  * Port NB#50390 from stable, always set current time on created files
+
+ -- Richard Hult <richard at imendio.com>  Tue, 30 Jan 2007 08:44:28 +0100
+
 osso-gnomevfs-extra (1.9.1-1) unstable; urgency=low
 
   * Remove file-chooser backend, and clean up build
@@ -3,5 +10,5 @@
   * Remove GTK+ dependency
 
- -- Richard Hult <richard at imendio.com>  Thu, 21 Dec 2006 09:49:20 +0100
+ -- Richard Hult <richard at imendio.com>  Mon, 29 Jan 2007 10:37:21 +0100
 
 osso-gnomevfs-extra (1.9.0-1) unstable; urgency=low

Modified: projects/haf/trunk/osso-gnomevfs-extra/obex-module/src/obex-method.c
===================================================================
--- projects/haf/trunk/osso-gnomevfs-extra/obex-module/src/obex-method.c	2007-01-29 17:03:42 UTC (rev 9444)
+++ projects/haf/trunk/osso-gnomevfs-extra/obex-module/src/obex-method.c	2007-01-30 07:47:02 UTC (rev 9445)
@@ -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) {