diff -r b6ec886c8c77 -r 7d1f4381fed0 src/conversation.h
--- a/src/conversation.h	Sun Mar 23 21:56:18 2003 +0000
+++ b/src/conversation.h	Sun Mar 23 22:00:14 2003 +0000
@@ -223,7 +223,7 @@
 	struct gaim_conversation_ui_ops *ui_ops; /**< UI-specific operations. */
 	void *ui_data;                           /**< UI-specific data.       */
 
-	GHashTable *plugin_data;                 /**< Plugin-specific data.   */
+	GHashTable *data;                 /**< Plugin-specific data.   */
 };
 
 typedef void (*gaim_conv_placement_fnc)(struct gaim_conversation *);
@@ -655,28 +655,25 @@
 #define GAIM_CHAT(c) (gaim_conversation_get_chat_data(c))
 
 /**
- * Sets a conversation's plugin-specific data.
+ * Sets extra data for a conversation.
  * 
- * To minimize key conflicts, the key should be in the form of
- * @c pluginname/keyname.
- *
  * @param conv The conversation.
  * @param key  The unique key.
  * @param data The data to assign.
  */
-void gaim_conversation_set_plugin_data(struct gaim_conversation *conv,
-									   const char *key, gpointer data);
+void gaim_conversation_set_data(struct gaim_conversation *conv,
+								const char *key, gpointer data);
 
 /**
- * Returns a conversation's plugin-specific data.
+ * Returns extra data in a conversation.
  *
  * @param conv The conversation.
  * @param key  The unqiue key.
  *
  * @return The data associated with the key.
  */
-gpointer gaim_conversation_get_plugin_data(struct gaim_conversation *conv,
-										   const char *key);
+gpointer gaim_conversation_get_data(struct gaim_conversation *conv,
+									const char *key);
 
 /**
  * Returns a list of all conversations.