r45243 - in /desktop/unstable/metacity/debian: changelog patches/ patches/check_display.diff patches/series

[mitya57 at users.alioth.debian.org]

Author: mitya57
Date: Mon Jun 15 14:17:37 2015
New Revision: 45243

URL: http://svn.debian.org/wsvn/pkg-gnome/?sc=1&rev=45243
Log:
Backport upstream patch (check_display.diff) to check for valid
display in meta_prefs_get_compositing_manager function.

Added:
    desktop/unstable/metacity/debian/patches/
    desktop/unstable/metacity/debian/patches/check_display.diff
    desktop/unstable/metacity/debian/patches/series
Modified:
    desktop/unstable/metacity/debian/changelog

Modified: desktop/unstable/metacity/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/metacity/debian/changelog?rev=45243&op=diff
==============================================================================
--- desktop/unstable/metacity/debian/changelog	[utf-8] (original)
+++ desktop/unstable/metacity/debian/changelog	[utf-8] Mon Jun 15 14:17:37 2015
@@ -3,6 +3,8 @@
   * Update README.Debian.
   * Remove manpages from debian/ directory, we are shipping upstream
     manpages anyway.
+  * Backport upstream patch (check_display.diff) to check for valid
+    display in meta_prefs_get_compositing_manager function.
 
  -- Dmitry Shachnev <mitya57 at debian.org>  Mon, 15 Jun 2015 13:33:07 +0300
 

Added: desktop/unstable/metacity/debian/patches/check_display.diff
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/metacity/debian/patches/check_display.diff?rev=45243&op=file
==============================================================================
--- desktop/unstable/metacity/debian/patches/check_display.diff	(added)
+++ desktop/unstable/metacity/debian/patches/check_display.diff	[utf-8] Mon Jun 15 14:17:37 2015
@@ -0,0 +1,16 @@
+Description: prefs: check if we have a valid display
+Origin: upstream, https://git.gnome.org/browse/metacity/commit/?id=6ec606c2a1b8ab4f
+Last-Update: 2015-06-13
+
+--- a/src/core/prefs.c
++++ b/src/core/prefs.c
+@@ -1920,6 +1920,9 @@
+ 
+   display = meta_get_display ();
+ 
++  if (!display)
++    return compositing_manager;
++
+   if (!compositing_manager)
+     warned = FALSE;
+ 

Added: desktop/unstable/metacity/debian/patches/series
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/metacity/debian/patches/series?rev=45243&op=file
==============================================================================
--- desktop/unstable/metacity/debian/patches/series	(added)
+++ desktop/unstable/metacity/debian/patches/series	[utf-8] Mon Jun 15 14:17:37 2015
@@ -0,0 +1 @@
+check_display.diff