← Back to branch summary

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

« back to all changes in this revision

Viewing changes to debian/patches/22_support_autostart_delay.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/22_support_autostart_delay.patch
5
5
Author: Chris Coulson <chrisccoulson@ubuntu.com>
6
6
Bug: https://bugzilla.gnome.org/show_bug.cgi?id=608402
7
7
 
8
 
Index: gnome-session-3.4.1/gnome-session/gsm-app.c
 
8
Index: ubuntu/gnome-session/gsm-app.c
9
9
===================================================================
10
 
--- gnome-session-3.4.1.orig/gnome-session/gsm-app.c    2012-05-06 19:49:34.236192032 -0400
11
 
+++ gnome-session-3.4.1/gnome-session/gsm-app.c 2012-05-06 19:49:46.132251015 -0400
 
10
--- ubuntu.orig/gnome-session/gsm-app.c 2012-06-11 12:21:16.629219765 +0100
 
11
+++ ubuntu/gnome-session/gsm-app.c      2012-06-11 12:21:35.441218936 +0100
12
12
@@ -252,6 +252,7 @@
13
13
         klass->impl_provides = NULL;
14
14
         klass->impl_get_provides = NULL;
36
36
 void
37
37
 gsm_app_exited (GsmApp *app,
38
38
                 guchar  exit_code)
39
 
Index: gnome-session-3.4.1/gnome-session/gsm-app.h
 
39
Index: ubuntu/gnome-session/gsm-app.h
40
40
===================================================================
41
 
--- gnome-session-3.4.1.orig/gnome-session/gsm-app.h    2012-05-06 19:49:34.236192032 -0400
42
 
+++ gnome-session-3.4.1/gnome-session/gsm-app.h 2012-05-06 19:49:46.132251015 -0400
 
41
--- ubuntu.orig/gnome-session/gsm-app.h 2012-06-11 12:21:16.629219765 +0100
 
42
+++ ubuntu/gnome-session/gsm-app.h      2012-06-11 12:21:35.441218936 +0100
43
43
@@ -67,6 +67,7 @@
44
44
                                                        GError    **error);
45
45
         gboolean    (*impl_stop)                      (GsmApp     *app,
56
56
 
57
57
 /* exported to bus */
58
58
 gboolean         gsm_app_get_app_id                     (GsmApp     *app,
59
 
Index: gnome-session-3.4.1/gnome-session/gsm-autostart-app.c
 
59
Index: ubuntu/gnome-session/gsm-autostart-app.c
60
60
===================================================================
61
 
--- gnome-session-3.4.1.orig/gnome-session/gsm-autostart-app.c  2012-05-06 19:49:34.236192032 -0400
62
 
+++ gnome-session-3.4.1/gnome-session/gsm-autostart-app.c       2012-05-06 19:49:46.136251034 -0400
 
61
--- ubuntu.orig/gnome-session/gsm-autostart-app.c       2012-06-11 12:21:16.629219765 +0100
 
62
+++ ubuntu/gnome-session/gsm-autostart-app.c    2012-06-11 12:21:35.441218936 +0100
63
63
@@ -65,6 +65,7 @@
64
64
         char                 *condition_string;
65
65
         gboolean              condition;
118
118
 
119
119
         g_object_class_install_property (object_class,
120
120
                                          PROP_DESKTOP_FILENAME,
121
 
Index: gnome-session-3.4.1/gnome-session/gsm-manager.c
 
121
Index: ubuntu/gnome-session/gsm-manager.c
122
122
===================================================================
123
 
--- gnome-session-3.4.1.orig/gnome-session/gsm-manager.c        2012-05-06 19:49:44.548243168 -0400
124
 
+++ gnome-session-3.4.1/gnome-session/gsm-manager.c     2012-05-06 19:49:46.136251034 -0400
 
123
--- ubuntu.orig/gnome-session/gsm-manager.c     2012-06-11 12:21:31.325219117 +0100
 
124
+++ ubuntu/gnome-session/gsm-manager.c  2012-06-11 12:21:35.445218936 +0100
125
125
@@ -410,13 +410,16 @@
126
126
                 } else {
127
127
                         g_debug ("GsmManager: stopping app %s", gsm_app_peek_id (app));
145
145
                         }
146
146
                 }
147
147
         }
148
 
@@ -725,10 +728,36 @@
 
148
@@ -736,10 +739,36 @@
149
149
 }
150
150
 
151
151
 static gboolean
182
182
         if (gsm_app_peek_phase (app) != manager->priv->phase) {
183
183
                 goto out;
184
184
         }
185
 
@@ -746,6 +775,15 @@
 
185
@@ -757,6 +786,15 @@
186
186
                 goto out;
187
187
         }
188
188
 
198
198
         if (!start_app_or_warn (manager, app))
199
199
                 goto out;
200
200
 
201
 
@@ -1648,11 +1686,12 @@
 
201
@@ -1659,11 +1697,12 @@
202
202
                 return FALSE;
203
203
         }
204
204
 
213
213
 
214
214
         return FALSE;
215
215
 }
216
 
Index: gnome-session-3.4.1/gnome-session/gsm-autostart-app.h
 
216
Index: ubuntu/gnome-session/gsm-autostart-app.h
217
217
===================================================================
218
 
--- gnome-session-3.4.1.orig/gnome-session/gsm-autostart-app.h  2012-05-06 19:49:34.236192032 -0400
219
 
+++ gnome-session-3.4.1/gnome-session/gsm-autostart-app.h       2012-05-06 19:49:46.140251064 -0400
 
218
--- ubuntu.orig/gnome-session/gsm-autostart-app.h       2012-06-11 12:21:16.629219765 +0100
 
219
+++ ubuntu/gnome-session/gsm-autostart-app.h    2012-06-11 12:21:35.445218936 +0100
220
220
@@ -71,6 +71,7 @@
221
221
 #define GSM_AUTOSTART_APP_DBUS_PATH_KEY   "X-GNOME-DBus-Path"
222
222
 #define GSM_AUTOSTART_APP_DBUS_ARGS_KEY   "X-GNOME-DBus-Start-Arguments"