Revision: 1994
http://gtkpod.svn.sourceforge.net/gtkpod/?rev=1994&view=rev
Author: jcsjcs
Date: 2008-05-30 06:00:24 -0700 (Fri, 30 May 2008)
Log Message:
-----------
* src/itdb_thumb.c
src/itdb_thumb.h
src/ithumb-writer.c
src/itdb_photoalbum.c: fixed a number of compile-time warnings.
Modified Paths:
--------------
libgpod/trunk/ChangeLog
libgpod/trunk/src/itdb_photoalbum.c
libgpod/trunk/src/itdb_thumb.c
libgpod/trunk/src/itdb_thumb.h
libgpod/trunk/src/ithumb-writer.c
Modified: libgpod/trunk/ChangeLog
===================================================================
--- libgpod/trunk/ChangeLog 2008-05-30 12:11:37 UTC (rev 1993)
+++ libgpod/trunk/ChangeLog 2008-05-30 13:00:24 UTC (rev 1994)
@@ -1,3 +1,10 @@
+2008-05-30 Jorg Schuler <jcsjcs at users.sourceforge.net>
+
+ * src/itdb_thumb.c
+ src/itdb_thumb.h
+ src/ithumb-writer.c
+ src/itdb_photoalbum.c: fixed a number of compile-time warnings.
+
2008-05-30 Christophe Fergeau <[EMAIL PROTECTED]>
Patch from Ian Stewart
Modified: libgpod/trunk/src/itdb_photoalbum.c
===================================================================
--- libgpod/trunk/src/itdb_photoalbum.c 2008-05-30 12:11:37 UTC (rev 1993)
+++ libgpod/trunk/src/itdb_photoalbum.c 2008-05-30 13:00:24 UTC (rev 1994)
@@ -358,7 +358,7 @@
GError **error)
{
#ifdef HAVE_GDKPIXBUF
- gboolean result;
+ gboolean result=FALSE;
Itdb_Artwork *artwork;
Itdb_PhotoAlbum *album;
Modified: libgpod/trunk/src/itdb_thumb.c
===================================================================
--- libgpod/trunk/src/itdb_thumb.c 2008-05-30 12:11:37 UTC (rev 1993)
+++ libgpod/trunk/src/itdb_thumb.c 2008-05-30 13:00:24 UTC (rev 1994)
@@ -84,7 +84,7 @@
return thumb_ipod;
}
-Itdb_Thumb *itdb_thumb_ipod_new (void)
+G_GNUC_INTERNAL Itdb_Thumb *itdb_thumb_ipod_new (void)
{
Itdb_Thumb *thumb;
@@ -359,7 +359,7 @@
gpointer itdb_thumb_to_pixbuf_at_size (Itdb_Device *device, Itdb_Thumb *thumb,
gint width, gint height)
{
- GdkPixbuf *pixbuf;
+ GdkPixbuf *pixbuf=NULL;
if (thumb->data_type == ITDB_THUMB_TYPE_FILE)
{
Itdb_Thumb_File *thumb_file = (Itdb_Thumb_File *)thumb;
@@ -430,11 +430,12 @@
GList *itdb_thumb_ipod_to_pixbufs (Itdb_Device *dev, Itdb_Thumb_Ipod *thumb)
{
- g_return_val_if_fail (thumb != NULL, NULL);
- g_return_val_if_fail (thumb->parent.data_type == ITDB_THUMB_TYPE_IPOD,
NULL);
const GList *items;
GList *pixbufs = NULL;
+ g_return_val_if_fail (thumb != NULL, NULL);
+ g_return_val_if_fail (thumb->parent.data_type == ITDB_THUMB_TYPE_IPOD,
NULL);
+
for (items = itdb_thumb_ipod_get_thumbs (thumb);
items != NULL;
items = items->next) {
Modified: libgpod/trunk/src/itdb_thumb.h
===================================================================
--- libgpod/trunk/src/itdb_thumb.h 2008-05-30 12:11:37 UTC (rev 1993)
+++ libgpod/trunk/src/itdb_thumb.h 2008-05-30 13:00:24 UTC (rev 1994)
@@ -96,7 +96,7 @@
gsize len);
G_GNUC_INTERNAL Itdb_Thumb *itdb_thumb_new_from_pixbuf (GdkPixbuf *pixbuf);
G_GNUC_INTERNAL Itdb_Thumb_Ipod_Item *itdb_thumb_new_item_from_ipod (const
Itdb_ArtworkFormat *format);
-G_GNUC_INTERNAL Itdb_Thumb *itdb_thumb_ipod_new ();
+G_GNUC_INTERNAL Itdb_Thumb *itdb_thumb_ipod_new (void);
G_GNUC_INTERNAL void itdb_thumb_set_rotation (Itdb_Thumb *thumb,
guint rotation);
G_GNUC_INTERNAL guint itdb_thumb_get_rotation (Itdb_Thumb *thumb);
Modified: libgpod/trunk/src/ithumb-writer.c
===================================================================
--- libgpod/trunk/src/ithumb-writer.c 2008-05-30 12:11:37 UTC (rev 1993)
+++ libgpod/trunk/src/ithumb-writer.c 2008-05-30 13:00:24 UTC (rev 1994)
@@ -1,4 +1,4 @@
-/* Time-stamp: <2008-05-25 23:15:17 jcs>
+/* Time-stamp: <2008-05-30 21:49:11 jcs>
*
* Copyright (C) 2005 Christophe Fergeau
*
@@ -1291,9 +1291,11 @@
case DB_TYPE_ITUNES:
for (gl=db_get_itunesdb(db)->tracks; gl; gl=gl->next)
{
+ Itdb_Thumb *thumb;
Itdb_Track *track = gl->data;
+
g_return_val_if_fail (track, FALSE);
- Itdb_Thumb *thumb = track->artwork->thumbnail;
+ thumb = track->artwork->thumbnail;
if (!itdb_track_has_thumbnails (track)) {
continue;
}
This was sent by the SourceForge.net collaborative development platform, the
world's largest Open Source development site.
-------------------------------------------------------------------------
This SF.net email is sponsored by: Microsoft
Defy all challenges. Microsoft(R) Visual Studio 2008.
http://clk.atdmt.com/MRT/go/vse0120000070mrt/direct/01/
_______________________________________________
gtkpod-cvs2 mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/gtkpod-cvs2
