Index: openacs-4/packages/calendar-portlet/calendar-portlet.info
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/calendar-portlet/calendar-portlet.info,v
diff -u -r1.17.2.2 -r1.17.2.3
--- openacs-4/packages/calendar-portlet/calendar-portlet.info	3 Apr 2004 04:04:02 -0000	1.17.2.2
+++ openacs-4/packages/calendar-portlet/calendar-portlet.info	4 Aug 2005 22:01:33 -0000	1.17.2.3
@@ -14,11 +14,14 @@
 
         <provides url="calendar-portlet" version="2.0.3"/>
         <requires url="calendar" version="1.0"/>
-        <requires url="new-portal" version="0.1a"/>
+        <requires url="portal" version="0.9"/>
 
+        <callbacks>
+            <callback type="after-install"  proc="calendar_portlet::install::package_install"/>
+            <callback type="before-uninstall"  proc="calendar_portlet::install::package_uninstall"/>
+        </callbacks>
+
         <parameters>
-            <parameter datatype="string"  min_n_values="1"  max_n_values="1"  name="pretty_name"  default="#calendar-portlet.pretty_name#" description="Pretty Name"/>
-            <parameter datatype="string"  min_n_values="1"  max_n_values="1"  name="full_portlet_pretty_name"  default="#calendar-portlet.full_portlet_pretty_name#" description="Description of Full Calendar Pretty Name"/>
             <parameter datatype="number"  min_n_values="1"  max_n_values="1"  name="force_region"  default="2" description="the portal region to add the calendar portlet"/>
         </parameters>
 
Index: openacs-4/packages/calendar-portlet/www/calendar-admin-portlet.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/calendar-portlet/www/calendar-admin-portlet.tcl,v
diff -u -r1.3 -r1.3.6.1
--- openacs-4/packages/calendar-portlet/www/calendar-admin-portlet.tcl	9 Aug 2002 18:39:31 -0000	1.3
+++ openacs-4/packages/calendar-portlet/www/calendar-admin-portlet.tcl	4 Aug 2005 22:01:33 -0000	1.3.6.1
@@ -27,7 +27,6 @@
 
 # get stuff out of the config array
 array set config $cf
-set view $config(default_view)
 set list_of_calendar_ids $config(calendar_id)
 
 if {[llength $list_of_calendar_ids] > 1} {
Index: openacs-4/packages/calendar-portlet/www/calendar-full-portlet.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/calendar-portlet/www/calendar-full-portlet.tcl,v
diff -u -r1.31 -r1.31.2.1
--- openacs-4/packages/calendar-portlet/www/calendar-full-portlet.tcl	5 Nov 2003 18:03:10 -0000	1.31
+++ openacs-4/packages/calendar-portlet/www/calendar-full-portlet.tcl	4 Aug 2005 22:01:33 -0000	1.31.2.1
@@ -49,15 +49,8 @@
 set ad_conn_url [ad_conn url]
 set base_url [ad_conn package_url]
 
-set scoped_p $config(scoped_p)
-if {$scoped_p == "t"} {
-    set show_calendar_name_p 1
-} else {
-    set show_calendar_name_p 0
-}
-
 if {[llength $list_of_calendar_ids] > 1} {
-    set force_calendar_id [calendar_have_private_p -return_id 1 -calendar_id_list $list_of_calendar_ids [ad_conn user_id]]
+    set force_calendar_id [calendar::have_private_p -return_id 1 -calendar_id_list $list_of_calendar_ids [ad_conn user_id]]
 } else {
     set force_calendar_id [lindex $list_of_calendar_ids 0]
 }
Index: openacs-4/packages/calendar-portlet/www/calendar-list-portlet.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/calendar-portlet/www/calendar-list-portlet.tcl,v
diff -u -r1.6 -r1.6.2.1
--- openacs-4/packages/calendar-portlet/www/calendar-list-portlet.tcl	5 Nov 2003 18:03:10 -0000	1.6
+++ openacs-4/packages/calendar-portlet/www/calendar-list-portlet.tcl	4 Aug 2005 22:01:33 -0000	1.6.2.1
@@ -47,15 +47,8 @@
 }
 set list_of_calendar_ids $config(calendar_id)
 
-set scoped_p $config(scoped_p)
-if {$scoped_p == "t"} {
-    set show_calendar_name_p 1
-} else {
-    set show_calendar_name_p 0
-}
-
 if {[llength $list_of_calendar_ids] > 1} {
-    set force_calendar_id [calendar_have_private_p -return_id 1 -calendar_id_list $list_of_calendar_ids [ad_conn user_id]]
+    set force_calendar_id [calendar::have_private_p -return_id 1 -calendar_id_list $list_of_calendar_ids [ad_conn user_id]]
 } else {
     set force_calendar_id [lindex $list_of_calendar_ids 0]
 }
Index: openacs-4/packages/calendar-portlet/www/calendar-portlet.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/calendar-portlet/www/calendar-portlet.tcl,v
diff -u -r1.26 -r1.26.2.1
--- openacs-4/packages/calendar-portlet/www/calendar-portlet.tcl	5 Nov 2003 18:03:10 -0000	1.26
+++ openacs-4/packages/calendar-portlet/www/calendar-portlet.tcl	4 Aug 2005 22:01:33 -0000	1.26.2.1
@@ -41,20 +41,13 @@
 
 # get stuff out of the config array
 array set config $cf
+
 set view $config(default_view)
 set list_of_calendar_ids $config(calendar_id)
 set base_url [ad_conn url]
 
-set scoped_p $config(scoped_p)
-
-if {$scoped_p == "t"} {
-    set show_calendar_name_p 1
-} else {
-    set show_calendar_name_p 0
-}
-
 if {[llength $list_of_calendar_ids] > 1} {
-    set force_calendar_id [calendar_have_private_p -return_id 1 -calendar_id_list $list_of_calendar_ids [ad_conn user_id]]
+    set force_calendar_id [calendar::have_private_p -return_id 1 -calendar_id_list $list_of_calendar_ids [ad_conn user_id]]
 } else {
     set force_calendar_id [lindex $list_of_calendar_ids 0]
 }