seed r754 - in trunk: . examples/broken/browser

[hortont svn gnome org]

Author: hortont
Date: Thu Jan 15 23:03:56 2009
New Revision: 754
URL: http://svn.gnome.org/viewvc/seed?rev=754&view=rev

Log:
Whoops @ Seed build. Fixes module installation, examples, etc.


Modified:
   trunk/configure.ac
   trunk/examples/broken/browser/browser-bookmarks.js
   trunk/examples/broken/browser/browser-find.js
   trunk/examples/broken/browser/browser-main.js
   trunk/examples/broken/browser/browser-tab.js

Modified: trunk/configure.ac
==============================================================================
--- trunk/configure.ac	(original)
+++ trunk/configure.ac	Thu Jan 15 23:03:56 2009
@@ -137,6 +137,12 @@
 AM_CONDITIONAL(BUILD_READLINE_MODULE, test "x$want_readline_module" = "xyes")
 AM_CONDITIONAL(BUILD_SQLITE_MODULE, test "x$want_sqlite_module" = "xyes")
 
+AC_SUBST(BUILD_CANVAS_MODULE)
+AC_SUBST(BUILD_EXAMPLE_MODULE)
+AC_SUBST(BUILD_MULTIPROCESSING_MODULE)
+AC_SUBST(BUILD_READLINE_MODULE)
+AC_SUBST(BUILD_SQLITE_MODULE)
+
 dnl =========================turtle example====================================
 AC_ARG_ENABLE(turtle-example,
 			  AC_HELP_STRING([--enable-turtle-example],
@@ -148,6 +154,7 @@
 fi
 
 AM_CONDITIONAL(BUILD_TURTLE_EXAMPLE, test "x$want_turtle_example" = "xyes")
+AC_SUBST(BUILD_TURTLE_EXAMPLE)
 
 dnl =========================Install Examples==================================
 AC_ARG_ENABLE(examples,
@@ -155,6 +162,7 @@
 							 [install JavaScript examples. [default=yes]]),
 			  [enable_examples=$enableval],[enable_examples="yes"])
 AM_CONDITIONAL(BUILD_SEED_EXAMPLES, test "x$enable_examples" = "xyes")
+AC_SUBST(BUILD_SEED_EXAMPLES)
 
 dnl =============================Debug=========================================
 AC_ARG_ENABLE(debug,

Modified: trunk/examples/broken/browser/browser-bookmarks.js
==============================================================================
--- trunk/examples/broken/browser/browser-bookmarks.js	(original)
+++ trunk/examples/broken/browser/browser-bookmarks.js	Thu Jan 15 23:03:56 2009
@@ -4,7 +4,7 @@
 
 //check if the bookmarks db exists and if there are permissions
 
-var new_db = (!GLib.file_test(bookmark_path, GLib.FileTest.Exists));
+var new_db = (!GLib.file_test(bookmark_path, GLib.FileTest.EXISTS));
 
 bookmarks_db = new sqlite.Database(bookmark_path);
 

Modified: trunk/examples/broken/browser/browser-find.js
==============================================================================
--- trunk/examples/broken/browser/browser-find.js	(original)
+++ trunk/examples/broken/browser/browser-find.js	Thu Jan 15 23:03:56 2009
@@ -7,14 +7,14 @@
 	{
 		var closeButton = new Gtk.Button();
 		closeButton.set_image(new Gtk.Image({stock: "gtk-close", 
-				icon_size: Gtk.IconSize.Menu}));
+				icon_size: Gtk.IconSize.MENU}));
 		closeButton.signal.clicked.connect(
 			function (button, findBox)
             {
 				findBox.entryBox.text = "";
 				findBox.hide();
             }, this);
-		closeButton.set_relief(Gtk.ReliefStyle.None);
+		closeButton.set_relief(Gtk.ReliefStyle.NONE);
 
 		var findLabel = new Gtk.Label({label:"Find: "});
 		this.entryBox = new Gtk.Entry();

Modified: trunk/examples/broken/browser/browser-main.js
==============================================================================
--- trunk/examples/broken/browser/browser-main.js	(original)
+++ trunk/examples/broken/browser/browser-main.js	Thu Jan 15 23:03:56 2009
@@ -7,7 +7,7 @@
 		{
 			var tab = new BrowserTab();
 			
-			this.append_page(tab, tab.title);
+			this.append_page(tab, new Gtk.Label({label:"Untitled"}));
 			this.set_tab_reorderable(tab, true);
 			
 			if(selectTabOnCreation)

Modified: trunk/examples/broken/browser/browser-tab.js
==============================================================================
--- trunk/examples/broken/browser/browser-tab.js	(original)
+++ trunk/examples/broken/browser/browser-tab.js	Thu Jan 15 23:03:56 2009
@@ -9,9 +9,9 @@
 
 function url_changed(webView, webFrame, tab)
 {
-	tab.toolbar.back.sensitive = webView.can_go_back();
-	tab.toolbar.forward.sensitive = webView.can_go_forward();
-	tab.toolbar.urlBar.text = webFrame.get_uri();
+	//tab.toolbar.back.sensitive = webView.can_go_back();
+	//tab.toolbar.forward.sensitive = webView.can_go_forward();
+	//tab.toolbar.urlBar.text = webFrame.get_uri();
 	return false;
 }
 
@@ -89,9 +89,9 @@
 					status.push(hoverContextId, uri);
            		});
 			
-			this.toolbar.urlBar.signal.activate.connect(browse, this);
-			this.toolbar.back.sensitive = this.webView.can_go_back();
-			this.toolbar.forward.sensitive = this.webView.can_go_forward();
+			//this.toolbar.urlBar.signal.activate.connect(browse, this);
+			//this.toolbar.back.sensitive = this.webView.can_go_back();
+			//this.toolbar.forward.sensitive = this.webView.can_go_forward();
 
 			
 			webView.set_settings(webKitSettings);
@@ -120,8 +120,8 @@
 			var scrollView = new Gtk.ScrolledWindow();
 			scrollView.smooth_scroll = true;
 			scrollView.add(this.webView);
-			scrollView.set_policy(Gtk.PolicyType.Automatic,
-								  Gtk.PolicyType.Automatic);
+			scrollView.set_policy(Gtk.PolicyType.AUTOMATIC,
+								  Gtk.PolicyType.AUTOMATIC);
 			this.pack_start(scrollView, true, true);
 			this.show_all();
 		}
@@ -130,31 +130,19 @@
 	{
 		this.webView = null;
 		
-		this.toolbar = new BrowserToolbar();
+		//this.toolbar = new BrowserToolbar();
 
-		this.pack_start(this.toolbar);
-	
-		var closeButton = new Gtk.Button();
-		closeButton.set_image(new Gtk.Image({stock: "gtk-close", 
-				icon_size: Gtk.IconSize.Menu}));
-		closeButton.signal.clicked.connect(close_tab, this);
-		closeButton.set_relief(Gtk.ReliefStyle.None);
+		//this.pack_start(this.toolbar);
 	
 		this.progress = new Gtk.ProgressBar({fraction: 0.5});
 	
-		this.title = new Gtk.HBox();
-		this.titleLabel = new Gtk.Label({label:"Untitled"})
-		this.title.pack_start(this.titleLabel);
-		this.title.pack_start(closeButton);
-		this.title.show_all();
-		
 /*		forker_pipe.write("fork");
 		this.pid = parseInt(forker_pipe.read());
 		Seed.print("new pid: " + this.pid);*/
 		
 		
 		this.show_all();
-		this.toolbar.urlBar.grab_focus();
+		//tthis.toolbar.urlBar.grab_focus();
 	}};
 
 BrowserTab = new GType(BrowserTabType);