Index: openacs-4/packages/dotlrn-dotlrn/tcl/dotlrn-dotlrn-procs.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn-dotlrn/tcl/dotlrn-dotlrn-procs.tcl,v
diff -u -r1.24 -r1.25
--- openacs-4/packages/dotlrn-dotlrn/tcl/dotlrn-dotlrn-procs.tcl	12 May 2002 18:15:03 -0000	1.24
+++ openacs-4/packages/dotlrn-dotlrn/tcl/dotlrn-dotlrn-procs.tcl	13 May 2002 06:00:06 -0000	1.25
@@ -69,31 +69,38 @@
 	Add the dotlrn applet to a specific community
     } {
 	set pt_id [dotlrn_community::get_portal_id -community_id $community_id]
-        dotlrn_portlet::add_self_to_page -portal_id $pt_id -community_id $community_id                
+        dotlrn_portlet::add_self_to_page -portal_id $pt_id -community_id $community_id
 
         if {[dotlrn_community::dummy_comm_p -community_id $community_id]} {
             return
         }
 
 	# set up the DS for the admin page
         set admin_portal_id [dotlrn_community::get_admin_portal_id -community_id $community_id]
-	dotlrn_admin_portlet::add_self_to_page -portal_id $admin_portal_id -community_id $community_id
+	dotlrn_admin_portlet::add_self_to_page \
+            -portal_id $admin_portal_id \
+            -community_id $community_id
 
 	return $community_id
     }
 
-    ad_proc -public remove_applet {
+    ad_proc -public remove_applet_from_community {
 	community_id
-	package_id
     } {
-	remove the applet from the community
+	remove the dotlrn applet from a specific community
     } {
-	# Remove all instances of the dotlrn portlet! (this is some serious stuff!)
+        set admin_portal_id [dotlrn_community::get_admin_portal_id -community_id $community_id]
+	dotlrn_admin_portlet::remove_self_from_page -portal_id $admin_portal_id
 
-	# Dropping all messages, forums
+	set pt_id [dotlrn_community::get_portal_id -community_id $community_id]
+        dotlrn_portlet::remove_self_from_page -portal_id $pt_id
+    }
 
-	# Killing the package
-    
+    ad_proc -public remove_applet {
+	package_id
+    } {
+	remove the applet from dotlrn
+    } {
     }
 
     ad_proc -public add_user {