Update to 2.91.3

This commit is contained in:
Owen W. Taylor 2010-11-29 19:51:27 -05:00
parent abef8c19a3
commit 99f86faca3
5 changed files with 8 additions and 76 deletions

1
.gitignore vendored
View File

@ -2,3 +2,4 @@ gnome-shell-2.31.5.tar.bz2
/gnome-shell-2.91.0.tar.bz2 /gnome-shell-2.91.0.tar.bz2
/gnome-shell-2.91.1.tar.bz2 /gnome-shell-2.91.1.tar.bz2
/gnome-shell-2.91.2.tar.bz2 /gnome-shell-2.91.2.tar.bz2
/gnome-shell-2.91.3.tar.bz2

View File

@ -1,34 +0,0 @@
From 025dda0f280022f2bd8074d2c61e4410604041fa Mon Sep 17 00:00:00 2001
From: Owen W. Taylor <otaylor@fishsoup.net>
Date: Wed, 17 Nov 2010 21:30:31 -0500
Subject: [PATCH] ShellTrayManager: fix icon actor memory management
Becaue ShellTrayManager doesn't know if the ShellTrayIcon actors
it creates will be added to a stage or not, it needs to adopt the
initial floating reference count with g_object_ref_sink().
This avoids crashes when unref'ing the actor when the tray is
removed.
Thanks for Jon McCann for help in tracking this down.
https://bugzilla.gnome.org/show_bug.cgi?id=635141
---
src/shell-tray-manager.c | 2 ++
1 files changed, 2 insertions(+), 0 deletions(-)
diff --git a/src/shell-tray-manager.c b/src/shell-tray-manager.c
index 37368da..ec6c8ae 100644
--- a/src/shell-tray-manager.c
+++ b/src/shell-tray-manager.c
@@ -264,6 +264,8 @@ on_plug_added (GtkSocket *socket,
child = g_hash_table_lookup (manager->priv->icons, socket);
child->actor = shell_tray_icon_new (SHELL_EMBEDDED_WINDOW (child->window));
+ g_object_ref_sink (child->actor);
+
g_signal_emit (manager, shell_tray_manager_signals[TRAY_ICON_ADDED], 0,
child->actor);
}
--
1.7.3.2

View File

@ -1,31 +0,0 @@
From 141b4ffe877948335ddf5e09722cb618935fa192 Mon Sep 17 00:00:00 2001
From: Giovanni Campagna <gcampagna@src.gnome.org>
Date: Sat, 13 Nov 2010 23:11:42 +0100
Subject: [PATCH] StFocusManager: don't unref removed groups
It is not referencing them when adding, and also it is connecting
to the "destroy" signal, emitted on dispose, so there is no risk
of storing finalized objects.
https://bugzilla.gnome.org/show_bug.cgi?id=634781
---
src/st/st-focus-manager.c | 3 +--
1 files changed, 1 insertions(+), 2 deletions(-)
diff --git a/src/st/st-focus-manager.c b/src/st/st-focus-manager.c
index 542fc5a..8c7bc9d 100644
--- a/src/st/st-focus-manager.c
+++ b/src/st/st-focus-manager.c
@@ -70,8 +70,7 @@ static void
st_focus_manager_init (StFocusManager *manager)
{
manager->priv = ST_FOCUS_MANAGER_GET_PRIVATE (manager);
- manager->priv->groups = g_hash_table_new_full (NULL, NULL,
- g_object_unref, NULL);
+ manager->priv->groups = g_hash_table_new (NULL, NULL);
}
static gboolean
--
1.7.3.2

View File

@ -1,6 +1,6 @@
Name: gnome-shell Name: gnome-shell
Version: 2.91.2 Version: 2.91.3
Release: 3%{?dist} Release: 1%{?dist}
Summary: Window management and application launching for GNOME Summary: Window management and application launching for GNOME
Group: User Interface/Desktops Group: User Interface/Desktops
@ -9,16 +9,11 @@ URL: http://live.gnome.org/GnomeShell
#VCS: git:git://git.gnome.org/gnome-shell #VCS: git:git://git.gnome.org/gnome-shell
Source0: http://ftp.gnome.org/pub/GNOME/sources/gnome-shell/2.91/%{name}-%{version}.tar.bz2 Source0: http://ftp.gnome.org/pub/GNOME/sources/gnome-shell/2.91/%{name}-%{version}.tar.bz2
# https://bugzilla.gnome.org/show_bug.cgi?id=634781
Patch1: StFocusManager-don-t-unref-removed-groups.patch
# https://bugzilla.gnome.org/show_bug.cgi?id=635141
Patch2: ShellTrayManager-fix-icon-actor-memory-management.patch
BuildRoot: %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX) BuildRoot: %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)
%define clutter_version 1.4.0 %define clutter_version 1.4.0
%define gobject_introspection_version 0.9.8 %define gobject_introspection_version 0.9.8
%define mutter_version 2.91.1 %define mutter_version 2.91.3
%define gjs_version 0.7.5 %define gjs_version 0.7.5
BuildRequires: clutter-devel >= %{clutter_version} BuildRequires: clutter-devel >= %{clutter_version}
@ -72,8 +67,6 @@ easy to use experience.
%prep %prep
%setup -q %setup -q
%patch1 -p1 -b .unreferenced-groups
%patch2 -p1 -b .unreferenced-groups
%build %build
(if ! test -x configure; then NOCONFIGURE=1 ./autogen.sh; fi; (if ! test -x configure; then NOCONFIGURE=1 ./autogen.sh; fi;
@ -137,6 +130,9 @@ gconftool-2 --makefile-install-rule \
glib-compile-schemas --allow-any-name %{_datadir}/glib-2.0/schemas ||: glib-compile-schemas --allow-any-name %{_datadir}/glib-2.0/schemas ||:
%changelog %changelog
* Mon Nov 29 2010 Owen Taylor <otaylor@redhat.com> - 2.91.2-1
- Update to 2.91.3
* Thu Nov 18 2010 Owen Taylor <otaylor@redhat.com> - 2.91.2-3 * Thu Nov 18 2010 Owen Taylor <otaylor@redhat.com> - 2.91.2-3
- Add another memory-management crasher fix from upstream - Add another memory-management crasher fix from upstream

View File

@ -1 +1 @@
97da75ffce5de8184257ae6b9373432f gnome-shell-2.91.2.tar.bz2 467a577946f044c96e046bff90075895 gnome-shell-2.91.3.tar.bz2