[mate-power-manager] 12/13: debian/patches: Drop 0001_dont-crash-if-XRRGetScreenResourceCurrent-fails.patch. Applied upstream.

[Martin Wimpress]

This is an automated email from the git hooks/post-receive script.

flexiondotorg-guest pushed a commit to branch master
in repository mate-power-manager.

commit 0a6c81921dc256448f9644786ffcdc96961d4b59
Author: Martin Wimpress <code at flexion.org>
Date:   Thu May 5 13:32:30 2016 +0100

    debian/patches: Drop 0001_dont-crash-if-XRRGetScreenResourceCurrent-fails.patch. Applied upstream.
---
 ...rash-if-XRRGetScreenResourceCurrent-fails.patch | 24 ----------------------
 debian/patches/series                              |  1 -
 2 files changed, 25 deletions(-)

diff --git a/debian/patches/0001_dont-crash-if-XRRGetScreenResourceCurrent-fails.patch b/debian/patches/0001_dont-crash-if-XRRGetScreenResourceCurrent-fails.patch
deleted file mode 100644
index 4eeaf21..0000000
--- a/debian/patches/0001_dont-crash-if-XRRGetScreenResourceCurrent-fails.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-From df94b62685f640c4e1854eec5736e01f812a2d66 Mon Sep 17 00:00:00 2001
-From: monsta <monsta at inbox.ru>
-Date: Tue, 15 Dec 2015 16:48:47 +0300
-Subject: [PATCH] don't crash when XRRGetScreenResourcesCurrent fails
-
----
- src/gpm-brightness.c | 5 +++++
- 1 file changed, 5 insertions(+)
-
---- a/src/gpm-brightness.c
-+++ b/src/gpm-brightness.c
-@@ -846,7 +846,12 @@
- 		}
- 
- 		root = RootWindow (brightness->priv->dpy, screen);
-+
-+		gdk_error_trap_push ();
- 		resource = XRRGetScreenResourcesCurrent (brightness->priv->dpy, root);
-+		if (gdk_error_trap_pop () || resource == NULL) {
-+			egg_warning ("failed to XRRGetScreenResourcesCurrent");
-+		}
- 
- 		if (resource != NULL) {
- 			egg_debug ("adding resource %p", resource);
diff --git a/debian/patches/series b/debian/patches/series
deleted file mode 100644
index 9c65931..0000000
--- a/debian/patches/series
+++ /dev/null
@@ -1 +0,0 @@
-0001_dont-crash-if-XRRGetScreenResourceCurrent-fails.patch

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-mate/mate-power-manager.git