summaryrefslogtreecommitdiffstats
path: root/x11
diff options
context:
space:
mode:
authormarcus <marcus@df743ca5-7f9a-e211-a948-0013205c9059>2008-04-29 01:23:15 +0800
committermarcus <marcus@df743ca5-7f9a-e211-a948-0013205c9059>2008-04-29 01:23:15 +0800
commitd2569396da8219a413e28ead77064e20f48f75fa (patch)
treeee021f7649e5d678ebda250116f60b3ad0553141 /x11
parent8c08ab06e146b8d06e7b68679acb61039b30f0f2 (diff)
downloadmarcuscom-ports-d2569396da8219a413e28ead77064e20f48f75fa.tar
marcuscom-ports-d2569396da8219a413e28ead77064e20f48f75fa.tar.gz
marcuscom-ports-d2569396da8219a413e28ead77064e20f48f75fa.tar.bz2
marcuscom-ports-d2569396da8219a413e28ead77064e20f48f75fa.tar.lz
marcuscom-ports-d2569396da8219a413e28ead77064e20f48f75fa.tar.xz
marcuscom-ports-d2569396da8219a413e28ead77064e20f48f75fa.tar.zst
marcuscom-ports-d2569396da8219a413e28ead77064e20f48f75fa.zip
Fix a crash when a session app doesn't have a desktop file.
git-svn-id: svn://creme-brulee.marcuscom.com/ports/trunk@10926 df743ca5-7f9a-e211-a948-0013205c9059
Diffstat (limited to 'x11')
-rw-r--r--x11/gnome-session/Makefile4
-rw-r--r--x11/gnome-session/files/patch-gnome-session_session.c11
2 files changed, 13 insertions, 2 deletions
diff --git a/x11/gnome-session/Makefile b/x11/gnome-session/Makefile
index ca4424ff4..3cd63e09e 100644
--- a/x11/gnome-session/Makefile
+++ b/x11/gnome-session/Makefile
@@ -3,12 +3,12 @@
# Whom: Joe Marcus Clarke <marcus@FreeBSD.org>
#
# $FreeBSD$
-# $MCom: ports/x11/gnome-session/Makefile,v 1.145 2008/04/26 18:05:02 marcus Exp $
+# $MCom: ports/x11/gnome-session/Makefile,v 1.146 2008/04/27 19:35:26 marcus Exp $
#
PORTNAME= gnome-session
PORTVERSION= 2.23.1.1
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= x11 gnome
MASTER_SITES= ${MASTER_SITE_GNOME} \
http://www.marcuscom.com/downloads/:local
diff --git a/x11/gnome-session/files/patch-gnome-session_session.c b/x11/gnome-session/files/patch-gnome-session_session.c
new file mode 100644
index 000000000..a78539889
--- /dev/null
+++ b/x11/gnome-session/files/patch-gnome-session_session.c
@@ -0,0 +1,11 @@
+--- gnome-session/session.c.orig 2008-04-28 13:19:41.000000000 -0400
++++ gnome-session/session.c 2008-04-28 13:17:22.000000000 -0400
+@@ -155,6 +155,8 @@ static void
+ append_app (GsmSession *session, GsmApp *app)
+ {
+ const char *basename = gsm_app_get_basename (app);
++ if (!basename)
++ return;
+ GsmApp *dup = g_hash_table_lookup (session->apps_by_name, basename);
+
+ if (dup)