Update of /cvsroot/gtkpod/gtkpod/src
In directory sc8-pr-cvs2.sourceforge.net:/tmp/cvs-serv3885/src
Modified Files:
Tag: coverart_display_development_branch
main.c
Log Message:
08/10/2007
- Patch tidying up function syntax and making init_display_cover static
Index: main.c
===================================================================
RCS file: /cvsroot/gtkpod/gtkpod/src/main.c,v
retrieving revision 1.58.2.1
retrieving revision 1.58.2.2
diff -u -d -r1.58.2.1 -r1.58.2.2
--- main.c 8 Jan 2007 21:08:44 -0000 1.58.2.1
+++ main.c 8 Jan 2007 21:45:34 -0000 1.58.2.2
@@ -123,6 +123,13 @@
gtkpod_window = gtkpod_xml_get_widget (main_window_xml, "gtkpod");
init_prefs(argc, argv);
+<<<<<<< main.c
+
+ init_default_file (argv[0]);
+
+ display_create ();
+
+=======
display_create ();
@@ -131,6 +138,7 @@
if (prefs_get_int("display_artcovers"))
coverart_init_display ();
+>>>>>>> 1.58.2.1
gtk_widget_show (gtkpod_window);
init_data (gtkpod_window); /* setup base data */
-------------------------------------------------------------------------
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
