From 26d1c4e6ceb8091586ea273018b91290babd3a8d Mon Sep 17 00:00:00 2001
From: Tomas Bzatek <tbzatek@redhat.com>
Date: May 11 2011 15:27:34 +0000
Subject: Update to 3.1.1


---

diff --git a/.gitignore b/.gitignore
index 7cdc475..3355759 100644
--- a/.gitignore
+++ b/.gitignore
@@ -13,3 +13,4 @@ gnome-desktop-2.90.4.tar.bz2
 /gnome-desktop-2.91.93.tar.bz2
 /gnome-desktop-3.0.0.tar.bz2
 /gnome-desktop-3.0.1.tar.bz2
+/gnome-desktop-3.1.1.tar.bz2
diff --git a/0001-Don-t-fall-over-if-RANDR-is-missing.patch b/0001-Don-t-fall-over-if-RANDR-is-missing.patch
deleted file mode 100644
index 5402a20..0000000
--- a/0001-Don-t-fall-over-if-RANDR-is-missing.patch
+++ /dev/null
@@ -1,30 +0,0 @@
-From aa93854f2ba6b0f72f1bdff9699b5724a72c89c9 Mon Sep 17 00:00:00 2001
-From: Matthias Clasen <mclasen@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
-
diff --git a/0001-Fix-refcount-issues-for-config.patch b/0001-Fix-refcount-issues-for-config.patch
deleted file mode 100644
index 2262042..0000000
--- a/0001-Fix-refcount-issues-for-config.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-From 8ceca629c2db2c8da0c7d8e391a68367c6c705d9 Mon Sep 17 00:00:00 2001
-From: Bastien Nocera <hadess@hadess.net>
-Date: Fri, 4 Feb 2011 03:23:09 +0000
-Subject: [PATCH] Fix refcount issues for ->config
-
-If the GnomeRRLabeler object is going to be unref'ing the
-config object, then it better keeps its own reference to it, otherwise
-it could cause problems when destroyed and re-created.
----
- libgnome-desktop/gnome-rr-labeler.c |    2 +-
- 1 files changed, 1 insertions(+), 1 deletions(-)
-
-diff --git a/libgnome-desktop/gnome-rr-labeler.c b/libgnome-desktop/gnome-rr-labeler.c
-index e477d36..a5db10b 100644
---- a/libgnome-desktop/gnome-rr-labeler.c
-+++ b/libgnome-desktop/gnome-rr-labeler.c
-@@ -171,7 +171,7 @@ gnome_rr_labeler_set_property (GObject *gobject, guint property_id, const GValue
- 
- 	switch (property_id) {
- 	case PROP_CONFIG:
--		self->priv->config = GNOME_RR_CONFIG (g_value_get_object (value));
-+		self->priv->config = GNOME_RR_CONFIG (g_value_dup_object (value));
- 		return;
- 	default:
- 		G_OBJECT_WARN_INVALID_PROPERTY_ID (gobject, property_id, param_spec);
--- 
-1.7.4
-
diff --git a/gnome-desktop3.spec b/gnome-desktop3.spec
index cda15c6..8310a4b 100644
--- a/gnome-desktop3.spec
+++ b/gnome-desktop3.spec
@@ -1,6 +1,6 @@
 %define libxml2_version                   2.4.20
 %define gtk3_version                      3.0.0
-%define glib2_version                     2.15.4
+%define glib2_version                     2.19.1
 %define startup_notification_version      0.5
 %define gnome_doc_utils_version           0.3.2
 %define gtk_doc_version                   1.9
@@ -9,13 +9,10 @@
 
 Summary: Shared code among gnome-panel, gnome-session, nautilus, etc
 Name: gnome-desktop3
-Version: 3.0.1
-Release: 2%{?dist}
+Version: 3.1.1
+Release: 1%{?dist}
 URL: http://www.gnome.org
-Source0: http://download.gnome.org/sources/gnome-desktop/3.0/gnome-desktop-%{version}.tar.bz2
-
-# Upstream fix
-Patch0: 0001-Don-t-fall-over-if-RANDR-is-missing.patch
+Source0: http://download.gnome.org/sources/gnome-desktop/3.1/gnome-desktop-%{version}.tar.bz2
 
 License: GPLv2+ and LGPLv2+
 Group: System Environment/Libraries
@@ -71,7 +68,6 @@ libgnomedesktop.
 
 %prep
 %setup -q -n gnome-desktop-%{version}
-%patch0 -p1 -b .randr-missing
 
 %build
 %configure --with-pnp-ids-path="/usr/share/hwdata/pnp.ids" \
@@ -109,6 +105,9 @@ rm -f $RPM_BUILD_ROOT%{_libdir}/*.a
 %doc %{_datadir}/gtk-doc/html/gnome-desktop3/
 
 %changelog
+* Wed May 11 2011 Tomas Bzatek <tbzatek@redhat.com> - 3.1.1-1
+- Update to 3.1.1
+
 * Mon May  2 2011 Matthias Clasen <mclasen@redhat.com> - 3.0.1-2
 - Prevent segfaults in gnome-rr users on randr-less displays
 
diff --git a/sources b/sources
index dfd8861..b2f99bc 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-ffc0ce6e9413786f78f59f18655e8523  gnome-desktop-3.0.1.tar.bz2
+be1c088efc09c6126ac71a67276c5b03  gnome-desktop-3.1.1.tar.bz2