1 files changed, 36 insertions, 37 deletions

diff --git a/lib/python/_sugar.defs b/lib/python/_sugar.defs
index bdf51a8..56c52ac 100644
--- a/lib/python/_sugar.defs
+++ b/lib/python/_sugar.defs
@@ -1,12 +1,5 @@
 ;; -*- scheme -*-
 ; object definitions ...
-(define-object Browser
-  (in-module "Gecko")
-  (parent "GtkMozEmbed")
-  (c-name "GeckoBrowser")
-  (gtype-id "GECKO_TYPE_BROWSER")
-)
-
 (define-object AddressEntry
   (in-module "Sugar")
   (parent "GtkEntry")
@@ -14,60 +7,66 @@
   (gtype-id "SUGAR_TYPE_ADDRESS_ENTRY")
 )
 
+(define-object Browser
+  (in-module "Sugar")
+  (parent "GtkMozEmbed")
+  (c-name "SugarBrowser")
+  (gtype-id "SUGAR_TYPE_BROWSER")
+)
+
+(define-object KeyGrabber
+  (in-module "Sugar")
+  (parent "GObject")
+  (c-name "SugarKeyGrabber")
+  (gtype-id "SUGAR_TYPE_KEY_GRABBER")
+)
+
 ;; Enumerations and flags ...
 
 
-;; From gecko-browser.h
+;; From sugar-address-entry.h
 
-(define-function get_type
-  (c-name "gecko_browser_get_type")
+(define-function sugar_address_entry_get_type
+  (c-name "sugar_address_entry_get_type")
   (return-type "GType")
 )
 
-(define-function startup_browser
-  (c-name "gecko_browser_startup")
-  (return-type "none")
+
+
+;; From sugar-browser.h
+
+(define-function sugar_browser_get_type
+  (c-name "sugar_browser_get_type")
+  (return-type "GType")
 )
 
-(define-function new
-  (c-name "gecko_browser_new")
-  (is-constructor-of "GeckoBrowser")
-  (return-type "GeckoBrowser*")
+(define-function startup_browser
+  (c-name "sugar_browser_startup")
+  (return-type "none")
 )
 
 (define-method create_window
-  (of-object "GeckoBrowser")
-  (c-name "gecko_browser_create_window")
-  (return-type "GeckoBrowser*")
+  (of-object "SugarBrowser")
+  (c-name "sugar_browser_create_window")
+  (return-type "SugarBrowser*")
 )
 
-(define-virtual create_window
-  (of-object "GeckoBrowser")
-  (return-type "GeckoBrowser*")
-)
-(define-object KeyGrabber
-  (in-module "globalkeys")
-  (parent "GObject")
-  (c-name "SugarKeyGrabber")
-  (gtype-id "SUGAR_TYPE_KEY_GRABBER")
-)
+
+
+;; From sugar-key-grabber.h
 
 (define-function sugar_key_grabber_get_type
   (c-name "sugar_key_grabber_get_type")
   (return-type "GType")
 )
 
-(define-function sugar_key_grabber_new
-  (c-name "sugar_key_grabber_new")
-  (is-constructor-of "SugarKeyGrabber")
-  (return-type "GObject*")
-)
-
 (define-method grab
   (of-object "SugarKeyGrabber")
   (c-name "sugar_key_grabber_grab")
   (return-type "none")
   (parameters
-    '("const-char*" "address")
+    '("const-char*" "key")
   )
 )
+
+