Mercurial > pidgin.yaz

changeset 15532:40683a234203

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
merge of '3cc3e42c54c15c5f925d8bba46eedd73967a104e' and 'ed910c313d1d1832866e5ef7ce03cc354973bc55'
author Richard Laager <rlaager@wiktel.com>
date Sun, 04 Feb 2007 05:55:54 +0000
parents 3fbd4d8b5f2b (current diff) cb0750152bf6 (diff)
children 92107f572ac6
files
diffstat 35 files changed, 546 insertions(+), 357 deletions(-) [+]
line wrap: on
line diff
--- a/libpurple/protocols/jabber/disco.c	Sun Feb 04 05:51:03 2007 +0000
+++ b/libpurple/protocols/jabber/disco.c	Sun Feb 04 05:55:54 2007 +0000
@@ -257,7 +257,7 @@
 		return;
 	}
 
-	for (child = xmlnode_get_child(query, "category"); child; 
+	for (child = xmlnode_get_child(query, "identity"); child; 
 	     child = xmlnode_get_next_twin(child)) {
 		const char *category, *type, *name;
 		category = xmlnode_get_attrib(child, "category");
@@ -273,8 +273,10 @@
 
 		g_free(js->server_name);
 		js->server_name = g_strdup(name);
-		if (!strcmp(name, "Google Talk"))
-			js->googletalk = TRUE;
+		if (!strcmp(name, "Google Talk")) {
+		  printf("ADSFADFAFAFADF !!!!\n");
+		  js->googletalk = TRUE;
+		}
 	}
 
 	for (child = xmlnode_get_child(query, "feature"); child; 
--- a/libpurple/protocols/jabber/google.c	Sun Feb 04 05:51:03 2007 +0000
+++ b/libpurple/protocols/jabber/google.c	Sun Feb 04 05:55:54 2007 +0000
@@ -21,6 +21,7 @@
 
 #include "internal.h"
 #include "debug.h"
+#include "util.h"
 #include "privacy.h"
 
 #include "buddy.h"
@@ -368,3 +369,119 @@
 	/* See if he's online */
 	jabber_presence_subscription_set(js, who, "probe");
 }
+
+/* This does two passes on the string. The first pass goes through
+ * and determine if all the structured text is properly balanced, and
+ * how many instances of each there is. The second pass goes and converts
+ * everything to HTML, depending on what's figured out by the first pass.
+ * It will short circuit once it knows it has no more replacements to make
+ */
+char *jabber_google_format_to_html(const char *text)
+{
+	const char *p;
+
+	/* The start of the screen may be consdiered a space for this purpose */
+	gboolean preceding_space = TRUE;
+
+	gboolean in_bold = FALSE, in_italic = FALSE;
+	gboolean in_tag = FALSE;
+
+	gint bold_count = 0, italic_count = 0;
+
+	GString *str;
+
+	for (p = text; *p != '\0'; p = g_utf8_next_char(p)) {
+		gunichar c = g_utf8_get_char(p);
+		if (c == '*' && !in_tag) {
+			if (in_bold && (g_unichar_isspace(*(p+1)) ||
+					*(p+1) == '\0' ||
+					*(p+1) == '<')) {
+				bold_count++;
+				in_bold = FALSE;
+			} else if (preceding_space && !in_bold) {
+				bold_count++;
+				in_bold = TRUE;
+			}
+			preceding_space = TRUE;
+		} else if (c == '_' && !in_tag) {
+			if (in_italic && (g_unichar_isspace(*(p+1)) ||
+					*(p+1) == '\0' ||
+					*(p+1) == '<')) {
+				italic_count++;
+				in_italic = FALSE;
+			} else if (preceding_space && !in_italic) {
+				italic_count++;
+				in_italic = TRUE;
+			}
+			preceding_space = TRUE;
+		} else if (c == '<' && !in_tag) {
+			in_tag = TRUE;
+		} else if (c == '>' && in_tag) {
+			in_tag = FALSE;
+		} else if (!in_tag) {
+			if (g_unichar_isspace(c))
+				preceding_space = TRUE;
+			else
+				preceding_space = FALSE;
+		}
+	}
+
+	str  = g_string_new(NULL);
+	in_bold = in_italic = in_tag = FALSE;
+	preceding_space = TRUE;
+
+	for (p = text; *p != '\0'; p = g_utf8_next_char(p)) {
+		gunichar c = g_utf8_get_char(p);
+ 
+		if (bold_count < 2 && italic_count < 2 && !in_bold && !in_italic) {
+			g_string_append(str, p);
+			return g_string_free(str, FALSE);
+		}
+
+		
+		if (c == '*' && !in_tag) {
+			if (in_bold && 
+			    (g_unichar_isspace(*(p+1))||*(p+1)=='<')) { /* This is safe in UTF-8 */
+				str = g_string_append(str, "</b>");
+				in_bold = FALSE;
+				bold_count--;
+			} else if (preceding_space && bold_count > 1) {
+				str = g_string_append(str, "<b>");
+				bold_count--;
+				in_bold = TRUE;
+			} else {
+				str = g_string_append_unichar(str, c);
+			}
+			preceding_space = TRUE;
+		} else if (c == '_' && !in_tag) {
+			if (in_italic &&
+			    (g_unichar_isspace(*(p+1))||*(p+1)=='<')) {
+				str = g_string_append(str, "</i>");
+				italic_count--;
+				in_italic = FALSE;
+			} else if (preceding_space && italic_count > 1) {
+				str = g_string_append(str, "<i>");
+				italic_count--;
+				in_italic = TRUE;
+			} else {
+				str = g_string_append_unichar(str, c);
+			}
+			preceding_space = TRUE;
+		} else if (c == '<' && !in_tag) {
+			str = g_string_append_unichar(str, c);
+			in_tag = TRUE;
+		} else if (c == '>' && in_tag) {
+			str = g_string_append_unichar(str, c);
+			in_tag = FALSE;
+		} else if (!in_tag) {
+			str = g_string_append_unichar(str, c);
+			if (g_unichar_isspace(c))
+				preceding_space = TRUE;
+			else
+				preceding_space = FALSE;
+		} else {
+			str = g_string_append_unichar(str, c);
+		}
+	}	
+	return g_string_free(str, FALSE);
+}
--- a/libpurple/protocols/jabber/google.h	Sun Feb 04 05:51:03 2007 +0000
+++ b/libpurple/protocols/jabber/google.h	Sun Feb 04 05:55:54 2007 +0000
@@ -39,6 +39,8 @@
 void jabber_google_roster_add_deny(GaimConnection *gc, const char *who);
 void jabber_google_roster_rem_deny(GaimConnection *gc, const char *who);
 
+char *jabber_google_format_to_html(const char *text);
+
 
 
 #endif   /* _GAIM_GOOGLE_H_ */
--- a/libpurple/protocols/jabber/message.c	Sun Feb 04 05:51:03 2007 +0000
+++ b/libpurple/protocols/jabber/message.c	Sun Feb 04 05:55:54 2007 +0000
@@ -27,6 +27,7 @@
 
 #include "buddy.h"
 #include "chat.h"
+#include "google.h"
 #include "message.h"
 #include "xmlnode.h"
 
@@ -99,6 +100,12 @@
 				g_free(jbr->thread_id);
 			jbr->thread_id = g_strdup(jbr->thread_id);
 		}
+		
+		if (jm->js->googletalk && jm->xhtml == NULL) {
+			char *tmp = jm->body;
+			jm->body = jabber_google_format_to_html(jm->body);
+			g_free(tmp);
+		}
 		serv_got_im(jm->js->gc, from, jm->xhtml ? jm->xhtml : jm->body, 0,
 				jm->sent);
 	}
@@ -255,7 +262,7 @@
 	if(type) {
 		if(!strcmp(type, "normal"))
 			jm->type = JABBER_MESSAGE_NORMAL;
-		else if(!strcmp(type, "chat"))
+	else if(!strcmp(type, "chat"))
 			jm->type = JABBER_MESSAGE_CHAT;
 		else if(!strcmp(type, "groupchat"))
 			jm->type = JABBER_MESSAGE_GROUPCHAT;
--- a/libpurple/protocols/oscar/oscar.c	Sun Feb 04 05:51:03 2007 +0000
+++ b/libpurple/protocols/oscar/oscar.c	Sun Feb 04 05:55:54 2007 +0000
@@ -58,6 +58,7 @@
 #define OSCAR_STATUS_ID_OCCUPIED    "occupied"
 #define OSCAR_STATUS_ID_FREE4CHAT   "free4chat"
 #define OSCAR_STATUS_ID_CUSTOM      "custom"
+#define OSCAR_STATUS_ID_MOBILE	    "mobile"
 
 #define AIMHASHDATA "http://gaim.sourceforge.net/aim_data.php3"
 
@@ -1767,6 +1768,13 @@
 											 info->status, info->status_len);
 	}
 
+	if (info->flags & AIM_FLAG_WIRELESS || info->capabilities & OSCAR_CAPABILITY_HIPTOP)
+	{
+		gaim_prpl_got_user_status(account, info->sn, OSCAR_STATUS_ID_MOBILE, NULL);
+	} else {
+		gaim_prpl_got_user_status_deactive(account, info->sn, OSCAR_STATUS_ID_MOBILE);
+	}
+
 	if (have_status_message)
 	{
 		gaim_prpl_got_user_status(account, info->sn, status_id,
@@ -1881,7 +1889,7 @@
 	va_end(ap);
 
 	gaim_prpl_got_user_status(account, info->sn, OSCAR_STATUS_ID_OFFLINE, NULL);
-
+	gaim_prpl_got_user_status_deactive(account, info->sn, OSCAR_STATUS_ID_MOBILE);
 	g_hash_table_remove(od->buddyinfo, gaim_normalize(gc->account, info->sn));
 
 	return 1;
@@ -5431,10 +5439,6 @@
 	if (userinfo != NULL ) {
 		if (userinfo->flags & AIM_FLAG_ADMINISTRATOR)
 			return "admin";
-		if (userinfo->flags & AIM_FLAG_WIRELESS)
-			return "mobile";
-		if (userinfo->capabilities & OSCAR_CAPABILITY_HIPTOP)
-			return "mobile";
 		if (userinfo->flags & AIM_FLAG_ACTIVEBUDDY)
 			return "bot";
 		if (userinfo->flags & AIM_FLAG_AOL)
@@ -5718,6 +5722,9 @@
 									 NULL, TRUE, TRUE, FALSE);
 	status_types = g_list_prepend(status_types, type);
 
+	type = gaim_status_type_new_full(GAIM_STATUS_MOBILE, OSCAR_STATUS_ID_MOBILE, NULL, FALSE, FALSE, TRUE);
+	status_types = g_list_prepend(status_types, type);
+
 	/* ICQ-specific status types */
 	type = gaim_status_type_new_with_attrs(GAIM_STATUS_UNAVAILABLE,
 				OSCAR_STATUS_ID_OCCUPIED,
--- a/libpurple/prpl.c	Sun Feb 04 05:51:03 2007 +0000
+++ b/libpurple/prpl.c	Sun Feb 04 05:55:54 2007 +0000
@@ -162,6 +162,31 @@
 		serv_got_typing_stopped(gaim_account_get_connection(account), name);
 }
 
+void gaim_prpl_got_user_status_deactive(GaimAccount *account, const char *name,
+					const char *status_id)
+{
+	GSList *list;
+	GaimBuddy *buddy;
+	GaimPresence *presence;
+	GaimStatus *status;
+	GaimStatus *old_status;
+	va_list args;
+
+	g_return_if_fail(account   != NULL);
+	g_return_if_fail(name      != NULL);
+	g_return_if_fail(status_id != NULL);
+	g_return_if_fail(gaim_account_is_connected(account) || gaim_account_is_connecting(account));
+
+	if ((buddy = gaim_find_buddy(account, name)) == NULL)
+		return;
+
+	presence = gaim_buddy_get_presence(buddy);
+	status   = gaim_presence_get_status(presence, status_id);
+
+	g_return_if_fail(status != NULL);
+	gaim_status_set_active(status, FALSE);
+}
+
 static void
 do_prpl_change_account_status(GaimAccount *account,
 								GaimStatus *old_status, GaimStatus *new_status)
--- a/libpurple/prpl.h	Sun Feb 04 05:51:03 2007 +0000
+++ b/libpurple/prpl.h	Sun Feb 04 05:55:54 2007 +0000
@@ -388,7 +388,7 @@
 								   time_t login_time);
 
 /**
- * Notifies Gaim that a user's status has changed.
+ * Notifies Gaim that a user's status has been activated.
  *
  * This is meant to be called from protocol plugins.
  *
@@ -400,6 +400,19 @@
  */
 void gaim_prpl_got_user_status(GaimAccount *account, const char *name,
 							   const char *status_id, ...);
+
+/**
+ * Notifies libpurple that a user's status has been deactivated
+ *
+ * This is meant to be called from protocol plugins.
+ *
+ * @param account   The account the user is on.
+ * @param name      The screen name of the user.
+ * @param status_id The status ID.
+ */
+void gaim_prpl_got_user_status_deactive(GaimAccount *account, const char *name,
+					const char *status_id);
+ 
 /**
  * Informs the server that an account's status changed.
  *
--- a/libpurple/status.c	Sun Feb 04 05:51:03 2007 +0000
+++ b/libpurple/status.c	Sun Feb 04 05:55:54 2007 +0000
@@ -1549,18 +1549,20 @@
 gaim_presence_is_status_primitive_active(const GaimPresence *presence,
 		GaimStatusPrimitive primitive)
 {
-	GaimStatus *status;
-	GaimStatusType *status_type;
+	GList *l;
 
 	g_return_val_if_fail(presence  != NULL,              FALSE);
 	g_return_val_if_fail(primitive != GAIM_STATUS_UNSET, FALSE);
 
-	status      = gaim_presence_get_active_status(presence);
-	status_type = gaim_status_get_type(status);
+	for (l = gaim_presence_get_statuses(presence);
+	     l != NULL; l = l->next)	{
+		GaimStatus *temp_status = l->data;
+		GaimStatusType *type = gaim_status_get_type(temp_status);
 
-	if (gaim_status_type_get_primitive(status_type) == primitive)
-		return TRUE;
-
+		if (gaim_status_type_get_primitive(type) == primitive &&
+		    gaim_status_is_active(temp_status))
+			return TRUE;
+	}
 	return FALSE;
 }
 
--- a/pidgin/gtkblist.c	Sun Feb 04 05:51:03 2007 +0000
+++ b/pidgin/gtkblist.c	Sun Feb 04 05:55:54 2007 +0000
@@ -2977,6 +2977,10 @@
 	const char *name = NULL;
 	char *filename, *path;
 	GdkPixbuf *ret;
+	GaimPresence *p;
+
+
+
 	if(GAIM_BLIST_NODE_IS_CONTACT(node)) {
 		if(!gtknode->contact_expanded) {
 			buddy = gaim_contact_get_priority_buddy((GaimContact*)node);
@@ -2995,7 +2999,17 @@
 	
 	if (!gaim_privacy_check(buddy->account, gaim_buddy_get_name(buddy))) {
 		path = g_build_filename(DATADIR, "pixmaps", "pidgin", "emblems", "16", "blocked.png", NULL);
-		return gdk_pixbuf_new_from_file(path, NULL);	
+		ret = gdk_pixbuf_new_from_file(path, NULL);
+		g_free(path);
+		return ret;
+	}
+	
+	p = gaim_buddy_get_presence(buddy);
+	if (gaim_presence_is_status_primitive_active(p, GAIM_STATUS_MOBILE)) {
+		path = g_build_filename(DATADIR, "pixmaps", "pidgin", "emblems", "16", "mobile.png", NULL);
+		ret = gdk_pixbuf_new_from_file(path, NULL);
+		g_free(path);
+		return ret;	
 	}
 
 	prpl = gaim_find_prpl(gaim_account_get_protocol_id(buddy->account));
--- a/pidgin/plugins/perl/common/GtkAccount.xs	Sun Feb 04 05:51:03 2007 +0000
+++ b/pidgin/plugins/perl/common/GtkAccount.xs	Sun Feb 04 05:55:54 2007 +0000
@@ -1,24 +1,24 @@
 #include "gtkmodule.h"
 
-MODULE = Gaim::GtkUI::Account  PACKAGE = Gaim::GtkUI::Account  PREFIX = gaim_gtk_account_
+MODULE = Pidgin::Account  PACKAGE = Pidgin::Account  PREFIX = pidgin_account_
 PROTOTYPES: ENABLE
 
 Gaim::Handle
-gaim_gtk_account_get_handle()
+pidgin_account_get_handle()
 
-MODULE = Gaim::GtkUI::Account  PACKAGE = Gaim::GtkUI::Account::Dialog  PREFIX = gaim_gtk_account_dialog_
+MODULE = Pidgin::Account  PACKAGE = Pidgin::Account::Dialog  PREFIX = pidgin_account_dialog_
 PROTOTYPES: ENABLE
 
 void
-gaim_gtk_account_dialog_show(type, account)
-	Gaim::GtkUI::Account::Dialog::Type type
+pidgin_account_dialog_show(type, account)
+	Pidgin::Account::Dialog::Type type
 	Gaim::Account account
 
-MODULE = Gaim::GtkUI::Account  PACKAGE = Gaim::GtkUI::Account::Window  PREFIX = gaim_gtk_accounts_window_
+MODULE = Pidgin::Account  PACKAGE = Pidgin::Account::Window  PREFIX = pidgin_accounts_window_
 PROTOTYPES: ENABLE
 
 void
-gaim_gtk_accounts_window_show()
+pidgin_accounts_window_show()
 
 void
-gaim_gtk_accounts_window_hide()
+pidgin_accounts_window_hide()
--- a/pidgin/plugins/perl/common/GtkBlist.xs	Sun Feb 04 05:51:03 2007 +0000
+++ b/pidgin/plugins/perl/common/GtkBlist.xs	Sun Feb 04 05:55:54 2007 +0000
@@ -1,76 +1,76 @@
 #include "gtkmodule.h"
 
-MODULE = Gaim::GtkUI::BuddyList  PACKAGE = Gaim::GtkUI::BuddyList  PREFIX = gaim_gtk_blist_
+MODULE = Pidgin::BuddyList  PACKAGE = Pidgin::BuddyList  PREFIX = pidgin_blist_
 PROTOTYPES: ENABLE
 
 Gaim::Handle
-gaim_gtk_blist_get_handle()
+pidgin_blist_get_handle()
 
-Gaim::GtkUI::BuddyList
-gaim_gtk_blist_get_default_gtk_blist()
+Pidgin::BuddyList
+pidgin_blist_get_default_gtk_blist()
 
 void
-gaim_gtk_blist_refresh(list)
+pidgin_blist_refresh(list)
 	Gaim::BuddyList list
 
 void
-gaim_gtk_blist_update_refresh_timeout()
+pidgin_blist_update_refresh_timeout()
 
 gboolean
-gaim_gtk_blist_node_is_contact_expanded(node)
+pidgin_blist_node_is_contact_expanded(node)
 	Gaim::BuddyList::Node node
 
 void
-gaim_gtk_blist_toggle_visibility()
+pidgin_blist_toggle_visibility()
 
 void
-gaim_gtk_blist_visibility_manager_add()
+pidgin_blist_visibility_manager_add()
 
 void
-gaim_gtk_blist_visibility_manager_remove()
+pidgin_blist_visibility_manager_remove()
 
 void
-gaim_gtk_blist_get_sort_methods()
+pidgin_blist_get_sort_methods()
 PREINIT:
 	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::GtkUI::BuddyList::SortMethod")));
+	for (l = pidgin_blist_get_sort_methods(); l != NULL; l = l->next) {
+		XPUSHs(sv_2mortal(gaim_perl_bless_object(l->data, "Pidgin::BuddyList::SortMethod")));
 	}
 
 void
-gaim_gtk_blist_sort_method_reg(id, name, func)
+pidgin_blist_sort_method_reg(id, name, func)
 	const char * id
 	const char * name
-	Gaim::GtkUI::BuddyList::SortFunction func
+	Pidgin::BuddyList::SortFunction func
 
 void
-gaim_gtk_blist_sort_method_unreg(id)
+pidgin_blist_sort_method_unreg(id)
 	const char * id
 
 void
-gaim_gtk_blist_sort_method_set(id)
+pidgin_blist_sort_method_set(id)
 	const char * id
 
 void
-gaim_gtk_blist_setup_sort_methods()
+pidgin_blist_setup_sort_methods()
 
 void
-gaim_gtk_blist_update_accounts_menu()
+pidgin_blist_update_accounts_menu()
 
 void
-gaim_gtk_blist_update_plugin_actions()
+pidgin_blist_update_plugin_actions()
 
 void
-gaim_gtk_blist_update_sort_methods()
+pidgin_blist_update_sort_methods()
 
 gboolean
-gaim_gtk_blist_joinchat_is_showable()
+pidgin_blist_joinchat_is_showable()
 
 void
-gaim_gtk_blist_joinchat_show()
+pidgin_blist_joinchat_show()
 
 void
-gaim_gtk_blist_update_account_error_state(account, message)
+pidgin_blist_update_account_error_state(account, message)
 	Gaim::Account account
 	const char * message
--- a/pidgin/plugins/perl/common/GtkConn.xs	Sun Feb 04 05:51:03 2007 +0000
+++ b/pidgin/plugins/perl/common/GtkConn.xs	Sun Feb 04 05:55:54 2007 +0000
@@ -1,7 +1,7 @@
 #include "gtkmodule.h"
 
-MODULE = Gaim::GtkUI::Connection  PACKAGE = Gaim::GtkUI::Connection  PREFIX = gaim_gtk_connection_
+MODULE = Pidgin::Connection  PACKAGE = Pidgin::Connection  PREFIX = pidgin_connection_
 PROTOTYPES: ENABLE
 
 Gaim::Handle
-gaim_gtk_connection_get_handle()
+pidgin_connection_get_handle()
--- a/pidgin/plugins/perl/common/GtkConv.xs	Sun Feb 04 05:51:03 2007 +0000
+++ b/pidgin/plugins/perl/common/GtkConv.xs	Sun Feb 04 05:55:54 2007 +0000
@@ -1,56 +1,56 @@
 #include "gtkmodule.h"
 
-MODULE = Gaim::GtkUI::Conversation  PACKAGE = Gaim::GtkUI::Conversation  PREFIX = gaim_gtkconv_
+MODULE = Pidgin::Conversation  PACKAGE = Pidgin::Conversation  PREFIX = pidgin_conv_
 PROTOTYPES: ENABLE
 
 void
-gaim_gtkconv_update_buddy_icon(conv)
+pidgin_conv_update_buddy_icon(conv)
 	Gaim::Conversation conv
 
 void
-gaim_gtkconv_switch_active_conversation(conv)
+pidgin_conv_switch_active_conversation(conv)
 	Gaim::Conversation conv
 
 void
-gaim_gtkconv_update_buttons_by_protocol(conv)
+pidgin_conv_update_buttons_by_protocol(conv)
 	Gaim::Conversation conv
 
 void
-gaim_gtkconv_present_conversation(conv)
+pidgin_conv_present_conversation(conv)
 	Gaim::Conversation conv
 
-Gaim::GtkUI::Conversation::Window
-gaim_gtkconv_get_window(conv)
-	Gaim::GtkUI::Conversation conv
+Pidgin::Conversation::Window
+pidgin_conv_get_window(conv)
+	Pidgin::Conversation conv
 
 void
-gaim_gtkconv_new(class, conv)
+pidgin_conv_new(class, conv)
 	Gaim::Conversation conv
     C_ARGS:
 	conv
 
 gboolean
-gaim_gtkconv_is_hidden(gtkconv)
-	Gaim::GtkUI::Conversation gtkconv
+pidgin_conv_is_hidden(gtkconv)
+	Pidgin::Conversation gtkconv
 
 void
-gaim_gtkconv_get_gtkconv(conv)
+pidgin_conv_get_gtkconv(conv)
 	Gaim::Conversation conv
 PPCODE:
 	if (conv != NULL && GAIM_IS_GTK_CONVERSATION(conv))
 		XPUSHs(sv_2mortal(gaim_perl_bless_object(
-				GAIM_GTK_CONVERSATION(conv),
-				"Gaim::GtkUI::Conversation")));
+				PIDGIN_CONVERSATION(conv),
+				"Pidgin::Conversation")));
 
-MODULE = Gaim::GtkUI::Conversation  PACKAGE = Gaim::GtkUI::Conversations  PREFIX = gaim_gtk_conversations_
+MODULE = Pidgin::Conversation  PACKAGE = Pidgin::Conversations  PREFIX = pidgin_conversations_
 PROTOTYPES: ENABLE
 
 void
-gaim_gtk_conversations_find_unseen_list(type, min_state, hidden_only, max_count)
+pidgin_conversations_find_unseen_list(type, min_state, hidden_only, max_count)
 	Gaim::ConversationType type
 	Gaim::UnseenState min_state
 	gboolean hidden_only
 	guint max_count
 
 Gaim::Handle
-gaim_gtk_conversations_get_handle()
+pidgin_conversations_get_handle()
--- a/pidgin/plugins/perl/common/GtkConvWin.xs	Sun Feb 04 05:51:03 2007 +0000
+++ b/pidgin/plugins/perl/common/GtkConvWin.xs	Sun Feb 04 05:55:54 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")));
 	}
--- a/pidgin/plugins/perl/common/GtkDebug.xs	Sun Feb 04 05:51:03 2007 +0000
+++ b/pidgin/plugins/perl/common/GtkDebug.xs	Sun Feb 04 05:55:54 2007 +0000
@@ -1,16 +1,16 @@
 #include "gtkmodule.h"
 
-MODULE = Gaim::GtkUI::Debug  PACKAGE = Gaim::GtkUI::Debug  PREFIX = gaim_gtk_debug_
+MODULE = Pidgin::Debug  PACKAGE = Pidgin::Debug  PREFIX = pidgin_debug_
 PROTOTYPES: ENABLE
 
 Gaim::Handle
-gaim_gtk_debug_get_handle()
+pidgin_debug_get_handle()
 
-MODULE = Gaim::GtkUI::Debug  PACKAGE = Gaim::GtkUI::Debug::Window  PREFIX = gaim_gtk_debug_window_
+MODULE = Pidgin::Debug  PACKAGE = Pidgin::Debug::Window  PREFIX = pidgin_debug_window_
 PROTOTYPES: ENABLE
 
 void
-gaim_gtk_debug_window_show()
+pidgin_debug_window_show()
 
 void
-gaim_gtk_debug_window_hide()
+pidgin_debug_window_hide()
--- a/pidgin/plugins/perl/common/GtkDialogs.xs	Sun Feb 04 05:51:03 2007 +0000
+++ b/pidgin/plugins/perl/common/GtkDialogs.xs	Sun Feb 04 05:55:54 2007 +0000
@@ -1,52 +1,52 @@
 #include "gtkmodule.h"
 
-MODULE = Gaim::GtkUI::Dialogs  PACKAGE = Gaim::GtkUI::Dialogs  PREFIX = gaim_gtkdialogs_
+MODULE = Pidgin::Dialogs  PACKAGE = Pidgin::Dialogs  PREFIX = pidgindialogs_
 PROTOTYPES: ENABLE
 
 void
-gaim_gtkdialogs_destroy_all()
+pidgindialogs_destroy_all()
 
 void
-gaim_gtkdialogs_about()
+pidgindialogs_about()
 
 void
-gaim_gtkdialogs_im()
+pidgindialogs_im()
 
 void
-gaim_gtkdialogs_im_with_user(account, username)
+pidgindialogs_im_with_user(account, username)
 	Gaim::Account account
 	const char * username
 
 void
-gaim_gtkdialogs_info()
+pidgindialogs_info()
 
 void
-gaim_gtkdialogs_log()
+pidgindialogs_log()
 
 void
-gaim_gtkdialogs_alias_contact(contact)
+pidgindialogs_alias_contact(contact)
 	Gaim::BuddyList::Contact contact
 
 void
-gaim_gtkdialogs_alias_buddy(buddy)
+pidgindialogs_alias_buddy(buddy)
 	Gaim::BuddyList::Buddy buddy
 
 void
-gaim_gtkdialogs_alias_chat(chat)
+pidgindialogs_alias_chat(chat)
 	Gaim::BuddyList::Chat chat
 
 void
-gaim_gtkdialogs_remove_buddy(buddy)
+pidgindialogs_remove_buddy(buddy)
 	Gaim::BuddyList::Buddy buddy
 
 void
-gaim_gtkdialogs_remove_group(group)
+pidgindialogs_remove_group(group)
 	Gaim::BuddyList::Group group
 
 void
-gaim_gtkdialogs_remove_chat(chat)
+pidgindialogs_remove_chat(chat)
 	Gaim::BuddyList::Chat chat
 
 void
-gaim_gtkdialogs_remove_contact(contact)
+pidgindialogs_remove_contact(contact)
 	Gaim::BuddyList::Contact contact
--- a/pidgin/plugins/perl/common/GtkFt.xs	Sun Feb 04 05:51:03 2007 +0000
+++ b/pidgin/plugins/perl/common/GtkFt.xs	Sun Feb 04 05:55:54 2007 +0000
@@ -1,50 +1,50 @@
 #include "gtkmodule.h"
 
-MODULE = Gaim::GtkUI::Xfer  PACKAGE = Gaim::GtkUI::Xfer  PREFIX = gaim_gtk_xfer_
+MODULE = Pidgin::Xfer  PACKAGE = Pidgin::Xfer  PREFIX = pidgin_xfer_
 PROTOTYPES: ENABLE
 
 void
 gaim_set_gtkxfer_dialog(dialog)
-	Gaim::GtkUI::Xfer::Dialog dialog
+	Pidgin::Xfer::Dialog dialog
 
-Gaim::GtkUI::Xfer::Dialog
+Pidgin::Xfer::Dialog
 gaim_get_gtkxfer_dialog()
 
-MODULE = Gaim::GtkUI::Xfer  PACKAGE = Gaim::GtkUI::Xfer::Dialog  PREFIX = gaim_gtkxfer_dialog_
+MODULE = Pidgin::Xfer  PACKAGE = Pidgin::Xfer::Dialog  PREFIX = pidginxfer_dialog_
 PROTOTYPES: ENABLE
 
-Gaim::GtkUI::Xfer::Dialog
-gaim_gtkxfer_dialog_new(class)
+Pidgin::Xfer::Dialog
+pidginxfer_dialog_new(class)
     C_ARGS: /* void */
 
 void
-gaim_gtkxfer_dialog_destroy(dialog)
-	Gaim::GtkUI::Xfer::Dialog dialog
+pidginxfer_dialog_destroy(dialog)
+	Pidgin::Xfer::Dialog dialog
 
 void
-gaim_gtkxfer_dialog_show(dialog = NULL)
-	Gaim::GtkUI::Xfer::Dialog dialog
+pidginxfer_dialog_show(dialog = NULL)
+	Pidgin::Xfer::Dialog dialog
 
 void
-gaim_gtkxfer_dialog_hide(dialog)
-	Gaim::GtkUI::Xfer::Dialog dialog
+pidginxfer_dialog_hide(dialog)
+	Pidgin::Xfer::Dialog dialog
 
 void
-gaim_gtkxfer_dialog_add_xfer(dialog, xfer)
-	Gaim::GtkUI::Xfer::Dialog dialog
+pidginxfer_dialog_add_xfer(dialog, xfer)
+	Pidgin::Xfer::Dialog dialog
 	Gaim::Xfer xfer
 
 void
-gaim_gtkxfer_dialog_remove_xfer(dialog, xfer)
-	Gaim::GtkUI::Xfer::Dialog dialog
+pidginxfer_dialog_remove_xfer(dialog, xfer)
+	Pidgin::Xfer::Dialog dialog
 	Gaim::Xfer xfer
 
 void
-gaim_gtkxfer_dialog_cancel_xfer(dialog, xfer)
-	Gaim::GtkUI::Xfer::Dialog dialog
+pidginxfer_dialog_cancel_xfer(dialog, xfer)
+	Pidgin::Xfer::Dialog dialog
 	Gaim::Xfer xfer
 
 void
-gaim_gtkxfer_dialog_update_xfer(dialog, xfer)
-	Gaim::GtkUI::Xfer::Dialog dialog
+pidginxfer_dialog_update_xfer(dialog, xfer)
+	Pidgin::Xfer::Dialog dialog
 	Gaim::Xfer xfer
--- a/pidgin/plugins/perl/common/GtkIMHtml.xs	Sun Feb 04 05:51:03 2007 +0000
+++ b/pidgin/plugins/perl/common/GtkIMHtml.xs	Sun Feb 04 05:55:54 2007 +0000
@@ -13,9 +13,9 @@
  * about doing that.
 void
 gtk_imhtml_insert_html_at_iter(imhtml, text, options, iter)
-	Gaim::GtkUI::IMHtml imhtml
+	Pidgin::IMHtml imhtml
 	const gchar * text
-	Gaim::GtkUI::IMHtml::Options options
+	Pidgin::IMHtml::Options options
 	Gtk::TextIter iter
 */
 
@@ -24,7 +24,7 @@
  * about doing that.
 void
 gtk_imhtml_delete(imhtml, start, end)
-	Gaim::GtkUI::IMHtml imhtml
+	Pidgin::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::GtkUI::IMHtml imhtml
+	Pidgin::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::GtkUI::IMHtml imhtml
+	Pidgin::IMHtml imhtml
 	const char * sml
 	char * smiley
 	Gtk::TextIter iter
 
 void
 gtk_imhtml_insert_image_at_iter(imhtml, id, iter)
-	Gaim::GtkUI::IMHtml imhtml
+	Pidgin::IMHtml imhtml
 	int id
 	Gtk::TextIter iter
 */
@@ -62,7 +62,7 @@
  * about doing that.
 gchar_own *
 gtk_imhtml_get_markup_range(imhtml, start, end)
-	Gaim::GtkUI::IMHtml imhtml
+	Pidgin::IMHtml imhtml
 	Gtk::TextIter start
 	Gtk::TextIter end
 */
@@ -72,7 +72,7 @@
  * about doing that.
 gchar_own *
 gtk_imhtml_get_text(imhtml, start, end)
-	Gaim::GtkUI::IMHtml imhtml
+	Pidgin::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::GtkUI::IMHtml::Scalable
+Pidgin::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::GtkUI::IMHtml::Scalable scale
-	Gaim::GtkUI::IMHtml imhtml
+	Pidgin::IMHtml::Scalable scale
+	Pidgin::IMHtml imhtml
 	Gtk::TextIter iter
 */
 
@@ -102,69 +102,69 @@
  * about doing that.
 void
 gtk_imhtml_hr_add_to(scale, imhtml, iter)
-	Gaim::GtkUI::IMHtml::Scalable scale
-	Gaim::GtkUI::IMHtml imhtml
+	Pidgin::IMHtml::Scalable scale
+	Pidgin::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::GtkUI::IMHtml imhtml
+	Pidgin::IMHtml imhtml
 	gboolean * bold
 	gboolean * italic
 	gboolean * underline
 */
 
-MODULE = Gaim::GtkUI::IMHtml  PACKAGE = Gaim::GtkUI::IMHtml  PREFIX = gtk_imhtml_
+MODULE = Pidgin::IMHtml  PACKAGE = Pidgin::IMHtml  PREFIX = gtk_imhtml_
 PROTOTYPES: ENABLE
 
-Gaim::GtkUI::IMHtml::Smiley
+Pidgin::IMHtml::Smiley
 gtk_imhtml_smiley_get(imhtml, sml, text)
-	Gaim::GtkUI::IMHtml imhtml
+	Pidgin::IMHtml imhtml
 	const gchar * sml
 	const gchar * text
 
 void
 gtk_imhtml_associate_smiley(imhtml, sml, smiley)
-	Gaim::GtkUI::IMHtml imhtml
+	Pidgin::IMHtml imhtml
 	const gchar * sml
-	Gaim::GtkUI::IMHtml::Smiley smiley
+	Pidgin::IMHtml::Smiley smiley
 
 void
 gtk_imhtml_remove_smileys(imhtml)
-	Gaim::GtkUI::IMHtml imhtml
+	Pidgin::IMHtml imhtml
 
 void
 gtk_imhtml_set_funcs(imhtml, f)
-	Gaim::GtkUI::IMHtml imhtml
-	Gaim::GtkUI::IMHtml::Funcs f
+	Pidgin::IMHtml imhtml
+	Pidgin::IMHtml::Funcs f
 
 void
 gtk_imhtml_show_comments(imhtml, show)
-	Gaim::GtkUI::IMHtml imhtml
+	Pidgin::IMHtml imhtml
 	gboolean show
 
 const char *
 gtk_imhtml_get_protocol_name(imhtml)
-	Gaim::GtkUI::IMHtml imhtml
+	Pidgin::IMHtml imhtml
 
 void
 gtk_imhtml_set_protocol_name(imhtml, protocol_name)
-	Gaim::GtkUI::IMHtml imhtml
+	Pidgin::IMHtml imhtml
 	const gchar * protocol_name
 
 void
 gtk_imhtml_append_text(imhtml, text, options)
-	Gaim::GtkUI::IMHtml imhtml
+	Pidgin::IMHtml imhtml
 	const gchar * text
-	Gaim::GtkUI::IMHtml::Options options
+	Pidgin::IMHtml::Options options
 
 void
 gtk_imhtml_append_text_with_images(imhtml, text, options, unused = NULL)
-	Gaim::GtkUI::IMHtml imhtml
+	Pidgin::IMHtml imhtml
 	const gchar * text
-	Gaim::GtkUI::IMHtml::Options options
+	Pidgin::IMHtml::Options options
 	SV *unused
 PREINIT:
 	GSList *t_GL;
@@ -181,136 +181,136 @@
 
 void
 gtk_imhtml_scroll_to_end(imhtml, smooth)
-	Gaim::GtkUI::IMHtml imhtml
+	Pidgin::IMHtml imhtml
 	gboolean smooth
 
 void
 gtk_imhtml_clear(imhtml)
-	Gaim::GtkUI::IMHtml imhtml
+	Pidgin::IMHtml imhtml
 
 void
 gtk_imhtml_page_up(imhtml)
-	Gaim::GtkUI::IMHtml imhtml
+	Pidgin::IMHtml imhtml
 
 void
 gtk_imhtml_page_down(imhtml)
-	Gaim::GtkUI::IMHtml imhtml
+	Pidgin::IMHtml imhtml
 
 void
 gtk_imhtml_set_editable(imhtml, editable)
-	Gaim::GtkUI::IMHtml imhtml
+	Pidgin::IMHtml imhtml
 	gboolean editable
 
 void
 gtk_imhtml_set_whole_buffer_formatting_only(imhtml, wbo)
-	Gaim::GtkUI::IMHtml imhtml
+	Pidgin::IMHtml imhtml
 	gboolean wbo
 
 void
 gtk_imhtml_set_format_functions(imhtml, buttons)
-	Gaim::GtkUI::IMHtml imhtml
-	Gaim::GtkUI::IMHtml::Buttons buttons
+	Pidgin::IMHtml imhtml
+	Pidgin::IMHtml::Buttons buttons
 
-Gaim::GtkUI::IMHtml::Buttons
+Pidgin::IMHtml::Buttons
 gtk_imhtml_get_format_functions(imhtml)
-	Gaim::GtkUI::IMHtml imhtml
+	Pidgin::IMHtml imhtml
 
 gchar_own *
 gtk_imhtml_get_current_fontface(imhtml)
-	Gaim::GtkUI::IMHtml imhtml
+	Pidgin::IMHtml imhtml
 
 gchar_own *
 gtk_imhtml_get_current_forecolor(imhtml)
-	Gaim::GtkUI::IMHtml imhtml
+	Pidgin::IMHtml imhtml
 
 gchar_own *
 gtk_imhtml_get_current_backcolor(imhtml)
-	Gaim::GtkUI::IMHtml imhtml
+	Pidgin::IMHtml imhtml
 
 gchar_own *
 gtk_imhtml_get_current_background(imhtml)
-	Gaim::GtkUI::IMHtml imhtml
+	Pidgin::IMHtml imhtml
 
 gint
 gtk_imhtml_get_current_fontsize(imhtml)
-	Gaim::GtkUI::IMHtml imhtml
+	Pidgin::IMHtml imhtml
 
 gboolean
 gtk_imhtml_get_editable(imhtml)
-	Gaim::GtkUI::IMHtml imhtml
+	Pidgin::IMHtml imhtml
 
 void
 gtk_imhtml_clear_formatting(imhtml)
-	Gaim::GtkUI::IMHtml imhtml
+	Pidgin::IMHtml imhtml
 
 void
 gtk_imhtml_toggle_bold(imhtml)
-	Gaim::GtkUI::IMHtml imhtml
+	Pidgin::IMHtml imhtml
 
 void
 gtk_imhtml_toggle_italic(imhtml)
-	Gaim::GtkUI::IMHtml imhtml
+	Pidgin::IMHtml imhtml
 
 void
 gtk_imhtml_toggle_underline(imhtml)
-	Gaim::GtkUI::IMHtml imhtml
+	Pidgin::IMHtml imhtml
 
 void
 gtk_imhtml_toggle_strike(imhtml)
-	Gaim::GtkUI::IMHtml imhtml
+	Pidgin::IMHtml imhtml
 
 void
 gtk_imhtml_toggle_forecolor(imhtml, color)
-	Gaim::GtkUI::IMHtml imhtml
+	Pidgin::IMHtml imhtml
 	const char * color
 
 void
 gtk_imhtml_toggle_backcolor(imhtml, color)
-	Gaim::GtkUI::IMHtml imhtml
+	Pidgin::IMHtml imhtml
 	const char * color
 
 void
 gtk_imhtml_toggle_background(imhtml, color)
-	Gaim::GtkUI::IMHtml imhtml
+	Pidgin::IMHtml imhtml
 	const char * color
 
 void
 gtk_imhtml_toggle_fontface(imhtml, face)
-	Gaim::GtkUI::IMHtml imhtml
+	Pidgin::IMHtml imhtml
 	const char * face
 
 void
 gtk_imhtml_toggle_link(imhtml, url)
-	Gaim::GtkUI::IMHtml imhtml
+	Pidgin::IMHtml imhtml
 	const char * url
 
 void
 gtk_imhtml_insert_smiley(imhtml, sml, smiley)
-	Gaim::GtkUI::IMHtml imhtml
+	Pidgin::IMHtml imhtml
 	const char * sml
 	char * smiley
 
 void
 gtk_imhtml_font_set_size(imhtml, size)
-	Gaim::GtkUI::IMHtml imhtml
+	Pidgin::IMHtml imhtml
 	gint size
 
 void
 gtk_imhtml_font_shrink(imhtml)
-	Gaim::GtkUI::IMHtml imhtml
+	Pidgin::IMHtml imhtml
 
 void
 gtk_imhtml_font_grow(imhtml)
-	Gaim::GtkUI::IMHtml imhtml
+	Pidgin::IMHtml imhtml
 
 gchar_own *
 gtk_imhtml_get_markup(imhtml)
-	Gaim::GtkUI::IMHtml imhtml
+	Pidgin::IMHtml imhtml
 
 # /* ETAN Test this, and document well that it returns an arrayref */
 void
 gtk_imhtml_get_markup_lines(imhtml)
-	Gaim::GtkUI::IMHtml imhtml
+	Pidgin::IMHtml imhtml
 PREINIT:
 	gint i;
 	AV *lines;
@@ -323,43 +323,43 @@
 	}
 	XPUSHs(sv_2mortal(newRV_noinc((SV *)lines)));
 
-MODULE = Gaim::GtkUI::IMHtml  PACKAGE = Gaim::GtkUI::IMHtml::Scalable  PREFIX = gtk_imhtml_image_
+MODULE = Pidgin::IMHtml  PACKAGE = Pidgin::IMHtml::Scalable  PREFIX = gtk_imhtml_image_
 PROTOTYPES: ENABLE
 
 void
 gtk_imhtml_image_free(scale)
-	Gaim::GtkUI::IMHtml::Scalable scale
+	Pidgin::IMHtml::Scalable scale
 
 void
 gtk_imhtml_image_scale(scale, width, height)
-	Gaim::GtkUI::IMHtml::Scalable scale
+	Pidgin::IMHtml::Scalable scale
 	int width
 	int height
 
-MODULE = Gaim::GtkUI::IMHtml  PACKAGE = Gaim::GtkUI::IMHtml::Hr  PREFIX = gtk_imhtml_hr_
+MODULE = Pidgin::IMHtml  PACKAGE = Pidgin::IMHtml::Hr  PREFIX = gtk_imhtml_hr_
 PROTOTYPES: ENABLE
 
-Gaim::GtkUI::IMHtml::Scalable
+Pidgin::IMHtml::Scalable
 gtk_imhtml_hr_new()
 
 void
 gtk_imhtml_hr_free(scale)
-	Gaim::GtkUI::IMHtml::Scalable scale
+	Pidgin::IMHtml::Scalable scale
 
 void
 gtk_imhtml_hr_scale(scale, width, height)
-	Gaim::GtkUI::IMHtml::Scalable scale
+	Pidgin::IMHtml::Scalable scale
 	int width
 	int height
 
-MODULE = Gaim::GtkUI::IMHtml  PACKAGE = Gaim::GtkUI::IMHtml::Search  PREFIX = gtk_imhtml_search_
+MODULE = Pidgin::IMHtml  PACKAGE = Pidgin::IMHtml::Search  PREFIX = gtk_imhtml_search_
 PROTOTYPES: ENABLE
 
 gboolean
 gtk_imhtml_search_find(imhtml, text)
-	Gaim::GtkUI::IMHtml imhtml
+	Pidgin::IMHtml imhtml
 	const gchar * text
 
 void
 gtk_imhtml_search_clear(imhtml)
-	Gaim::GtkUI::IMHtml imhtml
+	Pidgin::IMHtml imhtml
--- a/pidgin/plugins/perl/common/GtkIMHtmlToolbar.xs	Sun Feb 04 05:51:03 2007 +0000
+++ b/pidgin/plugins/perl/common/GtkIMHtmlToolbar.xs	Sun Feb 04 05:55:54 2007 +0000
@@ -9,14 +9,14 @@
 
 void
 gtk_imhtmltoolbar_attach(toolbar, imhtml)
-	Gaim::GtkUI::IMHtmlToolbar toolbar
+	Pidgin::IMHtmlToolbar toolbar
 	Gtk::Widget imhtml
 */
 
-MODULE = Gaim::GtkUI::IMHtmlToolbar  PACKAGE = Gaim::GtkUI::IMHtmlToolbar  PREFIX = gtk_imhtmltoolbar_
+MODULE = Pidgin::IMHtmlToolbar  PACKAGE = Pidgin::IMHtmlToolbar  PREFIX = gtk_imhtmltoolbar_
 PROTOTYPES: ENABLE
 
 void
 gtk_imhtmltoolbar_associate_smileys(toolbar, proto_id)
-	Gaim::GtkUI::IMHtmlToolbar toolbar
+	Pidgin::IMHtmlToolbar toolbar
 	const char * proto_id
--- a/pidgin/plugins/perl/common/GtkLog.xs	Sun Feb 04 05:51:03 2007 +0000
+++ b/pidgin/plugins/perl/common/GtkLog.xs	Sun Feb 04 05:55:54 2007 +0000
@@ -1,23 +1,23 @@
 #include "gtkmodule.h"
 
-MODULE = Gaim::GtkUI::Log  PACKAGE = Gaim::GtkUI::Log  PREFIX = gaim_gtk_log_
+MODULE = Pidgin::Log  PACKAGE = Pidgin::Log  PREFIX = pidgin_log_
 PROTOTYPES: ENABLE
 
 Gaim::Handle
-gaim_gtk_log_get_handle()
+pidgin_log_get_handle()
 
 void
-gaim_gtk_log_show(type, screenname, account)
+pidgin_log_show(type, screenname, account)
 	Gaim::LogType type
 	const char * screenname
 	Gaim::Account account
 
 void
-gaim_gtk_log_show_contact(contact)
+pidgin_log_show_contact(contact)
 	Gaim::BuddyList::Contact contact
 
-MODULE = Gaim::GtkUI::Log  PACKAGE = Gaim::GtkUI::SysLog  PREFIX = gaim_gtk_syslog_
+MODULE = Pidgin::Log  PACKAGE = Pidgin::SysLog  PREFIX = pidgin_syslog_
 PROTOTYPES: ENABLE
 
 void
-gaim_gtk_syslog_show()
+pidgin_syslog_show()
--- a/pidgin/plugins/perl/common/GtkMenuTray.xs	Sun Feb 04 05:51:03 2007 +0000
+++ b/pidgin/plugins/perl/common/GtkMenuTray.xs	Sun Feb 04 05:55:54 2007 +0000
@@ -4,30 +4,30 @@
  * I thought about using the one from libgtk2-perl but wasn't sure how to go
  * about doing that.
 Gtk::Widget
-gaim_gtk_menu_tray_new()
+pidgin_menu_tray_new()
 
 Gtk::Widget
-gaim_gtk_menu_tray_get_box(menu_tray)
-	Gaim::GtkUI::MenuTray menu_tray
+pidgin_menu_tray_get_box(menu_tray)
+	Pidgin::MenuTray menu_tray
 
 void
-gaim_gtk_menu_tray_append(menu_tray, widget, tooltip)
-	Gaim::GtkUI::MenuTray menu_tray
+pidgin_menu_tray_append(menu_tray, widget, tooltip)
+	Pidgin::MenuTray menu_tray
 	Gtk::Widget widget
 	const char * tooltip
 
 void
-gaim_gtk_menu_tray_prepend(menu_tray, widget, tooltip)
-	Gaim::GtkUI::MenuTray menu_tray
+pidgin_menu_tray_prepend(menu_tray, widget, tooltip)
+	Pidgin::MenuTray menu_tray
 	Gtk::Widget widget
 	const char * tooltip
 
 void
-gaim_gtk_menu_tray_set_tooltip(menu_tray, widget, tooltip)
-	Gaim::GtkUI::MenuTray menu_tray
+pidgin_menu_tray_set_tooltip(menu_tray, widget, tooltip)
+	Pidgin::MenuTray menu_tray
 	Gtk::Widget widget
 	const char * tooltip
 */
 
-MODULE = Gaim::GtkUI::MenuTray  PACKAGE = Gaim::GtkUI::MenuTray  PREFIX = gaim_gtk_menu_tray
+MODULE = Pidgin::MenuTray  PACKAGE = Pidgin::MenuTray  PREFIX = pidgin_menu_tray
 PROTOTYPES: ENABLE
--- a/pidgin/plugins/perl/common/GtkPlugin.xs	Sun Feb 04 05:51:03 2007 +0000
+++ b/pidgin/plugins/perl/common/GtkPlugin.xs	Sun Feb 04 05:55:54 2007 +0000
@@ -1,13 +1,13 @@
 #include "gtkmodule.h"
 
-MODULE = Gaim::GtkUI::Plugin  PACKAGE = Gaim::GtkUI::Plugins  PREFIX = gaim_gtk_plugins_
+MODULE = Pidgin::Plugin  PACKAGE = Pidgin::Plugins  PREFIX = pidgin_plugins_
 PROTOTYPES: ENABLE
 
 void
-gaim_gtk_plugins_save()
+pidgin_plugins_save()
 
-MODULE = Gaim::GtkUI::Plugin  PACKAGE = Gaim::GtkUI::Plugin::Dialog  PREFIX = gaim_gtk_plugin_dialog_
+MODULE = Pidgin::Plugin  PACKAGE = Pidgin::Plugin::Dialog  PREFIX = pidgin_plugin_dialog_
 PROTOTYPES: ENABLE
 
 void
-gaim_gtk_plugin_dialog_show()
+pidgin_plugin_dialog_show()
--- a/pidgin/plugins/perl/common/GtkPluginPref.xs	Sun Feb 04 05:51:03 2007 +0000
+++ b/pidgin/plugins/perl/common/GtkPluginPref.xs	Sun Feb 04 05:55:54 2007 +0000
@@ -1,4 +1,4 @@
 #include "gtkmodule.h"
 
-MODULE = Gaim::GtkUI::PluginPref  PACKAGE = Gaim::GtkUI::PluginPref  PREFIX = gaim_gtk_plugin_pref_
+MODULE = Pidgin::PluginPref  PACKAGE = Pidgin::PluginPref  PREFIX = pidgin_plugin_pref_
 PROTOTYPES: ENABLE
--- a/pidgin/plugins/perl/common/GtkPounce.xs	Sun Feb 04 05:51:03 2007 +0000
+++ b/pidgin/plugins/perl/common/GtkPounce.xs	Sun Feb 04 05:55:54 2007 +0000
@@ -1,25 +1,25 @@
 #include "gtkmodule.h"
 
-MODULE = Gaim::GtkUI::Pounce  PACKAGE = Gaim::GtkUI::Pounce  PREFIX = gaim_gtk_pounce_
+MODULE = Pidgin::Pounce  PACKAGE = Pidgin::Pounce  PREFIX = pidgin_pounce_
 PROTOTYPES: ENABLE
 
 void
-gaim_gtk_pounce_editor_show(account, name, cur_pounce)
+pidgin_pounce_editor_show(account, name, cur_pounce)
 	Gaim::Account account
 	const char * name
 	Gaim::Pounce cur_pounce
 
-MODULE = Gaim::GtkUI::Pounce  PACKAGE = Gaim::GtkUI::Pounces  PREFIX = gaim_gtk_pounces_
+MODULE = Pidgin::Pounce  PACKAGE = Pidgin::Pounces  PREFIX = pidgin_pounces_
 PROTOTYPES: ENABLE
 
 Gaim::Handle
-gaim_gtk_pounces_get_handle()
+pidgin_pounces_get_handle()
 
-MODULE = Gaim::GtkUI::Pounce  PACKAGE = Gaim::GtkUI::Pounces::Manager  PREFIX = gaim_gtk_pounces_manager_
+MODULE = Pidgin::Pounce  PACKAGE = Pidgin::Pounces::Manager  PREFIX = pidgin_pounces_manager_
 PROTOTYPES: ENABLE
 
 void
-gaim_gtk_pounces_manager_show()
+pidgin_pounces_manager_show()
 
 void
-gaim_gtk_pounces_manager_hide()
+pidgin_pounces_manager_hide()
--- a/pidgin/plugins/perl/common/GtkPrefs.xs	Sun Feb 04 05:51:03 2007 +0000
+++ b/pidgin/plugins/perl/common/GtkPrefs.xs	Sun Feb 04 05:55:54 2007 +0000
@@ -1,7 +1,7 @@
 #include "gtkmodule.h"
 
-MODULE = Gaim::GtkUI::Prefs  PACKAGE = Gaim::GtkUI::Prefs  PREFIX = gaim_gtk_prefs_
+MODULE = Pidgin::Prefs  PACKAGE = Pidgin::Prefs  PREFIX = pidgin_prefs_
 PROTOTYPES: ENABLE
 
 void
-gaim_gtk_prefs_show()
+pidgin_prefs_show()
--- a/pidgin/plugins/perl/common/GtkPrivacy.xs	Sun Feb 04 05:51:03 2007 +0000
+++ b/pidgin/plugins/perl/common/GtkPrivacy.xs	Sun Feb 04 05:55:54 2007 +0000
@@ -1,23 +1,23 @@
 #include "gtkmodule.h"
 
-MODULE = Gaim::GtkUI::Privacy  PACKAGE = Gaim::GtkUI::Privacy  PREFIX = gaim_gtk_
+MODULE = Pidgin::Privacy  PACKAGE = Pidgin::Privacy  PREFIX = pidgin_
 PROTOTYPES: ENABLE
 
 void
-gaim_gtk_request_add_permit(account, name)
+pidgin_request_add_permit(account, name)
 	Gaim::Account account
 	const char * name
 
 void
-gaim_gtk_request_add_block(account, name)
+pidgin_request_add_block(account, name)
 	Gaim::Account account
 	const char * name
 
-MODULE = Gaim::GtkUI::Privacy  PACKAGE = Gaim::GtkUI::Privacy::Dialog  PREFIX = gaim_gtk_privacy_dialog_
+MODULE = Pidgin::Privacy  PACKAGE = Pidgin::Privacy::Dialog  PREFIX = pidgin_privacy_dialog_
 PROTOTYPES: ENABLE
 
 void
-gaim_gtk_privacy_dialog_show()
+pidgin_privacy_dialog_show()
 
 void
-gaim_gtk_privacy_dialog_hide()
+pidgin_privacy_dialog_hide()
--- a/pidgin/plugins/perl/common/GtkRoomlist.xs	Sun Feb 04 05:51:03 2007 +0000
+++ b/pidgin/plugins/perl/common/GtkRoomlist.xs	Sun Feb 04 05:55:54 2007 +0000
@@ -1,17 +1,17 @@
 #include "gtkmodule.h"
 
-MODULE = Gaim::GtkUI::Roomlist  PACKAGE = Gaim::GtkUI::Roomlist  PREFIX = gaim_gtk_roomlist_
+MODULE = Pidgin::Roomlist  PACKAGE = Pidgin::Roomlist  PREFIX = pidgin_roomlist_
 PROTOTYPES: ENABLE
 
 gboolean
-gaim_gtk_roomlist_is_showable()
+pidgin_roomlist_is_showable()
 
-MODULE = Gaim::GtkUI::Roomlist  PACKAGE = Gaim::GtkUI::Roomlist::Dialog  PREFIX = gaim_gtk_roomlist_dialog_
+MODULE = Pidgin::Roomlist  PACKAGE = Pidgin::Roomlist::Dialog  PREFIX = pidgin_roomlist_dialog_
 PROTOTYPES: ENABLE
 
 void
-gaim_gtk_roomlist_dialog_show()
+pidgin_roomlist_dialog_show()
 
 void
-gaim_gtk_roomlist_dialog_show_with_account(account)
+pidgin_roomlist_dialog_show_with_account(account)
 	Gaim::Account account
--- a/pidgin/plugins/perl/common/GtkSavedStatuses.xs	Sun Feb 04 05:51:03 2007 +0000
+++ b/pidgin/plugins/perl/common/GtkSavedStatuses.xs	Sun Feb 04 05:55:54 2007 +0000
@@ -1,24 +1,24 @@
 #include "gtkmodule.h"
 
-MODULE = Gaim::GtkUI::Status  PACKAGE = Gaim::GtkUI::Status  PREFIX = gaim_gtk_status_
+MODULE = Pidgin::Status  PACKAGE = Pidgin::Status  PREFIX = pidgin_status_
 PROTOTYPES: ENABLE
 
 Gaim::Handle
-gaim_gtk_status_get_handle()
+pidgin_status_get_handle()
 
-MODULE = Gaim::GtkUI::Status  PACKAGE = Gaim::GtkUI::Status::Editor  PREFIX = gaim_gtk_status_editor_
+MODULE = Pidgin::Status  PACKAGE = Pidgin::Status::Editor  PREFIX = pidgin_status_editor_
 PROTOTYPES: ENABLE
 
 void
-gaim_gtk_status_editor_show(edit, status)
+pidgin_status_editor_show(edit, status)
 	gboolean edit
 	Gaim::SavedStatus status
 
-MODULE = Gaim::GtkUI::Status  PACKAGE = Gaim::GtkUI::Status::Window  PREFIX = gaim_gtk_status_window_
+MODULE = Pidgin::Status  PACKAGE = Pidgin::Status::Window  PREFIX = pidgin_status_window_
 PROTOTYPES: ENABLE
 
 void
-gaim_gtk_status_window_show()
+pidgin_status_window_show()
 
 void
-gaim_gtk_status_window_hide()
+pidgin_status_window_hide()
--- a/pidgin/plugins/perl/common/GtkSound.xs	Sun Feb 04 05:51:03 2007 +0000
+++ b/pidgin/plugins/perl/common/GtkSound.xs	Sun Feb 04 05:55:54 2007 +0000
@@ -1,15 +1,15 @@
 #include "gtkmodule.h"
 
-MODULE = Gaim::GtkUI::Sound  PACKAGE = Gaim::GtkUI::Sound  PREFIX = gaim_gtk_sound_
+MODULE = Pidgin::Sound  PACKAGE = Pidgin::Sound  PREFIX = pidgin_sound_
 PROTOTYPES: ENABLE
 
 const char *
-gaim_gtk_sound_get_event_option(event)
+pidgin_sound_get_event_option(event)
 	Gaim::SoundEventID event
 
 const char *
-gaim_gtk_sound_get_event_label(event)
+pidgin_sound_get_event_label(event)
 	Gaim::SoundEventID event
 
 Gaim::Handle
-gaim_gtk_sound_get_handle()
+pidgin_sound_get_handle()
--- a/pidgin/plugins/perl/common/GtkStatusBox.xs	Sun Feb 04 05:51:03 2007 +0000
+++ b/pidgin/plugins/perl/common/GtkStatusBox.xs	Sun Feb 04 05:55:54 2007 +0000
@@ -4,47 +4,47 @@
  * I thought about using the one from libgtk2-perl but wasn't sure how to go
  * about doing that.
 Gtk::Widget
-gtk_gaim_status_box_new()
+pidgin_status_box_new()
 
 Gtk::Widget
-gtk_gaim_status_box_new_with_account(account)
+pidgin_status_box_new_with_account(account)
 	Gaim::Account account
 
 void
-gtk_gaim_status_box_add(status_box, type, pixbuf, text, sec_text, data)
-	Gaim::GtkUI::StatusBox status_box
-	Gaim::GtkUI::StatusBox::ItemType type
+pidgin_status_box_add(status_box, type, pixbuf, text, sec_text, data)
+	Pidgin::StatusBox status_box
+	Pidgin::StatusBox::ItemType type
 	GdkPixbuf pixbuf
 	const char * text
 	const char * sec_text
 	gpointer data
 */
 
-MODULE = Gaim::GtkUI::StatusBox  PACKAGE = Gaim::GtkUI::StatusBox  PREFIX = gtk_gaim_status_box_
+MODULE = Pidgin::StatusBox  PACKAGE = Pidgin::StatusBox  PREFIX = pidgin_status_box_
 PROTOTYPES: ENABLE
 
 void
-gtk_gaim_status_box_add_separator(status_box)
-	Gaim::GtkUI::StatusBox status_box
+pidgin_status_box_add_separator(status_box)
+	Pidgin::StatusBox status_box
 
 void
-gtk_gaim_status_box_set_connecting(status_box, connecting)
-	Gaim::GtkUI::StatusBox status_box
+pidgin_status_box_set_connecting(status_box, connecting)
+	Pidgin::StatusBox status_box
 	gboolean connecting
 
 void
-gtk_gaim_status_box_pulse_connecting(status_box)
-	Gaim::GtkUI::StatusBox status_box
+pidgin_status_box_pulse_connecting(status_box)
+	Pidgin::StatusBox status_box
 
 void
-gtk_gaim_status_box_set_buddy_icon(status_box, filename)
-	Gaim::GtkUI::StatusBox status_box
+pidgin_status_box_set_buddy_icon(status_box, filename)
+	Pidgin::StatusBox status_box
 	const char * filename
 
 const char *
-gtk_gaim_status_box_get_buddy_icon(status_box)
-	Gaim::GtkUI::StatusBox status_box
+pidgin_status_box_get_buddy_icon(status_box)
+	Pidgin::StatusBox status_box
 
 gchar_own *
-gtk_gaim_status_box_get_message(status_box)
-	Gaim::GtkUI::StatusBox status_box
+pidgin_status_box_get_message(status_box)
+	Pidgin::StatusBox status_box
--- a/pidgin/plugins/perl/common/GtkThemes.xs	Sun Feb 04 05:51:03 2007 +0000
+++ b/pidgin/plugins/perl/common/GtkThemes.xs	Sun Feb 04 05:55:54 2007 +0000
@@ -1,28 +1,28 @@
 #include "gtkmodule.h"
 
-MODULE = Gaim::GtkUI::Themes  PACKAGE = Gaim::GtkUI::Themes  PREFIX = gaim_gtkthemes_
+MODULE = Pidgin::Themes  PACKAGE = Pidgin::Themes  PREFIX = pidginthemes_
 PROTOTYPES: ENABLE
 
 void
-gaim_gtkthemes_init()
+pidginthemes_init()
 
 gboolean
-gaim_gtkthemes_smileys_disabled()
+pidginthemes_smileys_disabled()
 
 void
-gaim_gtkthemes_smiley_theme_probe()
+pidginthemes_smiley_theme_probe()
 
 void
-gaim_gtkthemes_load_smiley_theme(file, load)
+pidginthemes_load_smiley_theme(file, load)
 	const char * file
 	gboolean load
 
 void
-gaim_gtkthemes_get_proto_smileys(id)
+pidginthemes_get_proto_smileys(id)
 	const char * id
 PREINIT:
 	GSList *l;
 PPCODE:
-	for (l = gaim_gtkthemes_get_proto_smileys(id); l != NULL; l = l->next) {
-		XPUSHs(sv_2mortal(gaim_perl_bless_object(l->data, "Gaim::GtkUI::IMHtml::Smiley")));
+	for (l = pidginthemes_get_proto_smileys(id); l != NULL; l = l->next) {
+		XPUSHs(sv_2mortal(gaim_perl_bless_object(l->data, "Pidgin::IMHtml::Smiley")));
 	}
--- a/pidgin/plugins/perl/common/GtkUI.xs	Sun Feb 04 05:51:03 2007 +0000
+++ b/pidgin/plugins/perl/common/GtkUI.xs	Sun Feb 04 05:55:54 2007 +0000
@@ -28,7 +28,7 @@
 GAIM_PERL_BOOT_PROTO(GtkUI__Utils);
 GAIM_PERL_BOOT_PROTO(GtkUI__Xfer);
 
-MODULE = Gaim::GtkUI  PACKAGE = Gaim::GtkUI  PREFIX = gaim_gtk_
+MODULE = Gaim::GtkUI  PACKAGE = Gaim::GtkUI  PREFIX = pidgin_
 PROTOTYPES: ENABLE
 
 BOOT:
--- a/pidgin/plugins/perl/common/GtkUtils.xs	Sun Feb 04 05:51:03 2007 +0000
+++ b/pidgin/plugins/perl/common/GtkUtils.xs	Sun Feb 04 05:55:54 2007 +0000
@@ -1,16 +1,16 @@
 #include "gtkmodule.h"
 
-MODULE = Gaim::GtkUI::Utils  PACKAGE = Gaim::GtkUI::Utils  PREFIX = gaim_gtk_
+MODULE = Pidgin::Utils  PACKAGE = Pidgin::Utils  PREFIX = pidgin_
 PROTOTYPES: ENABLE
 
 gboolean
-gaim_gtk_save_accels(data)
+pidgin_save_accels(data)
 	gpointer data
 
 void
-gaim_gtk_load_accels()
+pidgin_load_accels()
 
 gchar_own *
-gaim_gtk_convert_buddy_icon(plugin, path)
+pidgin_convert_buddy_icon(plugin, path)
 	Gaim::Plugin plugin
 	const char * path
--- a/pidgin/plugins/perl/common/gtkmodule.h	Sun Feb 04 05:51:03 2007 +0000
+++ b/pidgin/plugins/perl/common/gtkmodule.h	Sun Feb 04 05:55:54 2007 +0000
@@ -1,4 +1,4 @@
-typedef struct group *Gaim__GtkUI__Group;
+typedef struct group *Pidgin__Group;
 
 #define group perl_group
 
@@ -41,36 +41,36 @@
 #include "gtkutils.h"
 
 /* gtkaccount.h */
-typedef PidginAccountDialogType			Gaim__GtkUI__Account__Dialog__Type;
+typedef PidginAccountDialogType		Pidgin__Account__Dialog__Type;
 
 /* gtkblist.h */
-typedef PidginBuddyList *				Gaim__GtkUI__BuddyList;
-typedef pidgin_blist_sort_function			Gaim__GtkUI__BuddyList__SortFunction;
+typedef PidginBuddyList *		Pidgin__BuddyList;
+typedef pidgin_blist_sort_function	Pidgin__BuddyList__SortFunction;
 
 /* gtkconv.h */
-typedef PidginConversation *				Gaim__GtkUI__Conversation;
-typedef GaimUnseenState					Gaim__UnseenState;
+typedef PidginConversation *		Pidgin__Conversation;
+typedef GaimUnseenState			Gaim__UnseenState;
 
 /* gtkconvwin.h */
-typedef PidginWindow *					Gaim__GtkUI__Conversation__Window;
-typedef GaimConvPlacementFunc				Gaim__Conversation__PlacementFunc;
+typedef PidginWindow *			Pidgin__Conversation__Window;
+typedef GaimConvPlacementFunc		Gaim__Conversation__PlacementFunc;
 
 /* gtkft.h */
-typedef PidginXferDialog *				Gaim__GtkUI__Xfer__Dialog;
+typedef PidginXferDialog *		Pidgin__Xfer__Dialog;
 
 /* gtkimhtml.h */
-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;
+typedef GtkIMHtml *			Pidgin__IMHtml;
+typedef GtkIMHtmlButtons		Pidgin__IMHtml__Buttons;
+typedef GtkIMHtmlFuncs *		Pidgin__IMHtml__Funcs;
+typedef GtkIMHtmlScalable *		Pidgin__IMHtml__Scalable;
+typedef GtkIMHtmlSmiley *		Pidgin__IMHtml__Smiley;
+typedef GtkIMHtmlOptions		Pidgin__IMHtml__Options;
 
 /* gtkimhtmltoolbar.h */
-typedef GtkIMHtmlToolbar *				Gaim__GtkUI__IMHtmlToolbar;
+typedef GtkIMHtmlToolbar *		Pidgin__IMHtmlToolbar;
 
 /* gtkmenutray.h */
-typedef PidginMenuTray *				Gaim__GtkUI__MenuTray;
+typedef PidginMenuTray *		Pidgin__MenuTray;
 
 /* gtkstatusbox.h */
-typedef PidginStatusBox *				Gaim__GtkUI__StatusBox;
+typedef PidginStatusBox *		Pidgin__StatusBox;
--- a/pidgin/plugins/perl/common/typemap	Sun Feb 04 05:51:03 2007 +0000
+++ b/pidgin/plugins/perl/common/typemap	Sun Feb 04 05:55:54 2007 +0000
@@ -3,18 +3,18 @@
 Gaim::UnseenState                       T_IV
 Gaim::ButtonOrientation                 T_IV
 
-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::StatusBox                  T_GaimObj
+Pidgin::Account::Dialog::Type      T_IV
+Pidgin::BuddyList                  T_GaimObj
+Pidgin::BuddyList::SortFunction    T_GaimObj
+Pidgin::Conversation               T_GaimObj
+Pidgin::Conversation::Window       T_GaimObj
+Pidgin::Xfer::Dialog               T_GaimObj
+Pidgin::IMHtml                     T_GaimObj
+Pidgin::IMHtml::Buttons            T_IV
+Pidgin::IMHtml::Funcs              T_GaimObj
+Pidgin::IMHtml::Scalable           T_GaimObj
+Pidgin::IMHtml::Smiley             T_GaimObj
+Pidgin::IMHtml::Options            T_IV
+Pidgin::IMHtmlToolbar              T_GaimObj
+Pidgin::MenuTray                   T_GaimObj
+Pidgin::StatusBox                  T_GaimObj