diff -r 969b74a3e27a -r 4de1981757fc libpurple/protocols/jabber/chat.h
--- a/libpurple/protocols/jabber/chat.h	Mon Mar 19 06:11:46 2007 +0000
+++ b/libpurple/protocols/jabber/chat.h	Mon Mar 19 07:01:17 2007 +0000
@@ -1,7 +1,7 @@
 /**
  * @file chat.h Chat stuff
  *
- * gaim
+ * purple
  *
  * Copyright (C) 2003 Nathan Walp <faceprint@faceprint.com>
  *
@@ -19,8 +19,8 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
-#ifndef _GAIM_JABBER_CHAT_H_
-#define _GAIM_JABBER_CHAT_H_
+#ifndef _PURPLE_JABBER_CHAT_H_
+#define _PURPLE_JABBER_CHAT_H_
 
 #include "internal.h"
 #include "connection.h"
@@ -42,34 +42,34 @@
 	char *server;
 	char *handle;
 	int id;
-	GaimConversation *conv;
+	PurpleConversation *conv;
 	gboolean muc;
 	gboolean xhtml;
-	GaimRequestType config_dialog_type;
+	PurpleRequestType config_dialog_type;
 	void *config_dialog_handle;
 	GHashTable *members;
 } JabberChat;
 
-GList *jabber_chat_info(GaimConnection *gc);
-GHashTable *jabber_chat_info_defaults(GaimConnection *gc, const char *chat_name);
+GList *jabber_chat_info(PurpleConnection *gc);
+GHashTable *jabber_chat_info_defaults(PurpleConnection *gc, const char *chat_name);
 char *jabber_get_chat_name(GHashTable *data);
-void jabber_chat_join(GaimConnection *gc, GHashTable *data);
+void jabber_chat_join(PurpleConnection *gc, GHashTable *data);
 JabberChat *jabber_chat_find(JabberStream *js, const char *room,
 		const char *server);
 JabberChat *jabber_chat_find_by_id(JabberStream *js, int id);
-JabberChat *jabber_chat_find_by_conv(GaimConversation *conv);
+JabberChat *jabber_chat_find_by_conv(PurpleConversation *conv);
 void jabber_chat_destroy(JabberChat *chat);
 void jabber_chat_free(JabberChat *chat);
-gboolean jabber_chat_find_buddy(GaimConversation *conv, const char *name);
-void jabber_chat_invite(GaimConnection *gc, int id, const char *message,
+gboolean jabber_chat_find_buddy(PurpleConversation *conv, const char *name);
+void jabber_chat_invite(PurpleConnection *gc, int id, const char *message,
 		const char *name);
-void jabber_chat_leave(GaimConnection *gc, int id);
-char *jabber_chat_buddy_real_name(GaimConnection *gc, int id, const char *who);
+void jabber_chat_leave(PurpleConnection *gc, int id);
+char *jabber_chat_buddy_real_name(PurpleConnection *gc, int id, const char *who);
 void jabber_chat_request_room_configure(JabberChat *chat);
 void jabber_chat_create_instant_room(JabberChat *chat);
 void jabber_chat_register(JabberChat *chat);
 void jabber_chat_change_topic(JabberChat *chat, const char *topic);
-void jabber_chat_set_topic(GaimConnection *gc, int id, const char *topic);
+void jabber_chat_set_topic(PurpleConnection *gc, int id, const char *topic);
 void jabber_chat_change_nick(JabberChat *chat, const char *nick);
 void jabber_chat_part(JabberChat *chat, const char *msg);
 void jabber_chat_track_handle(JabberChat *chat, const char *handle,
@@ -84,12 +84,12 @@
 gboolean jabber_chat_kick_user(JabberChat *chat, const char *who,
 		const char *why);
 
-GaimRoomlist *jabber_roomlist_get_list(GaimConnection *gc);
-void jabber_roomlist_cancel(GaimRoomlist *list);
+PurpleRoomlist *jabber_roomlist_get_list(PurpleConnection *gc);
+void jabber_roomlist_cancel(PurpleRoomlist *list);
 
 void jabber_chat_disco_traffic(JabberChat *chat);
 
-char *jabber_roomlist_room_serialize(GaimRoomlistRoom *room);
+char *jabber_roomlist_room_serialize(PurpleRoomlistRoom *room);
 
 
-#endif /* _GAIM_JABBER_CHAT_H_ */
+#endif /* _PURPLE_JABBER_CHAT_H_ */