From: Alan Knowles <alan@roojs.com>
Date: Mon, 13 Apr 2015 09:57:30 +0000 (+0800)
Subject: src/builder
X-Git-Url: http://git.roojs.org/?p=app.Builder.js;a=commitdiff_plain;h=71002bfc617f4c039cf9a87bc66ccd83260cca5e

src/builder
src/Application.c
src/Main.c
src/Resources.c
src/builder_vala.stamp
src/Application.o
src/Main.o
src/Resources.o
src/Builder4/About.o
src/Builder4/ClutterFiles.o
src/Builder4/DialogConfirm.o
src/Builder4/DialogNewComponent.o
src/Builder4/DialogSaveModule.o
src/Builder4/DialogSaveTemplate.o
src/Builder4/DialogTemplateSelect.o
src/Builder4/Editor.o
src/Builder4/EditProject.o
src/Builder4/FakeServer.o
src/Builder4/GtkView.o
src/Builder4/MainWindow.o
src/Builder4/ProjectSettings.o
src/Builder4/StandardErrorDialog.o
src/Builder4/ValaProjectSettings.o
src/Builder4/WindowAddProp.o
src/Builder4/WindowLeftProjects.o
src/Builder4/WindowLeftProps.o
src/Builder4/WindowLeftTree.o
src/Builder4/WindowRightPalete.o
src/Builder4/WindowRooView.o
src/Builder4/WindowState.o
src/JsRender/Gtk.o
src/JsRender/JsRender.o
src/JsRender/Lang.o
src/JsRender/Node.o
src/JsRender/NodeToGlade.o
src/JsRender/NodeToGtk.o
src/JsRender/NodeToJs.o
src/JsRender/NodeToVala.o
src/JsRender/Roo.o
src/Palete/Gir.o
src/Palete/Gtk.o
src/Palete/Javascript.o
src/Palete/Palete.o
src/Palete/Roo.o
src/Palete/ValaSource.o
src/Project/Gtk.o
src/Project/Project.o
src/Project/Roo.o
src/c/jscore_object_call_as_function.o
---

diff --git a/src/Builder4/FakeServer.vala b/src/Builder4/FakeServer.vala
index ee338a1b4..961b8bfa3 100644
--- a/src/Builder4/FakeServer.vala
+++ b/src/Builder4/FakeServer.vala
@@ -13,9 +13,13 @@
  * the idea is nicked from geary.
  * 
  */
-
+public errordomain FakeServerError {
+		FILE_DOES_NOT_EXIST
+	}
+	
 public class FakeServer : Object
 {
+	
 	WebKit.WebView view;
 	
 	public FakeServer(WebKit.WebView wkview)
@@ -45,6 +49,7 @@ public class FakeServer : Object
 		var  file = File.new_for_path ( GLib.Environment.get_home_dir() + "/gitlive" + request.get_path());
 		if (!file.query_exists()) {
 			print("Skip file missing = %s/gitlive%s\n", GLib.Environment.get_home_dir() , request.get_path());
+			request.finish_error(new FakeServerError.FILE_DOES_NOT_EXIST ("My error msg"));
 			return;
 		}
 			
diff --git a/src/JsRender/RooDatabase.vala b/src/JsRender/RooDatabase.vala
index 42eef32a2..a6c907fb2 100644
--- a/src/JsRender/RooDatabase.vala
+++ b/src/JsRender/RooDatabase.vala
@@ -176,7 +176,7 @@ namespace JsRender {
 					var val = qnr.get_value_at(i,r);
 					var type = val.type().name();
 					if (type == "GdaBinary" || type == "GdaBlob") {
-						add.set_string_member(n, val.value.to_string(1024));
+						add.set_string_member(n, "?? big string ??");
 						continue;
 					}
 					add.set_string_member(n, val.get_string());
diff --git a/src/Makefile.am b/src/Makefile.am
index 11b3c681a..8d4246688 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -29,7 +29,7 @@ bin_PROGRAMS = builder
 
 builder_PKGS = \
 		--pkg glib-2.0  \
-        --pkg gobject-2.0  \
+		--pkg gobject-2.0  \
 		--pkg  gtk+-3.0 \
 		--pkg  gtksourceview-3.0 \
 		--pkg  libxml-2.0 \
@@ -43,7 +43,8 @@ builder_PKGS = \
  		--pkg javascriptcore \
 		$(builder_LIBVALA) \
 		--pkg vte-2.90 \
-		--pkg posix
+		--pkg posix \
+		--pkg libgda-5.0
 
 
 builder_SOURCES = \
diff --git a/src/c/jscore_object_call_as_function.o b/src/c/jscore_object_call_as_function.o
deleted file mode 100644
index c9e8d599c..000000000
Binary files a/src/c/jscore_object_call_as_function.o and /dev/null differ