[gnome-desktop3] Add missing file
Bastien Nocera
hadess at fedoraproject.org
Fri Feb 4 03:27:24 UTC 2011
commit 8bdd0248d70171cc9ed08aa7aeba2ce7660e4459
Author: Bastien Nocera <hadess at hadess.net>
Date: Fri Feb 4 03:27:14 2011 +0000
Add missing file
0001-Fix-refcount-issues-for-config.patch | 28 ++++++++++++++++++++++++++++
gnome-desktop3.spec | 8 +++++++-
2 files changed, 35 insertions(+), 1 deletions(-)
---
diff --git a/0001-Fix-refcount-issues-for-config.patch b/0001-Fix-refcount-issues-for-config.patch
new file mode 100644
index 0000000..2262042
--- /dev/null
+++ b/0001-Fix-refcount-issues-for-config.patch
@@ -0,0 +1,28 @@
+From 8ceca629c2db2c8da0c7d8e391a68367c6c705d9 Mon Sep 17 00:00:00 2001
+From: Bastien Nocera <hadess at 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 a648b81..a25bae0 100644
--- a/gnome-desktop3.spec
+++ b/gnome-desktop3.spec
@@ -10,7 +10,7 @@
Summary: Shared code among gnome-panel, gnome-session, nautilus, etc
Name: gnome-desktop3
Version: 2.91.6.1
-Release: 1%{?dist}
+Release: 2%{?dist}
URL: http://www.gnome.org
Source0: http://download.gnome.org/sources/gnome-desktop/2.91/gnome-desktop-%{version}.tar.bz2
License: GPLv2+ and LGPLv2+
@@ -38,6 +38,8 @@ BuildRequires: gettext
BuildRequires: gtk-doc >= %{gtk_doc_version}
BuildRequires: automake autoconf libtool intltool
+Patch0: 0001-Fix-refcount-issues-for-config.patch
+
%description
The gnome-desktop package contains an internal library
@@ -65,6 +67,7 @@ libgnomedesktop.
%prep
%setup -q -n gnome-desktop-%{version}
+%patch0 -p1 -b .refcount
%build
%configure --with-pnp-ids-path="/usr/share/hwdata/pnp.ids" \
@@ -102,6 +105,9 @@ rm -f $RPM_BUILD_ROOT%{_libdir}/*.a
%doc %{_datadir}/gtk-doc/html/gnome-desktop3/
%changelog
+* Fri Feb 04 2011 Bastien Nocera <bnocera at redhat.com> 2.91.6.1-2
+- Fix refcount issue in GnomeRRLabeler
+
* Wed Feb 2 2011 Matthias Clasen <mclasen at redhat.com> 2.91.6.1-1
- Update to 2.91.6.1
More information about the scm-commits
mailing list