Index: openacs-4/packages/notifications/tcl/notification-procs.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/notifications/tcl/notification-procs.tcl,v
diff -u -N -r1.10.2.1 -r1.10.2.2
--- openacs-4/packages/notifications/tcl/notification-procs.tcl	15 Jun 2005 18:36:17 -0000	1.10.2.1
+++ openacs-4/packages/notifications/tcl/notification-procs.tcl	7 Jul 2005 23:34:03 -0000	1.10.2.2
@@ -346,33 +346,33 @@
     }
 }
 
-namespace eval notification::merge {
-    ad_proc -callback MergeShowUserInfo -impl notifications {
-	-user_id:required
-    } {
-	Show the notifications of user_id
-    } {
-	set result [list "Notifications of $user_id"]
-	set user_notifications [db_list_of_lists user_notification { *SQL* }]
-	lappend result $user_notifications
-	return $result
-    }
 
-    ad_proc -callback MergePackageUser -impl notifications {
-	-from_user_id:required
-	-to_user_id:required
-    } {
-	Merge the notifications of two users.
-    } {
-	set msg "Merging notifications"
-	set result [list $msg]
-	ns_log Notice $msg
-	
-	db_transaction {
-	    db_dml upd_notifications { *SQL* }
-	    db_dml upd_map { *SQL* }
-	    lappend result "Notifications merge is done"
-	} 
-	return $result
-    }
+ad_proc -callback merge::MergeShowUserInfo -impl notifications {
+    -user_id:required
+} {
+    Show the notifications of user_id
+} {
+    set result [list "Notifications of $user_id"]
+    set user_notifications [db_list_of_lists user_notification { *SQL* }]
+    lappend result $user_notifications
+    return $result
 }
+
+ad_proc -callback merge::MergePackageUser -impl notifications {
+    -from_user_id:required
+    -to_user_id:required
+} {
+    Merge the notifications of two users.
+} {
+    set msg "Merging notifications"
+    set result [list $msg]
+    ns_log Notice $msg
+    
+    db_transaction {
+	db_dml upd_notifications { *SQL* }
+	db_dml upd_map { *SQL* }
+	lappend result "Notifications merge is done"
+    } 
+    return $result
+}
+