r216 - in trunk/src/target/OM-2007/applications/openmoko-chordmaster: . src

mickey at gta01.hmw-consulting.de mickey at gta01.hmw-consulting.de
Sun Nov 12 16:46:44 CET 2006


Author: mickey
Date: 2006-11-12 15:46:44 +0000 (Sun, 12 Nov 2006)
New Revision: 216

Added:
   trunk/src/target/OM-2007/applications/openmoko-chordmaster/README
Modified:
   trunk/src/target/OM-2007/applications/openmoko-chordmaster/src/chordsdb.c
   trunk/src/target/OM-2007/applications/openmoko-chordmaster/src/fretboard-widget.c
Log:
chordmaster: fix finding resource when using autotools


Added: trunk/src/target/OM-2007/applications/openmoko-chordmaster/README
===================================================================

Modified: trunk/src/target/OM-2007/applications/openmoko-chordmaster/src/chordsdb.c
===================================================================
--- trunk/src/target/OM-2007/applications/openmoko-chordmaster/src/chordsdb.c	2006-11-12 14:50:46 UTC (rev 215)
+++ trunk/src/target/OM-2007/applications/openmoko-chordmaster/src/chordsdb.c	2006-11-12 15:46:44 UTC (rev 216)
@@ -69,7 +69,7 @@
     object_class->dispose = chordsdb_dispose;
     object_class->finalize = chordsdb_finalize;
 
-    FILE* file = g_fopen( RESOURCE_PATH "accords.chords", "r" );
+    FILE* file = g_fopen( PKGDATADIR "/accords.chords", "r" );
     g_assert( file ); //FIXME error handling, if chord file is not present
     gchar line[256];
     gchar category[2] = { 0, 0 };

Modified: trunk/src/target/OM-2007/applications/openmoko-chordmaster/src/fretboard-widget.c
===================================================================
--- trunk/src/target/OM-2007/applications/openmoko-chordmaster/src/fretboard-widget.c	2006-11-12 14:50:46 UTC (rev 215)
+++ trunk/src/target/OM-2007/applications/openmoko-chordmaster/src/fretboard-widget.c	2006-11-12 15:46:44 UTC (rev 216)
@@ -190,8 +190,8 @@
 fretboard_widget_init (FretboardWidget *self)
 {
     GError* error = NULL;
-    self->texture = gdk_pixbuf_new_from_file( RESOURCE_PATH "wood.png", &error );
-    self->fingerpoint = gdk_pixbuf_new_from_file( RESOURCE_PATH "ball.png", &error );
+    self->texture = gdk_pixbuf_new_from_file( PKGDATADIR "/wood.png", &error );
+    self->fingerpoint = gdk_pixbuf_new_from_file( PKGDATADIR "/ball.png", &error );
 
     gtk_widget_set_size_request(self, 450, 270);
     g_signal_connect (G_OBJECT(self), "expose_event",





More information about the commitlog mailing list