From 6acebfa0b19e106c6dca91eceb31c6d1975828b5 Mon Sep 17 00:00:00 2001
From: Thomas White <taw@bitwiz.me.uk>
Date: Sun, 1 Apr 2018 11:08:38 +0200
Subject: Use GFile for presentation loading

---
 src/colloquium.c | 9 ++++-----
 1 file changed, 4 insertions(+), 5 deletions(-)

(limited to 'src/colloquium.c')

diff --git a/src/colloquium.c b/src/colloquium.c
index 63cacc8..26c45f3 100644
--- a/src/colloquium.c
+++ b/src/colloquium.c
@@ -220,15 +220,14 @@ static void colloquium_open(GApplication  *papp, GFile **files, gint n_files,
 
 	for ( i = 0; i<n_files; i++ ) {
 		struct presentation *p;
-		char *uri = g_file_get_path(files[i]);
-		/* FIXME: Use GFile properly, hence support weird URIs etc */
 		p = new_presentation(app->imagestore);
-		if ( load_presentation(p, uri) == 0 ) {
+		if ( load_presentation(p, files[i]) == 0 ) {
 			narrative_window_new(p, papp);
 		} else {
+			char *uri = g_file_get_uri(files[i]);
 			fprintf(stderr, "Failed to load '%s'\n", uri);
+			g_free(uri);
 		}
-		g_free(uri);
 	}
 }
 
@@ -352,7 +351,7 @@ static void colloquium_startup(GApplication *papp)
 	if ( !g_file_test(app->mydir, G_FILE_TEST_IS_DIR) ) {
 
 		/* Folder not created yet */
-		GFile *file = g_file_new_for_path(DATADIR"/demo.sc");
+		GFile *file = g_file_new_for_uri("resource:///uk/me/bitwiz/Colloquium/demo.sc");
 		g_application_open(G_APPLICATION(app), &file, 1, "");
 		app->first_run = 1;
 		g_object_unref(file);
-- 
cgit v1.2.3