Index: openacs-4/packages/dotlrn-calendar/tcl/dotlrn-calendar-procs.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn-calendar/tcl/dotlrn-calendar-procs.tcl,v
diff -u -N -r1.45 -r1.46
--- openacs-4/packages/dotlrn-calendar/tcl/dotlrn-calendar-procs.tcl	6 May 2002 23:56:24 -0000	1.45
+++ openacs-4/packages/dotlrn-calendar/tcl/dotlrn-calendar-procs.tcl	7 May 2002 22:06:11 -0000	1.46
@@ -207,16 +207,11 @@
 
     ad_proc -public remove_applet_from_community {
         community_id
-        comm_package_id
     } {
         remove the applet from the community
     } {        
         set group_calendar_id [get_group_calendar_id -community_id $community_id]
-        
-        # aks debug 
-        ad_return_complaint 1 "aks2: [site_nodes::get_node_id_from_child_name -parent_node_id [site_nodes::get_node_id_from_package_id -package_id $comm_package_id] -name [package_key] ]"
 
-
         # first, revoke the permissions
         set members_segment_id [dotlrn_community::get_rel_segment_id \
                 -community_id $community_id \
@@ -262,29 +257,26 @@
 
         calendar_portlet::make_self_unavailable $portal_id
 
-        portal::remove_element [portal::get_element_id_by_ds \
+        portal::remove_element [portal::get_element_ids_by_ds \
                 $portal_id \
                 [calendar_portlet::my_name]
         ]
 
         # now for the "full calendar" portlet from the comm's portal
         calendar_full_portlet::make_self_unavailable $portal_id
 
-        portal::remove_element [portal::get_element_id_by_ds \
+        portal::remove_element [portal::get_element_ids_by_ds \
                 $portal_id \
                 [calendar_full_portlet::my_name]
         ]
         
         # and finally kill the group calendar
-        calendar_delete $group_calendar_id
+        calendar_delete -calendar_id $group_calendar_id
 
         # delete the package instance and the site node where it's mounted
-
-        # XXX it appears that the only way to get the package id
-        # of the calendar package mounted at this point, is through
-        # the comm_id/comm_package_id and the url, this should be better!
-        dotlrn::unmount_package -package_id $package_id
-                
+        dotlrn::unmount_community_applet_package \
+                -community_id $community_id \
+                -package_key [package_key]
     }
 
     ad_proc -public add_user {