summaryrefslogtreecommitdiffstats
path: root/x11
diff options
context:
space:
mode:
authormarcus <marcus@df743ca5-7f9a-e211-a948-0013205c9059>2008-02-13 03:36:42 +0800
committermarcus <marcus@df743ca5-7f9a-e211-a948-0013205c9059>2008-02-13 03:36:42 +0800
commit43b3df6f1317966b06799d33e9afdf1a363c7e1f (patch)
tree54b4f2d6c498f7be453982fdb26c6cbbb11f0e93 /x11
parentf413e5dfa49ca351eaa3b21adc9b63b52de91994 (diff)
downloadmarcuscom-ports-43b3df6f1317966b06799d33e9afdf1a363c7e1f.tar
marcuscom-ports-43b3df6f1317966b06799d33e9afdf1a363c7e1f.tar.gz
marcuscom-ports-43b3df6f1317966b06799d33e9afdf1a363c7e1f.tar.bz2
marcuscom-ports-43b3df6f1317966b06799d33e9afdf1a363c7e1f.tar.lz
marcuscom-ports-43b3df6f1317966b06799d33e9afdf1a363c7e1f.tar.xz
marcuscom-ports-43b3df6f1317966b06799d33e9afdf1a363c7e1f.tar.zst
marcuscom-ports-43b3df6f1317966b06799d33e9afdf1a363c7e1f.zip
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
Diffstat (limited to 'x11')
-rw-r--r--x11/gnome-desktop/Makefile4
-rw-r--r--x11/gnome-desktop/files/patch-libgnome-desktop_gnome-bg.c16
2 files changed, 18 insertions, 2 deletions
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 <marcus@FreeBSD.org>
#
# $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);
+ }
+