* src/itdb.h

  src/itdb_device.c
  Rename itdb_info_get_ipod_model_name() ->
         itdb_info_get_ipod_model_name_string()
	 itdb_info_get_ipod_generation_name() ->
	 itdb_info_get_ipod_generation_string()

Input on naming welcome!


git-svn-id: https://gtkpod.svn.sf.net/svnroot/gtkpod/libgpod/trunk@1300 f01d2545-417e-4e96-918e-98f8d0dbbcb6

3 files changed, 14 insertions, 8 deletions

diff --git a/ChangeLog b/ChangeLog
index 296e858..41ecdc8 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -8,6 +8,12 @@
 	* src/itdb_itunesdb.c (itdb_create_directories):
 	  Create Photos directory.
 
+	* src/itdb.h
+	  src/itdb_device.c
+	  Rename itdb_info_get_ipod_model_name() ->
+	         itdb_info_get_ipod_model_name_string()
+		 itdb_info_get_ipod_generation_name() ->
+		 itdb_info_get_ipod_generation_string()
 
 2006-06-04  Jorg Schuler <jcsjcs at users.sourceforge.net>
 
diff --git a/src/itdb.h b/src/itdb.h
index facd55b..058db8b 100644
--- a/src/itdb.h
+++ b/src/itdb.h
@@ -1,4 +1,4 @@
-/* Time-stamp: <2006-06-04 19:21:02 jcs>
+/* Time-stamp: <2006-06-06 00:13:08 jcs>
 |
 |  Copyright (C) 2002-2005 Jorg Schuler <jcsjcs at users sourceforge net>
 |  Part of the gtkpod project.
@@ -865,8 +865,8 @@ gboolean itdb_device_read_sysinfo (Itdb_Device *device);
 gchar *itdb_device_get_sysinfo (Itdb_Device *device, const gchar *field);
 const Itdb_IpodInfo *itdb_device_get_ipod_info (Itdb_Device *device);
 const Itdb_IpodInfo *itdb_info_get_ipod_info_table (void);
-const gchar *itdb_info_get_ipod_model_name (Itdb_IpodModel model);
-const gchar *itdb_info_get_ipod_generation_name (Itdb_IpodGeneration generation);
+const gchar *itdb_info_get_ipod_model_name_string (Itdb_IpodModel model);
+const gchar *itdb_info_get_ipod_generation_string (Itdb_IpodGeneration generation);
 
 /* track functions */
 Itdb_Track *itdb_track_new (void);
diff --git a/src/itdb_device.c b/src/itdb_device.c
index 17d6a98..4407a56 100644
--- a/src/itdb_device.c
+++ b/src/itdb_device.c
@@ -1,4 +1,4 @@
-/* Time-stamp: <2006-06-04 19:22:40 jcs>
+/* Time-stamp: <2006-06-06 00:13:09 jcs>
 |
 |  Copyright (C) 2002-2005 Jorg Schuler <jcsjcs at users sourceforge net>
 |  Part of the gtkpod project.
@@ -598,14 +598,14 @@ const Itdb_IpodInfo *itdb_info_get_ipod_info_table (void)
 
 
 /**
- * itdb_info_get_ipod_model_name:
+ * itdb_info_get_ipod_model_string:
  *
  * Return the iPod's generic model name, like "Color", "Nano"...
  *
  * Return value: a pointer to the model name. This is a static string
  * and must not be g_free()d.
  **/
-const gchar *itdb_info_get_ipod_model_name (Itdb_IpodModel model)
+const gchar *itdb_info_get_ipod_model_name_string (Itdb_IpodModel model)
 {
     gint i=0;
 
@@ -621,7 +621,7 @@ const gchar *itdb_info_get_ipod_model_name (Itdb_IpodModel model)
 
 
 /**
- * itdb_info_get_ipod_generation_name:
+ * itdb_info_get_ipod_generation_string:
  *
  * Return the iPod's generic generation name, like "First Generation",
  * "Mobile Phone"...
@@ -629,7 +629,7 @@ const gchar *itdb_info_get_ipod_model_name (Itdb_IpodModel model)
  * Return value: a pointer to the generation name. This is a static
  * string and must not be g_free()d.
  **/
-const gchar *itdb_info_get_ipod_generation_name (Itdb_IpodGeneration generation)
+const gchar *itdb_info_get_ipod_generation_string (Itdb_IpodGeneration generation)
 {
     gint i=0;