diff options
| author | Nicolás Reynolds <fauno@kiwwwi.com.ar> | 2012-06-11 15:22:39 -0300 |
|---|---|---|
| committer | Nicolás Reynolds <fauno@kiwwwi.com.ar> | 2012-06-11 15:22:39 -0300 |
| commit | d9929db3b4ad2dfeeb19ad71f6016eb8122d0208 (patch) | |
| tree | 72944f18f0c554390a9ced86c8a8e2c06ce6cc47 /extra/gnome-session/timeout.patch | |
| parent | 54452120abed3fa83e394e89110859525788c0ea (diff) | |
| parent | 306ac55c1e99cfb5801ef0d9acf2a11d3994d80d (diff) | |
Merge branch 'master' of ssh://vparabola/home/parabola/abslibre-pre-mips64el
Conflicts:
community/hostapd/PKGBUILD
extra/samba/PKGBUILD
staging/ffmpeg/PKGBUILD
Diffstat (limited to 'extra/gnome-session/timeout.patch')
| -rw-r--r-- | extra/gnome-session/timeout.patch | 16 |
1 files changed, 14 insertions, 2 deletions
diff --git a/extra/gnome-session/timeout.patch b/extra/gnome-session/timeout.patch index 20500206b..a26b0dcf5 100644 --- a/extra/gnome-session/timeout.patch +++ b/extra/gnome-session/timeout.patch @@ -1,12 +1,24 @@ +diff -u -r gnome-session-3.4.2/gnome-session/gsm-session-fill.c gnome-session-3.4.2-timeout/gnome-session/gsm-session-fill.c +--- gnome-session-3.4.2/gnome-session/gsm-session-fill.c 2012-02-02 15:33:01.000000000 +0100 ++++ gnome-session-3.4.2-timeout/gnome-session/gsm-session-fill.c 2012-06-10 02:39:46.184348462 +0200 +@@ -36,7 +36,7 @@ + #define GSM_KEYFILE_DEFAULT_PROVIDER_PREFIX "DefaultProvider" + + /* See https://bugzilla.gnome.org/show_bug.cgi?id=641992 for discussion */ +-#define GSM_RUNNABLE_HELPER_TIMEOUT 3000 /* ms */ ++#define GSM_RUNNABLE_HELPER_TIMEOUT 10000 /* ms */ + + typedef void (*GsmFillHandleProvider) (const char *provides, + const char *default_provider, diff -u -r gnome-session-3.4.2/tools/gnome-session-check-accelerated.c gnome-session-3.4.2-timeout/tools/gnome-session-check-accelerated.c --- gnome-session-3.4.2/tools/gnome-session-check-accelerated.c 2011-03-22 21:31:43.000000000 +0100 -+++ gnome-session-3.4.2-timeout/tools/gnome-session-check-accelerated.c 2012-06-04 11:06:35.911690067 +0200 ++++ gnome-session-3.4.2-timeout/tools/gnome-session-check-accelerated.c 2012-06-10 02:42:08.013218006 +0200 @@ -30,7 +30,7 @@ #include <X11/Xatom.h> /* Wait up to this long for a running check to finish */ -#define PROPERTY_CHANGE_TIMEOUT 5000 -+#define PROPERTY_CHANGE_TIMEOUT 10000 ++#define PROPERTY_CHANGE_TIMEOUT 12000 /* Values used for the _GNOME_SESSION_ACCELERATED root window property */ #define NO_ACCEL 0 |