[ease/builder] [welcomewindow] fix an assignment



commit cc9c8224f4ba505fb3f72776b13dcafce3faa376
Author: Stéphane Maniaci <stephane maniaci gmail com>
Date:   Mon Jul 12 15:03:46 2010 -0500

    [welcomewindow] fix an assignment

 src/ease-document.vala       |    2 ++
 src/ease-welcome-window.vala |   10 ++++++----
 2 files changed, 8 insertions(+), 4 deletions(-)
---
diff --git a/src/ease-document.vala b/src/ease-document.vala
index 16e62b8..6997f97 100644
--- a/src/ease-document.vala
+++ b/src/ease-document.vala
@@ -69,6 +69,8 @@ public class Ease.Document : SlideSet
 		height = h;
 		theme = doc_theme;
 		
+		assert (doc_theme != null);
+
 		// allocate a temp directory for the new document
 		path = Temp.request();
 		
diff --git a/src/ease-welcome-window.vala b/src/ease-welcome-window.vala
index 828d515..a6dff29 100644
--- a/src/ease-welcome-window.vala
+++ b/src/ease-welcome-window.vala
@@ -91,8 +91,9 @@ public class Ease.WelcomeWindow : Gtk.Window
 		
 		var builder = new Gtk.Builder ();
 		try {
-			builder.add_from_file ("data/ui/welcome-window.ui");
-			//FIXME : compute path
+			builder.add_from_file (data_path(Path.build_filename(Temp.TEMP_DIR,
+																 Temp.UI_DIR,
+																 "welcome-window.ui")));
 		} catch (Error e) {
 			error ("Unable to load UI : %s", e.message);
 		}
@@ -185,7 +186,7 @@ public class Ease.WelcomeWindow : Gtk.Window
 
 		try	{
 			// FIXME : incompatible assignment
-			string[] data_dirs = Environment.get_system_data_dirs ();
+			unowned string[] data_dirs = Environment.get_system_data_dirs ();
 			foreach (string dir in data_dirs) {
 				var filename = Path.build_filename (dir,
 				                                   Temp.TEMP_DIR,
@@ -275,13 +276,14 @@ public class Ease.WelcomeWindow : Gtk.Window
 	[CCode (instance_pos = -1)]
 	public void new_document()
 	{
+		debug ("Creating a new document.");
 		try
 		{
 			// create a new Document
 			var document = new Document.from_theme(selected_theme,
 												   (int)x_res.get_value(),
 												   (int)y_res.get_value());
-
+			debug ("Creating an editor window");
 			// create an EditorWindow for the new Document
 			var editor = new EditorWindow(document);
 



[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]