From 9d584826c2f0d7ad95883bb6e153aab6b9b695ea Mon Sep 17 00:00:00 2001
From: "mark.finkle%gmail.com" <mark.finkle%gmail.com>
Date: Tue, 2 Oct 2007 02:10:41 +0000
Subject: [PATCH] Added files and code to support a simple options dialog

---
 extensions/canvas3d/Makefile.in               | 56 -------------------
 extensions/canvas3d/install.rdf               |  9 +--
 extensions/canvas3d/jar.mn                    |  0
 .../canvas3d/resources/content/options.xul    |  0
 4 files changed, 5 insertions(+), 60 deletions(-)
 create mode 100644 extensions/canvas3d/jar.mn
 create mode 100644 extensions/canvas3d/resources/content/options.xul

diff --git a/extensions/canvas3d/Makefile.in b/extensions/canvas3d/Makefile.in
index 72dd4082e91..e69de29bb2d 100644
--- a/extensions/canvas3d/Makefile.in
+++ b/extensions/canvas3d/Makefile.in
@@ -1,56 +0,0 @@
-# 
-# ***** BEGIN LICENSE BLOCK *****
-# Version: MPL 1.1/GPL 2.0/LGPL 2.1
-#
-# The contents of this file are subject to the Mozilla Public License Version
-# 1.1 (the "License"); you may not use this file except in compliance with
-# the License. You may obtain a copy of the License at
-# http://www.mozilla.org/MPL/
-#
-# Software distributed under the License is distributed on an "AS IS" basis,
-# WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
-# for the specific language governing rights and limitations under the
-# License.
-#
-# The Original Code is canvas code.
-#
-# The Initial Developer of the Original Code is
-#   Mozilla
-# Portions created by the Initial Developer are Copyright (C) 2006
-# the Initial Developer. All Rights Reserved.
-#
-# Contributor(s):
-#   Vladimir Vukicevic <vladimir@pobox.com>
-#
-# Alternatively, the contents of this file may be used under the terms of
-# either of the GNU General Public License Version 2 or later (the "GPL"),
-# or the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
-# in which case the provisions of the GPL or the LGPL are applicable instead
-# of those above. If you wish to allow use of your version of this file only
-# under the terms of either the GPL or the LGPL, and not to allow others to
-# use your version of this file under the terms of the MPL, indicate your
-# decision by deleting the provisions above and replace them with the notice
-# and other provisions required by the GPL or the LGPL. If you do not delete
-# the provisions above, a recipient may use your version of this file under
-# the terms of any one of the MPL, the GPL or the LGPL.
-#
-# ***** END LICENSE BLOCK *****
-
-DEPTH            = ../..
-topsrcdir        = @top_srcdir@
-srcdir           = @srcdir@
-VPATH            = @srcdir@
-
-include $(DEPTH)/config/autoconf.mk
-
-MODULE		= canvas3d
-DIRS            = public src
-
-XPI_NAME	= canvas3d
-INSTALL_EXTENSION_ID = canvas3d@mozilla.com
-XPI_PKGNAME	= canvas3d
-
-DIST_FILES = install.rdf
-
-include $(topsrcdir)/config/rules.mk
-
diff --git a/extensions/canvas3d/install.rdf b/extensions/canvas3d/install.rdf
index b865af38d7f..f0efb832555 100644
--- a/extensions/canvas3d/install.rdf
+++ b/extensions/canvas3d/install.rdf
@@ -12,19 +12,20 @@
       <!-- Firefox -->
       <Description>
         <em:id>{ec8030f7-c20a-464f-9b0e-13a3a9e97384}</em:id>
-	<!-- this version needs to be set to the exact version this 
+	<!-- this version needs to be set to the exact version this
 	     extension was built for, because of the way we're tied
 	     to internal interfaces.
 	  -->
-        <em:minVersion>3.0a4pre</em:minVersion>
-        <em:maxVersion>3.0a4pre</em:maxVersion>
+        <em:minVersion>3.0a8pre</em:minVersion>
+        <em:maxVersion>3.0a8pre</em:maxVersion>
       </Description>
     </em:targetApplication>
-	
+
     <!-- front-end metadata -->
     <em:creator>Vladimir Vukicevic/mozilla.com</em:creator>
     <em:name>Canvas 3D (Gecko 1.9)</em:name>
     <em:description>Canvas 3D context(s) for Gecko 1.9</em:description>
     <em:homepageURL>http://people.mozilla.com/~vladimir/canvas3d/</em:homepageURL>
+    <em:optionsURL>chrome://canvas3d/content/options.xul</em:optionsURL>
   </Description>
 </RDF>
diff --git a/extensions/canvas3d/jar.mn b/extensions/canvas3d/jar.mn
new file mode 100644
index 00000000000..e69de29bb2d
diff --git a/extensions/canvas3d/resources/content/options.xul b/extensions/canvas3d/resources/content/options.xul
new file mode 100644
index 00000000000..e69de29bb2d