src/Builder4/About.vala.c

src/Builder4/ClutterFiles.vala.c
src/Builder4/DialogConfirm.vala.c
src/Builder4/DialogPluginWebkit.vala.c
src/Builder4/DialogSaveModule.vala.c
src/Builder4/DialogSaveTemplate.vala.c
src/Builder4/DialogTemplateSelect.vala.c
src/Builder4/Editor.vala.c
src/Builder4/EditProject.vala.c
src/Builder4/FakeServer.vala.c
src/Builder4/GtkView.vala.c
src/Builder4/MainWindow.vala.c
src/Builder4/ProjectSettings.vala.c
src/Builder4/RooProjectProperties.vala.c
src/Builder4/StandardErrorDialog.vala.c
src/Builder4/ValaProjectSettings.vala.c
src/Builder4/WindowAddProp.vala.c
src/Builder4/WindowLeftProjects.vala.c
src/Builder4/WindowLeftProps.vala.c
src/Builder4/WindowLeftTree.vala.c
src/Builder4/WindowRightPalete.vala.c
src/Builder4/WindowRooView.vala.c
src/JsRender/Gtk.vala.c
src/JsRender/JsRender.vala.c
src/JsRender/Lang.vala.c
src/JsRender/NodeToGlade.vala.c
src/JsRender/NodeToGtk.vala.c
src/JsRender/NodeToJs.vala.c
src/JsRender/NodeToVala.vala.c
src/JsRender/Node.vala.c
src/JsRender/Roo.vala.c
src/Palete/Gir.vala.c
src/Palete/Gtk.vala.c
src/Palete/Javascript.vala.c
src/Palete/Palete.vala.c
src/Palete/RooDatabase.vala.c
src/Palete/Roo.vala.c
src/Palete/ValaSource.vala.c
src/Palete/GirObject.vala.c
src/Palete/VapiParser.vala.c
src/Palete/ValaSourceCompiler.vala.c
src/Application.vala.c
src/Main.vala.c
src/Resources.vala.c
src/Spawn.vala.c
src/Builder4/PopoverFileDetails.vala.c
src/Builder4/ValaCompileErrors.vala.c
src/Builder4/ValaCompileResults.vala.c
src/Builder4/PopoverProperty.vala.c
src/JsRender/PlainFile.vala.c
src/Palete/CompletionProvider.vala.c
src/Project/Gtk.vala.c
src/Project/Project.vala.c
src/Project/Roo.vala.c

diff --git a/src/Palete/ValaSource.vala b/src/Palete/ValaSource.vala
index d023a6f..286b4c1 100644 (file)
--- a/src/Palete/ValaSource.vala
+++ b/src/Palete/ValaSource.vala
@@ -390,16 +390,12 @@ namespace Palete {
                                print("Missing output file: %s\n",exe);
                                return;
                        }
-                       string args[] = {};
+                       string[] args = "/usr/bin/gnome-terminal -e /usr/bin/gdb -ex=r --args".split(" ");
+
                        
                        // runs gnome-terminal, with gdb .. running the application..
                        // fixme -- need a system/which
                        
-                       args += "/usr/bin/gnome-terminal";
-                       args += "-e";
-                       args += "/usr/bin/gdb";
-                       args += "-ex=r";
-                       args += "--args";
                        args += exe;
                        if (cg.execute_args.length > 0) {
                                var aa = cg.execute_args.split(" ");

diff --git a/src/Palete/ValaSourceCompiler.vala b/src/Palete/ValaSourceCompiler.vala
index a6dfd31..2cf02c6 100644 (file)
--- a/src/Palete/ValaSourceCompiler.vala
+++ b/src/Palete/ValaSourceCompiler.vala
@@ -344,6 +344,12 @@ namespace Palete {
                        
                var dcg = pr.compilegroups.get("_default_");
                for (var i = 0; i < dcg.packages.size; i++) {
+               
+                       var pkg = dcg.packages.get(i);
+                       // do not add libvala versions except the one that matches the one we are compiled against..
+                       if (Regex.match_simple("^libvala", pkg) && pkg != ("libvala-0." + ver.to_string())) {
+                               continue;
+                       }
                                valac += " --pkg " + dcg.packages.get(i);
                                if (!this.has_vapi(context.vapi_directories, dcg.packages.get(i))) {
                                        GLib.debug("Skip vapi '%s' - does not exist", dcg.packages.get(i));