r52242 - in /desktop/unstable/gnome-control-center/debian: changelog patches/info-Do-not-crash-if-Renderer-is-not-set-by-SessionM.patch patches/series

[biebl at users.alioth.debian.org]

Author: biebl
Date: Tue Mar 14 22:15:33 2017
New Revision: 52242

URL: http://svn.debian.org/wsvn/pkg-gnome/?sc=1&rev=52242
Log:
* debian/patches/info-Do-not-crash-if-Renderer-is-not-set-by-SessionM.patch
  - Fix a crash in the info panel if the renderer can not be retrieved from
    SessionManager.

Added:
    desktop/unstable/gnome-control-center/debian/patches/info-Do-not-crash-if-Renderer-is-not-set-by-SessionM.patch
Modified:
    desktop/unstable/gnome-control-center/debian/changelog
    desktop/unstable/gnome-control-center/debian/patches/series

Modified: desktop/unstable/gnome-control-center/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gnome-control-center/debian/changelog?rev=52242&op=diff
==============================================================================
--- desktop/unstable/gnome-control-center/debian/changelog	[utf-8] (original)
+++ desktop/unstable/gnome-control-center/debian/changelog	[utf-8] Tue Mar 14 22:15:33 2017
@@ -4,6 +4,9 @@
   * Set --with-gnome-session-libexecdir so gnome-control-center can find the
     gnome-session-check-accelerated binary which is required for the info
     panel.
+  * debian/patches/info-Do-not-crash-if-Renderer-is-not-set-by-SessionM.patch
+    - Fix a crash in the info panel if the renderer can not be retrieved from
+      SessionManager.
 
  -- Michael Biebl <biebl at debian.org>  Tue, 14 Mar 2017 17:56:57 +0100
 

Added: desktop/unstable/gnome-control-center/debian/patches/info-Do-not-crash-if-Renderer-is-not-set-by-SessionM.patch
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gnome-control-center/debian/patches/info-Do-not-crash-if-Renderer-is-not-set-by-SessionM.patch?rev=52242&op=file
==============================================================================
--- desktop/unstable/gnome-control-center/debian/patches/info-Do-not-crash-if-Renderer-is-not-set-by-SessionM.patch	(added)
+++ desktop/unstable/gnome-control-center/debian/patches/info-Do-not-crash-if-Renderer-is-not-set-by-SessionM.patch	[utf-8] Tue Mar 14 22:15:33 2017
@@ -0,0 +1,31 @@
+From 97e4d87ae8a123d5b1711ddbaba6bc0d3a0a39a8 Mon Sep 17 00:00:00 2001
+From: Ondrej Holy <oholy at redhat.com>
+Date: Mon, 5 Dec 2016 10:15:12 +0100
+Subject: [PATCH] info: Do not crash if Renderer is not set by SessionManager
+
+This regression has been introduced by commit 52da4da. The
+info panel crashes if prettify_info() returns NULL. This happens
+if Renderer property from SessionManager is empty.
+
+https://bugzilla.gnome.org/show_bug.cgi?id=774240
+---
+ panels/info/info-cleanup.c | 3 +++
+ 1 file changed, 3 insertions(+)
+
+diff --git a/panels/info/info-cleanup.c b/panels/info/info-cleanup.c
+index 20243ecfb..bb47493aa 100644
+--- a/panels/info/info-cleanup.c
++++ b/panels/info/info-cleanup.c
+@@ -99,6 +99,9 @@ remove_duplicate_whitespace (const char *old)
+   GRegex *re;
+   GError *error;
+ 
++  if (old == NULL)
++    return NULL;
++
+   error = NULL;
+   re = g_regex_new ("[ \t\n\r]+", G_REGEX_MULTILINE, 0, &error);
+   if (re == NULL)
+-- 
+2.11.0
+

Modified: desktop/unstable/gnome-control-center/debian/patches/series
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gnome-control-center/debian/patches/series?rev=52242&op=diff
==============================================================================
--- desktop/unstable/gnome-control-center/debian/patches/series	[utf-8] (original)
+++ desktop/unstable/gnome-control-center/debian/patches/series	[utf-8] Tue Mar 14 22:15:33 2017
@@ -1,3 +1,4 @@
 01_menu_category.patch
 06_handle_passwd_with_ldap.patch
 07_polkit_wheel_sudo_group.patch
+info-Do-not-crash-if-Renderer-is-not-set-by-SessionM.patch