From b708e9bc14cc3aa9e4995bd0d2380699a0c9d2d1 Mon Sep 17 00:00:00 2001
From: ajacoutot <ajacoutot@openbsd.org>
Date: Thu, 15 Nov 2012 08:32:36 +0000
Subject: [PATCH] Handle calendar-server errors, from upstream.

---
 x11/gnome/shell/Makefile                      |  3 ++-
 .../shell/patches/patch-js_ui_calendar_js     | 20 +++++++++++++++++++
 2 files changed, 22 insertions(+), 1 deletion(-)
 create mode 100644 x11/gnome/shell/patches/patch-js_ui_calendar_js

diff --git a/x11/gnome/shell/Makefile b/x11/gnome/shell/Makefile
index 267670f0a7a..51c883e3351 100644
--- a/x11/gnome/shell/Makefile
+++ b/x11/gnome/shell/Makefile
@@ -1,9 +1,10 @@
-# $OpenBSD: Makefile,v 1.23 2012/11/13 18:19:13 jasper Exp $
+# $OpenBSD: Makefile,v 1.24 2012/11/15 08:32:36 ajacoutot Exp $
 
 COMMENT=		next generation GNOME shell
 
 GNOME_PROJECT=		gnome-shell
 GNOME_VERSION=		3.6.2
+REVISION=		0
 
 HOMEPAGE=		http://live.gnome.org/GnomeShell
 
diff --git a/x11/gnome/shell/patches/patch-js_ui_calendar_js b/x11/gnome/shell/patches/patch-js_ui_calendar_js
new file mode 100644
index 00000000000..165782d0ff9
--- /dev/null
+++ b/x11/gnome/shell/patches/patch-js_ui_calendar_js
@@ -0,0 +1,20 @@
+$OpenBSD: patch-js_ui_calendar_js,v 1.1 2012/11/15 08:32:36 ajacoutot Exp $
+
+From a4e29e1244b097fc2bebc371e00d7af30537c376 Mon Sep 17 00:00:00 2001
+From: Florian Müllner <fmuellner@gnome.org>
+Date: Tue, 23 Oct 2012 12:32:27 +0000
+Subject: calendar: Handle calendar-server errors
+
+--- js/ui/calendar.js.orig	Mon Nov 12 21:18:59 2012
++++ js/ui/calendar.js	Thu Nov 15 09:16:05 2012
+@@ -270,8 +270,9 @@ const DBusEventSource = new Lang.Class({
+         this._loadEvents(false);
+     },
+ 
+-    _onEventsReceived: function([appointments]) {
++    _onEventsReceived: function(results, error) {
+         let newEvents = [];
++        let appointments = results ? results[0] : null;
+         if (appointments != null) {
+             for (let n = 0; n < appointments.length; n++) {
+                 let a = appointments[n];