Move private extensions out of the lib, inside the shell.

lib/python/_sugar.defs

@@ -31,13 +31,6 @@
   (gtype-id "SUGAR_TYPE_BROWSER")
 )
 
-(define-object KeyGrabber
-  (in-module "Sugar")
-  (parent "GObject")
-  (c-name "SugarKeyGrabber")
-  (gtype-id "SUGAR_TYPE_KEY_GRABBER")
-)
-
 (define-object DownloadManager
   (in-module "Sugar")
   (parent "GObject")
@@ -52,14 +45,6 @@
   (gtype-id "SUGAR_TYPE_DOWNLOAD")
 )
 
-(define-object AudioManager
-  (in-module "Sugar")
-  (parent "GObject")
-  (c-name "SugarAudioManager")
-  (gtype-id "SUGAR_TYPE_AUDIO_MANAGER")
-)
-
-
 ;; Enumerations and flags ...
 
 
@@ -70,8 +55,6 @@
   (return-type "GType")
 )
 
-
-
 ;; From sugar-browser.h
 
 (define-function sugar_browser_get_type
@@ -216,25 +199,6 @@
   )
 )
 
-;; Enumerations and flags ...
-
-
-;; From sugar-audio-manager.h
-
-(define-function audio_manager_get_type
-  (c-name "sugar_audio_manager_get_type")
-  (return-type "GType")
-)
-
-(define-method set_volume
-  (of-object "SugarAudioManager")
-  (c-name "sugar_audio_manager_set_volume")
-  (return-type "none")
-  (parameters
-    '("int" "level")
-  )
-)
-
 ;; From sugar-utils.h
 
 (define-function get_screen_dpi

lib/python/_sugar.override

@@ -5,11 +5,9 @@ headers
 
 #include "pygobject.h"
 #include "sugar-browser.h"
-#include "sugar-key-grabber.h"
 #include "sugar-address-entry.h"
 #include "sugar-download-manager.h"
 #include "sugar-download.h"
-#include "sugar-audio-manager.h"
 
 #include "pycairo.h"
 #include <pygtk/pygtk.h>