From 71002bfc617f4c039cf9a87bc66ccd83260cca5e Mon Sep 17 00:00:00 2001 From: Alan Knowles Date: Mon, 13 Apr 2015 17:57:30 +0800 Subject: [PATCH] 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 --- src/Builder4/FakeServer.vala | 7 ++++++- src/JsRender/RooDatabase.vala | 2 +- src/Makefile.am | 5 +++-- src/c/jscore_object_call_as_function.o | Bin 6248 -> 0 bytes 4 files changed, 10 insertions(+), 4 deletions(-) delete mode 100644 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 c9e8d599ccc468624bd59c240bda2a8966e863c2..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 6248 zcmbtYYit}>6~42x-mL9-{VGjDplqVFv<*9JhbT%z8ffguDAKcLmq90?d!ONrP z{&H<}l?=|i*G>+f`uNYj6B8mXLnUQK>(V+Yg{lKxA!0lCLT@GyKp)RR*9Lz=i3STm zn#mK*=#VGTD)jN7S(JNDiV#gC*BqH|y&{nf(2EW6HqQ@4A}+avAw!wTPk_iwz7Bm{ zk#8XR7IXG26auSA>z;PD`MayDyP)rwg9?FjVZqbZ5=2 z3!@)7q6cjf!-{zI65MbZ6G2zKSd?Cw zrQG$&`51~6j3w!n-36q6f}NV5(QDkF>hCmDTT{J8--ez|P>*|sncCO+kcO*QA@F%)myZU8~O;km_JRI!b-vSwqA&Ul;+sZWcg6nq%*mL3`U|+I^v{ z4fDbYgpF6q5K~M(MM6UqnB4B~$Vn+1=J7>}E}KomL6#GrPbyMQjcq zN|AtLUw0txOtm=gI>C%%S1L1heP*uVJAqgAEeAh;V}%jB?pkI1cGQE}S$7U-Qwa3n zRQ)-x1U%fcrQpnxTL&6$?y*84sCj;ALMnsdSmC%`X}A&osEio`aE?{Mp`K=s@eT9r z{>JkszIWvG$%~I4FuSH>?NC&9o2$8Y;6CLA<*CWTdvhw5sC#GKnE>Ww*GhHq*b`If zTpDU-?Mi1BgNE-uT5^52<~hLHHK+V2lrFPpcREu_XO8XyvwBbyC8uoH#B8-uthi#X zQndqcTk_r6v=n5^)kQaJS8P99@`8%D49wD!HPY}Zvu@3ruV?EuCo);l@T2CHs$WWn z5PmJ4>>Zb&Uar=HW~;G+s$LEjY`A`ymP-U>udW2*=#qW9;f@t@RX=c70#50Oz2H){ zn$lp0upH5~6LQk-isLTfeh9rr3XY2|Ib$xNPf5_S z%#2j46#-viT(Gs!O%p2NW)R}BTy9_b!GmtmvwgJ}GJ^vTDN2ZY=olMkCxo%mV{F~H zA^8&Q_#J@1k7V-152t!QAIo(ma$hvh#bX6fQ&OvbW-+jf!h%fHSZ1o`R%}a_-kP-o zTUf<f)jc)wKL-;977NGWEcA7Rbmg&&<{AMJUj18c!OphnGi-W~ztLI*BQI*I@{l zYcH};z8$E(NZt5rG7PwUc7>XXn7IXh`WE;dP99w6cQ~52zhCJNkK7@AZD{w<`)M9{ zq2s*%^R8+SMsTbe<4;6zd}K1tI{;TuzUN6#zLkMSyc7QTgU&0#_+`?64~>j}mUw=x z;XV&PK0rSd(MKC@77^^{Z)gbZpc=w_9wvNL!(GBZrs1C<9M>Bg`~S9LMT17he@^;m zHT(qO=QaEt!oQ^9_Yu#JDE9vv;osHt$H~u+G(17Y`@M#rCjCEY_`isMTf=#tS2g?x z#9!C&Kal?$8vZcl(?)Wh*Ne>a2zI!Cie$e@!||6ew)-@^tYEQI!(S$TmxlLKKKMSw z#`*l4_yZdLE#mVu;y^B>y%*7s-iCez$9esZ_>~Bb`s31z5TAG50O0#O^xlpuPv6I z{}5QUs^3dgzZ)oohV{cW((88&Fx@9W;&Cd-O=KcX*TwIYj-mQtip%GlUFf=auj&}; zcF=|zU_%;p-Fd)U&HsfyWx)10e>_9_{LcZV`$Wrq6u+biHC8+Wx~<}0qWHW|G5$vQ z)8oGg82aQqft2l4dgKh;V*NRfuYz_f`#0$c%-?l#8_t#OzfSfn=kXt{pU|N_>s=yy zElqKa?1xy9MxH;zKLnyx{eIh`e)y(id#)>D`q@R_1Gw1GeyWDB=Xo=Lyq-JCZjk-2 c$N=As_