Update of /cvsroot/gtkpod/gtkpod/src
In directory sc8-pr-cvs2.sourceforge.net:/tmp/cvs-serv2495/src

Modified Files:
        file.h file_export.c 
Log Message:
         * sync-evocalendar.sh
           sync-kaddressbook.sh
           sync-korganizer.sh
           sync-notes.sh
           sync-tomboy.sh
           sync-webcalendar.sh: corrected syntax description from
           "-e=none" to "-e none".

         * src/file_export.c (export_playlist_file_write): simplified
           prefs_get_*_value() to prefs_get_*()

         * file.h (FileSource): changed order to reflect the order of
           options in the Export Playlist file requester
           dialog. Thanks to Todd.

         * README: updated instructions on how to restore one's iPod
           after file system errors or similar devastating events.



Index: file.h
===================================================================
RCS file: /cvsroot/gtkpod/gtkpod/src/file.h,v
retrieving revision 1.58
retrieving revision 1.59
diff -u -d -r1.58 -r1.59
--- file.h      5 Feb 2007 08:45:56 -0000       1.58
+++ file.h      10 Feb 2007 09:33:33 -0000      1.59
@@ -1,4 +1,4 @@
-/* Time-stamp: <2007-02-05 12:53:44 jcs>
+/* Time-stamp: <2007-02-10 17:52:19 jcs>
 |
 |  Copyright (C) 2002-2005 Jorg Schuler <jcsjcs at users sourceforge net>
 |  Part of the gtkpod project.
@@ -60,12 +60,16 @@
     FILE_TYPE_DIRECTORY
 } FileType;
 
+
+/* Don't change the order of this enum -- when exporting playlists the
+   file requester depends on having these in order because the toggle
+   buttons are arranged that way */
 typedef enum
 {
     SOURCE_PREFER_LOCAL = 0,
-    SOURCE_PREFER_IPOD,
     SOURCE_LOCAL,
-    SOURCE_IPOD
+    SOURCE_IPOD,
+    SOURCE_PREFER_IPOD
 } FileSource;
 
 

Index: file_export.c
===================================================================
RCS file: /cvsroot/gtkpod/gtkpod/src/file_export.c,v
retrieving revision 1.67
retrieving revision 1.68
diff -u -d -r1.67 -r1.68
--- file_export.c       22 Nov 2006 15:48:19 -0000      1.67
+++ file_export.c       10 Feb 2007 09:33:33 -0000      1.68
@@ -1,4 +1,4 @@
-/* Time-stamp: <2006-11-23 00:45:42 jcs>
+/* Time-stamp: <2007-02-10 17:46:56 jcs>
 |
 |  Copyright (C) 2002 Corey Donohoe <atmos at atmos.org>
 |  Copyright (C) 2002-2005 Jorg Schuler <jcsjcs at users sourceforge net>
@@ -943,9 +943,9 @@
 
     num = g_list_length (fcd->tracks);
 
-    prefs_get_int_value (EXPORT_PLAYLIST_FILE_TYPE, &type);
-    prefs_get_int_value (EXPORT_PLAYLIST_FILE_SOURCE, &source);
-    prefs_get_string_value (EXPORT_PLAYLIST_FILE_TPL, &template);
+    type = prefs_get_int (EXPORT_PLAYLIST_FILE_TYPE);
+    source = prefs_get_int (EXPORT_PLAYLIST_FILE_SOURCE);
+    template = prefs_get_string (EXPORT_PLAYLIST_FILE_TPL);
     if (!template)
        template = g_strdup (EXPORT_PLAYLIST_FILE_TPL_DFLT);
 


-------------------------------------------------------------------------
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

Reply via email to