Update of /cvsroot/gtkpod/gtkpod/src
In directory sc8-pr-cvs2.sourceforge.net:/tmp/cvs-serv17849/src
Modified Files:
Tag: fetchcover_development_branch
display_coverart.c
Log Message:
display_coverart.c
- Minor edits
- Proper handling of HIGHLIGHT_MAIN file so that it is properly loaded when
gtkpod is installed
Index: display_coverart.c
===================================================================
RCS file: /cvsroot/gtkpod/gtkpod/src/display_coverart.c,v
retrieving revision 1.7.2.6
retrieving revision 1.7.2.7
diff -u -d -r1.7.2.6 -r1.7.2.7
--- display_coverart.c 14 Apr 2007 20:02:44 -0000 1.7.2.6
+++ display_coverart.c 14 Apr 2007 21:21:34 -0000 1.7.2.7
@@ -390,7 +390,6 @@
if (mbutton == 1)
{
/* Left mouse button clicked so find all tracks with displayed
cover */
-
cover = g_ptr_array_index(cdwidget->cdcovers, IMG_MAIN);
/* Stop redisplay of the artwork as its already
* in the correct location
@@ -752,6 +751,11 @@
HIGHLIGHT_FILE = NULL;
}
+ if (HIGHLIGHT_FILE_MAIN && !g_file_test (HIGHLIGHT_FILE_MAIN,
G_FILE_TEST_EXISTS))
+ {
+ g_free (HIGHLIGHT_FILE_MAIN);
+ HIGHLIGHT_FILE_MAIN = NULL;
+ }
}
if (!DEFAULT_FILE)
@@ -762,6 +766,10 @@
{
HIGHLIGHT_FILE = g_build_filename (PACKAGE_DATA_DIR, PACKAGE, "pixmaps",
"cdshine.png", NULL);
}
+ if (!HIGHLIGHT_FILE_MAIN)
+ {
+ HIGHLIGHT_FILE_MAIN = g_build_filename (PACKAGE_DATA_DIR, PACKAGE,
"pixmaps", "cdshine_main.png", NULL);
+ }
}
/**
@@ -1336,8 +1344,6 @@
gtk_range_set_value (GTK_RANGE (cdwidget->cdslider), 0);
- printf ("Size of glist = %d\n", g_list_length
(cdwidget->displaytracks));
-
/*printf("######### ORIGINAL LINE UP ########\n");
debug_albums ();
printf("######### END OF ORIGINAL LINE UP #######\n");*/
-------------------------------------------------------------------------
This SF.net email is sponsored by DB2 Express
Download DB2 Express C - the FREE version of DB2 express and take
control of your XML. No limits. Just data. Click to get it now.
http://sourceforge.net/powerbar/db2/
_______________________________________________
gtkpod-cvs2 mailing list
[EMAIL PROTECTED]
https://lists.sourceforge.net/lists/listinfo/gtkpod-cvs2
