diff -r 3359b45df7ac -r ecda27df58b9 pidgin/gtkconv.h
--- a/pidgin/gtkconv.h	Wed Feb 14 02:28:44 2007 +0000
+++ b/pidgin/gtkconv.h	Wed Feb 14 02:35:35 2007 +0000
@@ -55,7 +55,7 @@
 #define PIDGIN_CONVERSATION(conv) \
 	((PidginConversation *)(conv)->ui_data)
 
-#define GAIM_IS_GTK_CONVERSATION(conv) \
+#define PIDGIN_IS_PIDGIN_CONVERSATION(conv) \
 	(gaim_conversation_get_ui_ops(conv) == \
 	 pidgin_conversations_get_conv_ui_ops())
 
@@ -134,7 +134,7 @@
 	gboolean entry_growing; /* True if the size of the entry was set
 				 * automatically by typing too much to fit
 				 * in one line */
-	
+
 	GtkWidget *close; /* "x" on the tab */
 	GtkWidget *icon;
 	GtkWidget *tab_label;