← Back to branch summary

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

« back to all changes in this revision

Viewing changes to debian/patches/95_dbus_request_shutdown.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/95_dbus_request_shutdown.patch
2
2
other applications to shutdown or reboot the machine via the session manager
3
3
Author: Chris Coulson <chrisccoulson@ubuntu.com>
4
4
 
5
 
Index: gnome-session-2.32.1/gnome-session/gsm-manager.c
 
5
Index: ubuntu/gnome-session/gsm-manager.c
6
6
===================================================================
7
 
--- gnome-session-2.32.1.orig/gnome-session/gsm-manager.c       2010-11-17 16:23:49.851939998 +0100
8
 
+++ gnome-session-2.32.1/gnome-session/gsm-manager.c    2010-11-17 16:23:50.203940000 +0100
9
 
@@ -3087,6 +3087,48 @@
 
7
--- ubuntu.orig/gnome-session/gsm-manager.c     2012-06-11 12:21:35.445218936 +0100
 
8
+++ ubuntu/gnome-session/gsm-manager.c  2012-06-11 12:21:56.689218002 +0100
 
9
@@ -3411,6 +3411,48 @@
10
10
 }
11
11
 
12
12
 gboolean
55
55
 gsm_manager_shutdown (GsmManager *manager,
56
56
                       GError    **error)
57
57
 {
58
 
Index: gnome-session-2.32.1/gnome-session/gsm-manager.h
 
58
Index: ubuntu/gnome-session/gsm-manager.h
59
59
===================================================================
60
 
--- gnome-session-2.32.1.orig/gnome-session/gsm-manager.h       2010-11-17 16:23:45.999939999 +0100
61
 
+++ gnome-session-2.32.1/gnome-session/gsm-manager.h    2010-11-17 16:23:50.203940000 +0100
62
 
@@ -148,7 +148,10 @@
 
60
--- ubuntu.orig/gnome-session/gsm-manager.h     2012-06-11 12:21:16.317219779 +0100
 
61
+++ ubuntu/gnome-session/gsm-manager.h  2012-06-11 12:21:56.689218002 +0100
 
62
@@ -160,7 +160,10 @@
63
63
                                                                 guint                  flags,
64
64
                                                                 gboolean              *is_inhibited,
65
65
                                                                 GError                *error);
71
71
 gboolean            gsm_manager_shutdown                       (GsmManager     *manager,
72
72
                                                                 GError        **error);
73
73
 
74
 
Index: gnome-session-2.32.1/gnome-session/org.gnome.SessionManager.xml
 
74
Index: ubuntu/gnome-session/org.gnome.SessionManager.xml
75
75
===================================================================
76
 
--- gnome-session-2.32.1.orig/gnome-session/org.gnome.SessionManager.xml        2010-11-17 16:23:46.007939999 +0100
77
 
+++ gnome-session-2.32.1/gnome-session/org.gnome.SessionManager.xml     2010-11-17 16:23:50.203940000 +0100
78
 
@@ -309,6 +309,23 @@
 
76
--- ubuntu.orig/gnome-session/org.gnome.SessionManager.xml      2012-06-11 12:21:16.317219779 +0100
 
77
+++ ubuntu/gnome-session/org.gnome.SessionManager.xml   2012-06-11 12:21:56.689218002 +0100
 
78
@@ -316,6 +316,23 @@
79
79
       </doc:doc>
80
80
     </method>
81
81