Update of /cvsroot/gtkpod/gtkpod/src
In directory sc8-pr-cvs2.sourceforge.net:/tmp/cvs-serv14126/src
Modified Files:
file.c
Log Message:
* file.c (get_track_info_from_file): don't reset time_added
when updating files.
Index: file.c
===================================================================
RCS file: /cvsroot/gtkpod/gtkpod/src/file.c,v
retrieving revision 1.181
retrieving revision 1.182
diff -u -d -r1.181 -r1.182
--- file.c 18 Aug 2006 01:38:11 -0000 1.181
+++ file.c 30 Aug 2006 14:04:29 -0000 1.182
@@ -1,4 +1,4 @@
-/* Time-stamp: <2006-08-18 10:31:58 jcs>
+/* Time-stamp: <2006-08-29 23:05:02 jcs>
|
| Copyright (C) 2002-2005 Jorg Schuler <jcsjcs at users sourceforge net>
| Part of the gtkpod project.
@@ -1003,7 +1003,7 @@
/* Fills the supplied @orig_track with data from the file @name. If
* @orig_track is NULL, a new track struct is created. The entries
* pc_path_utf8 and pc_path_locale are not changed if an entry already
- * exists */
+ * exists. time_added is not modified if already set. */
/* Returns NULL on error, a pointer to the Track otherwise */
static Track *get_track_info_from_file (gchar *name, Track *orig_track)
{
@@ -1146,7 +1146,14 @@
if (orig_track)
{ /* we need to copy all information over to the original
* track */
+ guint32 time_added = orig_track->time_added;
+
copy_new_info (nti, orig_track);
+
+ /* restore time_added */
+ if (time_added != 0)
+ orig_track->time_added = time_added;
+
track = orig_track;
itdb_track_free (nti);
nti = NULL;
-------------------------------------------------------------------------
Using Tomcat but need to do more? Need to support web services, security?
Get stuff done quickly with pre-integrated technology to make your job easier
Download IBM WebSphere Application Server v.1.0.1 based on Apache Geronimo
http://sel.as-us.falkag.net/sel?cmd=lnk&kid=120709&bid=263057&dat=121642
_______________________________________________
gtkpod-cvs2 mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/gtkpod-cvs2
