commit 110f0bde5c6b0330740b355f95f2e79c8726b3b2
Merge: c9bf5ab e7def59
Author: phantomjinx <[email protected]>
Date: Sat Jun 4 10:28:27 2011 +0100
Merge branch 'master' into gtk-3.0
Conflicts:
libgtkpod/file.c
libgtkpod/file.c | 100 +++++++++++-----
libgtkpod/file.h | 15 +--
libgtkpod/gp_private.c | 11 ++
libgtkpod/gp_private.h | 2 +
libgtkpod/misc_playlist.c | 8 +-
libgtkpod/misc_track.c | 19 ++--
libgtkpod/syncdir.c | 2 +-
.../playlist_display/playlist_display_actions.c | 121 +++++++++++++++++---
po/fr.po | 4 +-
9 files changed, 209 insertions(+), 73 deletions(-)
---
diff --cc libgtkpod/file.c
index 058cd06,98d3e50..65d3026
--- a/libgtkpod/file.c
+++ b/libgtkpod/file.c
@@@ -206,9 -207,10 +207,10 @@@ add_playlist_by_filename(iTunesDB *itdb
gchar *dirname = NULL, *plname = NULL;
gchar buf[PATH_MAX];
FileType *type = NULL; /* type of playlist file */
- gint line, tracks;
+ gint line;
FILE *fp;
- gboolean error;
+ gboolean errstatus;
+ GString *errors = g_string_new("");
g_return_val_if_fail (plfile, FALSE);
g_return_val_if_fail (itdb, FALSE);
@@@ -253,8 -255,9 +255,8 @@@
all of these are line based -- add different code for different
playlist files */
line = -1; /* nr of line being read */
- error = FALSE;
- while (!error && fgets(buf, PATH_MAX, fp)) {
- tracks = 0; /* nr of tracks added */
+ errstatus = FALSE;
+ while (!errstatus && fgets(buf, PATH_MAX, fp)) {
gchar *bufp = buf;
gchar *filename = NULL;
gint len = strlen(bufp); /* remove newline */
------------------------------------------------------------------------------
Simplify data backup and recovery for your virtual environment with vRanger.
Installation's a snap, and flexible recovery options mean your data is safe,
secure and there when you need it. Discover what all the cheering's about.
Get your free trial download today.
http://p.sf.net/sfu/quest-dev2dev2
_______________________________________________
gtkpod-cvs2 mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/gtkpod-cvs2
