Propagate change to notification handler parameters to all clients (RDF_BRANCH landing).

cmd/macfe/central/CBookmarksAttachment.cp

@@ -77,7 +77,7 @@ CBookmarksAttachment :: InitQuickfileView ( )
 
 void
 CBookmarksAttachment :: HandleNotification( HT_Notification /* notifyStruct*/,
-												HT_Resource node, HT_Event event)
+			HT_Resource node, HT_Event event, void *token, uint32 tokenType)
 {
 	switch (event) {
 	

cmd/macfe/central/CBookmarksAttachment.h

@@ -59,7 +59,7 @@ public:
 protected:
 	static void			FillMenuFromList( HT_Resource top, LMenu* newMenu, int& nextMenuID, int whichItem );
 
-	virtual	void		HandleNotification( HT_Notification	notifyStruct, HT_Resource node, HT_Event event);
+	virtual	void		HandleNotification( HT_Notification	notifyStruct, HT_Resource node, HT_Event event, void *token, uint32 tokenType);
 
 	static LMenu*		sMenu;
 	static Boolean		sInvalidMenu;

cmd/macfe/gui/CPersonalToolbarTable.cp

@@ -180,7 +180,9 @@ void
 CPersonalToolbarTable  :: HandleNotification(
 	HT_Notification	/*notifyStruct*/,
 	HT_Resource		node,
-	HT_Event		event)
+	HT_Event		event,
+	void*			token,
+	uint32			tokenType)
 {
 	switch (event)
 	{

cmd/macfe/gui/CPersonalToolbarTable.h

@@ -106,7 +106,7 @@ class CPersonalToolbarTable : public LSmallIconTable, public LDragAndDrop,
 		void AddButton ( const string & inURL, const string & inTitle, Uint32 inIndex ) ;
 		void RemoveButton ( Uint32 inIndex );
 
-		void HandleNotification( HT_Notification notifyStruct, HT_Resource node, HT_Event event);
+		void HandleNotification( HT_Notification notifyStruct, HT_Resource node, HT_Event event, void* token, uint32 tokenType);
 
 			// for handling mouse tracking
 		virtual void MouseLeave ( ) ;

cmd/macfe/rdfui/CRDFCoordinator.cp

@@ -263,7 +263,9 @@ CRDFCoordinator :: RestorePlace ( LStream* inStreamData )
 void CRDFCoordinator::HandleNotification(
 	HT_Notification	/*notifyStruct*/,
 	HT_Resource		node,
-	HT_Event		event)
+	HT_Event		event,
+	void			*token,
+	uint32			tokenType)
 {
 	PRBool isOpen;
 	HT_Error err;

cmd/macfe/rdfui/CRDFCoordinator.h

@@ -103,7 +103,7 @@ protected:
 	virtual void	CollapseNode(HT_Resource node);
 
 		// messaging and notifications
-	virtual	void	HandleNotification( HT_Notification	notifyStruct, HT_Resource node, HT_Event event);
+	virtual	void	HandleNotification( HT_Notification	notifyStruct, HT_Resource node, HT_Event event, void *token, uint32 tokenType);
 	virtual void	ListenToMessage( MessageT inMessage, void *ioParam);
 
 	PaneIDT					mSelectorPaneID;	// for the selector shelf

cmd/macfe/rdfui/CRDFNotificationHandler.cp

@@ -45,10 +45,10 @@ CRDFNotificationHandler::rdfNotifyProc(
 	HT_Notification	notifyStruct,
 	HT_Resource		node,
 	HT_Event		event,
-	void *			param,
+	void			*token,
 	uint32			tokenType)
 {
 	CRDFNotificationHandler* handler =
 		reinterpret_cast<CRDFNotificationHandler*>(notifyStruct->data);
-	handler->HandleNotification(notifyStruct, node, event);
+	handler->HandleNotification(notifyStruct, node, event, token, tokenType);
 }

cmd/macfe/rdfui/CRDFNotificationHandler.h

@@ -38,12 +38,14 @@ protected:
 	virtual	void	HandleNotification(
 						HT_Notification	notifyStruct,
 						HT_Resource		node,
-						HT_Event		event) = 0;
+						HT_Event		event,
+						void			*token,
+						uint32			tokenType) = 0;
 	
 	static void		rdfNotifyProc(
 						HT_Notification	notifyStruct,
 						HT_Resource		node,
 						HT_Event		event,
-						void *param,	
-						uint32 tokenType);
+						void			*token,
+						uint32			tokenType);
 };