# HG changeset patch
# User Etan Reisner <pidgin@unreliablesource.net>
# Date 1158471346 0
# Node ID d6eae5115b315c5a38bbdbabaf89653c379c5717
# Parent  d2de045b077fd629918f6c6d75e99821971a9993
[gaim-migrate @ 17291]
This is a really huge commit for basically nothing, I decided that Gaim::Gtk
should really be Gaim::GtkUI (which will line up better with any eventual
Gaim::GntUI that might exist, etc.). So that's what this is, I think I got
everything, it builds here at least.

committer: Tailor Script <tailor@pidgin.im>

diff -r d2de045b077f -r d6eae5115b31 gtk/plugins/perl/Makefile.am
--- a/gtk/plugins/perl/Makefile.am	Sun Sep 17 04:42:42 2006 +0000
+++ b/gtk/plugins/perl/Makefile.am	Sun Sep 17 05:35:46 2006 +0000
@@ -1,8 +1,6 @@
 perl_dirs = common
 
 common_sources = \
-	common/Gtk.pm \
-	common/Gtk.xs \
 	common/GtkAccount.xs \
 	common/GtkBlist.xs \
 	common/GtkConn.xs \
@@ -26,9 +24,11 @@
 	common/GtkSound.xs \
 	common/GtkStatusBox.xs \
 	common/GtkThemes.xs \
+	common/GtkUI.pm \
+	common/GtkUI.xs \
 	common/GtkUtils.xs \
+	common/Makefile.PL.in \
 	common/gtkmodule.h \
-	common/Makefile.PL.in \
 	common/typemap
 
 EXTRA_DIST = \
diff -r d2de045b077f -r d6eae5115b31 gtk/plugins/perl/common/Gtk.pm
--- a/gtk/plugins/perl/common/Gtk.pm	Sun Sep 17 04:42:42 2006 +0000
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,61 +0,0 @@
-package Gaim::Gtk;
-
-use 5.008;
-use strict;
-use warnings;
-use Carp;
-
-our $VERSION = '0.01';
-
-use Gaim;
-
-require XSLoader;
-XSLoader::load('Gaim::Gtk', $VERSION);
-
-1;
-__END__
-
-=head1 NAME
-
-Gaim::Gtk - Perl extension for the Gaim instant messenger.
-
-=head1 SYNOPSIS
-
-    use Gaim::Gtk;
-
-=head1 ABSTRACT
-
-    This module provides the interface for using perl scripts as plugins in
-    Gaim, with access to the Gaim Gtk interface functions.
-
-=head1 DESCRIPTION
-
-This module provides the interface for using perl scripts as plugins in Gaim,
-with access to the Gaim Gtk interface functions. With this, developers can
-write perl scripts that can be loaded in Gaim as plugins. The script can
-interact with IMs, chats, accoutns, the buddy list, gaim signals, and more.
-
-The API for the perl interface is very similar to that of the Gaim C API,
-which can be viewed at http://gaim.sourceforge.net/api/ or in the header files
-in the Gaim source tree.
-
-=head1 FUNCTIONS
-
-=over
-
-=back
-
-=head1 SEE ALSO
-Gaim C API documentation - http://gaim.sourceforge.net/api/
-
-The Gaim perl module.
-
-Gaim website - http://gaim.sourceforge.net/
-
-=head1 AUTHOR
-
-Etan Reisner, E<lt>deryni@gmail.comE<gt>
-
-=head1 COPYRIGHT AND LICENSE
-
-Copyright 2006 by Etan Reisner
diff -r d2de045b077f -r d6eae5115b31 gtk/plugins/perl/common/Gtk.xs
--- a/gtk/plugins/perl/common/Gtk.xs	Sun Sep 17 04:42:42 2006 +0000
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,80 +0,0 @@
-#include "gtkmodule.h"
-
-/*
-#define GAIM_PERL_BOOT_PROTO(x) \
-	void boot_Gaim__##x(pTHX_ CV *cv);
-
-#define GAIM_PERL_BOOT(x) \
-	gaim_perl_callXS(boot_Gaim__##x, cv, mark)
-
-static void
-gaim_perl_callXS(void (*subaddr)(pTHX_ CV *cv), CV *cv, SV **mark)
-{
-	dSP;
-
-	PUSHMARK(mark);
-	(*subaddr)(aTHX_ cv);
-
-	PUTBACK;
-}
-*/
-
-/* Prototypes for the BOOT section below. */
-GAIM_PERL_BOOT_PROTO(Gtk__Account);
-GAIM_PERL_BOOT_PROTO(Gtk__BuddyList);
-GAIM_PERL_BOOT_PROTO(Gtk__Connection);
-GAIM_PERL_BOOT_PROTO(Gtk__Conversation);
-GAIM_PERL_BOOT_PROTO(Gtk__Conversation__Window);
-GAIM_PERL_BOOT_PROTO(Gtk__Debug);
-GAIM_PERL_BOOT_PROTO(Gtk__Dialogs);
-GAIM_PERL_BOOT_PROTO(Gtk__IMHtml);
-GAIM_PERL_BOOT_PROTO(Gtk__IMHtmlToolbar);
-GAIM_PERL_BOOT_PROTO(Gtk__Log);
-GAIM_PERL_BOOT_PROTO(Gtk__MenuTray);
-GAIM_PERL_BOOT_PROTO(Gtk__Plugin);
-GAIM_PERL_BOOT_PROTO(Gtk__PluginPref);
-GAIM_PERL_BOOT_PROTO(Gtk__Pounce);
-GAIM_PERL_BOOT_PROTO(Gtk__Prefs);
-GAIM_PERL_BOOT_PROTO(Gtk__Privacy);
-GAIM_PERL_BOOT_PROTO(Gtk__Roomlist);
-GAIM_PERL_BOOT_PROTO(Gtk__Status);
-#ifndef _WIN32
-GAIM_PERL_BOOT_PROTO(Gtk__Session);
-#endif
-GAIM_PERL_BOOT_PROTO(Gtk__Sound);
-GAIM_PERL_BOOT_PROTO(Gtk__StatusBox);
-GAIM_PERL_BOOT_PROTO(Gtk__Themes);
-GAIM_PERL_BOOT_PROTO(Gtk__Utils);
-GAIM_PERL_BOOT_PROTO(Gtk__Xfer);
-
-MODULE = Gaim::Gtk  PACKAGE = Gaim::Gtk PREFIX = gaim_gtk_
-PROTOTYPES: ENABLE
-
-BOOT:
-	GAIM_PERL_BOOT(Gtk__Debug);
-GAIM_PERL_BOOT(Gtk__Account);
-GAIM_PERL_BOOT(Gtk__BuddyList);
-GAIM_PERL_BOOT(Gtk__Connection);
-GAIM_PERL_BOOT(Gtk__Conversation);
-GAIM_PERL_BOOT(Gtk__Conversation__Window);
-GAIM_PERL_BOOT(Gtk__Debug);
-GAIM_PERL_BOOT(Gtk__Dialogs);
-GAIM_PERL_BOOT(Gtk__IMHtml);
-GAIM_PERL_BOOT(Gtk__IMHtmlToolbar);
-GAIM_PERL_BOOT(Gtk__Log);
-GAIM_PERL_BOOT(Gtk__MenuTray);
-GAIM_PERL_BOOT(Gtk__Plugin);
-GAIM_PERL_BOOT(Gtk__PluginPref);
-GAIM_PERL_BOOT(Gtk__Pounce);
-GAIM_PERL_BOOT(Gtk__Prefs);
-GAIM_PERL_BOOT(Gtk__Privacy);
-GAIM_PERL_BOOT(Gtk__Roomlist);
-GAIM_PERL_BOOT(Gtk__Status);
-#ifndef _WIN32
-GAIM_PERL_BOOT(Gtk__Session);
-#endif
-GAIM_PERL_BOOT(Gtk__Sound);
-GAIM_PERL_BOOT(Gtk__StatusBox);
-GAIM_PERL_BOOT(Gtk__Themes);
-GAIM_PERL_BOOT(Gtk__Utils);
-GAIM_PERL_BOOT(Gtk__Xfer);
diff -r d2de045b077f -r d6eae5115b31 gtk/plugins/perl/common/GtkAccount.xs
--- a/gtk/plugins/perl/common/GtkAccount.xs	Sun Sep 17 04:42:42 2006 +0000
+++ b/gtk/plugins/perl/common/GtkAccount.xs	Sun Sep 17 05:35:46 2006 +0000
@@ -1,20 +1,20 @@
 #include "gtkmodule.h"
 
-MODULE = Gaim::Gtk::Account  PACKAGE = Gaim::Gtk::Account  PREFIX = gaim_gtk_account_
+MODULE = Gaim::GtkUI::Account  PACKAGE = Gaim::GtkUI::Account  PREFIX = gaim_gtk_account_
 PROTOTYPES: ENABLE
 
 void *
 gaim_gtk_account_get_handle()
 
-MODULE = Gaim::Gtk::Account  PACKAGE = Gaim::Gtk::Account::Dialog  PREFIX = gaim_gtk_account_dialog_
+MODULE = Gaim::GtkUI::Account  PACKAGE = Gaim::GtkUI::Account::Dialog  PREFIX = gaim_gtk_account_dialog_
 PROTOTYPES: ENABLE
 
 void
 gaim_gtk_account_dialog_show(type, account)
-	Gaim::Gtk::Account::Dialog::Type type
+	Gaim::GtkUI::Account::Dialog::Type type
 	Gaim::Account account
 
-MODULE = Gaim::Gtk::Account  PACKAGE = Gaim::Gtk::Account::Window  PREFIX = gaim_gtk_accounts_window_
+MODULE = Gaim::GtkUI::Account  PACKAGE = Gaim::GtkUI::Account::Window  PREFIX = gaim_gtk_accounts_window_
 PROTOTYPES: ENABLE
 
 void
diff -r d2de045b077f -r d6eae5115b31 gtk/plugins/perl/common/GtkBlist.xs
--- a/gtk/plugins/perl/common/GtkBlist.xs	Sun Sep 17 04:42:42 2006 +0000
+++ b/gtk/plugins/perl/common/GtkBlist.xs	Sun Sep 17 05:35:46 2006 +0000
@@ -38,13 +38,13 @@
 	Gaim::BuddyList::Node node
 */
 
-MODULE = Gaim::Gtk::BuddyList  PACKAGE = Gaim::Gtk::BuddyList  PREFIX = gaim_gtk_blist_
+MODULE = Gaim::GtkUI::BuddyList  PACKAGE = Gaim::GtkUI::BuddyList  PREFIX = gaim_gtk_blist_
 PROTOTYPES: ENABLE
 
 void *
 gaim_gtk_blist_get_handle()
 
-Gaim::Gtk::BuddyList
+Gaim::GtkUI::BuddyList
 gaim_gtk_blist_get_default_gtk_blist()
 
 void
@@ -73,14 +73,14 @@
 	GList *l;
 PPCODE:
 	for (l = gaim_gtk_blist_get_sort_methods(); l != NULL; l = l->next) {
-		XPUSHs(sv_2mortal(gaim_perl_bless_object(l->data, "Gaim::Gtk::BuddyList::SortMethod")));
+		XPUSHs(sv_2mortal(gaim_perl_bless_object(l->data, "Gaim::GtkUI::BuddyList::SortMethod")));
 	}
 
 void
 gaim_gtk_blist_sort_method_reg(id, name, func)
 	const char * id
 	const char * name
-	Gaim::Gtk::BuddyList::SortFunction func
+	Gaim::GtkUI::BuddyList::SortFunction func
 
 void
 gaim_gtk_blist_sort_method_unreg(id)
diff -r d2de045b077f -r d6eae5115b31 gtk/plugins/perl/common/GtkConn.xs
--- a/gtk/plugins/perl/common/GtkConn.xs	Sun Sep 17 04:42:42 2006 +0000
+++ b/gtk/plugins/perl/common/GtkConn.xs	Sun Sep 17 05:35:46 2006 +0000
@@ -1,6 +1,6 @@
 #include "gtkmodule.h"
 
-MODULE = Gaim::Gtk::Connection  PACKAGE = Gaim::Gtk::Connection  PREFIX = gaim_gtk_connection_
+MODULE = Gaim::GtkUI::Connection  PACKAGE = Gaim::GtkUI::Connection  PREFIX = gaim_gtk_connection_
 PROTOTYPES: ENABLE
 
 void *
diff -r d2de045b077f -r d6eae5115b31 gtk/plugins/perl/common/GtkConv.xs
--- a/gtk/plugins/perl/common/GtkConv.xs	Sun Sep 17 04:42:42 2006 +0000
+++ b/gtk/plugins/perl/common/GtkConv.xs	Sun Sep 17 05:35:46 2006 +0000
@@ -33,13 +33,13 @@
 /* This can't work at the moment since I don't have a typemap for gboolean *.
 int
 gaim_gtkconv_get_tab_at_xy(win, x, y, to_right)
-	Gaim::Gtk::Conversation::Window win
+	Gaim::GtkUI::Conversation::Window win
 	int x
 	int y
 	gboolean * to_right
 */
 
-MODULE = Gaim::Gtk::Conversation  PACKAGE = Gaim::Gtk::Conversation  PREFIX = gaim_gtkconv_
+MODULE = Gaim::GtkUI::Conversation  PACKAGE = Gaim::GtkUI::Conversation  PREFIX = gaim_gtkconv_
 PROTOTYPES: ENABLE
 
 void
@@ -58,9 +58,9 @@
 gaim_gtkconv_present_conversation(conv)
 	Gaim::Conversation conv
 
-Gaim::Gtk::Conversation::Window
+Gaim::GtkUI::Conversation::Window
 gaim_gtkconv_get_window(conv)
-	Gaim::Gtk::Conversation conv
+	Gaim::GtkUI::Conversation conv
 
 void
 gaim_gtkconv_new(conv)
@@ -68,9 +68,9 @@
 
 gboolean
 gaim_gtkconv_is_hidden(gtkconv)
-	Gaim::Gtk::Conversation gtkconv
+	Gaim::GtkUI::Conversation gtkconv
 
-MODULE = Gaim::Gtk::Conversation  PACKAGE = Gaim::Gtk::Conversations  PREFIX = gaim_gtk_conversations_
+MODULE = Gaim::GtkUI::Conversation  PACKAGE = Gaim::GtkUI::Conversations  PREFIX = gaim_gtk_conversations_
 PROTOTYPES: ENABLE
 
 void
diff -r d2de045b077f -r d6eae5115b31 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")));
 	}
diff -r d2de045b077f -r d6eae5115b31 gtk/plugins/perl/common/GtkDebug.xs
--- a/gtk/plugins/perl/common/GtkDebug.xs	Sun Sep 17 04:42:42 2006 +0000
+++ b/gtk/plugins/perl/common/GtkDebug.xs	Sun Sep 17 05:35:46 2006 +0000
@@ -1,12 +1,12 @@
 #include "gtkmodule.h"
 
-MODULE = Gaim::Gtk::Debug  PACKAGE = Gaim::Gtk::Debug  PREFIX = gaim_gtk_debug_
+MODULE = Gaim::GtkUI::Debug  PACKAGE = Gaim::GtkUI::Debug  PREFIX = gaim_gtk_debug_
 PROTOTYPES: ENABLE
 
 void *
 gaim_gtk_debug_get_handle()
 
-MODULE = Gaim::Gtk::Debug  PACKAGE = Gaim::Gtk::Debug::Window  PREFIX = gaim_gtk_debug_window_
+MODULE = Gaim::GtkUI::Debug  PACKAGE = Gaim::GtkUI::Debug::Window  PREFIX = gaim_gtk_debug_window_
 PROTOTYPES: ENABLE
 
 void
diff -r d2de045b077f -r d6eae5115b31 gtk/plugins/perl/common/GtkDialogs.xs
--- a/gtk/plugins/perl/common/GtkDialogs.xs	Sun Sep 17 04:42:42 2006 +0000
+++ b/gtk/plugins/perl/common/GtkDialogs.xs	Sun Sep 17 05:35:46 2006 +0000
@@ -1,6 +1,6 @@
 #include "gtkmodule.h"
 
-MODULE = Gaim::Gtk::Dialogs  PACKAGE = Gaim::Gtk::Dialogs  PREFIX = gaim_gtkdialogs_
+MODULE = Gaim::GtkUI::Dialogs  PACKAGE = Gaim::GtkUI::Dialogs  PREFIX = gaim_gtkdialogs_
 PROTOTYPES: ENABLE
 
 void
diff -r d2de045b077f -r d6eae5115b31 gtk/plugins/perl/common/GtkFt.xs
--- a/gtk/plugins/perl/common/GtkFt.xs	Sun Sep 17 04:42:42 2006 +0000
+++ b/gtk/plugins/perl/common/GtkFt.xs	Sun Sep 17 05:35:46 2006 +0000
@@ -1,49 +1,49 @@
 #include "gtkmodule.h"
 
-MODULE = Gaim::Gtk::Xfer  PACKAGE = Gaim::Gtk::Xfer  PREFIX = gaim_gtk_xfer_
+MODULE = Gaim::GtkUI::Xfer  PACKAGE = Gaim::GtkUI::Xfer  PREFIX = gaim_gtk_xfer_
 PROTOTYPES: ENABLE
 
 void
 gaim_set_gtkxfer_dialog(dialog)
-	Gaim::Gtk::Xfer::Dialog dialog
+	Gaim::GtkUI::Xfer::Dialog dialog
 
-Gaim::Gtk::Xfer::Dialog
+Gaim::GtkUI::Xfer::Dialog
 gaim_get_gtkxfer_dialog()
 
-MODULE = Gaim::Gtk::Xfer  PACKAGE = Gaim::Gtk::Xfer::Dialog  PREFIX = gaim_gtkxfer_dialog_
+MODULE = Gaim::GtkUI::Xfer  PACKAGE = Gaim::GtkUI::Xfer::Dialog  PREFIX = gaim_gtkxfer_dialog_
 PROTOTYPES: ENABLE
 
-Gaim::Gtk::Xfer::Dialog
+Gaim::GtkUI::Xfer::Dialog
 gaim_gtkxfer_dialog_new()
 
 void
 gaim_gtkxfer_dialog_destroy(dialog)
-	Gaim::Gtk::Xfer::Dialog dialog
+	Gaim::GtkUI::Xfer::Dialog dialog
 
 void
 gaim_gtkxfer_dialog_show(dialog = NULL)
-	Gaim::Gtk::Xfer::Dialog dialog
+	Gaim::GtkUI::Xfer::Dialog dialog
 
 void
 gaim_gtkxfer_dialog_hide(dialog)
-	Gaim::Gtk::Xfer::Dialog dialog
+	Gaim::GtkUI::Xfer::Dialog dialog
 
 void
 gaim_gtkxfer_dialog_add_xfer(dialog, xfer)
-	Gaim::Gtk::Xfer::Dialog dialog
+	Gaim::GtkUI::Xfer::Dialog dialog
 	Gaim::Xfer xfer
 
 void
 gaim_gtkxfer_dialog_remove_xfer(dialog, xfer)
-	Gaim::Gtk::Xfer::Dialog dialog
+	Gaim::GtkUI::Xfer::Dialog dialog
 	Gaim::Xfer xfer
 
 void
 gaim_gtkxfer_dialog_cancel_xfer(dialog, xfer)
-	Gaim::Gtk::Xfer::Dialog dialog
+	Gaim::GtkUI::Xfer::Dialog dialog
 	Gaim::Xfer xfer
 
 void
 gaim_gtkxfer_dialog_update_xfer(dialog, xfer)
-	Gaim::Gtk::Xfer::Dialog dialog
+	Gaim::GtkUI::Xfer::Dialog dialog
 	Gaim::Xfer xfer
diff -r d2de045b077f -r d6eae5115b31 gtk/plugins/perl/common/GtkIMHtml.xs
--- a/gtk/plugins/perl/common/GtkIMHtml.xs	Sun Sep 17 04:42:42 2006 +0000
+++ b/gtk/plugins/perl/common/GtkIMHtml.xs	Sun Sep 17 05:35:46 2006 +0000
@@ -13,9 +13,9 @@
  * about doing that.
 void
 gtk_imhtml_insert_html_at_iter(imhtml, text, options, iter)
-	Gaim::Gtk::IMHtml imhtml
+	Gaim::GtkUI::IMHtml imhtml
 	const gchar * text
-	Gaim::Gtk::IMHtml::Options options
+	Gaim::GtkUI::IMHtml::Options options
 	Gtk::TextIter iter
 */
 
@@ -24,7 +24,7 @@
  * about doing that.
 void
 gtk_imhtml_delete(imhtml, start, end)
-	Gaim::Gtk::IMHtml imhtml
+	Gaim::GtkUI::IMHtml imhtml
 	Gtk::TextIter start
 	Gtk::TextIter end
 */
@@ -34,7 +34,7 @@
  * about doing that.
 void
 gtk_imhtml_insert_link(imhtml, mark, url, text)
-	Gaim::Gtk::IMHtml imhtml
+	Gaim::GtkUI::IMHtml imhtml
 	Gtk::TextMark mark
 	const char * url
 	const char * text
@@ -45,14 +45,14 @@
  * about doing that.
 void
 gtk_imhtml_insert_smiley_at_iter(imhtml, sml, smiley, iter)
-	Gaim::Gtk::IMHtml imhtml
+	Gaim::GtkUI::IMHtml imhtml
 	const char * sml
 	char * smiley
 	Gtk::TextIter iter
 
 void
 gtk_imhtml_insert_image_at_iter(imhtml, id, iter)
-	Gaim::Gtk::IMHtml imhtml
+	Gaim::GtkUI::IMHtml imhtml
 	int id
 	Gtk::TextIter iter
 */
@@ -62,7 +62,7 @@
  * about doing that.
 char *
 gtk_imhtml_get_markup_range(imhtml, start, end)
-	Gaim::Gtk::IMHtml imhtml
+	Gaim::GtkUI::IMHtml imhtml
 	Gtk::TextIter start
 	Gtk::TextIter end
 */
@@ -72,7 +72,7 @@
  * about doing that.
 char *
 gtk_imhtml_get_text(imhtml, start, end)
-	Gaim::Gtk::IMHtml imhtml
+	Gaim::GtkUI::IMHtml imhtml
 	Gtk::TextIter start
 	Gtk::TextIter end
 */
@@ -80,7 +80,7 @@
 /* This can't work at the moment since I don't have a typemap for Gdk::Pixbuf.
  * I thought about using the one from libgtk2-perl but wasn't sure how to go
  * about doing that.
-Gaim::Gtk::IMHtml::Scalable
+Gaim::GtkUI::IMHtml::Scalable
 gtk_imhtml_image_new(img, filename, id)
 	Gdk::Pixbuf img
 	const gchar * filename
@@ -92,8 +92,8 @@
  * about doing that.
 void
 gtk_imhtml_image_add_to(scale, imhtml, iter)
-	Gaim::Gtk::IMHtml::Scalable scale
-	Gaim::Gtk::IMHtml imhtml
+	Gaim::GtkUI::IMHtml::Scalable scale
+	Gaim::GtkUI::IMHtml imhtml
 	Gtk::TextIter iter
 */
 
@@ -102,69 +102,69 @@
  * about doing that.
 void
 gtk_imhtml_hr_add_to(scale, imhtml, iter)
-	Gaim::Gtk::IMHtml::Scalable scale
-	Gaim::Gtk::IMHtml imhtml
+	Gaim::GtkUI::IMHtml::Scalable scale
+	Gaim::GtkUI::IMHtml imhtml
 	Gtk::TextIter iter
 */
 
 /* This can't work at the moment since I don't have a typemap for gboolean *.
 void
 gtk_imhtml_get_current_format(imhtml, bold, italic, underline)
-	Gaim::Gtk::IMHtml imhtml
+	Gaim::GtkUI::IMHtml imhtml
 	gboolean * bold
 	gboolean * italic
 	gboolean * underline
 */
 
-MODULE = Gaim::Gtk::IMHtml  PACKAGE = Gaim::Gtk::IMHtml  PREFIX = gtk_imhtml_
+MODULE = Gaim::GtkUI::IMHtml  PACKAGE = Gaim::GtkUI::IMHtml  PREFIX = gtk_imhtml_
 PROTOTYPES: ENABLE
 
-Gaim::Gtk::IMHtml::Smiley
+Gaim::GtkUI::IMHtml::Smiley
 gtk_imhtml_smiley_get(imhtml, sml, text)
-	Gaim::Gtk::IMHtml imhtml
+	Gaim::GtkUI::IMHtml imhtml
 	const gchar * sml
 	const gchar * text
 
 void
 gtk_imhtml_associate_smiley(imhtml, sml, smiley)
-	Gaim::Gtk::IMHtml imhtml
+	Gaim::GtkUI::IMHtml imhtml
 	const gchar * sml
-	Gaim::Gtk::IMHtml::Smiley smiley
+	Gaim::GtkUI::IMHtml::Smiley smiley
 
 void
 gtk_imhtml_remove_smileys(imhtml)
-	Gaim::Gtk::IMHtml imhtml
+	Gaim::GtkUI::IMHtml imhtml
 
 void
 gtk_imhtml_set_funcs(imhtml, f)
-	Gaim::Gtk::IMHtml imhtml
-	Gaim::Gtk::IMHtml::Funcs f
+	Gaim::GtkUI::IMHtml imhtml
+	Gaim::GtkUI::IMHtml::Funcs f
 
 void
 gtk_imhtml_show_comments(imhtml, show)
-	Gaim::Gtk::IMHtml imhtml
+	Gaim::GtkUI::IMHtml imhtml
 	gboolean show
 
 const char *
 gtk_imhtml_get_protocol_name(imhtml)
-	Gaim::Gtk::IMHtml imhtml
+	Gaim::GtkUI::IMHtml imhtml
 
 void
 gtk_imhtml_set_protocol_name(imhtml, protocol_name)
-	Gaim::Gtk::IMHtml imhtml
+	Gaim::GtkUI::IMHtml imhtml
 	const gchar * protocol_name
 
 void
 gtk_imhtml_append_text(imhtml, text, options)
-	Gaim::Gtk::IMHtml imhtml
+	Gaim::GtkUI::IMHtml imhtml
 	const gchar * text
-	Gaim::Gtk::IMHtml::Options options
+	Gaim::GtkUI::IMHtml::Options options
 
 void
 gtk_imhtml_append_text_with_images(imhtml, text, options, unused = NULL)
-	Gaim::Gtk::IMHtml imhtml
+	Gaim::GtkUI::IMHtml imhtml
 	const gchar * text
-	Gaim::Gtk::IMHtml::Options options
+	Gaim::GtkUI::IMHtml::Options options
 	SV *unused
 PREINIT:
 	GSList *t_GL;
@@ -181,173 +181,185 @@
 
 void
 gtk_imhtml_scroll_to_end(imhtml, smooth)
-	Gaim::Gtk::IMHtml imhtml
+	Gaim::GtkUI::IMHtml imhtml
 	gboolean smooth
 
 void
 gtk_imhtml_clear(imhtml)
-	Gaim::Gtk::IMHtml imhtml
+	Gaim::GtkUI::IMHtml imhtml
 
 void
 gtk_imhtml_page_up(imhtml)
-	Gaim::Gtk::IMHtml imhtml
+	Gaim::GtkUI::IMHtml imhtml
 
 void
 gtk_imhtml_page_down(imhtml)
-	Gaim::Gtk::IMHtml imhtml
+	Gaim::GtkUI::IMHtml imhtml
 
 void
 gtk_imhtml_set_editable(imhtml, editable)
-	Gaim::Gtk::IMHtml imhtml
+	Gaim::GtkUI::IMHtml imhtml
 	gboolean editable
 
 void
 gtk_imhtml_set_whole_buffer_formatting_only(imhtml, wbo)
-	Gaim::Gtk::IMHtml imhtml
+	Gaim::GtkUI::IMHtml imhtml
 	gboolean wbo
 
 void
 gtk_imhtml_set_format_functions(imhtml, buttons)
-	Gaim::Gtk::IMHtml imhtml
-	Gaim::Gtk::IMHtml::Buttons buttons
+	Gaim::GtkUI::IMHtml imhtml
+	Gaim::GtkUI::IMHtml::Buttons buttons
 
-Gaim::Gtk::IMHtml::Buttons
+Gaim::GtkUI::IMHtml::Buttons
 gtk_imhtml_get_format_functions(imhtml)
-	Gaim::Gtk::IMHtml imhtml
+	Gaim::GtkUI::IMHtml imhtml
 
 char *
 gtk_imhtml_get_current_fontface(imhtml)
-	Gaim::Gtk::IMHtml imhtml
+	Gaim::GtkUI::IMHtml imhtml
 
 char *
 gtk_imhtml_get_current_forecolor(imhtml)
-	Gaim::Gtk::IMHtml imhtml
+	Gaim::GtkUI::IMHtml imhtml
 
 char *
 gtk_imhtml_get_current_backcolor(imhtml)
-	Gaim::Gtk::IMHtml imhtml
+	Gaim::GtkUI::IMHtml imhtml
 
 char *
 gtk_imhtml_get_current_background(imhtml)
-	Gaim::Gtk::IMHtml imhtml
+	Gaim::GtkUI::IMHtml imhtml
 
 gint
 gtk_imhtml_get_current_fontsize(imhtml)
-	Gaim::Gtk::IMHtml imhtml
+	Gaim::GtkUI::IMHtml imhtml
 
 gboolean
 gtk_imhtml_get_editable(imhtml)
-	Gaim::Gtk::IMHtml imhtml
+	Gaim::GtkUI::IMHtml imhtml
 
 void
 gtk_imhtml_clear_formatting(imhtml)
-	Gaim::Gtk::IMHtml imhtml
+	Gaim::GtkUI::IMHtml imhtml
 
 void
 gtk_imhtml_toggle_bold(imhtml)
-	Gaim::Gtk::IMHtml imhtml
+	Gaim::GtkUI::IMHtml imhtml
 
 void
 gtk_imhtml_toggle_italic(imhtml)
-	Gaim::Gtk::IMHtml imhtml
+	Gaim::GtkUI::IMHtml imhtml
 
 void
 gtk_imhtml_toggle_underline(imhtml)
-	Gaim::Gtk::IMHtml imhtml
+	Gaim::GtkUI::IMHtml imhtml
 
 void
 gtk_imhtml_toggle_strike(imhtml)
-	Gaim::Gtk::IMHtml imhtml
+	Gaim::GtkUI::IMHtml imhtml
 
 void
 gtk_imhtml_toggle_forecolor(imhtml, color)
-	Gaim::Gtk::IMHtml imhtml
+	Gaim::GtkUI::IMHtml imhtml
 	const char * color
 
 void
 gtk_imhtml_toggle_backcolor(imhtml, color)
-	Gaim::Gtk::IMHtml imhtml
+	Gaim::GtkUI::IMHtml imhtml
 	const char * color
 
 void
 gtk_imhtml_toggle_background(imhtml, color)
-	Gaim::Gtk::IMHtml imhtml
+	Gaim::GtkUI::IMHtml imhtml
 	const char * color
 
 void
 gtk_imhtml_toggle_fontface(imhtml, face)
-	Gaim::Gtk::IMHtml imhtml
+	Gaim::GtkUI::IMHtml imhtml
 	const char * face
 
 void
 gtk_imhtml_toggle_link(imhtml, url)
-	Gaim::Gtk::IMHtml imhtml
+	Gaim::GtkUI::IMHtml imhtml
 	const char * url
 
 void
 gtk_imhtml_insert_smiley(imhtml, sml, smiley)
-	Gaim::Gtk::IMHtml imhtml
+	Gaim::GtkUI::IMHtml imhtml
 	const char * sml
 	char * smiley
 
 void
 gtk_imhtml_font_set_size(imhtml, size)
-	Gaim::Gtk::IMHtml imhtml
+	Gaim::GtkUI::IMHtml imhtml
 	gint size
 
 void
 gtk_imhtml_font_shrink(imhtml)
-	Gaim::Gtk::IMHtml imhtml
+	Gaim::GtkUI::IMHtml imhtml
 
 void
 gtk_imhtml_font_grow(imhtml)
-	Gaim::Gtk::IMHtml imhtml
+	Gaim::GtkUI::IMHtml imhtml
 
 char *
 gtk_imhtml_get_markup(imhtml)
-	Gaim::Gtk::IMHtml imhtml
+	Gaim::GtkUI::IMHtml imhtml
 
-char **
+# ETAN Test this, and document well that it returns an arrayref
+void
 gtk_imhtml_get_markup_lines(imhtml)
-	Gaim::Gtk::IMHtml imhtml
+	Gaim::GtkUI::IMHtml imhtml
+PREINIT:
+	gint i;
+	AV *lines;
+	gchar **bufs;
+PPCODE:
+	bufs = gtk_imhtml_get_markup_lines(imhtml);
+	lines = newAV();
+	for (i = 0; bufs[i]; i++) {
+	    av_push(lines, newSVpv(bufs[i], 0));
+	}
+	XPUSHs(sv_2mortal(newRV_noinc((SV *)lines)));
 
-MODULE = Gaim::Gtk::IMHtml  PACKAGE = Gaim::Gtk::IMHtml::Scalable  PREFIX = gtk_imhtml_image_
+MODULE = Gaim::GtkUI::IMHtml  PACKAGE = Gaim::GtkUI::IMHtml::Scalable  PREFIX = gtk_imhtml_image_
 PROTOTYPES: ENABLE
 
 void
 gtk_imhtml_image_free(scale)
-	Gaim::Gtk::IMHtml::Scalable scale
+	Gaim::GtkUI::IMHtml::Scalable scale
 
 void
 gtk_imhtml_image_scale(scale, width, height)
-	Gaim::Gtk::IMHtml::Scalable scale
+	Gaim::GtkUI::IMHtml::Scalable scale
 	int width
 	int height
 
-MODULE = Gaim::Gtk::IMHtml  PACKAGE = Gaim::Gtk::IMHtml::Hr  PREFIX = gtk_imhtml_hr_
+MODULE = Gaim::GtkUI::IMHtml  PACKAGE = Gaim::GtkUI::IMHtml::Hr  PREFIX = gtk_imhtml_hr_
 PROTOTYPES: ENABLE
 
-Gaim::Gtk::IMHtml::Scalable
+Gaim::GtkUI::IMHtml::Scalable
 gtk_imhtml_hr_new()
 
 void
 gtk_imhtml_hr_free(scale)
-	Gaim::Gtk::IMHtml::Scalable scale
+	Gaim::GtkUI::IMHtml::Scalable scale
 
 void
 gtk_imhtml_hr_scale(scale, width, height)
-	Gaim::Gtk::IMHtml::Scalable scale
+	Gaim::GtkUI::IMHtml::Scalable scale
 	int width
 	int height
 
-MODULE = Gaim::Gtk::IMHtml  PACKAGE = Gaim::Gtk::IMHtml::Search  PREFIX = gtk_imhtml_search_
+MODULE = Gaim::GtkUI::IMHtml  PACKAGE = Gaim::GtkUI::IMHtml::Search  PREFIX = gtk_imhtml_search_
 PROTOTYPES: ENABLE
 
 gboolean
 gtk_imhtml_search_find(imhtml, text)
-	Gaim::Gtk::IMHtml imhtml
+	Gaim::GtkUI::IMHtml imhtml
 	const gchar * text
 
 void
 gtk_imhtml_search_clear(imhtml)
-	Gaim::Gtk::IMHtml imhtml
+	Gaim::GtkUI::IMHtml imhtml
diff -r d2de045b077f -r d6eae5115b31 gtk/plugins/perl/common/GtkIMHtmlToolbar.xs
--- a/gtk/plugins/perl/common/GtkIMHtmlToolbar.xs	Sun Sep 17 04:42:42 2006 +0000
+++ b/gtk/plugins/perl/common/GtkIMHtmlToolbar.xs	Sun Sep 17 05:35:46 2006 +0000
@@ -9,14 +9,14 @@
 
 void
 gtk_imhtmltoolbar_attach(toolbar, imhtml)
-	Gaim::Gtk::IMHtmlToolbar toolbar
+	Gaim::GtkUI::IMHtmlToolbar toolbar
 	Gtk::Widget imhtml
 */
 
-MODULE = Gaim::Gtk::IMHtmlToolbar  PACKAGE = Gaim::Gtk::IMHtmlToolbar  PREFIX = gtk_imhtmltoolbar_
+MODULE = Gaim::GtkUI::IMHtmlToolbar  PACKAGE = Gaim::GtkUI::IMHtmlToolbar  PREFIX = gtk_imhtmltoolbar_
 PROTOTYPES: ENABLE
 
 void
 gtk_imhtmltoolbar_associate_smileys(toolbar, proto_id)
-	Gaim::Gtk::IMHtmlToolbar toolbar
+	Gaim::GtkUI::IMHtmlToolbar toolbar
 	const char * proto_id
diff -r d2de045b077f -r d6eae5115b31 gtk/plugins/perl/common/GtkLog.xs
--- a/gtk/plugins/perl/common/GtkLog.xs	Sun Sep 17 04:42:42 2006 +0000
+++ b/gtk/plugins/perl/common/GtkLog.xs	Sun Sep 17 05:35:46 2006 +0000
@@ -1,6 +1,6 @@
 #include "gtkmodule.h"
 
-MODULE = Gaim::Gtk::Log  PACKAGE = Gaim::Gtk::Log  PREFIX = gaim_gtk_log_
+MODULE = Gaim::GtkUI::Log  PACKAGE = Gaim::GtkUI::Log  PREFIX = gaim_gtk_log_
 PROTOTYPES: ENABLE
 
 void *
@@ -16,7 +16,7 @@
 gaim_gtk_log_show_contact(contact)
 	Gaim::BuddyList::Contact contact
 
-MODULE = Gaim::Gtk::Log  PACKAGE = Gaim::Gtk::SysLog  PREFIX = gaim_gtk_syslog_
+MODULE = Gaim::GtkUI::Log  PACKAGE = Gaim::GtkUI::SysLog  PREFIX = gaim_gtk_syslog_
 PROTOTYPES: ENABLE
 
 void
diff -r d2de045b077f -r d6eae5115b31 gtk/plugins/perl/common/GtkMenuTray.xs
--- a/gtk/plugins/perl/common/GtkMenuTray.xs	Sun Sep 17 04:42:42 2006 +0000
+++ b/gtk/plugins/perl/common/GtkMenuTray.xs	Sun Sep 17 05:35:46 2006 +0000
@@ -8,26 +8,26 @@
 
 Gtk::Widget
 gaim_gtk_menu_tray_get_box(menu_tray)
-	Gaim::Gtk::MenuTray menu_tray
+	Gaim::GtkUI::MenuTray menu_tray
 
 void
 gaim_gtk_menu_tray_append(menu_tray, widget, tooltip)
-	Gaim::Gtk::MenuTray menu_tray
+	Gaim::GtkUI::MenuTray menu_tray
 	Gtk::Widget widget
 	const char * tooltip
 
 void
 gaim_gtk_menu_tray_prepend(menu_tray, widget, tooltip)
-	Gaim::Gtk::MenuTray menu_tray
+	Gaim::GtkUI::MenuTray menu_tray
 	Gtk::Widget widget
 	const char * tooltip
 
 void
 gaim_gtk_menu_tray_set_tooltip(menu_tray, widget, tooltip)
-	Gaim::Gtk::MenuTray menu_tray
+	Gaim::GtkUI::MenuTray menu_tray
 	Gtk::Widget widget
 	const char * tooltip
 */
 
-MODULE = Gaim::Gtk::MenuTray  PACKAGE = Gaim::Gtk::MenuTray  PREFIX = gaim_gtk_menu_tray
+MODULE = Gaim::GtkUI::MenuTray  PACKAGE = Gaim::GtkUI::MenuTray  PREFIX = gaim_gtk_menu_tray
 PROTOTYPES: ENABLE
diff -r d2de045b077f -r d6eae5115b31 gtk/plugins/perl/common/GtkPlugin.xs
--- a/gtk/plugins/perl/common/GtkPlugin.xs	Sun Sep 17 04:42:42 2006 +0000
+++ b/gtk/plugins/perl/common/GtkPlugin.xs	Sun Sep 17 05:35:46 2006 +0000
@@ -8,16 +8,16 @@
 	Gaim::Plugin plugin
 */
 
-MODULE = Gaim::Gtk::Plugin  PACKAGE = Gaim::Gtk::Plugin  PREFIX = gaim_gtk_plugin_
+MODULE = Gaim::GtkUI::Plugin  PACKAGE = Gaim::GtkUI::Plugin  PREFIX = gaim_gtk_plugin_
 PROTOTYPES: ENABLE
 
-MODULE = Gaim::Gtk::Plugin  PACKAGE = Gaim::Gtk::Plugins  PREFIX = gaim_gtk_plugins_
+MODULE = Gaim::GtkUI::Plugin  PACKAGE = Gaim::GtkUI::Plugins  PREFIX = gaim_gtk_plugins_
 PROTOTYPES: ENABLE
 
 void
 gaim_gtk_plugins_save()
 
-MODULE = Gaim::Gtk::Plugin  PACKAGE = Gaim::Gtk::Plugin::Dialog  PREFIX = gaim_gtk_plugin_dialog_
+MODULE = Gaim::GtkUI::Plugin  PACKAGE = Gaim::GtkUI::Plugin::Dialog  PREFIX = gaim_gtk_plugin_dialog_
 PROTOTYPES: ENABLE
 
 void
diff -r d2de045b077f -r d6eae5115b31 gtk/plugins/perl/common/GtkPluginPref.xs
--- a/gtk/plugins/perl/common/GtkPluginPref.xs	Sun Sep 17 04:42:42 2006 +0000
+++ b/gtk/plugins/perl/common/GtkPluginPref.xs	Sun Sep 17 05:35:46 2006 +0000
@@ -8,5 +8,5 @@
 	Gaim::PluginPref::Frame frame
 */
 
-MODULE = Gaim::Gtk::PluginPref  PACKAGE = Gaim::Gtk::PluginPref  PREFIX = gaim_gtk_plugin_pref_
+MODULE = Gaim::GtkUI::PluginPref  PACKAGE = Gaim::GtkUI::PluginPref  PREFIX = gaim_gtk_plugin_pref_
 PROTOTYPES: ENABLE
diff -r d2de045b077f -r d6eae5115b31 gtk/plugins/perl/common/GtkPounce.xs
--- a/gtk/plugins/perl/common/GtkPounce.xs	Sun Sep 17 04:42:42 2006 +0000
+++ b/gtk/plugins/perl/common/GtkPounce.xs	Sun Sep 17 05:35:46 2006 +0000
@@ -1,6 +1,6 @@
 #include "gtkmodule.h"
 
-MODULE = Gaim::Gtk::Pounce  PACKAGE = Gaim::Gtk::Pounce  PREFIX = gaim_gtk_pounce_
+MODULE = Gaim::GtkUI::Pounce  PACKAGE = Gaim::GtkUI::Pounce  PREFIX = gaim_gtk_pounce_
 PROTOTYPES: ENABLE
 
 void
@@ -9,13 +9,13 @@
 	const char * name
 	Gaim::Pounce cur_pounce
 
-MODULE = Gaim::Gtk::Pounce  PACKAGE = Gaim::Gtk::Pounces  PREFIX = gaim_gtk_pounces_
+MODULE = Gaim::GtkUI::Pounce  PACKAGE = Gaim::GtkUI::Pounces  PREFIX = gaim_gtk_pounces_
 PROTOTYPES: ENABLE
 
 void *
 gaim_gtk_pounces_get_handle()
 
-MODULE = Gaim::Gtk::Pounce  PACKAGE = Gaim::Gtk::Pounces::Manager  PREFIX = gaim_gtk_pounces_manager_
+MODULE = Gaim::GtkUI::Pounce  PACKAGE = Gaim::GtkUI::Pounces::Manager  PREFIX = gaim_gtk_pounces_manager_
 PROTOTYPES: ENABLE
 
 void
diff -r d2de045b077f -r d6eae5115b31 gtk/plugins/perl/common/GtkPrefs.xs
--- a/gtk/plugins/perl/common/GtkPrefs.xs	Sun Sep 17 04:42:42 2006 +0000
+++ b/gtk/plugins/perl/common/GtkPrefs.xs	Sun Sep 17 05:35:46 2006 +0000
@@ -67,7 +67,7 @@
 	RETVAL
 */
 
-MODULE = Gaim::Gtk::Prefs  PACKAGE = Gaim::Gtk::Prefs  PREFIX = gaim_gtk_prefs_
+MODULE = Gaim::GtkUI::Prefs  PACKAGE = Gaim::GtkUI::Prefs  PREFIX = gaim_gtk_prefs_
 PROTOTYPES: ENABLE
 
 void
diff -r d2de045b077f -r d6eae5115b31 gtk/plugins/perl/common/GtkPrivacy.xs
--- a/gtk/plugins/perl/common/GtkPrivacy.xs	Sun Sep 17 04:42:42 2006 +0000
+++ b/gtk/plugins/perl/common/GtkPrivacy.xs	Sun Sep 17 05:35:46 2006 +0000
@@ -1,6 +1,6 @@
 #include "gtkmodule.h"
 
-MODULE = Gaim::Gtk::Privacy  PACKAGE = Gaim::Gtk::Privacy  PREFIX = gaim_gtk_
+MODULE = Gaim::GtkUI::Privacy  PACKAGE = Gaim::GtkUI::Privacy  PREFIX = gaim_gtk_
 PROTOTYPES: ENABLE
 
 void
@@ -13,7 +13,7 @@
 	Gaim::Account account
 	const char * name
 
-MODULE = Gaim::Gtk::Privacy  PACKAGE = Gaim::Gtk::Privacy::Dialog  PREFIX = gaim_gtk_privacy_dialog_
+MODULE = Gaim::GtkUI::Privacy  PACKAGE = Gaim::GtkUI::Privacy::Dialog  PREFIX = gaim_gtk_privacy_dialog_
 PROTOTYPES: ENABLE
 
 void
diff -r d2de045b077f -r d6eae5115b31 gtk/plugins/perl/common/GtkRoomlist.xs
--- a/gtk/plugins/perl/common/GtkRoomlist.xs	Sun Sep 17 04:42:42 2006 +0000
+++ b/gtk/plugins/perl/common/GtkRoomlist.xs	Sun Sep 17 05:35:46 2006 +0000
@@ -1,23 +1,23 @@
 #include "gtkmodule.h"
 
-MODULE = Gaim::Gtk::Roomlist  PACKAGE = Gaim::Gtk::Roomlist  PREFIX = gaim_gtk_roomlist_
+MODULE = Gaim::GtkUI::Roomlist  PACKAGE = Gaim::GtkUI::Roomlist  PREFIX = gaim_gtk_roomlist_
 PROTOTYPES: ENABLE
 
 gboolean
 gaim_gtk_roomlist_is_showable()
 
-MODULE = Gaim::Gtk::Roomlist  PACKAGE = Gaim::Gtk::Roomlist::Dialog  PREFIX = gaim_gtk_roomlist_dialog_
+MODULE = Gaim::GtkUI::Roomlist  PACKAGE = Gaim::GtkUI::Roomlist::Dialog  PREFIX = gaim_gtk_roomlist_dialog_
 PROTOTYPES: ENABLE
 
 void
 gaim_gtk_roomlist_dialog_show(class)
     C_ARGS: /* void */
 
-Gaim::Gtk::Roomlist::Dialog
+Gaim::GtkUI::Roomlist::Dialog
 gaim_gtk_roomlist_dialog_new(class)
     C_ARGS: /* void */
 
-Gaim::Gtk::Roomlist::Dialog
+Gaim::GtkUI::Roomlist::Dialog
 gaim_gtk_roomlist_dialog_new_with_account(class, account)
 	Gaim::Account account
     C_ARGS:
diff -r d2de045b077f -r d6eae5115b31 gtk/plugins/perl/common/GtkSavedStatuses.xs
--- a/gtk/plugins/perl/common/GtkSavedStatuses.xs	Sun Sep 17 04:42:42 2006 +0000
+++ b/gtk/plugins/perl/common/GtkSavedStatuses.xs	Sun Sep 17 05:35:46 2006 +0000
@@ -11,13 +11,13 @@
 	GCallback callback
 */
 
-MODULE = Gaim::Gtk::Status  PACKAGE = Gaim::Gtk::Status  PREFIX = gaim_gtk_status_
+MODULE = Gaim::GtkUI::Status  PACKAGE = Gaim::GtkUI::Status  PREFIX = gaim_gtk_status_
 PROTOTYPES: ENABLE
 
 void *
 gaim_gtk_status_get_handle()
 
-MODULE = Gaim::Gtk::Status  PACKAGE = Gaim::Gtk::Status::Editor  PREFIX = gaim_gtk_status_editor_
+MODULE = Gaim::GtkUI::Status  PACKAGE = Gaim::GtkUI::Status::Editor  PREFIX = gaim_gtk_status_editor_
 PROTOTYPES: ENABLE
 
 void
@@ -25,7 +25,7 @@
 	gboolean edit
 	Gaim::SavedStatus status
 
-MODULE = Gaim::Gtk::Status  PACKAGE = Gaim::Gtk::Status::Window  PREFIX = gaim_gtk_status_window_
+MODULE = Gaim::GtkUI::Status  PACKAGE = Gaim::GtkUI::Status::Window  PREFIX = gaim_gtk_status_window_
 PROTOTYPES: ENABLE
 
 void
diff -r d2de045b077f -r d6eae5115b31 gtk/plugins/perl/common/GtkSession.xs
--- a/gtk/plugins/perl/common/GtkSession.xs	Sun Sep 17 04:42:42 2006 +0000
+++ b/gtk/plugins/perl/common/GtkSession.xs	Sun Sep 17 05:35:46 2006 +0000
@@ -1,6 +1,6 @@
 #include "gtkmodule.h"
 
-MODULE = Gaim::Gtk::Session  PACKAGE = Gaim::Gtk::Session  PREFIX = gaim_gtk_session_
+MODULE = Gaim::GtkUI::Session  PACKAGE = Gaim::GtkUI::Session  PREFIX = gaim_gtk_session_
 PROTOTYPES: ENABLE
 
 void
diff -r d2de045b077f -r d6eae5115b31 gtk/plugins/perl/common/GtkSound.xs
--- a/gtk/plugins/perl/common/GtkSound.xs	Sun Sep 17 04:42:42 2006 +0000
+++ b/gtk/plugins/perl/common/GtkSound.xs	Sun Sep 17 05:35:46 2006 +0000
@@ -1,6 +1,6 @@
 #include "gtkmodule.h"
 
-MODULE = Gaim::Gtk::Sound  PACKAGE = Gaim::Gtk::Sound  PREFIX = gaim_gtk_sound_
+MODULE = Gaim::GtkUI::Sound  PACKAGE = Gaim::GtkUI::Sound  PREFIX = gaim_gtk_sound_
 PROTOTYPES: ENABLE
 
 const char *
diff -r d2de045b077f -r d6eae5115b31 gtk/plugins/perl/common/GtkStatusBox.xs
--- a/gtk/plugins/perl/common/GtkStatusBox.xs	Sun Sep 17 04:42:42 2006 +0000
+++ b/gtk/plugins/perl/common/GtkStatusBox.xs	Sun Sep 17 05:35:46 2006 +0000
@@ -12,39 +12,39 @@
 
 void
 gtk_gaim_status_box_add(status_box, type, pixbuf, text, sec_text, data)
-	Gaim::Gtk::StatusBox status_box
-	Gaim::Gtk::StatusBox::ItemType type
+	Gaim::GtkUI::StatusBox status_box
+	Gaim::GtkUI::StatusBox::ItemType type
 	GdkPixbuf pixbuf
 	const char * text
 	const char * sec_text
 	gpointer data
 */
 
-MODULE = Gaim::Gtk::StatusBox  PACKAGE = Gaim::Gtk::StatusBox  PREFIX = gtk_gaim_status_box
+MODULE = Gaim::GtkUI::StatusBox  PACKAGE = Gaim::GtkUI::StatusBox  PREFIX = gtk_gaim_status_box
 PROTOTYPES: ENABLE
 
 void
 gtk_gaim_status_box_add_separator(status_box)
-	Gaim::Gtk::StatusBox status_box
+	Gaim::GtkUI::StatusBox status_box
 
 void
 gtk_gaim_status_box_set_connecting(status_box, connecting)
-	Gaim::Gtk::StatusBox status_box
+	Gaim::GtkUI::StatusBox status_box
 	gboolean connecting
 
 void
 gtk_gaim_status_box_pulse_connecting(status_box)
-	Gaim::Gtk::StatusBox status_box
+	Gaim::GtkUI::StatusBox status_box
 
 void
 gtk_gaim_status_box_set_buddy_icon(status_box, filename)
-	Gaim::Gtk::StatusBox status_box
+	Gaim::GtkUI::StatusBox status_box
 	const char * filename
 
 const char *
 gtk_gaim_status_box_get_buddy_icon(status_box)
-	Gaim::Gtk::StatusBox status_box
+	Gaim::GtkUI::StatusBox status_box
 
 char *
 gtk_gaim_status_box_get_message(status_box)
-	Gaim::Gtk::StatusBox status_box
+	Gaim::GtkUI::StatusBox status_box
diff -r d2de045b077f -r d6eae5115b31 gtk/plugins/perl/common/GtkThemes.xs
--- a/gtk/plugins/perl/common/GtkThemes.xs	Sun Sep 17 04:42:42 2006 +0000
+++ b/gtk/plugins/perl/common/GtkThemes.xs	Sun Sep 17 05:35:46 2006 +0000
@@ -8,7 +8,7 @@
 	Gtk::Widget * widget
 */
 
-MODULE = Gaim::Gtk::Themes  PACKAGE = Gaim::Gtk::Themes  PREFIX = gaim_gtkthemes_
+MODULE = Gaim::GtkUI::Themes  PACKAGE = Gaim::GtkUI::Themes  PREFIX = gaim_gtkthemes_
 PROTOTYPES: ENABLE
 
 void
diff -r d2de045b077f -r d6eae5115b31 gtk/plugins/perl/common/GtkUI.pm
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/gtk/plugins/perl/common/GtkUI.pm	Sun Sep 17 05:35:46 2006 +0000
@@ -0,0 +1,61 @@
+package Gaim::GtkUI;
+
+use 5.008;
+use strict;
+use warnings;
+use Carp;
+
+our $VERSION = '0.01';
+
+use Gaim;
+
+require XSLoader;
+XSLoader::load('Gaim::GtkUI', $VERSION);
+
+1;
+__END__
+
+=head1 NAME
+
+Gaim::GtkUI - Perl extension for the Gaim instant messenger.
+
+=head1 SYNOPSIS
+
+    use Gaim::GtkUI;
+
+=head1 ABSTRACT
+
+    This module provides the interface for using perl scripts as plugins in
+    Gaim, with access to the Gaim Gtk interface functions.
+
+=head1 DESCRIPTION
+
+This module provides the interface for using perl scripts as plugins in Gaim,
+with access to the Gaim Gtk interface functions. With this, developers can
+write perl scripts that can be loaded in Gaim as plugins. The script can
+interact with IMs, chats, accoutns, the buddy list, gaim signals, and more.
+
+The API for the perl interface is very similar to that of the Gaim C API,
+which can be viewed at http://gaim.sourceforge.net/api/ or in the header files
+in the Gaim source tree.
+
+=head1 FUNCTIONS
+
+=over
+
+=back
+
+=head1 SEE ALSO
+Gaim C API documentation - http://gaim.sourceforge.net/api/
+
+The Gaim perl module.
+
+Gaim website - http://gaim.sourceforge.net/
+
+=head1 AUTHOR
+
+Etan Reisner, E<lt>deryni@gmail.comE<gt>
+
+=head1 COPYRIGHT AND LICENSE
+
+Copyright 2006 by Etan Reisner
diff -r d2de045b077f -r d6eae5115b31 gtk/plugins/perl/common/GtkUI.xs
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/gtk/plugins/perl/common/GtkUI.xs	Sun Sep 17 05:35:46 2006 +0000
@@ -0,0 +1,79 @@
+#include "gtkmodule.h"
+
+/*
+#define GAIM_PERL_BOOT_PROTO(x) \
+	void boot_Gaim__##x(pTHX_ CV *cv);
+
+#define GAIM_PERL_BOOT(x) \
+	gaim_perl_callXS(boot_Gaim__##x, cv, mark)
+
+static void
+gaim_perl_callXS(void (*subaddr)(pTHX_ CV *cv), CV *cv, SV **mark)
+{
+	dSP;
+
+	PUSHMARK(mark);
+	(*subaddr)(aTHX_ cv);
+
+	PUTBACK;
+}
+*/
+
+/* Prototypes for the BOOT section below. */
+GAIM_PERL_BOOT_PROTO(GtkUI__Account);
+GAIM_PERL_BOOT_PROTO(GtkUI__BuddyList);
+GAIM_PERL_BOOT_PROTO(GtkUI__Connection);
+GAIM_PERL_BOOT_PROTO(GtkUI__Conversation);
+GAIM_PERL_BOOT_PROTO(GtkUI__Conversation__Window);
+GAIM_PERL_BOOT_PROTO(GtkUI__Debug);
+GAIM_PERL_BOOT_PROTO(GtkUI__Dialogs);
+GAIM_PERL_BOOT_PROTO(GtkUI__IMHtml);
+GAIM_PERL_BOOT_PROTO(GtkUI__IMHtmlToolbar);
+GAIM_PERL_BOOT_PROTO(GtkUI__Log);
+GAIM_PERL_BOOT_PROTO(GtkUI__MenuTray);
+GAIM_PERL_BOOT_PROTO(GtkUI__Plugin);
+GAIM_PERL_BOOT_PROTO(GtkUI__PluginPref);
+GAIM_PERL_BOOT_PROTO(GtkUI__Pounce);
+GAIM_PERL_BOOT_PROTO(GtkUI__Prefs);
+GAIM_PERL_BOOT_PROTO(GtkUI__Privacy);
+GAIM_PERL_BOOT_PROTO(GtkUI__Roomlist);
+GAIM_PERL_BOOT_PROTO(GtkUI__Status);
+#ifndef _WIN32
+GAIM_PERL_BOOT_PROTO(GtkUI__Session);
+#endif
+GAIM_PERL_BOOT_PROTO(GtkUI__Sound);
+GAIM_PERL_BOOT_PROTO(GtkUI__StatusBox);
+GAIM_PERL_BOOT_PROTO(GtkUI__Themes);
+GAIM_PERL_BOOT_PROTO(GtkUI__Utils);
+GAIM_PERL_BOOT_PROTO(GtkUI__Xfer);
+
+MODULE = Gaim::Gtk  PACKAGE = Gaim::Gtk PREFIX = gaim_gtk_
+PROTOTYPES: ENABLE
+
+BOOT:
+GAIM_PERL_BOOT(GtkUI__Account);
+GAIM_PERL_BOOT(GtkUI__BuddyList);
+GAIM_PERL_BOOT(GtkUI__Connection);
+GAIM_PERL_BOOT(GtkUI__Conversation);
+GAIM_PERL_BOOT(GtkUI__Conversation__Window);
+GAIM_PERL_BOOT(GtkUI__Debug);
+GAIM_PERL_BOOT(GtkUI__Dialogs);
+GAIM_PERL_BOOT(GtkUI__IMHtml);
+GAIM_PERL_BOOT(GtkUI__IMHtmlToolbar);
+GAIM_PERL_BOOT(GtkUI__Log);
+GAIM_PERL_BOOT(GtkUI__MenuTray);
+GAIM_PERL_BOOT(GtkUI__Plugin);
+GAIM_PERL_BOOT(GtkUI__PluginPref);
+GAIM_PERL_BOOT(GtkUI__Pounce);
+GAIM_PERL_BOOT(GtkUI__Prefs);
+GAIM_PERL_BOOT(GtkUI__Privacy);
+GAIM_PERL_BOOT(GtkUI__Roomlist);
+GAIM_PERL_BOOT(GtkUI__Status);
+#ifndef _WIN32
+GAIM_PERL_BOOT(GtkUI__Session);
+#endif
+GAIM_PERL_BOOT(GtkUI__Sound);
+GAIM_PERL_BOOT(GtkUI__StatusBox);
+GAIM_PERL_BOOT(GtkUI__Themes);
+GAIM_PERL_BOOT(GtkUI__Utils);
+GAIM_PERL_BOOT(GtkUI__Xfer);
diff -r d2de045b077f -r d6eae5115b31 gtk/plugins/perl/common/GtkUtils.xs
--- a/gtk/plugins/perl/common/GtkUtils.xs	Sun Sep 17 04:42:42 2006 +0000
+++ b/gtk/plugins/perl/common/GtkUtils.xs	Sun Sep 17 05:35:46 2006 +0000
@@ -192,7 +192,7 @@
 	Gtk::Widget widget
 */
 
-MODULE = Gaim::Gtk::Utils  PACKAGE = Gaim::Gtk::Utils  PREFIX = gaim_gtk_utils_
+MODULE = Gaim::GtkUI::Utils  PACKAGE = Gaim::GtkUI::Utils  PREFIX = gaim_gtk_utils_
 PROTOTYPES: ENABLE
 
 gboolean
diff -r d2de045b077f -r d6eae5115b31 gtk/plugins/perl/common/MANIFEST
--- a/gtk/plugins/perl/common/MANIFEST	Sun Sep 17 04:42:42 2006 +0000
+++ b/gtk/plugins/perl/common/MANIFEST	Sun Sep 17 05:35:46 2006 +0000
@@ -1,5 +1,3 @@
-Gtk.pm
-Gtk.xs
 GtkAccount.xs
 GtkBlist.xs
 GtkConn.xs
@@ -23,6 +21,8 @@
 GtkSound.xs
 GtkStatusBox.xs
 GtkThemes.xs
+GtkUI.pm
+GtkUI.xs
 GtkUtils.xs
 MANIFEST
 typemap
diff -r d2de045b077f -r d6eae5115b31 gtk/plugins/perl/common/Makefile.PL.in
--- a/gtk/plugins/perl/common/Makefile.PL.in	Sun Sep 17 04:42:42 2006 +0000
+++ b/gtk/plugins/perl/common/Makefile.PL.in	Sun Sep 17 05:35:46 2006 +0000
@@ -2,10 +2,10 @@
 use ExtUtils::MakeMaker;
 
 WriteMakefile(
-    'NAME'          => 'Gaim::Gtk',
-    'VERSION_FROM'  => '@srcdir@/Gtk.pm', # finds $VERSION
+    'NAME'          => 'Gaim::GtkUI',
+    'VERSION_FROM'  => '@srcdir@/GtkUI.pm', # finds $VERSION
     ($] >= 5.005 ? ## Add these new keywords supported since 5.005
-	('ABSTRACT_FROM' => '@srcdir@/Gtk.pm', # finds $ABSTRACT
+	('ABSTRACT_FROM' => '@srcdir@/GtkUI.pm', # finds $ABSTRACT
 	'AUTHOR'        => 'Gaim <http://gaim.sourceforge.net/>') :  ()),
     'DEFINE'        => '@DEBUG_CFLAGS@',
     'INC'           => '-I. -I@srcdir@ -I@top_srcdir@ -I@top_srcdir@/libgaim -I@top_srcdir@/gtk @GTK_CFLAGS@',
diff -r d2de045b077f -r d6eae5115b31 gtk/plugins/perl/common/gtkmodule.h
--- a/gtk/plugins/perl/common/gtkmodule.h	Sun Sep 17 04:42:42 2006 +0000
+++ b/gtk/plugins/perl/common/gtkmodule.h	Sun Sep 17 05:35:46 2006 +0000
@@ -1,4 +1,4 @@
-typedef struct group *Gaim__Gtk__Group;
+typedef struct group *Gaim__GtkUI__Group;
 
 #define group perl_group
 
@@ -41,39 +41,39 @@
 #include "gtkutils.h"
 
 /* gtkaccount.h */
-typedef GaimGtkAccountDialogType			Gaim__Gtk__Account__Dialog__Type;
+typedef GaimGtkAccountDialogType			Gaim__GtkUI__Account__Dialog__Type;
 
 /* gtkblist.h */
-typedef GaimGtkBuddyList *				Gaim__Gtk__BuddyList;
-typedef gaim_gtk_blist_sort_function			Gaim__Gtk__BuddyList__SortFunction;
+typedef GaimGtkBuddyList *				Gaim__GtkUI__BuddyList;
+typedef gaim_gtk_blist_sort_function			Gaim__GtkUI__BuddyList__SortFunction;
 
 /* gtkconv.h */
-typedef GaimGtkConversation *				Gaim__Gtk__Conversation;
+typedef GaimGtkConversation *				Gaim__GtkUI__Conversation;
 typedef GaimUnseenState					Gaim__UnseenState;
 
 /* gtkconvwin.h */
-typedef GaimGtkWindow *					Gaim__Gtk__Conversation__Window;
+typedef GaimGtkWindow *					Gaim__GtkUI__Conversation__Window;
 typedef GaimConvPlacementFunc				Gaim__Conversation__PlacementFunc;
 
 /* gtkft.h */
-typedef GaimGtkXferDialog *				Gaim__Gtk__Xfer__Dialog;
+typedef GaimGtkXferDialog *				Gaim__GtkUI__Xfer__Dialog;
 
 /* gtkimhtml.h */
-typedef GtkIMHtml *					Gaim__Gtk__IMHtml;
-typedef GtkIMHtmlButtons					Gaim__Gtk__IMHtml__Buttons;
-typedef GtkIMHtmlFuncs *					Gaim__Gtk__IMHtml__Funcs;
-typedef GtkIMHtmlScalable *					Gaim__Gtk__IMHtml__Scalable;
-typedef GtkIMHtmlSmiley *					Gaim__Gtk__IMHtml__Smiley;
-typedef GtkIMHtmlOptions					Gaim__Gtk__IMHtml__Options;
+typedef GtkIMHtml *					Gaim__GtkUI__IMHtml;
+typedef GtkIMHtmlButtons				Gaim__GtkUI__IMHtml__Buttons;
+typedef GtkIMHtmlFuncs *				Gaim__GtkUI__IMHtml__Funcs;
+typedef GtkIMHtmlScalable *				Gaim__GtkUI__IMHtml__Scalable;
+typedef GtkIMHtmlSmiley *				Gaim__GtkUI__IMHtml__Smiley;
+typedef GtkIMHtmlOptions				Gaim__GtkUI__IMHtml__Options;
 
 /* gtkimhtmltoolbar.h */
-typedef GtkIMHtmlToolbar *					Gaim__Gtk__IMHtmlToolbar;
+typedef GtkIMHtmlToolbar *				Gaim__GtkUI__IMHtmlToolbar;
 
 /* gtkmenutray.h */
-typedef GaimGtkMenuTray *					Gaim__Gtk__MenuTray;
+typedef GaimGtkMenuTray *				Gaim__GtkUI__MenuTray;
 
 /* gtkroomlist.h */
-typedef GaimGtkRoomlistDialog *					Gaim__Gtk__Roomlist__Dialog;
+typedef GaimGtkRoomlistDialog *				Gaim__GtkUI__Roomlist__Dialog;
 
 /* gtkstatusbox.h */
-typedef GtkGaimStatusBox *						Gaim__Gtk__StatusBox;
+typedef GtkGaimStatusBox *				Gaim__GtkUI__StatusBox;
diff -r d2de045b077f -r d6eae5115b31 gtk/plugins/perl/common/typemap
--- a/gtk/plugins/perl/common/typemap	Sun Sep 17 04:42:42 2006 +0000
+++ b/gtk/plugins/perl/common/typemap	Sun Sep 17 05:35:46 2006 +0000
@@ -3,19 +3,19 @@
 Gaim::UnseenState                       T_IV
 Gaim::ButtonOrientation                 T_IV
 
-Gaim::Gtk::Account::Dialog::Type        T_IV
-Gaim::Gtk::BuddyList                    T_GaimObj
-Gaim::Gtk::BuddyList::SortFunction      T_GaimObj
-Gaim::Gtk::Conversation                 T_GaimObj
-Gaim::Gtk::Conversation::Window         T_GaimObj
-Gaim::Gtk::Xfer::Dialog                 T_GaimObj
-Gaim::Gtk::IMHtml                       T_GaimObj
-Gaim::Gtk::IMHtml::Buttons              T_IV
-Gaim::Gtk::IMHtml::Funcs                T_GaimObj
-Gaim::Gtk::IMHtml::Scalable             T_GaimObj
-Gaim::Gtk::IMHtml::Smiley               T_GaimObj
-Gaim::Gtk::IMHtml::Options              T_IV
-Gaim::Gtk::IMHtmlToolbar                T_GaimObj
-Gaim::Gtk::MenuTray                     T_GaimObj
-Gaim::Gtk::Roomlist::Dialog             T_GaimObj
-Gaim::Gtk::StatusBox                    T_GaimObj
+Gaim::GtkUI::Account::Dialog::Type      T_IV
+Gaim::GtkUI::BuddyList                  T_GaimObj
+Gaim::GtkUI::BuddyList::SortFunction    T_GaimObj
+Gaim::GtkUI::Conversation               T_GaimObj
+Gaim::GtkUI::Conversation::Window       T_GaimObj
+Gaim::GtkUI::Xfer::Dialog               T_GaimObj
+Gaim::GtkUI::IMHtml                     T_GaimObj
+Gaim::GtkUI::IMHtml::Buttons            T_IV
+Gaim::GtkUI::IMHtml::Funcs              T_GaimObj
+Gaim::GtkUI::IMHtml::Scalable           T_GaimObj
+Gaim::GtkUI::IMHtml::Smiley             T_GaimObj
+Gaim::GtkUI::IMHtml::Options            T_IV
+Gaim::GtkUI::IMHtmlToolbar              T_GaimObj
+Gaim::GtkUI::MenuTray                   T_GaimObj
+Gaim::GtkUI::Roomlist::Dialog           T_GaimObj
+Gaim::GtkUI::StatusBox                  T_GaimObj