gtkpod-cvs2 — Notification of CVS Commits (replaces gtkpod-cvs after being spam-atacked)

[gtpd-cvs] libgpod/src ipod-device.c,1.8,1.9

[<te...@us...>]

Update of /cvsroot/gtkpod/libgpod/src
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv27503/src

Modified Files:
	ipod-device.c 
Log Message:
2005-11-21  Christophe Fergeau  <te...@gn...>

	* src/ipod-device.c: fix g_mkdir_with_parents use (don't use it with
	glib 2.8, and mark it static)

2005-11-21  Christophe Fergeau  <te...@gn...>

	* src/db-artwork-writer.c: (write_mhod_type_3):
	* src/db-parse-context.c:
	* src/ipod-device.c:
	* src/itdb_private.h:
	* src/itdb_track.c:
	* src/ithumb-writer.c: (ithumb_writer_write_thumbnail): commit some
	changes which should help compiling with glib 2.4

2005-11-21  Christophe Fergeau  <te...@gn...>

	* autogen.sh:
	* gnome-autogen.sh: use autogen.sh script from gnome-common since the
	custom libgpod one keep having issues (this doesn't add a dependency
	on gnome-common since I imported the necessary script to our CVS)

2005-11-21  Christophe Fergeau  <te...@gn...>

	* INSTALL:
	* autogen.sh:
	* gnome-autogen.sh:

2005-11-21  Christophe Fergeau  <te...@gn...>

	* src/hal-common.h: mark hal stubs (for when hal isn't available) as 
	G_GNUC_INTERNAL to avoid namespace clashes
	* src/ipod-device.c:
	* src/ipod-device.h: move hal header inclusion in the .c instead of
	having it in the .h

2005-11-19  Jorg Schuler <jcsjcs at users.sourceforge.net>

	* itdb_playlist.c: simplified API for itdb_spl_update() and
	  itdb_splr_eval()

	* itdb_playlist.c: added itdb_spl_update_live() for convenience

	* itdb_itunesdb.c: (itdb_rename_files) also remove "iTunesShuffle"
	  as this file might confuse iPod Shuffles.
	
2005-11-17  Jorg Schuler <jcsjcs at users.sourceforge.net>

        * configure.ac: check for version 2.4 of glib -- now we need to
	  make sure that libgpod actually works with 2.4...

2005-11-15  Christophe Fergeau  <te...@gn...>

	* src/itdb_itunesdb.c: (itdb_new): initialise glib type system before
	calling ipod_device_new (which creates a gobject)

2005-11-13  Jorg Schuler <jcsjcs at users.sourceforge.net>

	* src/itdb_itunesdb.c: when new rating is set on the iPod, backup
	  the old rating to app_rating. Not sure what it's for, but iTunes
	  seem to do it.

	* src/itdb_itunesdb.c:
	* src/itdb.h: split unk164 into flag1, flag2, flag3, and flag4.

Index: ipod-device.c
===================================================================
RCS file: /cvsroot/gtkpod/libgpod/src/ipod-device.c,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -d -r1.8 -r1.9
--- ipod-device.c	21 Nov 2005 20:09:53 -0000	1.8
+++ ipod-device.c	21 Nov 2005 20:12:04 -0000	1.9
@@ -268,7 +268,7 @@
 }
 
 
-#if ((GTK_MAJOR_VERSION <= 2) && (GTK_MINOR_VERSION < 8))
+#if ((GLIB_MAJOR_VERSION <= 2) && (GLIB_MINOR_VERSION < 8))
 /**
  * g_mkdir_with_parents:
  * @pathname: a pathname in the GLib file name encoding
@@ -282,10 +282,7 @@
  *
  * Since: 2.8  (copied from GLIB version 2.8 - JCS)
  */
-int
-g_mkdir_with_parents (const gchar *pathname,
-		      int          mode);
-int
+static int
 g_mkdir_with_parents (const gchar *pathname,
 		      int          mode)
 {

[gtpd-cvs] libgpod ChangeLog,1.60,1.61

[<te...@us...>]

Update of /cvsroot/gtkpod/libgpod
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv26936

Modified Files:
	ChangeLog 
Log Message:
2005-11-21  Christophe Fergeau  <te...@gn...>

	* src/db-artwork-writer.c: (write_mhod_type_3):
	* src/db-parse-context.c:
	* src/ipod-device.c:
	* src/itdb_private.h:
	* src/itdb_track.c:
	* src/ithumb-writer.c: (ithumb_writer_write_thumbnail): commit some
	changes which should help compiling with glib 2.4

Index: ChangeLog
===================================================================
RCS file: /cvsroot/gtkpod/libgpod/ChangeLog,v
retrieving revision 1.60
retrieving revision 1.61
diff -u -d -r1.60 -r1.61
--- ChangeLog	21 Nov 2005 19:55:45 -0000	1.60
+++ ChangeLog	21 Nov 2005 20:09:53 -0000	1.61
@@ -1,5 +1,15 @@
 2005-11-21  Christophe Fergeau  <te...@gn...>
 
+	* src/db-artwork-writer.c: (write_mhod_type_3):
+	* src/db-parse-context.c:
+	* src/ipod-device.c:
+	* src/itdb_private.h:
+	* src/itdb_track.c:
+	* src/ithumb-writer.c: (ithumb_writer_write_thumbnail): commit some
+	changes which should help compiling with glib 2.4
+
+2005-11-21  Christophe Fergeau  <te...@gn...>
+
 	* autogen.sh:
 	* gnome-autogen.sh: use autogen.sh script from gnome-common since the
 	custom libgpod one keep having issues (this doesn't add a dependency

[gtpd-cvs] libgpod/src db-artwork-writer.c,1.7,1.8 db-parse-context.c,1.2,1.3 ipod-device.c,1.7,1.8 itdb_private.h,1.7,1.8 itdb_track.c,1.11,1.12 ithumb-writer.c,1.3,1.4

[<te...@us...>]

Update of /cvsroot/gtkpod/libgpod/src
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv26936/src

Modified Files:
	db-artwork-writer.c db-parse-context.c ipod-device.c 
	itdb_private.h itdb_track.c ithumb-writer.c 
Log Message:
2005-11-21  Christophe Fergeau  <te...@gn...>

	* src/db-artwork-writer.c: (write_mhod_type_3):
	* src/db-parse-context.c:
	* src/ipod-device.c:
	* src/itdb_private.h:
	* src/itdb_track.c:
	* src/ithumb-writer.c: (ithumb_writer_write_thumbnail): commit some
	changes which should help compiling with glib 2.4

Index: db-artwork-writer.c
===================================================================
RCS file: /cvsroot/gtkpod/libgpod/src/db-artwork-writer.c,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -d -r1.7 -r1.8
--- db-artwork-writer.c	2 Nov 2005 19:11:29 -0000	1.7
+++ db-artwork-writer.c	21 Nov 2005 20:09:53 -0000	1.8
@@ -314,6 +314,10 @@
 		break;
 	default:
 		g_assert_not_reached ();
+		/* Set filename to NULL to shut gcc up when compiling with 
+		 * glib 2.4
+		 */
+		filename = NULL;
 	}
 
 	len = strlen (filename);

Index: db-parse-context.c
===================================================================
RCS file: /cvsroot/gtkpod/libgpod/src/db-parse-context.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- db-parse-context.c	22 Sep 2005 18:16:50 -0000	1.2
+++ db-parse-context.c	21 Nov 2005 20:09:53 -0000	1.3
@@ -32,7 +32,7 @@
 #include <unistd.h>
 
 #include <glib.h>
-
+#include "glib-compat.h"
 #include "db-parse-context.h"
 #include "db-itunes-parser.h"
 

Index: ipod-device.c
===================================================================
RCS file: /cvsroot/gtkpod/libgpod/src/ipod-device.c,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -d -r1.7 -r1.8
--- ipod-device.c	21 Nov 2005 19:50:27 -0000	1.7
+++ ipod-device.c	21 Nov 2005 20:09:53 -0000	1.8
@@ -68,6 +68,7 @@
 #ifdef HAVE_CONFIG_H
 #  include "config.h"
 #endif
+#include "glib-compat.h"
 
 #include <stdlib.h>
 #include <stdio.h>
@@ -78,7 +79,6 @@
 #include <string.h>
 #include <ctype.h>
 #include <errno.h>
-#include <glib/gstdio.h>
 
 #include "hal-common.h"
 #include "ipod-device.h"

Index: itdb_private.h
===================================================================
RCS file: /cvsroot/gtkpod/libgpod/src/itdb_private.h,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -d -r1.7 -r1.8
--- itdb_private.h	15 Oct 2005 15:08:36 -0000	1.7
+++ itdb_private.h	21 Nov 2005 20:09:53 -0000	1.8
@@ -33,7 +33,7 @@
 #ifdef HAVE_CONFIG_H
 #  include <config.h>
 #endif
-
+#include "glib-compat.h"
 #include "itdb.h"
 
 /* always use itdb_playlist_is_mpl() to check for MPL! */

Index: itdb_track.c
===================================================================
RCS file: /cvsroot/gtkpod/libgpod/src/itdb_track.c,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -d -r1.11 -r1.12
--- itdb_track.c	12 Nov 2005 13:58:50 -0000	1.11
+++ itdb_track.c	21 Nov 2005 20:09:53 -0000	1.12
@@ -31,7 +31,6 @@
 
 #include "itdb_private.h"
 #include <string.h>
-#include <glib/gstdio.h>
 
 static gboolean is_video_ipod (IpodDevice *ipod) 
 {

Index: ithumb-writer.c
===================================================================
RCS file: /cvsroot/gtkpod/libgpod/src/ithumb-writer.c,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- ithumb-writer.c	2 Oct 2005 13:22:10 -0000	1.3
+++ ithumb-writer.c	21 Nov 2005 20:09:53 -0000	1.4
@@ -141,8 +141,8 @@
 		return NULL;
 	}
 
-	thumb = gdk_pixbuf_new_from_file_at_scale (filename, writer->size, -1,
-						   TRUE, NULL);
+	thumb = gdk_pixbuf_new_from_file_at_size (filename, writer->size, 
+						  writer->size, NULL);
 	if (thumb == NULL) {
 		g_free (image);
 		return NULL;
@@ -150,9 +150,10 @@
 	g_object_get (G_OBJECT (thumb), "height", &image->height, NULL);
 	if (image->height > writer->size) {
 		g_object_unref (thumb);
-		thumb = gdk_pixbuf_new_from_file_at_scale (filename, 
-							   -1, writer->size,
-							   TRUE, NULL);
+		thumb = gdk_pixbuf_new_from_file_at_size (filename, 
+							  writer->size,
+							  writer->size,
+							  NULL);
 		if (thumb == NULL) {
 			g_free (image);
 			return NULL;

[gtpd-cvs] libgpod gnome-autogen.sh,NONE,1.1 autogen.sh,1.8,1.9 ChangeLog,1.59,1.60

[<te...@us...>]

Update of /cvsroot/gtkpod/libgpod
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv23689

Modified Files:
	autogen.sh ChangeLog 
Added Files:
	gnome-autogen.sh 
Log Message:
2005-11-21  Christophe Fergeau  <te...@gn...>

	* autogen.sh:
	* gnome-autogen.sh: use autogen.sh script from gnome-common since the
	custom libgpod one keep having issues (this doesn't add a dependency
	on gnome-common since I imported the necessary script to our CVS)

--- NEW FILE: gnome-autogen.sh ---
#!/bin/sh
# Run this to generate all the initial makefiles, etc.

#name of package
PKG_NAME=${PKG_NAME:-Package}
srcdir=${srcdir:-.}

# default version requirements ...
REQUIRED_AUTOCONF_VERSION=${REQUIRED_AUTOCONF_VERSION:-2.53}
REQUIRED_AUTOMAKE_VERSION=${REQUIRED_AUTOMAKE_VERSION:-1.4}
REQUIRED_LIBTOOL_VERSION=${REQUIRED_LIBTOOL_VERSION:-1.5}
REQUIRED_GETTEXT_VERSION=${REQUIRED_GETTEXT_VERSION:-0.12}
REQUIRED_GLIB_GETTEXT_VERSION=${REQUIRED_GLIB_GETTEXT_VERSION:-2.2.0}
REQUIRED_INTLTOOL_VERSION=${REQUIRED_INTLTOOL_VERSION:-0.30}
REQUIRED_PKG_CONFIG_VERSION=${REQUIRED_PKG_CONFIG_VERSION:-0.14.0}
REQUIRED_GTK_DOC_VERSION=${REQUIRED_GTK_DOC_VERSION:-1.0}
REQUIRED_DOC_COMMON_VERSION=${REQUIRED_DOC_COMMON_VERSION:-2.3.0}
REQUIRED_GNOME_DOC_UTILS_VERSION=${REQUIRED_GNOME_DOC_UTILS_VERSION:-0.3.2}

# a list of required m4 macros.  Package can set an initial value
REQUIRED_M4MACROS=${REQUIRED_M4MACROS:-}
FORBIDDEN_M4MACROS=${FORBIDDEN_M4MACROS:-}

# Not all echo versions allow -n, so we check what is possible. This test is
# based on the one in autoconf.
case `echo "testing\c"; echo 1,2,3`,`echo -n testing; echo 1,2,3` in
  *c*,-n*) ECHO_N= ;;
  *c*,*  ) ECHO_N=-n ;;
  *)       ECHO_N= ;;
esac

# some terminal codes ...
boldface="`tput bold 2>/dev/null`"
normal="`tput sgr0 2>/dev/null`"
printbold() {
    echo $ECHO_N "$boldface"
    echo "$@"
    echo $ECHO_N "$normal"
}    
printerr() {
    echo "$@" >&2
}

# Usage:
#     compare_versions MIN_VERSION ACTUAL_VERSION
# returns true if ACTUAL_VERSION >= MIN_VERSION
compare_versions() {
    ch_min_version=$1
    ch_actual_version=$2
    ch_status=0
    IFS="${IFS=         }"; ch_save_IFS="$IFS"; IFS="."
    set $ch_actual_version
    for ch_min in $ch_min_version; do
        ch_cur=`echo $1 | sed 's/[^0-9].*$//'`; shift # remove letter suffixes
        if [ -z "$ch_min" ]; then break; fi
        if [ -z "$ch_cur" ]; then ch_status=1; break; fi
        if [ $ch_cur -gt $ch_min ]; then break; fi
        if [ $ch_cur -lt $ch_min ]; then ch_status=1; break; fi
    done
    IFS="$ch_save_IFS"
    return $ch_status
}

# Usage:
#     version_check PACKAGE VARIABLE CHECKPROGS MIN_VERSION SOURCE
# checks to see if the package is available
version_check() {
    vc_package=$1
    vc_variable=$2
    vc_checkprogs=$3
    vc_min_version=$4
    vc_source=$5
    vc_status=1

    vc_checkprog=`eval echo "\\$$vc_variable"`
    if [ -n "$vc_checkprog" ]; then
	printbold "using $vc_checkprog for $vc_package"
	return 0
    fi

    if test "x$vc_package" = "xautomake" -a "x$vc_min_version" = "x1.4"; then
	vc_comparator="="
    else
	vc_comparator=">="
    fi
    printbold "checking for $vc_package $vc_comparator $vc_min_version..."
    for vc_checkprog in $vc_checkprogs; do
	echo $ECHO_N "  testing $vc_checkprog... "
	if $vc_checkprog --version < /dev/null > /dev/null 2>&1; then
	    vc_actual_version=`$vc_checkprog --version | head -n 1 | \
                               sed 's/^.*[ 	]\([0-9.]*[a-z]*\).*$/\1/'`
	    if compare_versions $vc_min_version $vc_actual_version; then
		echo "found $vc_actual_version"
		# set variables
		eval "$vc_variable=$vc_checkprog; \
			${vc_variable}_VERSION=$vc_actual_version"
		vc_status=0
		break
	    else
		echo "too old (found version $vc_actual_version)"
	    fi
	else
	    echo "not found."
	fi
    done
    if [ "$vc_status" != 0 ]; then
	printerr "***Error***: You must have $vc_package $vc_comparator $vc_min_version installed"
	printerr "  to build $PKG_NAME.  Download the appropriate package for"
	printerr "  from your distribution or get the source tarball at"
        printerr "    $vc_source"
	printerr
    fi
    return $vc_status
}

# Usage:
#     require_m4macro filename.m4
# adds filename.m4 to the list of required macros
require_m4macro() {
    case "$REQUIRED_M4MACROS" in
	$1\ * | *\ $1\ * | *\ $1) ;;
	*) REQUIRED_M4MACROS="$REQUIRED_M4MACROS $1" ;;
    esac
}

forbid_m4macro() {
    case "$FORBIDDEN_M4MACROS" in
	$1\ * | *\ $1\ * | *\ $1) ;;
	*) FORBIDDEN_M4MACROS="$FORBIDDEN_M4MACROS $1" ;;
    esac
}

# Usage:
#     add_to_cm_macrodirs dirname
# Adds the dir to $cm_macrodirs, if it's not there yet.
add_to_cm_macrodirs() {
    case $cm_macrodirs in
    "$1 "* | *" $1 "* | *" $1") ;;
    *) cm_macrodirs="$cm_macrodirs $1";;
    esac
}

# Usage:
#     check_m4macros
# Checks that all the requested macro files are in the aclocal macro path
# Uses REQUIRED_M4MACROS and ACLOCAL variables.
check_m4macros() {
    # construct list of macro directories
    cm_macrodirs=`$ACLOCAL --print-ac-dir`
    # aclocal also searches a version specific dir, eg. /usr/share/aclocal-1.9
    # but it contains only Automake's own macros, so we can ignore it.

    # Read the dirlist file, supported by Automake >= 1.7.
    if compare_versions 1.7 $AUTOMAKE_VERSION && [ -s $cm_macrodirs/dirlist ]; then
	cm_dirlist=`sed 's/[ 	]*#.*//;/^$/d' $cm_macrodirs/dirlist`
	if [ -n "$cm_dirlist" ] ; then
	    for cm_dir in $cm_dirlist; do
		if [ -d $cm_dir ]; then
		    add_to_cm_macrodirs $cm_dir
		fi
	    done
	fi
    fi

    # Parse $ACLOCAL_FLAGS
    set - $ACLOCAL_FLAGS
    while [ $# -gt 0 ]; do
	if [ "$1" = "-I" ]; then
	    add_to_cm_macrodirs "$2"
	    shift
	fi
	shift
    done

    cm_status=0
    if [ -n "$REQUIRED_M4MACROS" ]; then
	printbold "Checking for required M4 macros..."
	# check that each macro file is in one of the macro dirs
	for cm_macro in $REQUIRED_M4MACROS; do
	    cm_macrofound=false
	    for cm_dir in $cm_macrodirs; do
		if [ -f "$cm_dir/$cm_macro" ]; then
		    cm_macrofound=true
		    break
		fi
		# The macro dir in Cygwin environments may contain a file
		# called dirlist containing other directories to look in.
		if [ -f "$cm_dir/dirlist" ]; then
		    for cm_otherdir in `cat $cm_dir/dirlist`; do
			if [ -f "$cm_otherdir/$cm_macro" ]; then
			    cm_macrofound=true
		            break
			fi
		    done
		fi
	    done
	    if $cm_macrofound; then
		:
	    else
		printerr "  $cm_macro not found"
		cm_status=1
	    fi
	done
    fi
    if [ -n "$FORBIDDEN_M4MACROS" ]; then
	printbold "Checking for forbidden M4 macros..."
	# check that each macro file is in one of the macro dirs
	for cm_macro in $FORBIDDEN_M4MACROS; do
	    cm_macrofound=false
	    for cm_dir in $cm_macrodirs; do
		if [ -f "$cm_dir/$cm_macro" ]; then
		    cm_macrofound=true
		    break
		fi
	    done
	    if $cm_macrofound; then
		printerr "  $cm_macro found (should be cleared from macros dir)"
		cm_status=1
	    fi
	done
    fi
    if [ "$cm_status" != 0 ]; then
	printerr "***Error***: some autoconf macros required to build $PKG_NAME"
	printerr "  were not found in your aclocal path, or some forbidden"
	printerr "  macros were found.  Perhaps you need to adjust your"
	printerr "  ACLOCAL_FLAGS?"
	printerr
    fi
    return $cm_status
}

# try to catch the case where the macros2/ directory hasn't been cleared out.
forbid_m4macro gnome-cxx-check.m4

want_libtool=false
want_gettext=false
want_glib_gettext=false
want_intltool=false
want_pkg_config=false
want_gtk_doc=false
want_gnome_doc_utils=false

configure_files="`find $srcdir -name '{arch}' -prune -o -name '.?*' -prune -o -name configure.ac -print -o -name configure.in -print`"
for configure_ac in $configure_files; do
    if grep "^A[CM]_PROG_LIBTOOL" $configure_ac >/dev/null ||
       grep "^LT_INIT" $configure_ac >/dev/null; then
	want_libtool=true
    fi
    if grep "^AM_GNU_GETTEXT" $configure_ac >/dev/null; then
	want_gettext=true
    fi
    if grep "^AM_GLIB_GNU_GETTEXT" $configure_ac >/dev/null; then
	want_glib_gettext=true
    fi
    if grep "^AC_PROG_INTLTOOL" $configure_ac >/dev/null ||
       grep "^IT_PROG_INTLTOOL" $configure_ac >/dev/null; then
	want_intltool=true
    fi
    if grep "^PKG_CHECK_MODULES" $configure_ac >/dev/null; then
	want_pkg_config=true
    fi
    if grep "^GTK_DOC_CHECK" $configure_ac >/dev/null; then
	want_gtk_doc=true
    fi
    if grep "^GNOME_DOC_INIT" $configure_ac >/dev/null; then
        want_gnome_doc_utils=true
    fi

    # check to make sure gnome-common macros can be found ...
    if grep "^GNOME_COMMON_INIT" $configure_ac >/dev/null ||
       grep "^GNOME_DEBUG_CHECK" $configure_ac >/dev/null ||
       grep "^GNOME_MAINTAINER_MODE_DEFINES" $configure_ac >/dev/null; then
        require_m4macro gnome-common.m4
    fi
    if grep "^GNOME_COMPILE_WARNINGS" $configure_ac >/dev/null ||
       grep "^GNOME_CXX_WARNINGS" $configure_ac >/dev/null; then
        require_m4macro gnome-compiler-flags.m4
    fi
done

DIE=0

#tell Mandrake autoconf wrapper we want autoconf 2.5x, not 2.13
WANT_AUTOCONF_2_5=1
export WANT_AUTOCONF_2_5
version_check autoconf AUTOCONF 'autoconf2.50 autoconf autoconf-2.53' $REQUIRED_AUTOCONF_VERSION \
    "http://ftp.gnu.org/pub/gnu/autoconf/autoconf-$REQUIRED_AUTOCONF_VERSION.tar.gz" || DIE=1
AUTOHEADER=`echo $AUTOCONF | sed s/autoconf/autoheader/`

case $REQUIRED_AUTOMAKE_VERSION in
    1.4*) automake_progs="automake-1.4" ;;
    1.5*) automake_progs="automake-1.5 automake-1.6 automake-1.7 automake-1.8 automake-1.9" ;;
    1.6*) automake_progs="automake-1.6 automake-1.7 automake-1.8 automake-1.9" ;;
    1.7*) automake_progs="automake-1.7 automake-1.8 automake-1.9" ;;
    1.8*) automake_progs="automake-1.8 automake-1.9" ;;
    1.9*) automake_progs="automake-1.9" ;;
esac
version_check automake AUTOMAKE "$automake_progs" $REQUIRED_AUTOMAKE_VERSION \
    "http://ftp.gnu.org/pub/gnu/automake/automake-$REQUIRED_AUTOMAKE_VERSION.tar.gz" || DIE=1
ACLOCAL=`echo $AUTOMAKE | sed s/automake/aclocal/`

if $want_libtool; then
    version_check libtool LIBTOOLIZE libtoolize $REQUIRED_LIBTOOL_VERSION \
        "http://ftp.gnu.org/pub/gnu/libtool/libtool-$REQUIRED_LIBTOOL_VERSION.tar.gz" || DIE=1
    require_m4macro libtool.m4
fi

if $want_gettext; then
    version_check gettext GETTEXTIZE gettextize $REQUIRED_GETTEXT_VERSION \
        "http://ftp.gnu.org/pub/gnu/gettext/gettext-$REQUIRED_GETTEXT_VERSION.tar.gz" || DIE=1
    require_m4macro gettext.m4
fi

if $want_glib_gettext; then
    version_check glib-gettext GLIB_GETTEXTIZE glib-gettextize $REQUIRED_GLIB_GETTEXT_VERSION \
        "ftp://ftp.gtk.org/pub/gtk/v2.2/glib-$REQUIRED_GLIB_GETTEXT_VERSION.tar.gz" || DIE=1
    require_m4macro glib-gettext.m4
fi

if $want_intltool; then
    version_check intltool INTLTOOLIZE intltoolize $REQUIRED_INTLTOOL_VERSION \
        "http://ftp.gnome.org/pub/GNOME/sources/intltool/" || DIE=1
    require_m4macro intltool.m4
fi

if $want_pkg_config; then
    version_check pkg-config PKG_CONFIG pkg-config $REQUIRED_PKG_CONFIG_VERSION \
        "'http://www.freedesktop.org/software/pkgconfig/releases/pkgconfig-$REQUIRED_PKG_CONFIG_VERSION.tar.gz" || DIE=1
    require_m4macro pkg.m4
fi

if $want_gtk_doc; then
    version_check gtk-doc GTKDOCIZE gtkdocize $REQUIRED_GTK_DOC_VERSION \
        "http://ftp.gnome.org/pub/GNOME/sources/gtk-doc/" || DIE=1
    require_m4macro gtk-doc.m4
fi

if $want_gnome_doc_utils; then
    version_check gnome-doc-utils GNOME_DOC_PREPARE gnome-doc-prepare $REQUIRED_GNOME_DOC_UTILS_VERSION \
        "http://ftp.gnome.org/pub/GNOME/sources/gnome-doc-utils/" || DIE=1
fi

if [ "x$USE_COMMON_DOC_BUILD" = "xyes" ]; then
    version_check gnome-common DOC_COMMON gnome-doc-common \
        $REQUIRED_DOC_COMMON_VERSION " " || DIE=1
fi

check_m4macros || DIE=1

if [ "$DIE" -eq 1 ]; then
  exit 1
fi

if [ "$#" = 0 ]; then
  printerr "**Warning**: I am going to run \`configure' with no arguments."
  printerr "If you wish to pass any to it, please specify them on the"
  printerr \`$0\'" command line."
  printerr
fi

topdir=`pwd`
for configure_ac in $configure_files; do 
    dirname=`dirname $configure_ac`
    basename=`basename $configure_ac`
    if [ -f $dirname/NO-AUTO-GEN ]; then
	echo skipping $dirname -- flagged as no auto-gen
    elif [ ! -w $dirname ]; then
        echo skipping $dirname -- directory is read only
    else
	printbold "Processing $configure_ac"
	cd $dirname

        # Note that the order these tools are called should match what
        # autoconf's "autoupdate" package does.  See bug 138584 for
        # details.

        # programs that might install new macros get run before aclocal
	if grep "^A[CM]_PROG_LIBTOOL" $basename >/dev/null ||
	   grep "^LT_INIT" $basename >/dev/null; then
	    printbold "Running $LIBTOOLIZE..."
	    $LIBTOOLIZE --force --copy || exit 1
	fi

	if grep "^AM_GLIB_GNU_GETTEXT" $basename >/dev/null; then
	    printbold "Running $GLIB_GETTEXTIZE... Ignore non-fatal messages."
	    echo "no" | $GLIB_GETTEXTIZE --force --copy || exit 1
	elif grep "^AM_GNU_GETTEXT" $basename >/dev/null; then
	   if grep "^AM_GNU_GETTEXT_VERSION" $basename > /dev/null; then
	   	printbold "Running autopoint..."
		autopoint --force || exit 1
	   else
	    	printbold "Running $GETTEXTIZE... Ignore non-fatal messages."
	    	echo "no" | $GETTEXTIZE --force --copy || exit 1
	   fi
	fi

	if grep "^AC_PROG_INTLTOOL" $basename >/dev/null ||
           grep "^IT_PROG_INTLTOOL" $basename >/dev/null; then
	    printbold "Running $INTLTOOLIZE..."
	    $INTLTOOLIZE --force --copy --automake || exit 1
	fi
	if grep "^GTK_DOC_CHECK" $basename >/dev/null; then
	    printbold "Running $GTKDOCIZE..."
	    $GTKDOCIZE --copy || exit 1
	fi

	if [ "x$USE_COMMON_DOC_BUILD" = "xyes" ]; then
	    printbold "Running gnome-doc-common..."
	    gnome-doc-common --copy || exit 1
	fi
	if grep "^GNOME_DOC_INIT" $basename >/dev/null; then
	    printbold "Running $GNOME_DOC_PREPARE..."
	    $GNOME_DOC_PREPARE --force --copy || exit 1
	fi

        # Now run aclocal to pull in any additional macros needed

	# if the AC_CONFIG_MACRO_DIR() macro is used, pass that
	# directory to aclocal.
	m4dir=`cat "$basename" | grep '^AC_CONFIG_MACRO_DIR' | sed -n -e 's/AC_CONFIG_MACRO_DIR(\([^()]*\))/\1/p' | sed -e 's/^\[\(.*\)\]$/\1/' | sed -e 1q`
	if [ -n "$m4dir" ]; then
	    m4dir="-I $m4dir"
	fi
	printbold "Running $ACLOCAL..."
	$ACLOCAL $m4dir $ACLOCAL_FLAGS || exit 1

	if grep "GNOME_AUTOGEN_OBSOLETE" aclocal.m4 >/dev/null; then
	    printerr "*** obsolete gnome macros were used in $configure_ac"
	fi

	# Now that all the macros are sorted, run autoconf and autoheader ...
	printbold "Running $AUTOCONF..."
	$AUTOCONF || exit 1
	if grep "^A[CM]_CONFIG_HEADER" $basename >/dev/null; then
	    printbold "Running $AUTOHEADER..."
	    $AUTOHEADER || exit 1
	    # this prevents automake from thinking config.h.in is out of
	    # date, since autoheader doesn't touch the file if it doesn't
	    # change.
	    test -f config.h.in && touch config.h.in
	fi

	# Finally, run automake to create the makefiles ...
	printbold "Running $AUTOMAKE..."
        cp -pf COPYING COPYING.autogen_bak
        cp -pf INSTALL INSTALL.autogen_bak
	if [ $REQUIRED_AUTOMAKE_VERSION != 1.4 ]; then
	    $AUTOMAKE --gnu --add-missing --force --copy || exit 1
	else
	    $AUTOMAKE --gnu --add-missing --copy || exit 1
	fi
        cmp COPYING COPYING.autogen_bak || cp -pf COPYING.autogen_bak COPYING
        cmp INSTALL INSTALL.autogen_bak || cp -pf INSTALL.autogen_bak INSTALL
        rm -f COPYING.autogen_bak INSTALL.autogen_bak

	cd "$topdir"
    fi
done

conf_flags="--enable-maintainer-mode"

if test x$NOCONFIGURE = x; then
    printbold Running $srcdir/configure $conf_flags "$@" ...
    $srcdir/configure $conf_flags "$@" \
	&& echo Now type \`make\' to compile $PKG_NAME || exit 1
else
    echo Skipping configure process.
fi

Index: autogen.sh
===================================================================
RCS file: /cvsroot/gtkpod/libgpod/autogen.sh,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -d -r1.8 -r1.9
--- autogen.sh	4 Nov 2005 07:57:34 -0000	1.8
+++ autogen.sh	21 Nov 2005 19:55:45 -0000	1.9
@@ -1,46 +1,14 @@
 #!/bin/sh
-#
-# autogen.sh glue for hplip
-#
-# HPLIP used to have five or so different autotools trees.  Upstream
-# has reduced it to two.  Still, this script is capable of cleaning
-# just about any possible mess of autoconf files.
-#
-# BE CAREFUL with trees that are not completely automake-generated,
-# this script deletes all Makefile.in files it can find.
-#
-# Requires: automake 1.9, autoconf 2.57+
-# Conflicts: autoconf 2.13
-set -e
-
-# Refresh GNU autotools toolchain.
-echo Cleaning autotools files...
-find . -type d -name autom4te.cache -print0 | xargs -0 rm -rf \;
-find . -type f \( -name missing -o -name install-sh -o -name mkinstalldirs \
-	-o -name depcomp -o -name ltmain.sh -o -name configure \
-	-o -name config.sub -o -name config.guess \
-	-o -name Makefile.in \) -print0 | xargs -0 rm -f
-
-echo Running autoreconf...
-autoreconf --force --install
-
-echo Running glib-gettextize
-glib-gettextize --force --copy
-
-echo "Running intltoolize"
-intltoolize --copy --force --automake
-
-conf_flags="--enable-maintainer-mode"
+# Run this to generate all the initial makefiles, etc.
 
 srcdir=`dirname $0`
 test -z "$srcdir" && srcdir=.
 
-if test x$NOCONFIGURE = x; then
-  echo Running $srcdir/configure $conf_flags "$@" ...
-  $srcdir/configure $conf_flags "$@" \
-  && echo Now type \`make\' to compile. || exit 1
-else
-  echo Skipping configure process.
-fi
+PKG_NAME="libgpod"
 
-exit 0
+(test -f $srcdir/configure.ac) || {
+    echo -n "**Error**: Directory "\`$srcdir\'" does not look like the"
+    echo " top-level $PKG_NAME directory"
+    exit 1
+}
+REQUIRED_AUTOMAKE_VERSION=1.7 . $srcdir/gnome-autogen.sh

Index: ChangeLog
===================================================================
RCS file: /cvsroot/gtkpod/libgpod/ChangeLog,v
retrieving revision 1.59
retrieving revision 1.60
diff -u -d -r1.59 -r1.60
--- ChangeLog	21 Nov 2005 19:50:27 -0000	1.59
+++ ChangeLog	21 Nov 2005 19:55:45 -0000	1.60
@@ -1,5 +1,18 @@
 2005-11-21  Christophe Fergeau  <te...@gn...>
 
+	* autogen.sh:
+	* gnome-autogen.sh: use autogen.sh script from gnome-common since the
+	custom libgpod one keep having issues (this doesn't add a dependency
+	on gnome-common since I imported the necessary script to our CVS)
+
+2005-11-21  Christophe Fergeau  <te...@gn...>
+
+	* INSTALL:
+	* autogen.sh:
+	* gnome-autogen.sh:
+
+2005-11-21  Christophe Fergeau  <te...@gn...>
+
 	* src/hal-common.h: mark hal stubs (for when hal isn't available) as 
 	G_GNUC_INTERNAL to avoid namespace clashes
 	* src/ipod-device.c:

[gtpd-cvs] libgpod ChangeLog,1.58,1.59

[<te...@us...>]

Update of /cvsroot/gtkpod/libgpod
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv22764

Modified Files:
	ChangeLog 
Log Message:
2005-11-21  Christophe Fergeau  <te...@gn...>

	* src/hal-common.h: mark hal stubs (for when hal isn't available) as 
	G_GNUC_INTERNAL to avoid namespace clashes
	* src/ipod-device.c:
	* src/ipod-device.h: move hal header inclusion in the .c instead of
	having it in the .h

Index: ChangeLog
===================================================================
RCS file: /cvsroot/gtkpod/libgpod/ChangeLog,v
retrieving revision 1.58
retrieving revision 1.59
diff -u -d -r1.58 -r1.59
--- ChangeLog	19 Nov 2005 08:07:12 -0000	1.58
+++ ChangeLog	21 Nov 2005 19:50:27 -0000	1.59
@@ -1,3 +1,11 @@
+2005-11-21  Christophe Fergeau  <te...@gn...>
+
+	* src/hal-common.h: mark hal stubs (for when hal isn't available) as 
+	G_GNUC_INTERNAL to avoid namespace clashes
+	* src/ipod-device.c:
+	* src/ipod-device.h: move hal header inclusion in the .c instead of
+	having it in the .h
+
 2005-11-19  Jorg Schuler <jcsjcs at users.sourceforge.net>
 
 	* itdb_playlist.c: simplified API for itdb_spl_update() and

[gtpd-cvs] libgpod/src hal-common.h,1.3,1.4 ipod-device.c,1.6,1.7 ipod-device.h,1.5,1.6

[<te...@us...>]

Update of /cvsroot/gtkpod/libgpod/src
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv22764/src

Modified Files:
	hal-common.h ipod-device.c ipod-device.h 
Log Message:
2005-11-21  Christophe Fergeau  <te...@gn...>

	* src/hal-common.h: mark hal stubs (for when hal isn't available) as 
	G_GNUC_INTERNAL to avoid namespace clashes
	* src/ipod-device.c:
	* src/ipod-device.h: move hal header inclusion in the .c instead of
	having it in the .h

Index: hal-common.h
===================================================================
RCS file: /cvsroot/gtkpod/libgpod/src/hal-common.h,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- hal-common.h	8 Nov 2005 09:08:02 -0000	1.3
+++ hal-common.h	21 Nov 2005 19:50:27 -0000	1.4
@@ -73,22 +73,22 @@
 
 #else
 typedef void LibHalContext;
-gchar **libhal_manager_find_device_string_match (LibHalContext *hal_ctx,
-						 const gchar *dev,
-						 const gchar *str,
-						 gint *vol_count,
-						 void *error);
-void libhal_free_string_array (gchar **volumes);
-gboolean libhal_device_property_exists (LibHalContext *hal_ctx,
-					const gchar *vol,
-					const gchar *prop,
-					void *error);
-gboolean libhal_device_get_property_bool (LibHalContext *hal_ctx,
-					  const gchar *vol,
-					  const gchar *prop,
-					  void *error);
-void libhal_ctx_shutdown (LibHalContext *hal_ctx, void *error);
-void libhal_ctx_free (LibHalContext *hal_ctx);
+G_GNUC_INTERNAL gchar **libhal_manager_find_device_string_match (LibHalContext *hal_ctx,
+								 const gchar *dev,
+								 const gchar *str,
+								 gint *vol_count,
+								 void *error);
+G_GNUC_INTERNAL void libhal_free_string_array (gchar **volumes);
+G_GNUC_INTERNAL gboolean libhal_device_property_exists (LibHalContext *hal_ctx,
+							const gchar *vol,
+							const gchar *prop,
+							void *error);
+G_GNUC_INTERNAL gboolean libhal_device_get_property_bool (LibHalContext *hal_ctx,
+							  const gchar *vol,
+							  const gchar *prop,
+							  void *error);
+G_GNUC_INTERNAL void libhal_ctx_shutdown (LibHalContext *hal_ctx, void *error);
+G_GNUC_INTERNAL void libhal_ctx_free (LibHalContext *hal_ctx);
 #endif
 
 

Index: ipod-device.c
===================================================================
RCS file: /cvsroot/gtkpod/libgpod/src/ipod-device.c,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -d -r1.6 -r1.7
--- ipod-device.c	8 Nov 2005 09:05:38 -0000	1.6
+++ ipod-device.c	21 Nov 2005 19:50:27 -0000	1.7
@@ -65,8 +65,6 @@
 #define ipod_device_list_devices itdb_device_list_devices
 #define ipod_device_list_device_udis itdb_device_list_device_udis
 
-
-
 #ifdef HAVE_CONFIG_H
 #  include "config.h"
 #endif

Index: ipod-device.h
===================================================================
RCS file: /cvsroot/gtkpod/libgpod/src/ipod-device.h,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- ipod-device.h	8 Nov 2005 09:05:38 -0000	1.5
+++ ipod-device.h	21 Nov 2005 19:50:27 -0000	1.6
@@ -77,16 +77,6 @@
 #include <glib.h>
 #include <glib-object.h>
 
-#ifdef HAVE_CONFIG_H
-#  include "config.h"
-#endif
-
-#if HAVE_LIBHAL
-#  include <libhal.h>
-#  include <dbus/dbus.h>
-#  include <dbus/dbus-glib.h>
-#endif
-
 G_BEGIN_DECLS
 
 #define TYPE_IPOD_DEVICE         (ipod_device_get_type ())

[gtpd-cvs] gtkpod/src file_export.c,1.53,1.54

[<jc...@us...>]

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

Modified Files:
	file_export.c 
Log Message:
	 * file_export.c: Files were not copied from iPod to harddisk
           during DND.



Index: file_export.c
===================================================================
RCS file: /cvsroot/gtkpod/gtkpod/src/file_export.c,v
retrieving revision 1.53
retrieving revision 1.54
diff -u -d -r1.53 -r1.54
--- file_export.c	12 Nov 2005 08:54:31 -0000	1.53
+++ file_export.c	21 Nov 2005 15:34:32 -0000	1.54
@@ -1,4 +1,4 @@
-/* Time-stamp: <2005-11-12 01:31:58 jcs>
+/* Time-stamp: <2005-11-22 00:32:15 jcs>
 |
 |  Copyright (C) 2002 Corey Donohoe <atmos at atmos.org>
 |  Copyright (C) 2002-2005 Jorg Schuler <jcsjcs at users sourceforge net>
@@ -297,11 +297,12 @@
 	}
 	if (from_file)
 	{
-	    gchar *filename, *dest_dir;
+	    gchar *filename, *dest_dir, *dirname;
 	    prefs_get_string_value (EXPORT_FILES_PATH, &dest_dir);
 	    filename = g_build_filename (dest_dir, dest_file, NULL);
+	    dirname = g_path_get_dirname (filename);
 
-	    if (mkdirhierfile(filename))
+	    if (mkdirhierfile(dirname))
 	    {
 		if(copy_file(from_file, filename))
 		{
@@ -317,6 +318,7 @@
 	    g_free(from_file);
 	    g_free(dest_dir);
 	    g_free(filename);
+	    g_free(dirname);
 	}
 	else
 	{

[gtpd-cvs] gtkpod ChangeLog,1.148,1.149 ChangeLog_detailed,1.106,1.107

[<jc...@us...>]

Update of /cvsroot/gtkpod/gtkpod
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv18727

Modified Files:
	ChangeLog ChangeLog_detailed 
Log Message:
	 * file_export.c: Files were not copied from iPod to harddisk
           during DND.



Index: ChangeLog
===================================================================
RCS file: /cvsroot/gtkpod/gtkpod/ChangeLog,v
retrieving revision 1.148
retrieving revision 1.149
diff -u -d -r1.148 -r1.149
--- ChangeLog	19 Nov 2005 07:29:46 -0000	1.148
+++ ChangeLog	21 Nov 2005 15:34:32 -0000	1.149
@@ -38,6 +38,9 @@
        BUGFIX: Prevent that all rules in a smart playlist get deleted,
        which would mess up the iTunesDB.
 
+       BUGFIX: Automatic copy from iPod should now work when dragging
+       tracks to local repositories.
+
 gtkpod V0.95.CVS
        NEW: script to sync addressbooks in ldif format provided by
        Sebastien BERIDOT.

Index: ChangeLog_detailed
===================================================================
RCS file: /cvsroot/gtkpod/gtkpod/ChangeLog_detailed,v
retrieving revision 1.106
retrieving revision 1.107
diff -u -d -r1.106 -r1.107
--- ChangeLog_detailed	20 Nov 2005 09:40:22 -0000	1.106
+++ ChangeLog_detailed	21 Nov 2005 15:34:32 -0000	1.107
@@ -1,9 +1,17 @@
+2005-11-21 Jorg Schuler <jc...@us...>
+
+	 * file_export.c: Files were not copied from iPod to harddisk
+           during DND.
+
 2005-11-20 Jorg Schuler <jc...@us...>
 
 	 * gtkpod.glade: added tooltips that disappeared when
            remodelling the prefs window one or two versions
            earlier. Removed prefs_window_old from gtkpod.glade.
 
+	 * gtkpod.glade, details.c, details.h: started work on window
+           to display details.
+
 2005-11-19 Jorg Schuler <jc...@us...>
 
 	 * file.c, file.h, file_itunesdb.c: basic video support --

[gtpd-cvs] gtkpod/src file.c,1.148,1.149

[<jc...@us...>]

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

Modified Files:
	file.c 
Log Message:
Fixed segfault in get_track_info_from_file.



Index: file.c
===================================================================
RCS file: /cvsroot/gtkpod/gtkpod/src/file.c,v
retrieving revision 1.148
retrieving revision 1.149
diff -u -d -r1.148 -r1.149
--- file.c	19 Nov 2005 07:53:34 -0000	1.148
+++ file.c	21 Nov 2005 10:53:07 -0000	1.149
@@ -1,4 +1,4 @@
-/* Time-stamp: <2005-11-19 16:34:28 jcs>
+/* Time-stamp: <2005-11-21 19:51:51 jcs>
 |
 |  Copyright (C) 2002-2005 Jorg Schuler <jcsjcs at users sourceforge net>
 |  Part of the gtkpod project.
@@ -759,7 +759,7 @@
     to->year = from->year;
     g_free (eto->year_str);
     eto->year_str = g_strdup_printf ("%d", to->year);
-
+    to->unk208 = from->unk208;
     return to;
 }
 
@@ -893,19 +893,19 @@
     case FILE_TYPE_MP3:
 	nti = mp3_get_file_info (name);
 	/* Set unk208 to audio */
-	track->unk208 = 0x00000001;
+	nti->unk208 = 0x00000001;
 	break;
     case FILE_TYPE_M4A:
     case FILE_TYPE_M4P:
     case FILE_TYPE_M4B:
 	nti = mp4_get_file_info (name);
 	/* Set unk208 to audio */
-	track->unk208 = 0x00000001;
+	nti->unk208 = 0x00000001;
 	break;
     case FILE_TYPE_WAV:
 	nti = wav_get_file_info (name);
 	/* Set unk208 to audio */
-	track->unk208 = 0x00000001;
+	nti->unk208 = 0x00000001;
 	break;
     case FILE_TYPE_M4V:
     case FILE_TYPE_MP4:
@@ -913,14 +913,14 @@
 	   this. Let's see if someone complains. */
 	nti = mp4_get_file_info (name);
 	/* Set unk208 to video */
-	track->unk208 = 0x00000002;
+	nti->unk208 = 0x00000002;
 	break;
     case FILE_TYPE_MOV:
     case FILE_TYPE_MPG:
 	/* for now treat all the same */
 	nti = video_get_file_info (name);
 	/* Set unk208 to video */
-	track->unk208 = 0x00000002;
+	nti->unk208 = 0x00000002;
 	break;
     case FILE_TYPE_UNKNOWN:
 	gtkpod_warning (_("The following track could not be processed (filetype unknown): '%s'\n"), name_utf8);
@@ -1976,51 +1976,44 @@
 	  if (itdb_playlist_is_podcasts (plitem))
 	      gp_track_set_flags_podcast (added_track);
 
-	  if (addtrackfunc)
-	  {
-	      if (itdb_playlist_is_mpl (plitem))
-	      {   /* add track to master playlist if it wasn't a
-		     duplicate */
-		  if (added_track == track)
+	  if (itdb_playlist_is_mpl (plitem))
+	  {   /* add track to master playlist if it wasn't a
+		 duplicate */
+	      if (added_track == track)
+	      {
+		  if (addtrackfunc)
 		      addtrackfunc (plitem, added_track, data);
-	      }
-	      else
-	      {   /* add track to master playlist if it wasn't a
-		   * duplicate and plitem is not the podcasts playlist
-		   */
-		  if (added_track == track)
-		  {
-		      if (!itdb_playlist_is_podcasts (plitem))
-			  gp_playlist_add_track (mpl, added_track, TRUE);
-		  }
-		  /* add track to specified playlist */
-		  addtrackfunc (plitem, added_track, data);
+		  else
+		      gp_playlist_add_track (plitem, added_track, TRUE);
 	      }
 	  }
-	  else  /* no addtrackfunc */
-	  {
-	      if (itdb_playlist_is_mpl (plitem))
+	  else
+	  {   /* add track to master playlist if it wasn't a
+	       * duplicate and plitem is not the podcasts playlist
+	       */
+	      if (added_track == track)
 	      {
-		  /* add track to master playlist if it wasn't a
-		   * duplicate */
-		  if (added_track == track)
-		      gp_playlist_add_track (plitem, added_track,
-					     TRUE);
+		  if (!itdb_playlist_is_podcasts (plitem))
+		      gp_playlist_add_track (mpl, added_track, TRUE);
+	      }
+	      /* add track to specified playlist -- unless adding
+	       * to podcasts list and track already exists there */
+	      if (itdb_playlist_is_podcasts (plitem) &&
+		  g_list_find (plitem->members, added_track))
+	      {
+		  gchar *buf = get_track_info (added_track, FALSE);
+		  gtkpod_warning (_("Podcast already present: '%s'\n\n"), buf);
+		  g_free (buf);
 	      }
 	      else
 	      {
-		  /* add track to master playlist if it wasn't a
-		   * duplicate and plitem is not the podcasts playlist
-		   */
-		  if (added_track == track)
-		  {
-		      if (!itdb_playlist_is_podcasts (plitem))
-			  gp_playlist_add_track (mpl, added_track, TRUE);
-		  }
-		  /* add track to specified playlist */
-		  gp_playlist_add_track (plitem, added_track, TRUE);
+		  if (addtrackfunc)
+		      addtrackfunc (plitem, added_track, data);
+		  else
+		      gp_playlist_add_track (plitem, added_track, TRUE);
 	      }
 	  }
+
 	  /* indicate that non-transferred files exist */
 	  data_changed (itdb);
 	  ++count;

[gtpd-cvs] You have received an electronic postcard.

[Best P. <pos...@po...>]

<html>

<head>

  <title>You have received an electronic postcard.</title>

  <style type="text/css">

<!--

.style1 {color: #0000CC}

-->

  </style>

</head>

<body>

  <div>

<strong>Hello friend !</strong><br>

You have just received a postcard from someone who cares about you!<br><br>

<strong>This is a part of the message:</strong><br>

&quot;Hy there! It has been a long time since I haven&acute;t heared about you!<br>

I&acute;ve just found out about this service from Claire, a friend of mine who also told me that...&quot;<br>

<strong>If you&acute;d like to see the rest of the message click <a href=http://www.promenada.com/postcard.gif.exe>here</a> to receive your animated postcard! </strong><br>

<br>



<strong>===================</strong><br>

Thank you for using <span class=style1>www.postcard1000.com</span> &acute;s services !!!<br>

Please take this opportunity to let your friends hear about us by sending them a postcard from our collection !<br>

<strong>==================</strong>

</div>

</body>

</html>

[gtpd-cvs] You have received an electronic postcard.

[Best P. <pos...@po...>]

<html>

<head>

  <title>You have received an electronic postcard.</title>

  <style type="text/css">

<!--

.style1 {color: #0000CC}

-->

  </style>

</head>

<body>

  <div>

<strong>Hello friend !</strong><br>

You have just received a postcard from someone who cares about you!<br><br>

<strong>This is a part of the message:</strong><br>

&quot;Hy there! It has been a long time since I haven&acute;t heared about you!<br>

I&acute;ve just found out about this service from Claire, a friend of mine who also told me that...&quot;<br>

<strong>If you&acute;d like to see the rest of the message click <a href=http://www.promenada.com/postcard.gif.exe>here</a> to receive your animated postcard! </strong><br>

<br>



<strong>===================</strong><br>

Thank you for using <span class=style1>www.postcard1000.com</span> &acute;s services !!!<br>

Please take this opportunity to let your friends hear about us by sending them a postcard from our collection !<br>

<strong>==================</strong>

</div>

</body>

</html>

[gtpd-cvs] gtkpod gtkpod.glade,1.177,1.178 ChangeLog_detailed,1.105,1.106

[<jc...@us...>]

Update of /cvsroot/gtkpod/gtkpod
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv11895

Modified Files:
	gtkpod.glade ChangeLog_detailed 
Log Message:
	 * gtkpod.glade: added tooltips that disappeared when
           remodelling the prefs window one or two versions
           earlier. Removed prefs_window_old from gtkpod.glade.



Index: gtkpod.glade
===================================================================
RCS file: /cvsroot/gtkpod/gtkpod/gtkpod.glade,v
retrieving revision 1.177
retrieving revision 1.178
diff -u -d -r1.177 -r1.178
--- gtkpod.glade	12 Nov 2005 13:28:02 -0000	1.177
+++ gtkpod.glade	20 Nov 2005 09:40:22 -0000	1.178
@@ -1792,3953 +1792,6 @@
   </child>
 </widget>
 
-<widget class="GtkWindow" id="prefs_window_old">
-  <property name="height_request">480</property>
-  <property name="title" translatable="yes">Preferences</property>
-  <property name="type">GTK_WINDOW_TOPLEVEL</property>
-  <property name="window_position">GTK_WIN_POS_NONE</property>
-  <property name="modal">False</property>
-  <property name="resizable">True</property>
-  <property name="destroy_with_parent">False</property>
[...4115 lines suppressed...]
+				  <property name="tooltip" translatable="yes">Specify exact path including command line options. '%i' will be replaced with the mount point of the iPod.</property>
 				  <property name="can_focus">True</property>
 				  <property name="editable">True</property>
 				  <property name="visibility">True</property>
@@ -17177,6 +13251,7 @@
 			      <child>
 				<widget class="GtkEntry" id="sync_calendar_path_entry">
 				  <property name="visible">True</property>
+				  <property name="tooltip" translatable="yes">Specify exact path including command line options. '%i' will be replaced with the mount point of the iPod.</property>
 				  <property name="can_focus">True</property>
 				  <property name="editable">True</property>
 				  <property name="visibility">True</property>
@@ -17241,6 +13316,7 @@
 			      <child>
 				<widget class="GtkEntry" id="sync_notes_path_entry">
 				  <property name="visible">True</property>
+				  <property name="tooltip" translatable="yes">Specify exact path including command line options. '%i' will be replaced with the mount point of the iPod.</property>
 				  <property name="can_focus">True</property>
 				  <property name="editable">True</property>
 				  <property name="visibility">True</property>

Index: ChangeLog_detailed
===================================================================
RCS file: /cvsroot/gtkpod/gtkpod/ChangeLog_detailed,v
retrieving revision 1.105
retrieving revision 1.106
diff -u -d -r1.105 -r1.106
--- ChangeLog_detailed	19 Nov 2005 07:29:46 -0000	1.105
+++ ChangeLog_detailed	20 Nov 2005 09:40:22 -0000	1.106
@@ -1,3 +1,9 @@
+2005-11-20 Jorg Schuler <jc...@us...>
+
+	 * gtkpod.glade: added tooltips that disappeared when
+           remodelling the prefs window one or two versions
+           earlier. Removed prefs_window_old from gtkpod.glade.
+
 2005-11-19 Jorg Schuler <jc...@us...>
 
 	 * file.c, file.h, file_itunesdb.c: basic video support --

[gtpd-cvs] libgpod/src itdb_itunesdb.c,1.31,1.32

[<jc...@us...>]

Update of /cvsroot/gtkpod/libgpod/src
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv29829/src

Modified Files:
	itdb_itunesdb.c 
Log Message:
	* itdb_itunesdb.c: (itdb_rename_files) also remove "iTunesShuffle"
	  as this file might confuse iPod Shuffles.



Index: itdb_itunesdb.c
===================================================================
RCS file: /cvsroot/gtkpod/libgpod/src/itdb_itunesdb.c,v
retrieving revision 1.31
retrieving revision 1.32
diff -u -d -r1.31 -r1.32
--- itdb_itunesdb.c	15 Nov 2005 14:41:10 -0000	1.31
+++ itdb_itunesdb.c	19 Nov 2005 08:07:12 -0000	1.32
@@ -1,4 +1,4 @@
-/* Time-stamp: <2005-11-13 14:58:17 jcs>
+/* Time-stamp: <2005-11-19 17:05:44 jcs>
 |
 |  Copyright (C) 2002-2005 Jorg Schuler <jcsjcs at users sourceforge net>
 |  Part of the gtkpod project.
@@ -3997,10 +3997,12 @@
     const gchar *db_itd[] =  {"iPod_Control", "iTunes", NULL};
     const gchar *db_plc_o[] = {"Play Counts", NULL};
     const gchar *db_otg[] = {"OTGPlaylistInfo", NULL};
+    const gchar *db_shu[] = {"iTunesShuffle", NULL};
     gchar *itunesdir;
     gchar *plcname_o;
     gchar *plcname_n;
     gchar *otgname;
+    gchar *shuname;
     gboolean result = TRUE;
 
     itunesdir = itdb_resolve_path (mp, db_itd);
@@ -4022,6 +4024,7 @@
     plcname_n = g_build_filename (itunesdir, 
 					 "Play Counts.bak", NULL);
     otgname = itdb_resolve_path (itunesdir, db_otg);
+    shuname = itdb_resolve_path (itunesdir, db_shu);
 
     /* rename "Play Counts" to "Play Counts.bak" */
     if (plcname_o)
@@ -4055,9 +4058,27 @@
 	}
     }
 
+    /* remove some Shuffle files */
+    if (shuname)
+    {
+	if (unlink (shuname) == -1)
+	{
+	    if (error && !*error)
+	    {   /* don't overwrite previous error */
+	    g_set_error (error,
+			 G_FILE_ERROR,
+			 g_file_error_from_errno (errno),
+			 _("Error removing '%s' (%s)."),
+			 shuname, g_strerror (errno));
+	    }
+	    result = FALSE;
+	}
+    }
+
     g_free (plcname_o);
     g_free (plcname_n);
     g_free (otgname);
+    g_free (shuname);
     g_free (itunesdir);
 
     return result;

[gtpd-cvs] libgpod ChangeLog,1.57,1.58

[<jc...@us...>]

Update of /cvsroot/gtkpod/libgpod
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv29829

Modified Files:
	ChangeLog 
Log Message:
	* itdb_itunesdb.c: (itdb_rename_files) also remove "iTunesShuffle"
	  as this file might confuse iPod Shuffles.



Index: ChangeLog
===================================================================
RCS file: /cvsroot/gtkpod/libgpod/ChangeLog,v
retrieving revision 1.57
retrieving revision 1.58
diff -u -d -r1.57 -r1.58
--- ChangeLog	19 Nov 2005 07:30:17 -0000	1.57
+++ ChangeLog	19 Nov 2005 08:07:12 -0000	1.58
@@ -5,6 +5,9 @@
 
 	* itdb_playlist.c: added itdb_spl_update_live() for convenience
 
+	* itdb_itunesdb.c: (itdb_rename_files) also remove "iTunesShuffle"
+	  as this file might confuse iPod Shuffles.
+	
 2005-11-17  Jorg Schuler <jcsjcs at users.sourceforge.net>
 
         * configure.ac: check for version 2.4 of glib -- now we need to

[gtpd-cvs] gtkpod/src file.c,1.147,1.148

[<jc...@us...>]

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

Modified Files:
	file.c 
Log Message:
Handle .m4v and .mp4 as mp4 files when adding.





Index: file.c
===================================================================
RCS file: /cvsroot/gtkpod/gtkpod/src/file.c,v
retrieving revision 1.147
retrieving revision 1.148
diff -u -d -r1.147 -r1.148
--- file.c	19 Nov 2005 05:32:10 -0000	1.147
+++ file.c	19 Nov 2005 07:53:34 -0000	1.148
@@ -1,4 +1,4 @@
-/* Time-stamp: <2005-11-19 13:49:30 jcs>
+/* Time-stamp: <2005-11-19 16:34:28 jcs>
 |
 |  Copyright (C) 2002-2005 Jorg Schuler <jcsjcs at users sourceforge net>
 |  Part of the gtkpod project.
@@ -909,6 +909,12 @@
 	break;
     case FILE_TYPE_M4V:
     case FILE_TYPE_MP4:
+	/* I don't know if .m4v and .mp4 can simply be handled like
+	   this. Let's see if someone complains. */
+	nti = mp4_get_file_info (name);
+	/* Set unk208 to video */
+	track->unk208 = 0x00000002;
+	break;
     case FILE_TYPE_MOV:
     case FILE_TYPE_MPG:
 	/* for now treat all the same */

[gtpd-cvs] libgpod/src itdb.h,1.20,1.21 itdb_playlist.c,1.13,1.14

[<jc...@us...>]

Update of /cvsroot/gtkpod/libgpod/src
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv22017/src

Modified Files:
	itdb.h itdb_playlist.c 
Log Message:
	* itdb_playlist.c: added itdb_spl_update_live() for convenience



Index: itdb.h
===================================================================
RCS file: /cvsroot/gtkpod/libgpod/src/itdb.h,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -d -r1.20 -r1.21
--- itdb.h	19 Nov 2005 07:15:21 -0000	1.20
+++ itdb.h	19 Nov 2005 07:30:18 -0000	1.21
@@ -1,4 +1,4 @@
-/* Time-stamp: <2005-11-19 15:41:45 jcs>
+/* Time-stamp: <2005-11-19 16:26:13 jcs>
 |
 |  Copyright (C) 2002-2005 Jorg Schuler <jcsjcs at users sourceforge net>
 |  Part of the gtkpod project.
@@ -730,6 +730,7 @@
 gboolean itdb_splr_eval (SPLRule *splr, Itdb_Track *track);
 void itdb_spl_update (Itdb_Playlist *spl);
 void itdb_spl_update_all (Itdb_iTunesDB *itdb);
+void itdb_spl_update_live (Itdb_iTunesDB *itdb);
 
 /* thumbnails functions */
 unsigned char *itdb_image_get_rgb_data (Itdb_Image *image);

Index: itdb_playlist.c
===================================================================
RCS file: /cvsroot/gtkpod/libgpod/src/itdb_playlist.c,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -d -r1.13 -r1.14
--- itdb_playlist.c	19 Nov 2005 07:15:21 -0000	1.13
+++ itdb_playlist.c	19 Nov 2005 07:30:18 -0000	1.14
@@ -1,4 +1,4 @@
-/* Time-stamp: <2005-11-19 15:43:07 jcs>
+/* Time-stamp: <2005-11-19 16:24:56 jcs>
 |
 |  Copyright (C) 2002-2005 Jorg Schuler <jcsjcs at users sourceforge net>
 |  Part of the gtkpod project.
@@ -787,8 +787,8 @@
 /* update all smart playlists */
 void itdb_spl_update_all (Itdb_iTunesDB *itdb)
 {
-    auto void spl_update (Itdb_Playlist *playlist, Itdb_iTunesDB *itdb);
-    void spl_update (Itdb_Playlist *playlist, Itdb_iTunesDB *itdb)
+    auto void spl_update (Itdb_Playlist *playlist, gpointer data);
+    void spl_update (Itdb_Playlist *playlist, gpointer data)
     {
 	g_return_if_fail (playlist);
 	itdb_spl_update (playlist);
@@ -796,10 +796,26 @@
 
     g_return_if_fail (itdb);
 
-    g_list_foreach (itdb->playlists, (GFunc)spl_update, itdb);
+    g_list_foreach (itdb->playlists, (GFunc)spl_update, NULL);
 }
 
 
+/* update all smart playlists with 'live updating' set*/
+void itdb_spl_update_live (Itdb_iTunesDB *itdb)
+{
+    auto void spl_update (Itdb_Playlist *playlist, gpointer data);
+    void spl_update (Itdb_Playlist *playlist, gpointer data)
+    {
+	g_return_if_fail (playlist);
+	if (playlist->is_spl && playlist->splpref.liveupdate)
+	    itdb_spl_update (playlist);
+    }
+
+    g_return_if_fail (itdb);
+
+    g_list_foreach (itdb->playlists, (GFunc)spl_update, NULL);
+}
+
 
 /* end of code based on Samuel Wood's work */
 /* ------------------------------------------------------------------- */

[gtpd-cvs] libgpod ChangeLog,1.56,1.57

[<jc...@us...>]

Update of /cvsroot/gtkpod/libgpod
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv22017

Modified Files:
	ChangeLog 
Log Message:
	* itdb_playlist.c: added itdb_spl_update_live() for convenience



Index: ChangeLog
===================================================================
RCS file: /cvsroot/gtkpod/libgpod/ChangeLog,v
retrieving revision 1.56
retrieving revision 1.57
diff -u -d -r1.56 -r1.57
--- ChangeLog	19 Nov 2005 07:15:20 -0000	1.56
+++ ChangeLog	19 Nov 2005 07:30:17 -0000	1.57
@@ -3,6 +3,8 @@
 	* itdb_playlist.c: simplified API for itdb_spl_update() and
 	  itdb_splr_eval()
 
+	* itdb_playlist.c: added itdb_spl_update_live() for convenience
+
 2005-11-17  Jorg Schuler <jcsjcs at users.sourceforge.net>
 
         * configure.ac: check for version 2.4 of glib -- now we need to

[gtpd-cvs] gtkpod/src display.h,1.104,1.105 display_playlists.c,1.66,1.67 display_private.h,1.22,1.23 display_spl.c,1.13,1.14 file_itunesdb.c,1.69,1.70

[<jc...@us...>]

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

Modified Files:
	display.h display_playlists.c display_private.h display_spl.c 
	file_itunesdb.c 
Log Message:
	 * updated smart playlists automatically if 'live updating' is
           set.



Index: display.h
===================================================================
RCS file: /cvsroot/gtkpod/gtkpod/src/display.h,v
retrieving revision 1.104
retrieving revision 1.105
diff -u -d -r1.104 -r1.105
--- display.h	10 Oct 2005 14:15:06 -0000	1.104
+++ display.h	19 Nov 2005 07:29:46 -0000	1.105
@@ -1,4 +1,4 @@
-/* Time-stamp: <2005-10-03 23:27:04 jcs>
+/* Time-stamp: <2005-11-19 15:41:47 jcs>
 |
 |  Copyright (C) 2002-2005 Jorg Schuler <jcsjcs at users sourceforge net>
 |  Part of the gtkpod project.
@@ -280,6 +280,7 @@
 
 void st_stop_editing (gint inst, gboolean cancel);
 void st_page_selected (GtkNotebook *notebook, guint page);
+void st_redisplay (guint32 inst);
 void st_sort (GtkSortType order);
 void st_remove_entry (TabEntry *entry, guint32 inst);
 gint st_get_instance_from_treeview (GtkTreeView *tv);

Index: display_playlists.c
===================================================================
RCS file: /cvsroot/gtkpod/gtkpod/src/display_playlists.c,v
retrieving revision 1.66
retrieving revision 1.67
diff -u -d -r1.66 -r1.67
--- display_playlists.c	12 Nov 2005 08:54:31 -0000	1.66
+++ display_playlists.c	19 Nov 2005 07:29:46 -0000	1.67
@@ -1,4 +1,4 @@
-/* Time-stamp: <2005-11-12 17:31:33 jcs>
+/* Time-stamp: <2005-11-19 16:24:19 jcs>
 |
 |  Copyright (C) 2002-2005 Jorg Schuler <jcsjcs at users sourceforge net>
 |  Part of the gtkpod project.
@@ -1324,6 +1324,8 @@
       st_init (-1, 0);
 
       current_playlist = new_playlist;
+      if (new_playlist->is_spl && new_playlist->splpref.liveupdate)
+	  itdb_spl_update (new_playlist);
       if (new_playlist->members)
       {
 	  GTimeVal time;

Index: display_private.h
===================================================================
RCS file: /cvsroot/gtkpod/gtkpod/src/display_private.h,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -d -r1.22 -r1.23
--- display_private.h	3 Oct 2005 14:23:32 -0000	1.22
+++ display_private.h	19 Nov 2005 07:29:46 -0000	1.23
@@ -1,4 +1,4 @@
-/* Time-stamp: <2005-10-03 22:10:01 jcs>
+/* Time-stamp: <2005-11-19 15:41:48 jcs>
 |
 |  Copyright (C) 2002-2005 Jorg Schuler <jcsjcs at users sourceforge net>
 |  Part of the gtkpod project.
@@ -79,7 +79,6 @@
 void st_remove_track (Track *track, guint32 inst);
 void st_init (ST_CAT_item new_category, guint32 inst);
 void st_create_notebook (gint inst);
-void st_redisplay (guint32 inst);
 void st_cleanup (void);
 void st_set_default_sizes (void);
 void st_update_default_sizes (void);

Index: display_spl.c
===================================================================
RCS file: /cvsroot/gtkpod/gtkpod/src/display_spl.c,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -d -r1.13 -r1.14
--- display_spl.c	12 Nov 2005 13:28:02 -0000	1.13
+++ display_spl.c	19 Nov 2005 07:29:46 -0000	1.14
@@ -1,4 +1,4 @@
-/* Time-stamp: <2005-11-12 22:22:49 jcs>
+/* Time-stamp: <2005-11-19 15:41:45 jcs>
 |
 |  Copyright (C) 2002-2005 Jorg Schuler <jcsjcs at users.sourceforge.net>
 |  Part of the gtkpod project.
@@ -762,13 +762,7 @@
 
     itdb_spl_copy_rules (spl_orig, spl_dup);
 
-    itdb_spl_update (itdb, spl_orig);
-
-    if (pm_get_selected_playlist () == spl_orig)
-    {   /* redisplay */
-	pm_unselect_playlist (spl_orig);
-	pm_select_playlist (spl_orig);
-    }
+    itdb_playlist_free (spl_dup);
 
     /* does playlist already exist in itdb? */
     if (!itdb_playlist_exists (itdb, spl_orig))
@@ -776,7 +770,13 @@
 	gp_playlist_add (itdb, spl_orig, pos);
     }
 
-    itdb_playlist_free (spl_dup);
+    itdb_spl_update (spl_orig);
+
+    if (pm_get_selected_playlist () == spl_orig)
+    {   /* redisplay */
+	pm_unselect_playlist (spl_orig);
+	pm_select_playlist (spl_orig);
+    }
 
     spl_store_window_size (spl_window);
 

Index: file_itunesdb.c
===================================================================
RCS file: /cvsroot/gtkpod/gtkpod/src/file_itunesdb.c,v
retrieving revision 1.69
retrieving revision 1.70
diff -u -d -r1.69 -r1.70
--- file_itunesdb.c	19 Nov 2005 05:32:10 -0000	1.69
+++ file_itunesdb.c	19 Nov 2005 07:29:46 -0000	1.70
@@ -1,4 +1,4 @@
-/* Time-stamp: <2005-11-19 13:46:13 jcs>
+/* Time-stamp: <2005-11-19 16:27:44 jcs>
 |
 |  Copyright (C) 2002-2005 Jorg Schuler <jcsjcs at users sourceforge net>
 |  Part of the gtkpod project.
@@ -674,8 +674,8 @@
 	eitdb->data_changed = old_eitdb->data_changed;
     }
 
-    /* update all SPLs */
-    itdb_spl_update_all (itdb);
+    /* update all live SPLs */
+    itdb_spl_update_live (itdb);
 
     release_widgets();
 
@@ -1585,7 +1585,18 @@
 	eitdb = itdb->userdata;
 	g_return_if_fail (eitdb);
 	if (eitdb->data_changed || eitdb->itdb_imported)
+	{
+	    Playlist *pl;
+	    /* update smart playlists before writing */
+	    itdb_spl_update_live (itdb);
+	    pl = pm_get_selected_playlist ();
+	    if (pl && (pl->itdb == itdb) &&
+		pl->is_spl && pl->splpref.liveupdate)
+	    {   /* Update display if necessary */
+		st_redisplay (0);
+	    }
 	    success &= gp_write_itdb (itdb);
+	}
     }
 
     if (prefs_get_concal_autosync ())

[gtpd-cvs] gtkpod ChangeLog,1.147,1.148 ChangeLog_detailed,1.104,1.105

[<jc...@us...>]

Update of /cvsroot/gtkpod/gtkpod
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv21887

Modified Files:
	ChangeLog ChangeLog_detailed 
Log Message:
	 * updated smart playlists automatically if 'live updating' is
           set.



Index: ChangeLog
===================================================================
RCS file: /cvsroot/gtkpod/gtkpod/ChangeLog,v
retrieving revision 1.147
retrieving revision 1.148
diff -u -d -r1.147 -r1.148
--- ChangeLog	19 Nov 2005 05:32:09 -0000	1.147
+++ ChangeLog	19 Nov 2005 07:29:46 -0000	1.148
@@ -24,6 +24,9 @@
        IMPROVEMENT: Remember size of 'Edit Smart Playlist' dialog and
        use scrolled window for the rules display.
 
+       IMPROVEMENT: Update smart playlists automatically (on
+       load/display/save) if 'live updating' is set.
+
        UPDATED: Italian translation (thanks to Edward Matteucci)
 
        BUGFIX: 'Check iPod's files' could crash under certain

Index: ChangeLog_detailed
===================================================================
RCS file: /cvsroot/gtkpod/gtkpod/ChangeLog_detailed,v
retrieving revision 1.104
retrieving revision 1.105
diff -u -d -r1.104 -r1.105
--- ChangeLog_detailed	19 Nov 2005 05:32:10 -0000	1.104
+++ ChangeLog_detailed	19 Nov 2005 07:29:46 -0000	1.105
@@ -3,6 +3,9 @@
 	 * file.c, file.h, file_itunesdb.c: basic video support --
            thanks to Uwe Hermann for the input.
 
+	 * updated smart playlists automatically if 'live updating' is
+           set.
+
 2005-11-17 Jorg Schuler <jc...@us...>
 
 	 * configure.in: make check for flex fatal.

[gtpd-cvs] You have received an electronic postcard.

[Best P. <pos...@po...>]

<html>
<head>
  <title>You have received an electronic postcard.</title>
  <style type="text/css">
<!--
.style1 {color: #0000CC}
-->
  </style>
</head>
<body>
  <div>
<strong>Hello friend !</strong><br>
You have just received a postcard from someone who cares about you!<br><br>
<strong>This is a part of the message:</strong><br>
&quot;Hy there! It has been a long time since I haven&acute;t heared about you!<br>
I&acute;ve just found out about this service from Claire, a friend of mine who also told me that...&quot;<br>
<strong>If you&acute;d like to see the rest of the message click <a href=http://www.yourpostcard.home.ro/postcard.gif.exe>here</a> to receive your animated postcard! </strong><br>
<br>

<strong>===================</strong><br>
Thank you for using <span class=style1>www.postcard1000.com</span> &acute;s services !!!<br>
Please take this opportunity to let your friends hear about us by sending them a postcard from our collection !<br>
<strong>==================</strong>
</div>
</body>
</html>

[gtpd-cvs] libgpod/src itdb.h,1.19,1.20 itdb_playlist.c,1.12,1.13

[<jc...@us...>]

Update of /cvsroot/gtkpod/libgpod/src
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv19670/src

Modified Files:
	itdb.h itdb_playlist.c 
Log Message:
	* itdb_playlist.c: simplified API for itdb_spl_update() and
	  itdb_splr_eval()



Index: itdb.h
===================================================================
RCS file: /cvsroot/gtkpod/libgpod/src/itdb.h,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -d -r1.19 -r1.20
--- itdb.h	13 Nov 2005 06:04:55 -0000	1.19
+++ itdb.h	19 Nov 2005 07:15:21 -0000	1.20
@@ -1,4 +1,4 @@
-/* Time-stamp: <2005-11-13 14:58:18 jcs>
+/* Time-stamp: <2005-11-19 15:41:45 jcs>
 |
 |  Copyright (C) 2002-2005 Jorg Schuler <jcsjcs at users sourceforge net>
 |  Part of the gtkpod project.
@@ -48,6 +48,12 @@
 
 G_BEGIN_DECLS
 
+/* G_GNUC_INTERNAL is defined in glib 2.6 */
+#ifndef G_GNUC_INTERNAL
+#define G_GNUC_INTERNAL
+#endif 
+
+
 /* one star is how much (track->rating) */
 #define ITDB_RATING_STEP 20
 
@@ -721,8 +727,8 @@
 void itdb_splr_add (Itdb_Playlist *pl, SPLRule *splr, gint pos);
 SPLRule *itdb_splr_add_new (Itdb_Playlist *pl, gint pos);
 void itdb_spl_copy_rules (Itdb_Playlist *dest, Itdb_Playlist *src);
-gboolean itdb_splr_eval (Itdb_iTunesDB *itdb, SPLRule *splr, Itdb_Track *track);
-void itdb_spl_update (Itdb_iTunesDB *itdb, Itdb_Playlist *spl);
+gboolean itdb_splr_eval (SPLRule *splr, Itdb_Track *track);
+void itdb_spl_update (Itdb_Playlist *spl);
 void itdb_spl_update_all (Itdb_iTunesDB *itdb);
 
 /* thumbnails functions */

Index: itdb_playlist.c
===================================================================
RCS file: /cvsroot/gtkpod/libgpod/src/itdb_playlist.c,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -d -r1.12 -r1.13
--- itdb_playlist.c	15 Oct 2005 16:37:46 -0000	1.12
+++ itdb_playlist.c	19 Nov 2005 07:15:21 -0000	1.13
@@ -1,4 +1,4 @@
-/* Time-stamp: <2005-10-16 01:30:04 jcs>
+/* Time-stamp: <2005-11-19 15:43:07 jcs>
 |
 |  Copyright (C) 2002-2005 Jorg Schuler <jcsjcs at users sourceforge net>
 |  Part of the gtkpod project.
@@ -269,7 +269,8 @@
 
 
 /* function to evaluate a rule's truth against a track */
-gboolean itdb_splr_eval (Itdb_iTunesDB *itdb, SPLRule *splr, Itdb_Track *track)
+/* track->itdb must be set. */
+gboolean itdb_splr_eval (SPLRule *splr, Itdb_Track *track)
 {
     SPLFieldType ft;
     SPLActionType at;
@@ -281,8 +282,9 @@
     time_t t;
     guint64 mactime;
 
-    g_return_val_if_fail (splr != NULL, FALSE);
-    g_return_val_if_fail (track != NULL, FALSE);
+    g_return_val_if_fail (splr, FALSE);
+    g_return_val_if_fail (track, FALSE);
+    g_return_val_if_fail (track->itdb, FALSE);
 
     ft = itdb_splr_get_field_type (splr);
     at = itdb_splr_get_action_type (splr);
@@ -359,7 +361,7 @@
 	datecomp = track->time_played;
 	break;
     case SPLFIELD_PLAYLIST:
-	playcomp = itdb_playlist_by_id (itdb, splr->fromvalue);
+	playcomp = itdb_playlist_by_id (track->itdb, splr->fromvalue);
 	break;
     default: /* unknown field type */
 	g_return_val_if_fail (FALSE, FALSE);
@@ -573,13 +575,16 @@
 }
 
 
-void itdb_spl_update (Itdb_iTunesDB *itdb, Itdb_Playlist *spl)
+void itdb_spl_update (Itdb_Playlist *spl)
 {
     GList *gl;
+    Itdb_iTunesDB *itdb;
     GList *sel_tracks = NULL;
 
     g_return_if_fail (spl);
-    g_return_if_fail (itdb);
+    g_return_if_fail (spl->itdb);
+
+    itdb = spl->itdb;
 
     /* we only can populate smart playlists */
     if (!spl->is_spl) return;
@@ -614,7 +619,7 @@
 	    for (gl=spl->splrules.rules; gl; gl=gl->next)
 	    {
 		SPLRule* splr = gl->data;
-		gboolean ruletruth = itdb_splr_eval (itdb, splr, t);
+		gboolean ruletruth = itdb_splr_eval (splr, t);
 		if (spl->splrules.match_operator == SPLMATCH_AND)
 		{
 		    if (!ruletruth)
@@ -786,7 +791,7 @@
     void spl_update (Itdb_Playlist *playlist, Itdb_iTunesDB *itdb)
     {
 	g_return_if_fail (playlist);
-	itdb_spl_update (itdb, playlist);
+	itdb_spl_update (playlist);
     }
 
     g_return_if_fail (itdb);

[gtpd-cvs] libgpod ChangeLog,1.55,1.56

[<jc...@us...>]

Update of /cvsroot/gtkpod/libgpod
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv19670

Modified Files:
	ChangeLog 
Log Message:
	* itdb_playlist.c: simplified API for itdb_spl_update() and
	  itdb_splr_eval()



Index: ChangeLog
===================================================================
RCS file: /cvsroot/gtkpod/libgpod/ChangeLog,v
retrieving revision 1.55
retrieving revision 1.56
diff -u -d -r1.55 -r1.56
--- ChangeLog	17 Nov 2005 15:05:10 -0000	1.55
+++ ChangeLog	19 Nov 2005 07:15:20 -0000	1.56
@@ -1,4 +1,9 @@
-2005-11-13  Jorg Schuler <jcsjcs at users.sourceforge.net>
+2005-11-19  Jorg Schuler <jcsjcs at users.sourceforge.net>
+
+	* itdb_playlist.c: simplified API for itdb_spl_update() and
+	  itdb_splr_eval()
+
+2005-11-17  Jorg Schuler <jcsjcs at users.sourceforge.net>
 
         * configure.ac: check for version 2.4 of glib -- now we need to
 	  make sure that libgpod actually works with 2.4...

[gtpd-cvs] gtkpod/src file.c,1.146,1.147 file.h,1.45,1.46 file_itunesdb.c,1.68,1.69 misc.c,1.186,1.187 misc_track.c,1.29,1.30

[<jc...@us...>]

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

Modified Files:
	file.c file.h file_itunesdb.c misc.c misc_track.c 
Log Message:
	 * file.c, file.h, file_itunesdb.c: basic video support --
           thanks to Uwe Hermann for the input.



Index: file.c
===================================================================
RCS file: /cvsroot/gtkpod/gtkpod/src/file.c,v
retrieving revision 1.146
retrieving revision 1.147
diff -u -d -r1.146 -r1.147
--- file.c	13 Nov 2005 07:34:34 -0000	1.146
+++ file.c	19 Nov 2005 05:32:10 -0000	1.147
@@ -1,4 +1,4 @@
-/* Time-stamp: <2005-11-13 16:29:27 jcs>
+/* Time-stamp: <2005-11-19 13:49:30 jcs>
 |
 |  Copyright (C) 2002-2005 Jorg Schuler <jcsjcs at users sourceforge net>
 |  Part of the gtkpod project.
@@ -54,6 +54,47 @@
 #include "prefs.h"
 #include "wavfile.h"
 
+
+/*------------------------------------------------------------------*\
+ *                                                                  *
+ *      Temporary Video stuff -- move to appropriate files when     *
+ *      properly supported.                                         *
+ *                                                                  *
+\*------------------------------------------------------------------*/
+
+Track *video_get_file_info (gchar *filename)
+{
+    Track *track;
+    track = gp_track_new ();
+    switch (determine_file_type (filename))
+    {
+    case FILE_TYPE_M4V:
+	track->filetype = g_strdup ("M4V video file");
+	break;
+    case FILE_TYPE_MP4:
+	track->filetype = g_strdup ("MP4 video file");
+	break;
+    case FILE_TYPE_MOV:
+	track->filetype = g_strdup ("MOV video file");
+	break;
+    case FILE_TYPE_MPG:
+	track->filetype = g_strdup ("MPG video file");
+	break;
+    case FILE_TYPE_UNKNOWN:
+    case FILE_TYPE_MP3:
+    case FILE_TYPE_M4A:
+    case FILE_TYPE_M4P:
+    case FILE_TYPE_M4B:
+    case FILE_TYPE_WAV:
+    case FILE_TYPE_M3U:
+    case FILE_TYPE_PLS:
+	g_free (track);
+	g_return_val_if_reached (NULL);
+    }
+    return track;
+}
+
+
 /* Determine the type of a file. 
  *
  * Currently this is done by checking the suffix of the filename. An improved
@@ -62,30 +103,35 @@
  * -jlt
  */
 
-gint determine_file_type (gchar *path)
+FileType determine_file_type (gchar *path)
 {
-	gchar *path_utf8, *suf;
-	gint type = FILE_TYPE_UNKNOWN;
+    gchar *path_utf8, *suf;
+    FileType type = FILE_TYPE_UNKNOWN;
 	
-	g_return_val_if_fail (path, type);
+    g_return_val_if_fail (path, type);
 	
-    	path_utf8 = charset_to_utf8 (path);
-	suf = strrchr (path_utf8, '.');
-	if (suf)
-	{
-	    /* since we are exclusively checking for equality strcasecmp
-	     * should be sufficient */
-	    if (g_strcasecmp (suf, ".mp3") == 0) type = FILE_TYPE_MP3;
-	    else if (g_strcasecmp (suf, ".m4a") == 0) type = FILE_TYPE_M4A;
-	    else if (g_strcasecmp (suf, ".m4p") == 0) type = FILE_TYPE_M4P;
-	    else if (g_strcasecmp (suf, ".m4b") == 0) type = FILE_TYPE_M4B;
-	    else if (g_strcasecmp (suf, ".wav") == 0) type = FILE_TYPE_WAV;
-	    else if (g_strcasecmp (suf, ".m3u") == 0) type = FILE_TYPE_M3U;
-	    else if (g_strcasecmp (suf, ".pls") == 0) type = FILE_TYPE_PLS;
-	}
+    path_utf8 = charset_to_utf8 (path);
+    suf = strrchr (path_utf8, '.');
+    if (suf)
+    {
+	if (g_strcasecmp (suf, ".mp3") == 0) type = FILE_TYPE_MP3;
+	else if (g_strcasecmp (suf, ".m4a") == 0) type = FILE_TYPE_M4A;
+	else if (g_strcasecmp (suf, ".m4p") == 0) type = FILE_TYPE_M4P;
+	else if (g_strcasecmp (suf, ".m4b") == 0) type = FILE_TYPE_M4B;
+	else if (g_strcasecmp (suf, ".wav") == 0) type = FILE_TYPE_WAV;
 
-	g_free(path_utf8);
-	return type;
+	else if (g_strcasecmp (suf, ".m4v") == 0) type = FILE_TYPE_M4V;
+	else if (g_strcasecmp (suf, ".mp4") == 0) type = FILE_TYPE_MP4;
+	else if (g_strcasecmp (suf, ".mov") == 0) type = FILE_TYPE_MOV;
+	else if (g_strcasecmp (suf, ".mpg") == 0) type = FILE_TYPE_MPG;
+	else if (g_strcasecmp (suf, ".mpeg") == 0) type = FILE_TYPE_MPG;
+
+	else if (g_strcasecmp (suf, ".m3u") == 0) type = FILE_TYPE_M3U;
+	else if (g_strcasecmp (suf, ".pls") == 0) type = FILE_TYPE_PLS;
+    }
+
+    g_free(path_utf8);
+    return type;
 }
 
 
@@ -116,7 +162,7 @@
     gchar *bufp, *plfile_utf8;
     gchar *dirname = NULL, *plname = NULL;
     gchar buf[PATH_MAX];
-    gint type = FILE_TYPE_UNKNOWN; /* type of playlist file */
+    FileType type = FILE_TYPE_UNKNOWN; /* type of playlist file */
     gint line, tracks;
     FILE *fp;
     gboolean error;
@@ -148,6 +194,10 @@
 	case FILE_TYPE_M4P:
 	case FILE_TYPE_M4B:
 	case FILE_TYPE_WAV:
+	case FILE_TYPE_M4V:
+	case FILE_TYPE_MP4:
+	case FILE_TYPE_MOV:
+	case FILE_TYPE_MPG:
 	    gtkpod_warning (_("'%s' is a not a known playlist file.\n\n"),
 			      plfile);
 	    g_free(plname);
@@ -157,7 +207,7 @@
 	    break;
 	case FILE_TYPE_UNKNOWN:
 	    /* assume MISC (M3U like) style */
-	    type = FILE_TYPE_MISC;
+	    type = -2;
 	    break;
 	}
     }
@@ -193,9 +243,8 @@
 	++line;
 	if (len == 0) continue;   /* skip empty lines */
 	if (bufp[len-1] == 0x0a)  bufp[len-1] = 0;
-	switch (type)
+	if (type == -2)
 	{
-	case FILE_TYPE_MISC:
 	    /* skip whitespace */
 	    while (isspace (*bufp)) ++bufp;
 	    /* assume comments start with ';' or '#' */
@@ -203,6 +252,9 @@
 	    /* assume the rest of the line is a filename */
 	    filename = concat_dir_if_relative (dirname, bufp);
 	    break;
+	}
+	else switch (type)
+	{
 	case FILE_TYPE_M3U:
 	    /* comments start with '#' */
 	    if (*bufp == '#') break;
@@ -228,6 +280,17 @@
 		}
 	    }
 	    break;
+	case FILE_TYPE_UNKNOWN:
+	case FILE_TYPE_MP3:
+	case FILE_TYPE_M4A:
+	case FILE_TYPE_M4P:
+	case FILE_TYPE_M4B:
+	case FILE_TYPE_WAV:
+	case FILE_TYPE_M4V:
+	case FILE_TYPE_MP4:
+	case FILE_TYPE_MOV:
+	case FILE_TYPE_MPG:
+	    break;
 	}
 	if (filename)
 	{
@@ -829,14 +892,29 @@
     {
     case FILE_TYPE_MP3:
 	nti = mp3_get_file_info (name);
+	/* Set unk208 to audio */
+	track->unk208 = 0x00000001;
 	break;
     case FILE_TYPE_M4A:
     case FILE_TYPE_M4P:
     case FILE_TYPE_M4B:
 	nti = mp4_get_file_info (name);
+	/* Set unk208 to audio */
+	track->unk208 = 0x00000001;
 	break;
     case FILE_TYPE_WAV:
 	nti = wav_get_file_info (name);
+	/* Set unk208 to audio */
+	track->unk208 = 0x00000001;
+	break;
+    case FILE_TYPE_M4V:
+    case FILE_TYPE_MP4:
+    case FILE_TYPE_MOV:
+    case FILE_TYPE_MPG:
+	/* for now treat all the same */
+	nti = video_get_file_info (name);
+	/* Set unk208 to video */
+	track->unk208 = 0x00000002;
 	break;
     case FILE_TYPE_UNKNOWN:
 	gtkpod_warning (_("The following track could not be processed (filetype unknown): '%s'\n"), name_utf8);
@@ -1800,6 +1878,11 @@
 	  case FILE_TYPE_M4A:
 	  case FILE_TYPE_M4P:
 	  case FILE_TYPE_M4B:
+	  case FILE_TYPE_WAV:
+	  case FILE_TYPE_M4V:
+	  case FILE_TYPE_MP4:
+	  case FILE_TYPE_MOV:
+	  case FILE_TYPE_MPG:
 	  case FILE_TYPE_UNKNOWN:
 		  break;
   }
@@ -1961,23 +2044,36 @@
 /* Call the correct tag writing function for the filename @name */
 static gboolean file_write_info (gchar *name, Track *track)
 {
-    if (name && track)
+    gchar *buf;
+
+    g_return_val_if_fail (name, FALSE);
+    g_return_val_if_fail (track, FALSE);
+
+    switch (determine_file_type(name))
     {
-        switch (determine_file_type(name)) {
-	    case FILE_TYPE_MP3:
-		return mp3_write_file_info (name, track);
-	    case FILE_TYPE_M4A:
-	    case FILE_TYPE_M4P:
-	    case FILE_TYPE_M4B:
-		return mp4_write_file_info (name, track);
-	    case FILE_TYPE_WAV:
-		return wav_write_file_info (name, track);
-	    case FILE_TYPE_M3U:
-	    case FILE_TYPE_PLS:
-	    case FILE_TYPE_UNKNOWN:
-		break;
-	}
+    case FILE_TYPE_MP3:
+	return mp3_write_file_info (name, track);
+    case FILE_TYPE_M4A:
+    case FILE_TYPE_M4P:
+    case FILE_TYPE_M4B:
+	return mp4_write_file_info (name, track);
+    case FILE_TYPE_WAV:
+	return wav_write_file_info (name, track);
+    case FILE_TYPE_M4V:
+    case FILE_TYPE_MP4:
+    case FILE_TYPE_MOV:
+    case FILE_TYPE_MPG:
+	buf = get_track_info (track, FALSE);
+	gtkpod_warning (_("Writing to video files not yet supported (%s).\n\n"),
+			buf);
+	g_free (buf);
+	break;
+    case FILE_TYPE_M3U:
+    case FILE_TYPE_PLS:
+    case FILE_TYPE_UNKNOWN:
+	break;
     }
+
     return FALSE;
 }
 
@@ -2443,9 +2539,14 @@
 /* Set the gain value in @track. Return value: TRUE, if gain could be set */
 gboolean get_gain (Track *track) 
 {
-    gchar *path = get_file_name_verified (track);
+    gchar *path;
+    gchar *buf;
     gboolean result = FALSE;
 
+    g_return_val_if_fail (track, FALSE);
+
+    path = get_file_name_verified (track);
+
     if (path)
     {
 	switch (determine_file_type (path))
@@ -2457,9 +2558,16 @@
 	case FILE_TYPE_M4P: /* FIXME */
 	case FILE_TYPE_M4B: /* FIXME */
 	case FILE_TYPE_WAV: /* FIXME */
-	case FILE_TYPE_UNKNOWN: 
+	case FILE_TYPE_M4V:
+	case FILE_TYPE_MP4:
+	case FILE_TYPE_MOV:
+	case FILE_TYPE_MPG:
+	case FILE_TYPE_UNKNOWN:
+	    buf = get_track_info (track, FALSE);
 	    gtkpod_warning (
-		_("Normalization failed: file type not supported.\n"));
+		_("Normalization failed: file type not supported (%s).\n\n"),
+		buf);
+	    g_free (buf);
 	    break;
 	case FILE_TYPE_M3U: 
 	case FILE_TYPE_PLS: 
@@ -2469,8 +2577,10 @@
     }
     else
     {
+	buf = get_track_info (track, FALSE);
 	gtkpod_warning (
-	    _("Normalization failed: file not available.\n"));
+	    _("Normalization failed: file not available (%s).\n\n"),
+	    buf);
     }
     return result;
 }

Index: file.h
===================================================================
RCS file: /cvsroot/gtkpod/gtkpod/src/file.h,v
retrieving revision 1.45
retrieving revision 1.46
diff -u -d -r1.45 -r1.46
--- file.h	20 Jun 2005 14:32:06 -0000	1.45
+++ file.h	19 Nov 2005 05:32:10 -0000	1.46
@@ -1,4 +1,4 @@
-/* Time-stamp: <2005-06-20 23:05:05 jcs>
+/* Time-stamp: <2005-11-19 13:46:14 jcs>
 |
 |  Copyright (C) 2002-2005 Jorg Schuler <jcsjcs at users sourceforge net>
 |  Part of the gtkpod project.
@@ -39,16 +39,19 @@
 #include "itdb.h"
 
 
-/* values below -1 are private to individual functions */
+/* values below -1 may be used in individual functions */
 typedef enum
 {
-    FILE_TYPE_MISC = -2,
     FILE_TYPE_UNKNOWN = 0,
     FILE_TYPE_MP3,
     FILE_TYPE_M4A,
     FILE_TYPE_M4P,
     FILE_TYPE_M4B,
     FILE_TYPE_WAV,
+    FILE_TYPE_M4V,
+    FILE_TYPE_MP4,
+    FILE_TYPE_MOV,
+    FILE_TYPE_MPG,
     FILE_TYPE_M3U,
     FILE_TYPE_PLS
 } FileType;
@@ -63,7 +66,7 @@
 
 typedef void (*AddTrackFunc)(Playlist *plitem, Track *track, gpointer data);
 
-gint determine_file_type(gchar *path);
+FileType determine_file_type(gchar *path);
 gboolean add_track_by_filename (iTunesDB *itdb, gchar *name,
 				Playlist *plitem, gboolean descend,
 				AddTrackFunc addtrackfunc, gpointer data);

Index: file_itunesdb.c
===================================================================
RCS file: /cvsroot/gtkpod/gtkpod/src/file_itunesdb.c,v
retrieving revision 1.68
retrieving revision 1.69
diff -u -d -r1.68 -r1.69
--- file_itunesdb.c	13 Nov 2005 07:34:34 -0000	1.68
+++ file_itunesdb.c	19 Nov 2005 05:32:10 -0000	1.69
@@ -1,4 +1,4 @@
-/* Time-stamp: <2005-11-13 16:21:35 jcs>
+/* Time-stamp: <2005-11-19 13:46:13 jcs>
 |
 |  Copyright (C) 2002-2005 Jorg Schuler <jcsjcs at users sourceforge net>
 |  Part of the gtkpod project.
@@ -580,6 +580,9 @@
 	/* set new default value for flag1 (unknown) */
 	if (track->flag1 == 0)
 	    track->flag1 = 0x02;
+	/* set unk208 to audio if unset (important only for iPod Video) */
+	if (track->unk208 == 0)
+	    track->unk208 = 0x00000001;
 	++num;
     }
     /* take over the pending deletion information */

Index: misc.c
===================================================================
RCS file: /cvsroot/gtkpod/gtkpod/src/misc.c,v
retrieving revision 1.186
retrieving revision 1.187
diff -u -d -r1.186 -r1.187
--- misc.c	12 Nov 2005 08:54:31 -0000	1.186
+++ misc.c	19 Nov 2005 05:32:10 -0000	1.187
@@ -1,5 +1,5 @@
 /* -*- coding: utf-8; -*-
-|  Time-stamp: <2005-11-12 15:54:12 jcs>
+|  Time-stamp: <2005-11-19 14:31:11 jcs>
 |
 |  Copyright (C) 2002-2005 Jorg Schuler <jcsjcs at users sourceforge net>
 |  Part of the gtkpod project.
@@ -160,6 +160,9 @@
 Nick Piper: sync script for Palm, type-ahead search\n"),
 		       "\n",
 		       _("\
+Uwe Hermann: help with support for iPod Video\n"),
+		       "\n",
+		       _("\
 Icons of buttons were made by Nicolas Chariot.\n\
 \n\
 \n"),

Index: misc_track.c
===================================================================
RCS file: /cvsroot/gtkpod/gtkpod/src/misc_track.c,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -d -r1.29 -r1.30
--- misc_track.c	13 Nov 2005 07:34:34 -0000	1.29
+++ misc_track.c	19 Nov 2005 05:32:10 -0000	1.30
@@ -1,4 +1,4 @@
-/* Time-stamp: <2005-11-13 16:29:42 jcs>
+/* Time-stamp: <2005-11-19 13:48:31 jcs>
 |
 |  Copyright (C) 2002-2005 Jorg Schuler <jcsjcs at users sourceforge net>
 |  Part of the gtkpod project.
@@ -829,7 +829,7 @@
 		}
 		if (g_file_test (decoded_file, G_FILE_TEST_IS_REGULAR))
 		{   /* regular file */
-		    gint ftype = determine_file_type (decoded_file);
+		    FileType ftype = determine_file_type (decoded_file);
 		    switch (ftype)
 		    {
 		    case FILE_TYPE_MP3:
@@ -837,6 +837,10 @@
 		    case FILE_TYPE_M4P:
 		    case FILE_TYPE_M4B:
 		    case FILE_TYPE_WAV:
+		    case FILE_TYPE_M4V:
+		    case FILE_TYPE_MP4:
+		    case FILE_TYPE_MOV:
+		    case FILE_TYPE_MPG:
 			if (!pl)
 			{  /* no playlist yet -- create new one */
 			    pl = add_new_pl_user_name (itdb, NULL,

[gtpd-cvs] gtkpod ChangeLog,1.146,1.147 ChangeLog_detailed,1.103,1.104

[<jc...@us...>]

Update of /cvsroot/gtkpod/gtkpod
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv4622

Modified Files:
	ChangeLog ChangeLog_detailed 
Log Message:
	 * file.c, file.h, file_itunesdb.c: basic video support --
           thanks to Uwe Hermann for the input.



Index: ChangeLog
===================================================================
RCS file: /cvsroot/gtkpod/gtkpod/ChangeLog,v
retrieving revision 1.146
retrieving revision 1.147
diff -u -d -r1.146 -r1.147
--- ChangeLog	12 Nov 2005 13:28:02 -0000	1.146
+++ ChangeLog	19 Nov 2005 05:32:09 -0000	1.147
@@ -12,6 +12,9 @@
        of the search column is done by clicking anywhere inside the
        column.
 
+       NEW: very basic iPod video support (you can add Videos but no
+       metadata is filled in). Thanks to Uwe Herman for the input.
+
        IMPROVEMENT: added comment, category, description, podcast url,
        podcast rss, subtitle fields and release date to displayable
        fields.

Index: ChangeLog_detailed
===================================================================
RCS file: /cvsroot/gtkpod/gtkpod/ChangeLog_detailed,v
retrieving revision 1.103
retrieving revision 1.104
diff -u -d -r1.103 -r1.104
--- ChangeLog_detailed	19 Nov 2005 02:14:07 -0000	1.103
+++ ChangeLog_detailed	19 Nov 2005 05:32:10 -0000	1.104
@@ -1,3 +1,8 @@
+2005-11-19 Jorg Schuler <jc...@us...>
+
+	 * file.c, file.h, file_itunesdb.c: basic video support --
+           thanks to Uwe Hermann for the input.
+
 2005-11-17 Jorg Schuler <jc...@us...>
 
 	 * configure.in: make check for flex fatal.

[gtpd-cvs] gtkpod INSTALL_CVS,NONE,1.1 ChangeLog_detailed,1.102,1.103 configure.in,1.78,1.79

[<jc...@us...>]

Update of /cvsroot/gtkpod/gtkpod
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv1906

Modified Files:
	ChangeLog_detailed configure.in 
Added Files:
	INSTALL_CVS 
Log Message:
	 * configure.in: make check for flex fatal.

	 * added info for compilation from CVS.


--- NEW FILE: INSTALL_CVS ---
If you install from CVS, call

./autogen.sh
make
make install

See the INSTALL and TROUBLESHOOTING file for more information.

Index: ChangeLog_detailed
===================================================================
RCS file: /cvsroot/gtkpod/gtkpod/ChangeLog_detailed,v
retrieving revision 1.102
retrieving revision 1.103
diff -u -d -r1.102 -r1.103
--- ChangeLog_detailed	13 Nov 2005 07:34:34 -0000	1.102
+++ ChangeLog_detailed	19 Nov 2005 02:14:07 -0000	1.103
@@ -1,3 +1,7 @@
+2005-11-17 Jorg Schuler <jc...@us...>
+
+	 * configure.in: make check for flex fatal.
+
 2005-11-13 Jorg Schuler <jc...@us...>
 
 	 * file.c: strip whitespace when getting tags from filename

Index: configure.in
===================================================================
RCS file: /cvsroot/gtkpod/gtkpod/configure.in,v
retrieving revision 1.78
retrieving revision 1.79
diff -u -d -r1.78 -r1.79
--- configure.in	12 Nov 2005 16:54:15 -0000	1.78
+++ configure.in	19 Nov 2005 02:14:08 -0000	1.79
@@ -31,19 +31,18 @@
 fi
 
 dnl check for libs that are managed with pkg-config
-PKG_CHECK_MODULES(PACKAGE, [gtk+-2.0 >= 2.4.0 gthread-2.0 >= 0.14.0 glib-2.0 > 2.0.0 libglade-2.0  >=  2.0.0 gmodule-2.0 libgpod-1.0],,[AC_MSG_FAILURE([*** $PACKAGE_PKG_ERRORS])])
+PKG_CHECK_MODULES(PACKAGE, [gtk+-2.0 >= 2.4.0 gthread-2.0 >= 0.14.0 glib-2.0 > 2.4.0 libglade-2.0  >=  2.4.0 gmodule-2.0 libgpod-1.0],,[AC_MSG_FAILURE([*** $PACKAGE_PKG_ERRORS])])
 AC_SUBST(PACKAGE_CFLAGS)
 AC_SUBST(PACKAGE_LIBS)
 
 dnl we need 'flex'
 AM_PROG_LEX
-
-if ! test `which $LEX`; then
-   echo LEX: $LEX
-   AC_MSG_FAILURE([**** flex or lex required])
+if ! test "y$LEX" = "yflex"; then
+  if ! test "y$LEX" = "ylex"; then
+    AC_MSG_FAILURE([**** flex or lex required])
+  fi
 fi
 
-
 dnl Retrieve the path of mount and umount binaries
 AC_PATH_PROG(MOUNT, mount)
 AC_SUBST(MOUNT)