[gnue] r9279 - in trunk/gnue-forms/src: . uidrivers/html

[reinhard]

Author: reinhard
Date: 2007-01-12 06:13:02 -0600 (Fri, 12 Jan 2007)
New Revision: 9279

Modified:
   trunk/gnue-forms/src/GFClient.py
   trunk/gnue-forms/src/uidrivers/html/GFServer.py
Log:
Use new instance functions.


Modified: trunk/gnue-forms/src/GFClient.py
===================================================================
--- trunk/gnue-forms/src/GFClient.py    2007-01-12 12:01:51 UTC (rev 9278)
+++ trunk/gnue-forms/src/GFClient.py    2007-01-12 12:13:02 UTC (rev 9279)
@@ -194,11 +194,8 @@
         raise StartupError, u_("No Forms Definition File Specified.")
 
     assert gDebug (4, "Parsing form definition")
-    instance.addFormFromFile (formfile)
+    instance.run_from_file(formfile, userParameters)
 
-    assert gDebug (4, "Activating form")
-    instance.activate ()
-
     assert gDebug (4, "Closing all connections")
     self.getConnectionManager ().closeAll ()
 

Modified: trunk/gnue-forms/src/uidrivers/html/GFServer.py
===================================================================
--- trunk/gnue-forms/src/uidrivers/html/GFServer.py     2007-01-12 12:01:51 UTC 
(rev 9278)
+++ trunk/gnue-forms/src/uidrivers/html/GFServer.py     2007-01-12 12:13:02 UTC 
(rev 9279)
@@ -109,14 +109,12 @@
             else:
                 raise StartupError, u_("No Forms Definition File Specified.")
 
-        assert gDebug (4, "Parsing form definition")
-        instance.addFormFromFile (formfile)
-
         # disable standart html drivers mainloop
         self.gfclient._ui.GFhtmlApp.GFhtmlApp._mainLoop = 1
 
-        assert gDebug (4, "Activating form")
+        instance.run_from_file(formfile, None)
         instance.activate ()
+
         print "GNUe Forms Session %s started" % uid
 
         assert gLeave (4)