Index: openacs-4/packages/calendar/tcl/calendar-callback-procs.xql
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/calendar/tcl/calendar-callback-procs.xql,v
diff -u -r1.2 -r1.3
--- openacs-4/packages/calendar/tcl/calendar-callback-procs.xql	8 Aug 2006 21:26:18 -0000	1.2
+++ openacs-4/packages/calendar/tcl/calendar-callback-procs.xql	15 May 2007 20:14:20 -0000	1.3
@@ -1,23 +1,23 @@
 <?xml version="1.0"?>
 <queryset>
 
-  <fullquery name="callback::MergeShowUserInfo::impl::calendar.get_calendars">
+  <fullquery name="callback::merge::MergeShowUserInfo::impl::calendar.get_calendars">
     <querytext>	
 	select calendar_name
 	from calendars
 	where owner_id = :user_id
     </querytext>
   </fullquery>	
 
-  <fullquery name="callback::MergePackageUser::impl::calendar.get_from_calendars">
+  <fullquery name="callback::merge::MergePackageUser::impl::calendar.get_from_calendars">
     <querytext>	
 	select calendar_id,package_id
 	from calendars
 	where owner_id = :from_user_id
     </querytext>
   </fullquery>	
   
-  <fullquery name="callback::MergePackageUser::impl::calendar.get_repeated_pkgs">
+  <fullquery name="callback::merge::MergePackageUser::impl::calendar.get_repeated_pkgs">
     <querytext>	
       select count(*)
       from calendars
@@ -26,7 +26,7 @@
     </querytext>
   </fullquery>	
 
-  <fullquery name="callback::MergePackageUser::impl::calendar.calendars_upd">
+  <fullquery name="callback::merge::MergePackageUser::impl::calendar.calendars_upd">
     <querytext>	
       update calendars
       set owner_id = :to_user_id
@@ -35,7 +35,7 @@
     </querytext>
   </fullquery>	
 
-  <fullquery name="callback::MergePackageUser::impl::calendar.gettocalid">
+  <fullquery name="callback::merge::MergePackageUser::impl::calendar.gettocalid">
     <querytext>	
       select calendar_id 
       from calendars 
@@ -44,15 +44,15 @@
     </querytext>
   </fullquery>	
 
-  <fullquery name="callback::MergePackageUser::impl::calendar.calendar_items_upd">
+  <fullquery name="callback::merge::MergePackageUser::impl::calendar.calendar_items_upd">
     <querytext>	
       update cal_items 
       set on_which_calendar = :to_cal_id
       where on_which_calendar = :l_cal_id
     </querytext>
   </fullquery>	
 
-  <fullquery name="callback::MergePackageUser::impl::calendar.del_from_cal">
+  <fullquery name="callback::merge::MergePackageUser::impl::calendar.del_from_cal">
     <querytext>	
       delete
       from calendars