Merge

2007-02-25 19:27:37 -05:00
parent bf98a5d064 69b48ade35
commit 0cad068bf4
60 changed files with 614 additions and 1921 deletions
@@ -64,12 +64,6 @@ model = ShellModel()
 service = ShellService(model)
 shell = Shell(model)

-# Start the NetworkManager applet
-# FIXME: do this somewhere else, better planned out
-args = ["sugar-nm-applet"]
-flags = gobject.SPAWN_SEARCH_PATH
-result = gobject.spawn_async(args, flags=flags, standard_output=False)
-
 tbh = TracebackUtils.TracebackHelper()
 try:
 	gtk.main()