summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorChristophe Fergeau <teuf@gnome.org>2007-10-21 10:41:40 +0000
committerChristophe Fergeau <teuf@gnome.org>2007-10-21 10:41:40 +0000
commit4f25a2d052f79fac4a43d65e1738670bcda0b8c2 (patch)
tree35c66d8cadc6ee28e8cb97444d35096cbc696d2e
parent289dc1abc2ce5d20d5fad2df8c69a2e544d23d70 (diff)
downloadlibgpod-tmz-4f25a2d052f79fac4a43d65e1738670bcda0b8c2.tar.gz
libgpod-tmz-4f25a2d052f79fac4a43d65e1738670bcda0b8c2.tar.xz
libgpod-tmz-4f25a2d052f79fac4a43d65e1738670bcda0b8c2.zip
* src/itdb_photoalbum.c: (itdb_get_photos_dir):
* src/ithumb-writer.c: (ipod_image_get_ithmb_filename): git-svn-id: https://gtkpod.svn.sf.net/svnroot/gtkpod/libgpod/trunk@1728 f01d2545-417e-4e96-918e-98f8d0dbbcb6
-rw-r--r--ChangeLog5
-rw-r--r--src/itdb_photoalbum.c3
-rw-r--r--src/ithumb-writer.c2
3 files changed, 8 insertions, 2 deletions
diff --git a/ChangeLog b/ChangeLog
index 700d7cb..a86b8ac 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2007-10-21 Christophe Fergeau <teuf@gnome.org>
+
+ * src/itdb_photoalbum.c: (itdb_get_photos_dir):
+ * src/ithumb-writer.c: (ipod_image_get_ithmb_filename):
+
2007-10-16 Todd Zullinger <tmzullinger at users.sourceforge.net>
* autogen.sh: add --enable-gtk-doc to the gnome-autogen.sh
diff --git a/src/itdb_photoalbum.c b/src/itdb_photoalbum.c
index 714446e..af15407 100644
--- a/src/itdb_photoalbum.c
+++ b/src/itdb_photoalbum.c
@@ -24,7 +24,7 @@
|
| This product is not supported/written/published by Apple!
|
-| $Id: itdb_photoalbum.c,v 1.17 2007/03/21 08:37:20 jcsjcs Exp $
+| $Id$
*/
#include <config.h>
@@ -136,6 +136,7 @@ gchar *itdb_get_photos_dir (const gchar *mountpoint)
for (ptr=paths; *ptr && !result; ++ptr)
{
+ g_free (result);
result = itdb_resolve_path (mountpoint, (const gchar **)*ptr);
}
return result;
diff --git a/src/ithumb-writer.c b/src/ithumb-writer.c
index e4d4a64..c6fa507 100644
--- a/src/ithumb-writer.c
+++ b/src/ithumb-writer.c
@@ -406,7 +406,7 @@ ipod_image_get_ithmb_filename (const char *mount_point, gint correlation_id, gin
/* printf ("%s %s\n", buf, filename);*/
g_free (buf);
-
+ g_free (artwork_dir);
return filename;
}