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.48 -r1.49
--- openacs-4/packages/dotlrn-calendar/tcl/dotlrn-calendar-procs.tcl	10 May 2002 06:35:14 -0000	1.48
+++ openacs-4/packages/dotlrn-calendar/tcl/dotlrn-calendar-procs.tcl	10 May 2002 19:05:09 -0000	1.49
@@ -237,31 +237,22 @@
 
         # remove the portlets, params will cascade
         # first the admin portlet, from the comm's admin portal
-        set admin_portal_id \
-                [dotlrn_community::get_admin_portal_id -community_id $community_id]
-        
-        set admin_element_id [portal::get_element_ids_by_ds \
-                $admin_portal_id \
-                [calendar_admin_portlet::get_my_name]
-        ] 
+        set admin_portal_id [dotlrn_community::get_admin_portal_id \
+                -community_id $community_id]
 
-        portal::remove_element $admin_element_id 
+        portal::remove_element \
+                -portal_id $admin_portal_id \
+                -portlet_name [calendar_admin_portlet::get_my_name]
 
         # now for the "regular" calendar portlet from the comm's portal
         set portal_id [dotlrn_community::get_portal_id \
                 -community_id $community_id
         ]
 
-        portal::remove_element [portal::get_element_ids_by_ds \
-                $portal_id \
-                [calendar_portlet::get_my_name]
-        ]
-
         # now for the "full calendar" portlet from the comm's portal
-        portal::remove_element [portal::get_element_ids_by_ds \
-                $portal_id \
-                [calendar_full_portlet::get_my_name]
-        ]
+        portal::remove_element \
+                -portal_id $portal_id \
+                -portlet_name [calendar_full_portlet::get_my_name]
         
         # and finally kill the group calendar
         calendar_delete -calendar_id $group_calendar_id