← Back to branch summary

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

« back to all changes in this revision

Viewing changes to debian/patches/21_up_start_on_demand.patch

  • 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:
debian/patches/21_up_start_on_demand.patch
3
3
case during auto-login). This can delay the whole session from starting.
4
4
Author: Chris Coulson <chrisccoulson@googlemail.com>
5
5
 
6
 
Index: gnome-session-3.0.0/gnome-session/gsm-manager.c
 
6
Index: ubuntu/gnome-session/gsm-manager.c
7
7
===================================================================
8
 
--- gnome-session-3.0.0.orig/gnome-session/gsm-manager.c        2011-05-23 19:15:05.605472279 +0200
9
 
+++ gnome-session-3.0.0/gnome-session/gsm-manager.c     2011-05-23 19:15:05.661472557 +0200
10
 
@@ -1094,12 +1094,20 @@
 
8
--- ubuntu.orig/gnome-session/gsm-manager.c     2012-06-11 12:21:30.113219171 +0100
 
9
+++ ubuntu/gnome-session/gsm-manager.c  2012-06-11 12:21:31.325219117 +0100
 
10
@@ -1154,12 +1154,20 @@
11
11
 }
12
12
 
13
13
 static void
28
28
         can_hibernate = up_client_get_can_hibernate (manager->priv->up_client);
29
29
         if (can_hibernate) {
30
30
 
31
 
@@ -1123,6 +1131,7 @@
 
31
@@ -1183,6 +1191,7 @@
32
32
         GError   *error;
33
33
         gboolean  ret;
34
34
 
36
36
         can_suspend = up_client_get_can_suspend (manager->priv->up_client);
37
37
         if (can_suspend) {
38
38
 
39
 
@@ -2728,7 +2737,7 @@
 
39
@@ -2804,7 +2813,7 @@
40
40
                                       NULL,
41
41
                                       NULL, NULL);
42
42
 
45
45
 
46
46
         manager->priv->shell = gsm_get_shell ();
47
47
 }
48
 
@@ -3332,6 +3341,7 @@
 
48
@@ -3408,6 +3417,7 @@
49
49
         gboolean can_suspend;
50
50
         gboolean can_hibernate;
51
51