diff options
| author | Marco Pesenti Gritti <mpgritti@gmail.com> | 2008-10-03 08:45:25 (GMT) |
|---|---|---|
| committer | Marco Pesenti Gritti <mpgritti@gmail.com> | 2008-10-03 08:45:25 (GMT) |
| commit | b314f4924da630cd6494760997a409805d33ce0e (patch) | |
| tree | d024894668e3220f762b08280e71c7e05b67b394 /bin | |
| parent | 5fd0fa22dad911632995a2d49f28fba6b84c4873 (diff) | |
Use the shell started callback also to run the control panel.
Diffstat (limited to 'bin')
| -rw-r--r-- | bin/sugar-shell | 15 |
1 files changed, 3 insertions, 12 deletions
diff --git a/bin/sugar-shell b/bin/sugar-shell index efa1142..3774fd3 100644 --- a/bin/sugar-shell +++ b/bin/sugar-shell @@ -45,15 +45,12 @@ def _setup_translations(): gettext.textdomain(domain) def _shell_started_cb(): - # Unfreeze the display hw_manager = hardwaremanager.get_manager() hw_manager.set_dcon_freeze(0) -def _software_update_cb(): - '''Ask the homeview to display an alert about available software updates - ''' - home_box = shell.get_instance().home_window.get_home_box() - home_box.show_software_updates_alert() + if os.path.isfile(os.path.expanduser('~/.sugar-update')): + home_box = shell.get_instance().home_window.get_home_box() + home_box.show_software_updates_alert() def main(): gobject.idle_add(_shell_started_cb) @@ -95,12 +92,6 @@ def main(): session_manager = get_session_manager() session_manager.start() - # dlo trac #7495: open 'software update' control panel after an upgrade - # to update activities. - update_trigger_file = os.path.expanduser('~/.sugar-update') - if os.path.isfile(update_trigger_file): - gobject.idle_add(_software_update_cb) - try: gtk.main() except KeyboardInterrupt: |