diff -r a694fdc89f19 -r 1a0cd727c121 gtk/plugins/perl/common/GtkConvWin.xs
--- a/gtk/plugins/perl/common/GtkConvWin.xs	Sun Sep 17 04:42:42 2006 +0000
+++ b/gtk/plugins/perl/common/GtkConvWin.xs	Sun Sep 17 05:35:46 2006 +0000
@@ -1,54 +1,54 @@
 #include "gtkmodule.h"
 
-MODULE = Gaim::Gtk::Conversation::Window  PACKAGE = Gaim::Gtk::Conversation::Window  PREFIX = gaim_gtk_conv_window_
+MODULE = Gaim::GtkUI::Conversation::Window  PACKAGE = Gaim::GtkUI::Conversation::Window  PREFIX = gaim_gtk_conv_window_
 PROTOTYPES: ENABLE
 
-Gaim::Gtk::Conversation::Window
+Gaim::GtkUI::Conversation::Window
 gaim_gtk_conv_window_new()
 
 void
 gaim_gtk_conv_window_destroy(win)
-	Gaim::Gtk::Conversation::Window win
+	Gaim::GtkUI::Conversation::Window win
 
 void
 gaim_gtk_conv_window_show(win)
-	Gaim::Gtk::Conversation::Window win
+	Gaim::GtkUI::Conversation::Window win
 
 void
 gaim_gtk_conv_window_hide(win)
-	Gaim::Gtk::Conversation::Window win
+	Gaim::GtkUI::Conversation::Window win
 
 void
 gaim_gtk_conv_window_raise(win)
-	Gaim::Gtk::Conversation::Window win
+	Gaim::GtkUI::Conversation::Window win
 
 void
 gaim_gtk_conv_window_switch_gtkconv(win, gtkconv)
-	Gaim::Gtk::Conversation::Window win
-	Gaim::Gtk::Conversation gtkconv
+	Gaim::GtkUI::Conversation::Window win
+	Gaim::GtkUI::Conversation gtkconv
 
 void
 gaim_gtk_conv_window_add_gtkconv(win, gtkconv)
-	Gaim::Gtk::Conversation::Window win
-	Gaim::Gtk::Conversation gtkconv
+	Gaim::GtkUI::Conversation::Window win
+	Gaim::GtkUI::Conversation gtkconv
 
 void
 gaim_gtk_conv_window_remove_gtkconv(win, gtkconv)
-	Gaim::Gtk::Conversation::Window win
-	Gaim::Gtk::Conversation gtkconv
+	Gaim::GtkUI::Conversation::Window win
+	Gaim::GtkUI::Conversation gtkconv
 
-Gaim::Gtk::Conversation
+Gaim::GtkUI::Conversation
 gaim_gtk_conv_window_get_gtkconv_at_index(win, index)
-	Gaim::Gtk::Conversation::Window win
+	Gaim::GtkUI::Conversation::Window win
 	int index
 
-Gaim::Gtk::Conversation
+Gaim::GtkUI::Conversation
 gaim_gtk_conv_window_get_active_gtkconv(win)
-	Gaim::Gtk::Conversation::Window win
+	Gaim::GtkUI::Conversation::Window win
 
 Gaim::Conversation
 gaim_gtk_conv_window_get_active_conversation(win)
-	Gaim::Gtk::Conversation::Window win
+	Gaim::GtkUI::Conversation::Window win
 
 gboolean
 gaim_gtk_conv_window_is_active_conversation(conv)
@@ -56,36 +56,36 @@
 
 gboolean
 gaim_gtk_conv_window_has_focus(win)
-	Gaim::Gtk::Conversation::Window win
+	Gaim::GtkUI::Conversation::Window win
 
-Gaim::Gtk::Conversation::Window
+Gaim::GtkUI::Conversation::Window
 gaim_gtk_conv_window_get_at_xy(x, y)
 	int x
 	int y
 
 void
 gaim_gtk_conv_window_get_gtkconvs(win)
-	Gaim::Gtk::Conversation::Window win
+	Gaim::GtkUI::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::Gtk::Conversation")));
+		XPUSHs(sv_2mortal(gaim_perl_bless_object(l->data, "Gaim::GtkUI::Conversation")));
 	}
 
 guint
 gaim_gtk_conv_window_get_gtkconv_count(win)
-	Gaim::Gtk::Conversation::Window win
+	Gaim::GtkUI::Conversation::Window win
 
-Gaim::Gtk::Conversation::Window
+Gaim::GtkUI::Conversation::Window
 gaim_gtk_conv_window_first_with_type(type)
 	Gaim::ConversationType type
 
-Gaim::Gtk::Conversation::Window
+Gaim::GtkUI::Conversation::Window
 gaim_gtk_conv_window_last_with_type(type)
 	Gaim::ConversationType type
 
-MODULE = Gaim::Gtk::Conversation::Window  PACKAGE = Gaim::Gtk::Conversation::Placement  PREFIX = gaim_gtkconv_placement_
+MODULE = Gaim::GtkUI::Conversation::Window  PACKAGE = Gaim::GtkUI::Conversation::Placement  PREFIX = gaim_gtkconv_placement_
 PROTOTYPES: ENABLE
 
 void
@@ -94,7 +94,7 @@
 	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::Gtk::Conversation::Window")));
+		XPUSHs(sv_2mortal(gaim_perl_bless_object(l->data, "Gaim::GtkUI::Conversation::Window")));
 	}
 
 void
@@ -124,9 +124,9 @@
 
 void
 gaim_gtkconv_placement_place(gtkconv)
-	Gaim::Gtk::Conversation gtkconv
+	Gaim::GtkUI::Conversation gtkconv
 
-MODULE = Gaim::Gtk::Conversation::Window  PACKAGE = Gaim::Gtk::Conversation::Windows  PREFIX = gaim_gtk_conv_windows_
+MODULE = Gaim::GtkUI::Conversation::Window  PACKAGE = Gaim::GtkUI::Conversation::Windows  PREFIX = gaim_gtk_conv_windows_
 PROTOTYPES: ENABLE
 
 void
@@ -135,5 +135,5 @@
 	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::Gtk::Conversation::Window")));
+		XPUSHs(sv_2mortal(gaim_perl_bless_object(l->data, "Gaim::GtkUI::Conversation::Window")));
 	}