Index: libs/csutil/cssubscription.cpp
===================================================================
RCS file: /cvsroot/crystal/CS/libs/csutil/cssubscription.cpp,v
retrieving revision 1.6
diff -u -r1.6 cssubscription.cpp
--- libs/csutil/cssubscription.cpp	19 Dec 2005 11:55:25 -0000	1.6
+++ libs/csutil/cssubscription.cpp	3 Jan 2006 04:42:30 -0000
@@ -423,8 +423,7 @@
  * from under a SubscriberQueue iterator, so we need to switch over to 
  * graph solver mode in such cases and flag the SQ for regeneration.
  */
-void csEventTree::FatRecordObject::UnsubscribeInternal(csHandlerID id,
-	csEventID baseevent)
+void csEventTree::FatRecordObject::UnsubscribeInternal(csHandlerID id)
 {
   /* It is possible we've been called for a "universal unsubscribe"
    * (baseevent==CS_EVENT_INVALID), so it could be there's nothing
@@ -454,12 +453,12 @@
  * This has to be "reentrant", by which we simply mean it must be safe for
  * an event handler to un-subscribe itself while it is being delivered to.
  */
-void csEventTree::UnsubscribeInternal(csHandlerID id, csEventID baseevent)
+void csEventTree::UnsubscribeInternal(csHandlerID id)
 {
   CS_ASSERT(id != CS_HANDLER_INVALID);
   if (fatNode)
   {
-    fatRecord->UnsubscribeInternal(id, baseevent);
+    fatRecord->UnsubscribeInternal(id);
   }
 
   /* Since we manipulate fatRecord in place, we only really need
@@ -468,7 +467,7 @@
 
   for (size_t i=0 ; i<children.Length() ; i++) 
   {
-    ((csEventTree *)children[i])->UnsubscribeInternal(id, baseevent);
+    ((csEventTree *)children[i])->UnsubscribeInternal(id);
   }
 }
 
@@ -511,12 +510,12 @@
 {
   CS_ASSERT(id != CS_HANDLER_INVALID);
   if (event == CS_EVENT_INVALID)
-    q->EventTree->UnsubscribeInternal(id, event);
+    q->EventTree->UnsubscribeInternal(id);
   else 
   {
     csEventTree *w = FindNode(event, q);
     w->ForceFatCopy ();
-    w->UnsubscribeInternal (id, event);
+    w->UnsubscribeInternal (id);
     // TODO : test if UnsubscribeInternal fails (i.e., is a no-op); 
     // if it turns out we created a fat copy unnecessarily, kill it.
   }
Index: include/csutil/cssubscription.h
===================================================================
RCS file: /cvsroot/crystal/CS/include/csutil/cssubscription.h,v
retrieving revision 1.7
diff -u -r1.7 cssubscription.h
--- include/csutil/cssubscription.h	19 Dec 2005 11:55:24 -0000	1.7
+++ include/csutil/cssubscription.h	3 Jan 2006 04:42:30 -0000
@@ -125,7 +125,7 @@
   csEventQueue *queue;
   
   bool SubscribeInternal (csHandlerID, csEventID);
-  void UnsubscribeInternal (csHandlerID, csEventID);
+  void UnsubscribeInternal (csHandlerID);
   /**
    * We use copy-on-write (COW) semantics to avoid making an 
    * unnecessary number of copies of the PO graph and the
@@ -182,7 +182,7 @@
     /**
      * Handle unsubscribe nitty-gritty
      */
-    void UnsubscribeInternal(csHandlerID, csEventID);
+    void UnsubscribeInternal(csHandlerID);
 
     /**
      * The current partial-order graph.