← Back to branch summary

~ubuntu-branches/ubuntu/raring/gnome-session/raring

« back to all changes in this revision

Viewing changes to .pc/21_up_start_on_demand.patch/gnome-session/gsm-manager.c

  • Committer: Package Import Robot
  • Author(s): Iain Lane
  • Date: 2012-06-11 12:11:00 UTC
  • mfrom: (1.1.77)
  • Revision ID: package-import@ubuntu.com-20120611121100-4v8ck97j20kykbbp
Tags: 3.5.2-0ubuntu1
https://launchpad.net/bugs/1011555
* debian/watch: Track unstable versions 
* New upstream release (LP: #1011555).
  + Fail softer in the face of spotty session bus
  + Consider that required component that exits with 1 has crashed
* Refresh patches to apply cleanly 

Show diffs side-by-side

added added

removed removed

Lines of Context:
.pc/21_up_start_on_demand.patch/gnome-session/gsm-manager.c
661
661
{
662
662
        g_debug ("App %s exited with %d", gsm_app_peek_app_id (app), exit_code);
663
663
 
664
 
        app_event_during_startup (manager, app);
 
664
        /* Consider that "exit = 1" means "crash" for required components */
 
665
        if (exit_code == 1 && is_app_required (manager, app)) {
 
666
                if (gsm_app_peek_autorestart (app)) {
 
667
                        g_debug ("Component '%s' is autorestart, ignoring exited(1) signal",
 
668
                                 gsm_app_peek_app_id (app));
 
669
                        return;
 
670
                }
 
671
 
 
672
                _restart_app (manager, app);
 
673
        } else {
 
674
                app_event_during_startup (manager, app);
 
675
        }
665
676
}
666
677
 
667
678
static void