Index: openacs-4/packages/calendar/www/view.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/calendar/www/view.adp,v
diff -u -r1.38 -r1.38.2.1
--- openacs-4/packages/calendar/www/view.adp	14 Jul 2015 22:36:43 -0000	1.38
+++ openacs-4/packages/calendar/www/view.adp	20 Sep 2015 17:54:56 -0000	1.38.2.1
@@ -18,7 +18,9 @@
     </p>
   
     <if @calendar_personal_p@ false>
-	    <p>@notification_chunk;noquote@</p>
+       <p><include src="/packages/notifications/lib/notification-widget" type="calendar_notif"
+	 	   object_id="@package_id;literal@"
+	 	   pretty_name="@instance_name;literal@" >
     </if>
   
     <include src="cal-options">	
Index: openacs-4/packages/calendar/www/view.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/calendar/www/view.tcl,v
diff -u -r1.31.2.1 -r1.31.2.2
--- openacs-4/packages/calendar/www/view.tcl	10 Sep 2015 08:30:16 -0000	1.31.2.1
+++ openacs-4/packages/calendar/www/view.tcl	20 Sep 2015 17:54:56 -0000	1.31.2.2
@@ -58,12 +58,7 @@
 } else {
     set calendar_personal_p [calendar::personal_p -calendar_id [lindex [calendar::calendar_list -package_id $package_id  ] 0 1] ]
 }
-set notification_chunk [notification::display::request_widget \
-                            -type calendar_notif \
-                            -object_id $package_id \
-                            -pretty_name [ad_conn instance_name] \
-                            -url [ad_conn url] \
-                           ]
+set instance_name [ad_conn instance_name]
 
 # Header stuff
 template::head::add_css -href "/resources/calendar/calendar.css" -media all