[gnome-desktop3] forgotten patch

[Matthias Clasen]

commit 1c7e173ddf177345a034b0de0879c970b5f4ac63
Author: Matthias Clasen <mclasen at redhat.com>
Date:   Mon May 2 14:46:03 2011 -0400

    forgotten patch

 0001-Don-t-fall-over-if-RANDR-is-missing.patch |   30 ++++++++++++++++++++++++
 1 files changed, 30 insertions(+), 0 deletions(-)
---
diff --git a/0001-Don-t-fall-over-if-RANDR-is-missing.patch b/0001-Don-t-fall-over-if-RANDR-is-missing.patch
new file mode 100644
index 0000000..5402a20
--- /dev/null
+++ b/0001-Don-t-fall-over-if-RANDR-is-missing.patch
@@ -0,0 +1,30 @@
+From aa93854f2ba6b0f72f1bdff9699b5724a72c89c9 Mon Sep 17 00:00:00 2001
+From: Matthias Clasen <mclasen at redhat.com>
+Date: Sat, 30 Apr 2011 20:48:03 -0400
+Subject: [PATCH] Don't fall over if RANDR is missing
+
+When RANDR is not present, the screen object never gets an info,
+and since screen_info_free asserts, we must not call it unconditionally
+in finalize.
+This fixes https://bugzilla.gnome.org/show_bug.cgi?id=649053
+---
+ libgnome-desktop/gnome-rr.c |    3 ++-
+ 1 files changed, 2 insertions(+), 1 deletions(-)
+
+diff --git a/libgnome-desktop/gnome-rr.c b/libgnome-desktop/gnome-rr.c
+index 4a9d98e..eb3d735 100644
+--- a/libgnome-desktop/gnome-rr.c
++++ b/libgnome-desktop/gnome-rr.c
+@@ -748,7 +748,8 @@ gnome_rr_screen_finalize (GObject *gobject)
+ 
+     gdk_window_remove_filter (screen->priv->gdk_root, screen_on_event, screen);
+ 
+-    screen_info_free (screen->priv->info);
++    if (screen->priv->info)
++      screen_info_free (screen->priv->info);
+ 
+     G_OBJECT_CLASS (gnome_rr_screen_parent_class)->finalize (gobject);
+ }
+-- 
+1.7.5
+