diff -r e6e89a427ed5 -r c07dd12bf3f4 pidgin/plugins/perl/common/GtkConvWin.xs
--- a/pidgin/plugins/perl/common/GtkConvWin.xs	Sun Feb 04 02:31:04 2007 +0000
+++ b/pidgin/plugins/perl/common/GtkConvWin.xs	Sun Feb 04 04:47:06 2007 +0000
@@ -1,140 +1,140 @@
 #include "gtkmodule.h"
 
-MODULE = Gaim::GtkUI::Conversation::Window  PACKAGE = Gaim::GtkUI::Conversation::Window  PREFIX = gaim_gtk_conv_window_
+MODULE = Pidgin::Conversation::Window  PACKAGE = Pidgin::Conversation::Window  PREFIX = pidgin_conv_window_
 PROTOTYPES: ENABLE
 
-Gaim::GtkUI::Conversation::Window
-gaim_gtk_conv_window_new(class)
+Pidgin::Conversation::Window
+pidgin_conv_window_new(class)
     C_ARGS: /* void */
 
 void
-gaim_gtk_conv_window_destroy(win)
-	Gaim::GtkUI::Conversation::Window win
+pidgin_conv_window_destroy(win)
+	Pidgin::Conversation::Window win
 
 void
-gaim_gtk_conv_window_show(win)
-	Gaim::GtkUI::Conversation::Window win
+pidgin_conv_window_show(win)
+	Pidgin::Conversation::Window win
 
 void
-gaim_gtk_conv_window_hide(win)
-	Gaim::GtkUI::Conversation::Window win
+pidgin_conv_window_hide(win)
+	Pidgin::Conversation::Window win
 
 void
-gaim_gtk_conv_window_raise(win)
-	Gaim::GtkUI::Conversation::Window win
+pidgin_conv_window_raise(win)
+	Pidgin::Conversation::Window win
 
 void
-gaim_gtk_conv_window_switch_gtkconv(win, gtkconv)
-	Gaim::GtkUI::Conversation::Window win
-	Gaim::GtkUI::Conversation gtkconv
+pidgin_conv_window_switch_gtkconv(win, gtkconv)
+	Pidgin::Conversation::Window win
+	Pidgin::Conversation gtkconv
 
 void
-gaim_gtk_conv_window_add_gtkconv(win, gtkconv)
-	Gaim::GtkUI::Conversation::Window win
-	Gaim::GtkUI::Conversation gtkconv
+pidgin_conv_window_add_gtkconv(win, gtkconv)
+	Pidgin::Conversation::Window win
+	Pidgin::Conversation gtkconv
 
 void
-gaim_gtk_conv_window_remove_gtkconv(win, gtkconv)
-	Gaim::GtkUI::Conversation::Window win
-	Gaim::GtkUI::Conversation gtkconv
+pidgin_conv_window_remove_gtkconv(win, gtkconv)
+	Pidgin::Conversation::Window win
+	Pidgin::Conversation gtkconv
 
-Gaim::GtkUI::Conversation
-gaim_gtk_conv_window_get_gtkconv_at_index(win, index)
-	Gaim::GtkUI::Conversation::Window win
+Pidgin::Conversation
+pidgin_conv_window_get_gtkconv_at_index(win, index)
+	Pidgin::Conversation::Window win
 	int index
 
-Gaim::GtkUI::Conversation
-gaim_gtk_conv_window_get_active_gtkconv(win)
-	Gaim::GtkUI::Conversation::Window win
+Pidgin::Conversation
+pidgin_conv_window_get_active_gtkconv(win)
+	Pidgin::Conversation::Window win
 
 Gaim::Conversation
-gaim_gtk_conv_window_get_active_conversation(win)
-	Gaim::GtkUI::Conversation::Window win
+pidgin_conv_window_get_active_conversation(win)
+	Pidgin::Conversation::Window win
 
 gboolean
-gaim_gtk_conv_window_is_active_conversation(conv)
+pidgin_conv_window_is_active_conversation(conv)
 	Gaim::Conversation conv
 
 gboolean
-gaim_gtk_conv_window_has_focus(win)
-	Gaim::GtkUI::Conversation::Window win
+pidgin_conv_window_has_focus(win)
+	Pidgin::Conversation::Window win
 
-Gaim::GtkUI::Conversation::Window
-gaim_gtk_conv_window_get_at_xy(x, y)
+Pidgin::Conversation::Window
+pidgin_conv_window_get_at_xy(x, y)
 	int x
 	int y
 
 void
-gaim_gtk_conv_window_get_gtkconvs(win)
-	Gaim::GtkUI::Conversation::Window win
+pidgin_conv_window_get_gtkconvs(win)
+	Pidgin::Conversation::Window win
 PREINIT:
 	GList *l;
 PPCODE:
-	for (l = gaim_gtk_conv_window_get_gtkconvs(win); l != NULL; l = l->next) {
-		XPUSHs(sv_2mortal(gaim_perl_bless_object(l->data, "Gaim::GtkUI::Conversation")));
+	for (l = pidgin_conv_window_get_gtkconvs(win); l != NULL; l = l->next) {
+		XPUSHs(sv_2mortal(gaim_perl_bless_object(l->data, "Pidgin::Conversation")));
 	}
 
 guint
-gaim_gtk_conv_window_get_gtkconv_count(win)
-	Gaim::GtkUI::Conversation::Window win
+pidgin_conv_window_get_gtkconv_count(win)
+	Pidgin::Conversation::Window win
 
-Gaim::GtkUI::Conversation::Window
-gaim_gtk_conv_window_first_with_type(type)
+Pidgin::Conversation::Window
+pidgin_conv_window_first_with_type(type)
 	Gaim::ConversationType type
 
-Gaim::GtkUI::Conversation::Window
-gaim_gtk_conv_window_last_with_type(type)
+Pidgin::Conversation::Window
+pidgin_conv_window_last_with_type(type)
 	Gaim::ConversationType type
 
-MODULE = Gaim::GtkUI::Conversation::Window  PACKAGE = Gaim::GtkUI::Conversation::Placement  PREFIX = gaim_gtkconv_placement_
+MODULE = Pidgin::Conversation::Window  PACKAGE = Pidgin::Conversation::Placement  PREFIX = pidgin_conv_placement_
 PROTOTYPES: ENABLE
 
 void
-gaim_gtkconv_placement_get_options()
+pidgin_conv_placement_get_options()
 PREINIT:
 	GList *l;
 PPCODE:
-	for (l = gaim_gtkconv_placement_get_options(); l != NULL; l = l->next) {
-		XPUSHs(sv_2mortal(gaim_perl_bless_object(l->data, "Gaim::GtkUI::Conversation::Window")));
+	for (l = pidgin_conv_placement_get_options(); l != NULL; l = l->next) {
+		XPUSHs(sv_2mortal(gaim_perl_bless_object(l->data, "Pidgin::Conversation::Window")));
 	}
 
 void
-gaim_gtkconv_placement_add_fnc(id, name, fnc)
+pidgin_conv_placement_add_fnc(id, name, fnc)
 	const char * id
 	const char * name
 	Gaim::Conversation::PlacementFunc fnc
 
 void
-gaim_gtkconv_placement_remove_fnc(id)
+pidgin_conv_placement_remove_fnc(id)
 	const char * id
 
 const char *
-gaim_gtkconv_placement_get_name(id)
+pidgin_conv_placement_get_name(id)
 	const char * id
 
 Gaim::Conversation::PlacementFunc
-gaim_gtkconv_placement_get_fnc(id)
+pidgin_conv_placement_get_fnc(id)
 	const char * id
 
 void
-gaim_gtkconv_placement_set_current_func(func)
+pidgin_conv_placement_set_current_func(func)
 	Gaim::Conversation::PlacementFunc func
 
 Gaim::Conversation::PlacementFunc
-gaim_gtkconv_placement_get_current_func()
+pidgin_conv_placement_get_current_func()
 
 void
-gaim_gtkconv_placement_place(gtkconv)
-	Gaim::GtkUI::Conversation gtkconv
+pidgin_conv_placement_place(gtkconv)
+	Pidgin::Conversation gtkconv
 
-MODULE = Gaim::GtkUI::Conversation::Window  PACKAGE = Gaim::GtkUI::Conversation::Windows  PREFIX = gaim_gtk_conv_windows_
+MODULE = Pidgin::Conversation::Window  PACKAGE = Pidgin::Conversation::Windows  PREFIX = pidgin_conv_windows_
 PROTOTYPES: ENABLE
 
 void
-gaim_gtk_conv_windows_get_list()
+pidgin_conv_windows_get_list()
 PREINIT:
 	GList *l;
 PPCODE:
-	for (l = gaim_gtk_conv_windows_get_list(); l != NULL; l = l->next) {
-		XPUSHs(sv_2mortal(gaim_perl_bless_object(l->data, "Gaim::GtkUI::Conversation::Window")));
+	for (l = pidgin_conv_windows_get_list(); l != NULL; l = l->next) {
+		XPUSHs(sv_2mortal(gaim_perl_bless_object(l->data, "Pidgin::Conversation::Window")));
 	}