Update of /cvsroot/gtkpod/libgpod/src
In directory sc8-pr-cvs2.sourceforge.net:/tmp/cvs-serv29310/src
Modified Files:
itdb.h itdb_device.c itdb_itunesdb.c itdb_photoalbum.c
Log Message:
applied Todd Zullinger's patch fixing warnings when building the documentation
Index: itdb.h
===================================================================
RCS file: /cvsroot/gtkpod/libgpod/src/itdb.h,v
retrieving revision 1.55
retrieving revision 1.56
diff -u -d -r1.55 -r1.56
--- itdb.h 9 Jan 2007 14:49:00 -0000 1.55
+++ itdb.h 10 Jan 2007 13:25:10 -0000 1.56
@@ -893,7 +893,7 @@
/* functions for reading/writing database, general itdb functions */
Itdb_iTunesDB *itdb_parse (const gchar *mp, GError **error);
Itdb_iTunesDB *itdb_parse_file (const gchar *filename, GError **error);
-gboolean itdb_write (Itdb_iTunesDB *db, GError **error);
+gboolean itdb_write (Itdb_iTunesDB *itdb, GError **error);
gboolean itdb_write_file (Itdb_iTunesDB *itdb, const gchar *filename,
GError **error);
gboolean itdb_shuffle_write (Itdb_iTunesDB *itdb, GError **error);
Index: itdb_device.c
===================================================================
RCS file: /cvsroot/gtkpod/libgpod/src/itdb_device.c,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -d -r1.14 -r1.15
--- itdb_device.c 12 Nov 2006 15:12:39 -0000 1.14
+++ itdb_device.c 10 Jan 2007 13:25:10 -0000 1.15
@@ -413,6 +413,7 @@
/**
* itdb_device_write_sysinfo:
* @device: an #Itdb_Device
+ * @error: return location for a #GError or NULL
*
* Fills the SysInfo file with information in device->sysinfo. Note:
* no directories are created if not already existent.
@@ -733,7 +734,8 @@
/**
- * itdb_info_get_ipod_model_string:
+ * itdb_info_get_ipod_model_name_string:
+ * @model: an #Itdb_IpodModel
*
* Return the iPod's generic model name, like "Color", "Nano"...
*
@@ -757,6 +759,7 @@
/**
* itdb_info_get_ipod_generation_string:
+ * @generation: an #Itdb_IpodGeneration
*
* Return the iPod's generic generation name, like "First Generation",
* "Mobile Phone"...
Index: itdb_itunesdb.c
===================================================================
RCS file: /cvsroot/gtkpod/libgpod/src/itdb_itunesdb.c,v
retrieving revision 1.72
retrieving revision 1.73
diff -u -d -r1.72 -r1.73
--- itdb_itunesdb.c 9 Jan 2007 14:49:00 -0000 1.72
+++ itdb_itunesdb.c 10 Jan 2007 13:25:10 -0000 1.73
@@ -287,11 +287,15 @@
* @root: in local encoding
* @components: in utf8
*
+ * Resolve the path to a track on the iPod
+ *
* We start by assuming that the ipod mount point exists. Then, for
* each component c of track->ipod_path, we try to find an entry d in
* good_path that is case-insensitively equal to c. If we find d, we
* append d to good_path and make the result the new good_path.
* Otherwise, we quit and return NULL.
+ *
+ * Return value: path to track on the iPod or NULL.
**/
gchar * itdb_resolve_path (const gchar *root,
const gchar * const * components)
@@ -5577,9 +5581,9 @@
* itdb_init_ipod:
* @mountpoint: the iPod mountpoint
* @model_number: the iPod model number
- * @model_type: the type of iPod, eg. regular, shuffle
* @ipod_name: the name to give to the iPod. Will be displayed in
* gtkpod or itunes
+ * @error: return location for a #GError or NULL
*
* Initialise an iPod device from scratch. The function attempts to
* create a blank database, complete with master playlist and device
Index: itdb_photoalbum.c
===================================================================
RCS file: /cvsroot/gtkpod/libgpod/src/itdb_photoalbum.c,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -d -r1.13 -r1.14
--- itdb_photoalbum.c 24 Nov 2006 04:03:47 -0000 1.13
+++ itdb_photoalbum.c 10 Jan 2007 13:25:10 -0000 1.14
@@ -578,13 +578,12 @@
/**
* itdb_photodb_photoalbum_by_name:
- * Return a pointer to the first photoalbum named @albumname
- *
* @db: the #Itdb_PhotoDB to retrieve the album from
* @albumname: the name of the photoalbum to get or NULL for the
* master photoalbum.
*
- * Returns the photoalbum if found, else NULL
+ * Return value: a pointer to the first photoalbum named @albumname,
+ * else NULL
*/
Itdb_PhotoAlbum *itdb_photodb_photoalbum_by_name (Itdb_PhotoDB *db, const
gchar *albumname)
{
-------------------------------------------------------------------------
Take Surveys. Earn Cash. Influence the Future of IT
Join SourceForge.net's Techsay panel and you'll get the chance to share your
opinions on IT & business topics through brief surveys - and earn cash
http://www.techsay.com/default.php?page=join.php&p=sourceforge&CID=DEVDEV
_______________________________________________
gtkpod-cvs2 mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/gtkpod-cvs2
