Revision: 2030
http://gtkpod.svn.sourceforge.net/gtkpod/?rev=2030&view=rev
Author: jcsjcs
Date: 2008-07-05 03:00:06 -0700 (Sat, 05 Jul 2008)
Log Message:
-----------
* src/misc_conversion.c (ST_to_T)
src/display_sorttabs.c (st_set_string_compare_func):
be more restrictive concerning ST_CAT_SPECIAL (assertion)
src/display_coverart: white space
src/file.c: added comments
Modified Paths:
--------------
gtkpod/trunk/ChangeLog
gtkpod/trunk/src/display_coverart.c
gtkpod/trunk/src/display_sorttabs.c
gtkpod/trunk/src/file.c
gtkpod/trunk/src/misc_conversion.c
Modified: gtkpod/trunk/ChangeLog
===================================================================
--- gtkpod/trunk/ChangeLog 2008-07-05 09:09:13 UTC (rev 2029)
+++ gtkpod/trunk/ChangeLog 2008-07-05 10:00:06 UTC (rev 2030)
@@ -1,8 +1,21 @@
2008-07-05 Jorg Schuler <jcsjcs at users.sourceforge.net>
+ * src/misc_conversion.c (ST_to_T)
+ src/display_sorttabs.c (st_set_string_compare_func):
+
+ be more restrictive concerning ST_CAT_SPECIAL (assertion)
+
+ src/display_coverart: white space
+
+ src/file.c: added comments
+
+
+2008-07-05 Jorg Schuler <jcsjcs at users.sourceforge.net>
+
* src/file.c: allow absolute paths in coverart
template. Thanks to J.D. Laub for the patch.
+
2008-07-05 Jorg Schuler <jcsjcs at users.sourceforge.net>
* src/display_itdb.c
Modified: gtkpod/trunk/src/display_coverart.c
===================================================================
--- gtkpod/trunk/src/display_coverart.c 2008-07-05 09:09:13 UTC (rev 2029)
+++ gtkpod/trunk/src/display_coverart.c 2008-07-05 10:00:06 UTC (rev 2030)
@@ -263,11 +263,10 @@
g_return_if_fail (cdwidget->cdslider);
g_return_if_fail (cdwidget->draw_area);
- /* Initialise the album hash backing store */
- album_hash = g_hash_table_new_full ( g_str_hash,
-
g_str_equal,
-
(GDestroyNotify) g_free,
-
(GDestroyNotify) free_album);
+ /* Initialise the album hash backing store */
+ album_hash = g_hash_table_new_full ( g_str_hash, g_str_equal,
+ (GDestroyNotify) g_free,
+ (GDestroyNotify) free_album);
album_key_list = NULL;
set_display_window_dimensions ();
Modified: gtkpod/trunk/src/display_sorttabs.c
===================================================================
--- gtkpod/trunk/src/display_sorttabs.c 2008-07-05 09:09:13 UTC (rev 2029)
+++ gtkpod/trunk/src/display_sorttabs.c 2008-07-05 10:00:06 UTC (rev 2030)
@@ -269,12 +269,15 @@
static void st_set_string_compare_func (guint inst, guint page_num)
{
gchar *buf;
- buf = g_strdup_printf ("sort_ign_field_%d", ST_to_T (page_num));
- if (prefs_get_int (buf))
- sorttab[inst]->string_compare_func = compare_string_fuzzy;
- else
- sorttab[inst]->string_compare_func = compare_string;
- g_free (buf);
+ if (page_num != ST_CAT_SPECIAL)
+ {
+ buf = g_strdup_printf ("sort_ign_field_%d", ST_to_T (page_num));
+ if (prefs_get_int (buf))
+ sorttab[inst]->string_compare_func = compare_string_fuzzy;
+ else
+ sorttab[inst]->string_compare_func = compare_string;
+ g_free (buf);
+ }
}
Modified: gtkpod/trunk/src/file.c
===================================================================
--- gtkpod/trunk/src/file.c 2008-07-05 09:09:13 UTC (rev 2029)
+++ gtkpod/trunk/src/file.c 2008-07-05 10:00:06 UTC (rev 2030)
@@ -1171,7 +1171,7 @@
{
if (strchr (*tplp, '.') != NULL)
{ /* if template has an extension, try if it is valid */
- if (fname[0] == '/')
+ if (fname[0] == '/') /* allow absolute paths in template */
filename_utf8 = g_build_filename ("", fname, NULL);
else
filename_utf8 = g_build_filename (dirname, fname, NULL);
@@ -1189,7 +1189,7 @@
while (*extp && !filename_local)
{
gchar *ffname = g_strconcat (fname, *extp, NULL);
- if (ffname[0] == '/')
+ if (ffname[0] == '/') /* allow absolute paths in template
*/
filename_utf8 = g_build_filename ("", ffname, NULL);
else
filename_utf8 = g_build_filename (dirname, ffname,
@@ -1210,7 +1210,7 @@
gchar *upper_ext = g_ascii_strup (*extp, -1);
gchar *ffname = g_strconcat (fname, upper_ext, NULL);
g_free (upper_ext);
- if (ffname[0] == '/')
+ if (ffname[0] == '/') /* allow absolute paths in template
*/
filename_utf8 = g_build_filename ("", ffname, NULL);
else
filename_utf8 = g_build_filename (dirname, ffname,
Modified: gtkpod/trunk/src/misc_conversion.c
===================================================================
--- gtkpod/trunk/src/misc_conversion.c 2008-07-05 09:09:13 UTC (rev 2029)
+++ gtkpod/trunk/src/misc_conversion.c 2008-07-05 10:00:06 UTC (rev 2030)
@@ -296,10 +296,9 @@
case ST_CAT_COMPOSER: return T_COMPOSER;
case ST_CAT_TITLE: return T_TITLE;
case ST_CAT_YEAR: return T_YEAR;
- case ST_CAT_SPECIAL: break;
+ case ST_CAT_SPECIAL: g_return_val_if_reached (-1);
default: g_return_val_if_reached (-1);
}
- return -1;
}
This was sent by the SourceForge.net collaborative development platform, the
world's largest Open Source development site.
-------------------------------------------------------------------------
Sponsored by: SourceForge.net Community Choice Awards: VOTE NOW!
Studies have shown that voting for your favorite open source project,
along with a healthy diet, reduces your potential for chronic lameness
and boredom. Vote Now at http://www.sourceforge.net/community/cca08
_______________________________________________
gtkpod-cvs2 mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/gtkpod-cvs2
