From 43b3df6f1317966b06799d33e9afdf1a363c7e1f Mon Sep 17 00:00:00 2001 From: marcus Date: Tue, 12 Feb 2008 19:36:42 +0000 Subject: Do not unref a NULL object. This should fix the g-s-d crashes. git-svn-id: svn://creme-brulee.marcuscom.com/ports/trunk@10436 df743ca5-7f9a-e211-a948-0013205c9059 --- x11/gnome-desktop/Makefile | 4 ++-- .../files/patch-libgnome-desktop_gnome-bg.c | 16 ++++++++++++++++ 2 files changed, 18 insertions(+), 2 deletions(-) create mode 100644 x11/gnome-desktop/files/patch-libgnome-desktop_gnome-bg.c (limited to 'x11/gnome-desktop') diff --git a/x11/gnome-desktop/Makefile b/x11/gnome-desktop/Makefile index 54a8f3861..aa6e71a0a 100644 --- a/x11/gnome-desktop/Makefile +++ b/x11/gnome-desktop/Makefile @@ -3,12 +3,12 @@ # Whom: Joe Marcus Clarke # # $FreeBSD$ -# $MCom: ports/x11/gnome-desktop/Makefile,v 1.134 2008/01/28 04:44:49 mezz Exp $ +# $MCom: ports/x11/gnome-desktop/Makefile,v 1.135 2008/02/11 20:16:10 kwm Exp $ # PORTNAME= gnome-desktop PORTVERSION= 2.21.91 -PORTREVISION?= 0 +PORTREVISION?= 1 CATEGORIES= x11 gnome MASTER_SITES= ${MASTER_SITE_GNOME} MASTER_SITE_SUBDIR= sources/gnome-desktop/${PORTVERSION:C/^([0-9]+\.[0-9]+).*/\1/} diff --git a/x11/gnome-desktop/files/patch-libgnome-desktop_gnome-bg.c b/x11/gnome-desktop/files/patch-libgnome-desktop_gnome-bg.c new file mode 100644 index 000000000..223c343ab --- /dev/null +++ b/x11/gnome-desktop/files/patch-libgnome-desktop_gnome-bg.c @@ -0,0 +1,16 @@ +--- libgnome-desktop/gnome-bg.c.orig 2008-02-12 14:33:11.000000000 -0500 ++++ libgnome-desktop/gnome-bg.c 2008-02-12 14:34:12.000000000 -0500 +@@ -1076,10 +1076,11 @@ get_mtime (const char *uri) + file = g_file_new_for_uri (uri); + info = g_file_query_info (file, G_FILE_ATTRIBUTE_TIME_MODIFIED, + G_FILE_QUERY_INFO_NONE, NULL, NULL); +- if (info) ++ if (info) { + mtime = g_file_info_get_attribute_uint64 (info, + G_FILE_ATTRIBUTE_TIME_MODIFIED); +- g_object_unref (info); ++ g_object_unref (info); ++ } + g_object_unref (file); + } + -- cgit v1.2.3