pool/gnome-desktop
SHA256
4
0
Fork 1
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Accepting request 81673 from home:vuntz:branches:GNOME:Factory

Browse Source 
Fix a crash

OBS-URL: https://build.opensuse.org/request/show/81673
OBS-URL: https://build.opensuse.org/package/show/GNOME:Factory/gnome-desktop?expand=0&rev=122
This commit is contained in:
Vincent Untz 2011-09-09 10:57:01 +00:00 committed by Git OBS Bridge
parent b50bded5c4
commit 2ac466b346
3 changed files with 36 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
gnome-desktop-gnome-wall-clock-crash.patch Normal file
View File

@ -0,0 +1,27 @@
commit a65613bf0a507a226c172bb6f503e27532efb0fa
Author: Vincent Untz <vuntz@gnome.org>
Date: Thu Sep 8 19:01:35 2011 +0200
GnomeWallClock: Remove the date/time source on dispose
We don't do it in finalize since the dispose handler needs the objects
that are being disposed.
https://bugzilla.gnome.org/show_bug.cgi?id=658583
diff --git a/libgnome-desktop/gnome-wall-clock.c b/libgnome-desktop/gnome-wall-clock.c
index 49437d8..167619d 100644
--- a/libgnome-desktop/gnome-wall-clock.c
+++ b/libgnome-desktop/gnome-wall-clock.c
@@ -84,6 +84,11 @@ gnome_wall_clock_dispose (GObject *object)
{
GnomeWallClock *self = GNOME_WALL_CLOCK (object);
+ if (self->priv->clock_update_id) {
+ g_source_remove (self->priv->clock_update_id);
+ self->priv->clock_update_id = 0;
+ }
+
if (self->priv->tz_monitor != NULL) {
g_object_unref (self->priv->tz_monitor);
self->priv->tz_monitor = NULL;

6
gnome-desktop.changes
View File

@ -1,3 +1,9 @@
-------------------------------------------------------------------
Fri Sep 9 10:36:36 UTC 2011 - vuntz@opensuse.org
- Add gnome-desktop-gnome-wall-clock-crash.patch: fix an issue
leading to a gnome-screensaver crash.
-------------------------------------------------------------------
Mon Sep 5 07:33:49 UTC 2011 - vuntz@opensuse.org

3
gnome-desktop.spec
View File

@ -27,6 +27,8 @@ Url: http://www.gnome.org
Group: System/GUI/GNOME
Source: http://download.gnome.org/sources/gnome-desktop/3.1/%{name}-%{version}.tar.bz2
Source99: baselibs.conf
# PATCH-FIX-UPSTREAM gnome-desktop-gnome-wall-clock-crash.patch vuntz@opensuse.org -- Fix a crash killing gnome-screensaver, taken from git
Patch0: gnome-desktop-gnome-wall-clock-crash.patch
BuildRequires: fdupes
BuildRequires: gnome-doc-utils-devel
BuildRequires: gobject-introspection-devel
@ -103,6 +105,7 @@ gtk-doc.
%prep
%setup -q
translation-update-upstream
%patch0 -p1
%if 0%{?BUILD_FROM_VCS}
[ -x ./autogen.sh] && NOCONFIGURE=1 ./autogen.sh