# HG changeset patch
# User Daniel Atallah <daniel.atallah@gmail.com>
# Date 1174326536 0
# Node ID cf140d8c878c9191c486840b2d932cbd4449cd89
# Parent  1342fa79d68c8cffedb097721e7513150ea0e69f# Parent  90188f78beeb5efcb3f5fa1bd7eb8bd19bd2ebfd
merge of '74177ab1f5003a87ec15dcfda14924e5ea2ba0ec'
     and '77b04659d074ab08ac7984a049d67eaaf0bb2761'

diff -r 1342fa79d68c -r cf140d8c878c .mtn-ignore
--- a/.mtn-ignore	Mon Mar 19 17:35:41 2007 +0000
+++ b/.mtn-ignore	Mon Mar 19 17:48:56 2007 +0000
@@ -18,17 +18,17 @@
 config.status
 config.sub
 configure
-console/gaim-text
-console/libgnt/gntmarshal.c
-console/libgnt/gntmarshal.h
+finch/finch
+finch/libgnt/gntmarshal.c
+finch/libgnt/gntmarshal.h
 depcomp
 doc/gaim-text.1
-doc/gaim.1
+doc/pidgin.1
 gaim.apspec
-gaim.desktop
+pidgin.desktop
 gaim.service
 gaim.spec
-pidgin/gaim
+pidgin/pidgin
 pidgin/plugins/musicmessaging/music-messaging-bindings.c
 pidgin/plugins/perl/common/Makefile.PL
 pidgin/win32/pidgin_dll_rc.rc
diff -r 1342fa79d68c -r cf140d8c878c pidgin/plugins/perl/common/GtkAccount.xs
--- a/pidgin/plugins/perl/common/GtkAccount.xs	Mon Mar 19 17:35:41 2007 +0000
+++ b/pidgin/plugins/perl/common/GtkAccount.xs	Mon Mar 19 17:48:56 2007 +0000
@@ -3,7 +3,7 @@
 MODULE = Pidgin::Account  PACKAGE = Pidgin::Account  PREFIX = pidgin_account_
 PROTOTYPES: ENABLE
 
-Gaim::Handle
+Purple::Handle
 pidgin_account_get_handle()
 
 MODULE = Pidgin::Account  PACKAGE = Pidgin::Account::Dialog  PREFIX = pidgin_account_dialog_
@@ -12,7 +12,7 @@
 void
 pidgin_account_dialog_show(type, account)
 	Pidgin::Account::Dialog::Type type
-	Gaim::Account account
+	Purple::Account account
 
 MODULE = Pidgin::Account  PACKAGE = Pidgin::Account::Window  PREFIX = pidgin_accounts_window_
 PROTOTYPES: ENABLE
diff -r 1342fa79d68c -r cf140d8c878c pidgin/plugins/perl/common/GtkBlist.xs
--- a/pidgin/plugins/perl/common/GtkBlist.xs	Mon Mar 19 17:35:41 2007 +0000
+++ b/pidgin/plugins/perl/common/GtkBlist.xs	Mon Mar 19 17:48:56 2007 +0000
@@ -3,7 +3,7 @@
 MODULE = Pidgin::BuddyList  PACKAGE = Pidgin::BuddyList  PREFIX = pidgin_blist_
 PROTOTYPES: ENABLE
 
-Gaim::Handle
+Purple::Handle
 pidgin_blist_get_handle()
 
 Pidgin::BuddyList
@@ -11,14 +11,14 @@
 
 void
 pidgin_blist_refresh(list)
-	Gaim::BuddyList list
+	Purple::BuddyList list
 
 void
 pidgin_blist_update_refresh_timeout()
 
 gboolean
 pidgin_blist_node_is_contact_expanded(node)
-	Gaim::BuddyList::Node node
+	Purple::BuddyList::Node node
 
 void
 pidgin_blist_toggle_visibility()
@@ -35,7 +35,7 @@
 	GList *l;
 PPCODE:
 	for (l = pidgin_blist_get_sort_methods(); l != NULL; l = l->next) {
-		XPUSHs(sv_2mortal(gaim_perl_bless_object(l->data, "Pidgin::BuddyList::SortMethod")));
+		XPUSHs(sv_2mortal(purple_perl_bless_object(l->data, "Pidgin::BuddyList::SortMethod")));
 	}
 
 void
@@ -72,5 +72,5 @@
 
 void
 pidgin_blist_update_account_error_state(account, message)
-	Gaim::Account account
+	Purple::Account account
 	const char * message
diff -r 1342fa79d68c -r cf140d8c878c pidgin/plugins/perl/common/GtkConn.xs
--- a/pidgin/plugins/perl/common/GtkConn.xs	Mon Mar 19 17:35:41 2007 +0000
+++ b/pidgin/plugins/perl/common/GtkConn.xs	Mon Mar 19 17:48:56 2007 +0000
@@ -3,5 +3,5 @@
 MODULE = Pidgin::Connection  PACKAGE = Pidgin::Connection  PREFIX = pidgin_connection_
 PROTOTYPES: ENABLE
 
-Gaim::Handle
+Purple::Handle
 pidgin_connection_get_handle()
diff -r 1342fa79d68c -r cf140d8c878c pidgin/plugins/perl/common/GtkConv.xs
--- a/pidgin/plugins/perl/common/GtkConv.xs	Mon Mar 19 17:35:41 2007 +0000
+++ b/pidgin/plugins/perl/common/GtkConv.xs	Mon Mar 19 17:48:56 2007 +0000
@@ -5,19 +5,19 @@
 
 void
 pidgin_conv_update_buddy_icon(conv)
-	Gaim::Conversation conv
+	Purple::Conversation conv
 
 void
 pidgin_conv_switch_active_conversation(conv)
-	Gaim::Conversation conv
+	Purple::Conversation conv
 
 void
 pidgin_conv_update_buttons_by_protocol(conv)
-	Gaim::Conversation conv
+	Purple::Conversation conv
 
 void
 pidgin_conv_present_conversation(conv)
-	Gaim::Conversation conv
+	Purple::Conversation conv
 
 Pidgin::Conversation::Window
 pidgin_conv_get_window(conv)
@@ -25,7 +25,7 @@
 
 void
 pidgin_conv_new(class, conv)
-	Gaim::Conversation conv
+	Purple::Conversation conv
     C_ARGS:
 	conv
 
@@ -35,10 +35,10 @@
 
 void
 pidgin_conv_get_gtkconv(conv)
-	Gaim::Conversation conv
+	Purple::Conversation conv
 PPCODE:
 	if (conv != NULL && PIDGIN_IS_PIDGIN_CONVERSATION(conv))
-		XPUSHs(sv_2mortal(gaim_perl_bless_object(
+		XPUSHs(sv_2mortal(purple_perl_bless_object(
 				PIDGIN_CONVERSATION(conv),
 				"Pidgin::Conversation")));
 
@@ -47,10 +47,10 @@
 
 void
 pidgin_conversations_find_unseen_list(type, min_state, hidden_only, max_count)
-	Gaim::ConversationType type
-	Gaim::UnseenState min_state
+	Purple::ConversationType type
+	Pidgin::UnseenState min_state
 	gboolean hidden_only
 	guint max_count
 
-Gaim::Handle
+Purple::Handle
 pidgin_conversations_get_handle()
diff -r 1342fa79d68c -r cf140d8c878c pidgin/plugins/perl/common/GtkConvWin.xs
--- a/pidgin/plugins/perl/common/GtkConvWin.xs	Mon Mar 19 17:35:41 2007 +0000
+++ b/pidgin/plugins/perl/common/GtkConvWin.xs	Mon Mar 19 17:48:56 2007 +0000
@@ -47,13 +47,13 @@
 pidgin_conv_window_get_active_gtkconv(win)
 	Pidgin::Conversation::Window win
 
-Gaim::Conversation
+Purple::Conversation
 pidgin_conv_window_get_active_conversation(win)
 	Pidgin::Conversation::Window win
 
 gboolean
 pidgin_conv_window_is_active_conversation(conv)
-	Gaim::Conversation conv
+	Purple::Conversation conv
 
 gboolean
 pidgin_conv_window_has_focus(win)
@@ -71,7 +71,7 @@
 	GList *l;
 PPCODE:
 	for (l = pidgin_conv_window_get_gtkconvs(win); l != NULL; l = l->next) {
-		XPUSHs(sv_2mortal(gaim_perl_bless_object(l->data, "Pidgin::Conversation")));
+		XPUSHs(sv_2mortal(purple_perl_bless_object(l->data, "Pidgin::Conversation")));
 	}
 
 guint
@@ -80,11 +80,11 @@
 
 Pidgin::Conversation::Window
 pidgin_conv_window_first_with_type(type)
-	Gaim::ConversationType type
+	Purple::ConversationType type
 
 Pidgin::Conversation::Window
 pidgin_conv_window_last_with_type(type)
-	Gaim::ConversationType type
+	Purple::ConversationType type
 
 MODULE = Pidgin::Conversation::Window  PACKAGE = Pidgin::Conversation::Placement  PREFIX = pidgin_conv_placement_
 PROTOTYPES: ENABLE
@@ -95,14 +95,14 @@
 	GList *l;
 PPCODE:
 	for (l = pidgin_conv_placement_get_options(); l != NULL; l = l->next) {
-		XPUSHs(sv_2mortal(gaim_perl_bless_object(l->data, "Pidgin::Conversation::Window")));
+		XPUSHs(sv_2mortal(purple_perl_bless_object(l->data, "Pidgin::Conversation::Window")));
 	}
 
 void
 pidgin_conv_placement_add_fnc(id, name, fnc)
 	const char * id
 	const char * name
-	Gaim::Conversation::PlacementFunc fnc
+	Pidgin::Conversation::PlacementFunc fnc
 
 void
 pidgin_conv_placement_remove_fnc(id)
@@ -112,15 +112,15 @@
 pidgin_conv_placement_get_name(id)
 	const char * id
 
-Gaim::Conversation::PlacementFunc
+Pidgin::Conversation::PlacementFunc
 pidgin_conv_placement_get_fnc(id)
 	const char * id
 
 void
 pidgin_conv_placement_set_current_func(func)
-	Gaim::Conversation::PlacementFunc func
+	Pidgin::Conversation::PlacementFunc func
 
-Gaim::Conversation::PlacementFunc
+Pidgin::Conversation::PlacementFunc
 pidgin_conv_placement_get_current_func()
 
 void
@@ -136,5 +136,5 @@
 	GList *l;
 PPCODE:
 	for (l = pidgin_conv_windows_get_list(); l != NULL; l = l->next) {
-		XPUSHs(sv_2mortal(gaim_perl_bless_object(l->data, "Pidgin::Conversation::Window")));
+		XPUSHs(sv_2mortal(purple_perl_bless_object(l->data, "Pidgin::Conversation::Window")));
 	}
diff -r 1342fa79d68c -r cf140d8c878c pidgin/plugins/perl/common/GtkDebug.xs
--- a/pidgin/plugins/perl/common/GtkDebug.xs	Mon Mar 19 17:35:41 2007 +0000
+++ b/pidgin/plugins/perl/common/GtkDebug.xs	Mon Mar 19 17:48:56 2007 +0000
@@ -3,7 +3,7 @@
 MODULE = Pidgin::Debug  PACKAGE = Pidgin::Debug  PREFIX = pidgin_debug_
 PROTOTYPES: ENABLE
 
-Gaim::Handle
+Purple::Handle
 pidgin_debug_get_handle()
 
 MODULE = Pidgin::Debug  PACKAGE = Pidgin::Debug::Window  PREFIX = pidgin_debug_window_
diff -r 1342fa79d68c -r cf140d8c878c pidgin/plugins/perl/common/GtkDialogs.xs
--- a/pidgin/plugins/perl/common/GtkDialogs.xs	Mon Mar 19 17:35:41 2007 +0000
+++ b/pidgin/plugins/perl/common/GtkDialogs.xs	Mon Mar 19 17:48:56 2007 +0000
@@ -14,7 +14,7 @@
 
 void
 pidgindialogs_im_with_user(account, username)
-	Gaim::Account account
+	Purple::Account account
 	const char * username
 
 void
@@ -25,28 +25,28 @@
 
 void
 pidgindialogs_alias_contact(contact)
-	Gaim::BuddyList::Contact contact
+	Purple::BuddyList::Contact contact
 
 void
 pidgindialogs_alias_buddy(buddy)
-	Gaim::BuddyList::Buddy buddy
+	Purple::BuddyList::Buddy buddy
 
 void
 pidgindialogs_alias_chat(chat)
-	Gaim::BuddyList::Chat chat
+	Purple::BuddyList::Chat chat
 
 void
 pidgindialogs_remove_buddy(buddy)
-	Gaim::BuddyList::Buddy buddy
+	Purple::BuddyList::Buddy buddy
 
 void
 pidgindialogs_remove_group(group)
-	Gaim::BuddyList::Group group
+	Purple::BuddyList::Group group
 
 void
 pidgindialogs_remove_chat(chat)
-	Gaim::BuddyList::Chat chat
+	Purple::BuddyList::Chat chat
 
 void
 pidgindialogs_remove_contact(contact)
-	Gaim::BuddyList::Contact contact
+	Purple::BuddyList::Contact contact
diff -r 1342fa79d68c -r cf140d8c878c pidgin/plugins/perl/common/GtkFt.xs
--- a/pidgin/plugins/perl/common/GtkFt.xs	Mon Mar 19 17:35:41 2007 +0000
+++ b/pidgin/plugins/perl/common/GtkFt.xs	Mon Mar 19 17:48:56 2007 +0000
@@ -32,19 +32,19 @@
 void
 pidginxfer_dialog_add_xfer(dialog, xfer)
 	Pidgin::Xfer::Dialog dialog
-	Gaim::Xfer xfer
+	Purple::Xfer xfer
 
 void
 pidginxfer_dialog_remove_xfer(dialog, xfer)
 	Pidgin::Xfer::Dialog dialog
-	Gaim::Xfer xfer
+	Purple::Xfer xfer
 
 void
 pidginxfer_dialog_cancel_xfer(dialog, xfer)
 	Pidgin::Xfer::Dialog dialog
-	Gaim::Xfer xfer
+	Purple::Xfer xfer
 
 void
 pidginxfer_dialog_update_xfer(dialog, xfer)
 	Pidgin::Xfer::Dialog dialog
-	Gaim::Xfer xfer
+	Purple::Xfer xfer
diff -r 1342fa79d68c -r cf140d8c878c pidgin/plugins/perl/common/GtkLog.xs
--- a/pidgin/plugins/perl/common/GtkLog.xs	Mon Mar 19 17:35:41 2007 +0000
+++ b/pidgin/plugins/perl/common/GtkLog.xs	Mon Mar 19 17:48:56 2007 +0000
@@ -3,18 +3,18 @@
 MODULE = Pidgin::Log  PACKAGE = Pidgin::Log  PREFIX = pidgin_log_
 PROTOTYPES: ENABLE
 
-Gaim::Handle
+Purple::Handle
 pidgin_log_get_handle()
 
 void
 pidgin_log_show(type, screenname, account)
-	Gaim::LogType type
+	Purple::LogType type
 	const char * screenname
-	Gaim::Account account
+	Purple::Account account
 
 void
 pidgin_log_show_contact(contact)
-	Gaim::BuddyList::Contact contact
+	Purple::BuddyList::Contact contact
 
 MODULE = Pidgin::Log  PACKAGE = Pidgin::SysLog  PREFIX = pidgin_syslog_
 PROTOTYPES: ENABLE
diff -r 1342fa79d68c -r cf140d8c878c pidgin/plugins/perl/common/GtkPounce.xs
--- a/pidgin/plugins/perl/common/GtkPounce.xs	Mon Mar 19 17:35:41 2007 +0000
+++ b/pidgin/plugins/perl/common/GtkPounce.xs	Mon Mar 19 17:48:56 2007 +0000
@@ -5,14 +5,14 @@
 
 void
 pidgin_pounce_editor_show(account, name, cur_pounce)
-	Gaim::Account account
+	Purple::Account account
 	const char * name
-	Gaim::Pounce cur_pounce
+	Purple::Pounce cur_pounce
 
 MODULE = Pidgin::Pounce  PACKAGE = Pidgin::Pounces  PREFIX = pidgin_pounces_
 PROTOTYPES: ENABLE
 
-Gaim::Handle
+Purple::Handle
 pidgin_pounces_get_handle()
 
 MODULE = Pidgin::Pounce  PACKAGE = Pidgin::Pounces::Manager  PREFIX = pidgin_pounces_manager_
diff -r 1342fa79d68c -r cf140d8c878c pidgin/plugins/perl/common/GtkPrivacy.xs
--- a/pidgin/plugins/perl/common/GtkPrivacy.xs	Mon Mar 19 17:35:41 2007 +0000
+++ b/pidgin/plugins/perl/common/GtkPrivacy.xs	Mon Mar 19 17:48:56 2007 +0000
@@ -5,12 +5,12 @@
 
 void
 pidgin_request_add_permit(account, name)
-	Gaim::Account account
+	Purple::Account account
 	const char * name
 
 void
 pidgin_request_add_block(account, name)
-	Gaim::Account account
+	Purple::Account account
 	const char * name
 
 MODULE = Pidgin::Privacy  PACKAGE = Pidgin::Privacy::Dialog  PREFIX = pidgin_privacy_dialog_
diff -r 1342fa79d68c -r cf140d8c878c pidgin/plugins/perl/common/GtkRoomlist.xs
--- a/pidgin/plugins/perl/common/GtkRoomlist.xs	Mon Mar 19 17:35:41 2007 +0000
+++ b/pidgin/plugins/perl/common/GtkRoomlist.xs	Mon Mar 19 17:48:56 2007 +0000
@@ -14,4 +14,4 @@
 
 void
 pidgin_roomlist_dialog_show_with_account(account)
-	Gaim::Account account
+	Purple::Account account
diff -r 1342fa79d68c -r cf140d8c878c pidgin/plugins/perl/common/GtkSavedStatuses.xs
--- a/pidgin/plugins/perl/common/GtkSavedStatuses.xs	Mon Mar 19 17:35:41 2007 +0000
+++ b/pidgin/plugins/perl/common/GtkSavedStatuses.xs	Mon Mar 19 17:48:56 2007 +0000
@@ -3,7 +3,7 @@
 MODULE = Pidgin::Status  PACKAGE = Pidgin::Status  PREFIX = pidgin_status_
 PROTOTYPES: ENABLE
 
-Gaim::Handle
+Purple::Handle
 pidgin_status_get_handle()
 
 MODULE = Pidgin::Status  PACKAGE = Pidgin::Status::Editor  PREFIX = pidgin_status_editor_
@@ -12,7 +12,7 @@
 void
 pidgin_status_editor_show(edit, status)
 	gboolean edit
-	Gaim::SavedStatus status
+	Purple::SavedStatus status
 
 MODULE = Pidgin::Status  PACKAGE = Pidgin::Status::Window  PREFIX = pidgin_status_window_
 PROTOTYPES: ENABLE
diff -r 1342fa79d68c -r cf140d8c878c pidgin/plugins/perl/common/GtkSession.xs
--- a/pidgin/plugins/perl/common/GtkSession.xs	Mon Mar 19 17:35:41 2007 +0000
+++ b/pidgin/plugins/perl/common/GtkSession.xs	Mon Mar 19 17:48:56 2007 +0000
@@ -1,6 +1,6 @@
 #include "gtkmodule.h"
 
-MODULE = Gaim::GtkUI::Session  PACKAGE = Gaim::GtkUI::Session  PREFIX = gaim_gtk_session_
+MODULE = Purple::GtkUI::Session  PACKAGE = Purple::GtkUI::Session  PREFIX = gaim_gtk_session_
 PROTOTYPES: ENABLE
 
 void
diff -r 1342fa79d68c -r cf140d8c878c pidgin/plugins/perl/common/GtkSound.xs
--- a/pidgin/plugins/perl/common/GtkSound.xs	Mon Mar 19 17:35:41 2007 +0000
+++ b/pidgin/plugins/perl/common/GtkSound.xs	Mon Mar 19 17:48:56 2007 +0000
@@ -5,11 +5,11 @@
 
 const char *
 pidgin_sound_get_event_option(event)
-	Gaim::SoundEventID event
+	Purple::SoundEventID event
 
 const char *
 pidgin_sound_get_event_label(event)
-	Gaim::SoundEventID event
+	Purple::SoundEventID event
 
-Gaim::Handle
+Purple::Handle
 pidgin_sound_get_handle()
diff -r 1342fa79d68c -r cf140d8c878c pidgin/plugins/perl/common/GtkStatusBox.xs
--- a/pidgin/plugins/perl/common/GtkStatusBox.xs	Mon Mar 19 17:35:41 2007 +0000
+++ b/pidgin/plugins/perl/common/GtkStatusBox.xs	Mon Mar 19 17:48:56 2007 +0000
@@ -8,7 +8,7 @@
 
 Gtk::Widget
 pidgin_status_box_new_with_account(account)
-	Gaim::Account account
+	Purple::Account account
 
 void
 pidgin_status_box_add(status_box, type, pixbuf, text, sec_text, data)
diff -r 1342fa79d68c -r cf140d8c878c pidgin/plugins/perl/common/GtkThemes.xs
--- a/pidgin/plugins/perl/common/GtkThemes.xs	Mon Mar 19 17:35:41 2007 +0000
+++ b/pidgin/plugins/perl/common/GtkThemes.xs	Mon Mar 19 17:48:56 2007 +0000
@@ -24,5 +24,5 @@
 	GSList *l;
 PPCODE:
 	for (l = pidginthemes_get_proto_smileys(id); l != NULL; l = l->next) {
-		XPUSHs(sv_2mortal(gaim_perl_bless_object(l->data, "Pidgin::IMHtml::Smiley")));
+		XPUSHs(sv_2mortal(purple_perl_bless_object(l->data, "Pidgin::IMHtml::Smiley")));
 	}
diff -r 1342fa79d68c -r cf140d8c878c pidgin/plugins/perl/common/GtkUI.pm
--- a/pidgin/plugins/perl/common/GtkUI.pm	Mon Mar 19 17:35:41 2007 +0000
+++ b/pidgin/plugins/perl/common/GtkUI.pm	Mon Mar 19 17:48:56 2007 +0000
@@ -1,4 +1,4 @@
-package Gaim::GtkUI;
+package Purple::GtkUI;
 
 use 5.008;
 use strict;
@@ -7,37 +7,37 @@
 
 our $VERSION = '0.01';
 
-use Gaim;
+use Purple;
 
 require XSLoader;
-XSLoader::load('Gaim::GtkUI', $VERSION);
+XSLoader::load('Purple::GtkUI', $VERSION);
 
 1;
 __END__
 
 =head1 NAME
 
-Gaim::GtkUI - Perl extension for the Gaim instant messenger.
+Purple::GtkUI - Perl extension for the Pidgin instant messenger.
 
 =head1 SYNOPSIS
 
-    use Gaim::GtkUI;
+    use Purple::GtkUI;
 
 =head1 ABSTRACT
 
     This module provides the interface for using perl scripts as plugins in
-    Gaim, with access to the Gaim Gtk interface functions.
+    Pidgin, with access to the Pidgin 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, accounts, the buddy list, gaim signals, and more.
+This module provides the interface for using perl scripts as plugins in Pidgin,
+with access to the Pidgin Gtk interface functions. With this, developers can
+write perl scripts that can be loaded in Pidgin as plugins. The script can
+interact with IMs, chats, accounts, the buddy list, pidgin 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.
+The API for the perl interface is very similar to that of the Pidgin C API,
+which can be viewed at http://developer.pidgin.im/doxygen/ or in the header files
+in the Pidgin source tree.
 
 =head1 FUNCTIONS
 
@@ -46,11 +46,11 @@
 =back
 
 =head1 SEE ALSO
-Gaim C API documentation - http://gaim.sourceforge.net/api/
+Pidgin C API documentation - http://developer.pidgin.im/doxygen/
 
-The Gaim perl module.
+The Pidgin perl module.
 
-Gaim website - http://gaim.sourceforge.net/
+Pidgin website - http://pidgin.im/
 
 =head1 AUTHOR
 
diff -r 1342fa79d68c -r cf140d8c878c pidgin/plugins/perl/common/GtkUI.xs
--- a/pidgin/plugins/perl/common/GtkUI.xs	Mon Mar 19 17:35:41 2007 +0000
+++ b/pidgin/plugins/perl/common/GtkUI.xs	Mon Mar 19 17:48:56 2007 +0000
@@ -1,60 +1,60 @@
 #include "gtkmodule.h"
 
 /* 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);
+PURPLE_PERL_BOOT_PROTO(GtkUI__Account);
+PURPLE_PERL_BOOT_PROTO(GtkUI__BuddyList);
+PURPLE_PERL_BOOT_PROTO(GtkUI__Connection);
+PURPLE_PERL_BOOT_PROTO(GtkUI__Conversation);
+PURPLE_PERL_BOOT_PROTO(GtkUI__Conversation__Window);
+PURPLE_PERL_BOOT_PROTO(GtkUI__Debug);
+PURPLE_PERL_BOOT_PROTO(GtkUI__Dialogs);
+PURPLE_PERL_BOOT_PROTO(GtkUI__IMHtml);
+PURPLE_PERL_BOOT_PROTO(GtkUI__IMHtmlToolbar);
+PURPLE_PERL_BOOT_PROTO(GtkUI__Log);
+PURPLE_PERL_BOOT_PROTO(GtkUI__MenuTray);
+PURPLE_PERL_BOOT_PROTO(GtkUI__Plugin);
+PURPLE_PERL_BOOT_PROTO(GtkUI__PluginPref);
+PURPLE_PERL_BOOT_PROTO(GtkUI__Pounce);
+PURPLE_PERL_BOOT_PROTO(GtkUI__Prefs);
+PURPLE_PERL_BOOT_PROTO(GtkUI__Privacy);
+PURPLE_PERL_BOOT_PROTO(GtkUI__Roomlist);
+PURPLE_PERL_BOOT_PROTO(GtkUI__Status);
 #ifndef _WIN32
-GAIM_PERL_BOOT_PROTO(GtkUI__Session);
+PURPLE_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);
+PURPLE_PERL_BOOT_PROTO(GtkUI__Sound);
+PURPLE_PERL_BOOT_PROTO(GtkUI__StatusBox);
+PURPLE_PERL_BOOT_PROTO(GtkUI__Themes);
+PURPLE_PERL_BOOT_PROTO(GtkUI__Utils);
+PURPLE_PERL_BOOT_PROTO(GtkUI__Xfer);
 
-MODULE = Gaim::GtkUI  PACKAGE = Gaim::GtkUI  PREFIX = pidgin_
+MODULE = Purple::GtkUI  PACKAGE = Purple::GtkUI  PREFIX = pidgin_
 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);
+	PURPLE_PERL_BOOT(GtkUI__Account);
+	PURPLE_PERL_BOOT(GtkUI__BuddyList);
+	PURPLE_PERL_BOOT(GtkUI__Connection);
+	PURPLE_PERL_BOOT(GtkUI__Conversation);
+	PURPLE_PERL_BOOT(GtkUI__Conversation__Window);
+	PURPLE_PERL_BOOT(GtkUI__Debug);
+	PURPLE_PERL_BOOT(GtkUI__Dialogs);
+	PURPLE_PERL_BOOT(GtkUI__IMHtml);
+	PURPLE_PERL_BOOT(GtkUI__IMHtmlToolbar);
+	PURPLE_PERL_BOOT(GtkUI__Log);
+	PURPLE_PERL_BOOT(GtkUI__MenuTray);
+	PURPLE_PERL_BOOT(GtkUI__Plugin);
+	PURPLE_PERL_BOOT(GtkUI__PluginPref);
+	PURPLE_PERL_BOOT(GtkUI__Pounce);
+	PURPLE_PERL_BOOT(GtkUI__Prefs);
+	PURPLE_PERL_BOOT(GtkUI__Privacy);
+	PURPLE_PERL_BOOT(GtkUI__Roomlist);
+	PURPLE_PERL_BOOT(GtkUI__Status);
 #ifndef _WIN32
-	GAIM_PERL_BOOT(GtkUI__Session);
+	PURPLE_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);
+	PURPLE_PERL_BOOT(GtkUI__Sound);
+	PURPLE_PERL_BOOT(GtkUI__StatusBox);
+	PURPLE_PERL_BOOT(GtkUI__Themes);
+	PURPLE_PERL_BOOT(GtkUI__Utils);
+	PURPLE_PERL_BOOT(GtkUI__Xfer);
diff -r 1342fa79d68c -r cf140d8c878c pidgin/plugins/perl/common/GtkUtils.xs
--- a/pidgin/plugins/perl/common/GtkUtils.xs	Mon Mar 19 17:35:41 2007 +0000
+++ b/pidgin/plugins/perl/common/GtkUtils.xs	Mon Mar 19 17:48:56 2007 +0000
@@ -12,5 +12,5 @@
 
 gchar_own *
 pidgin_convert_buddy_icon(plugin, path)
-	Gaim::Plugin plugin
+	Purple::Plugin plugin
 	const char * path
diff -r 1342fa79d68c -r cf140d8c878c pidgin/plugins/perl/common/Makefile.PL.in
--- a/pidgin/plugins/perl/common/Makefile.PL.in	Mon Mar 19 17:35:41 2007 +0000
+++ b/pidgin/plugins/perl/common/Makefile.PL.in	Mon Mar 19 17:48:56 2007 +0000
@@ -2,14 +2,14 @@
 use ExtUtils::MakeMaker;
 
 WriteMakefile(
-    'NAME'          => 'Gaim::GtkUI',
+    'NAME'          => 'Purple::GtkUI',
     'VERSION_FROM'  => '@srcdir@/GtkUI.pm', # finds $VERSION
     ($] >= 5.005 ? ## Add these new keywords supported since 5.005
 	('ABSTRACT_FROM' => '@srcdir@/GtkUI.pm', # finds $ABSTRACT
-	'AUTHOR'        => 'Gaim <http://gaim.sourceforge.net/>') :  ()),
+	'AUTHOR'        => 'Pidgin <http://pidgin.im/>') :  ()),
     'DEFINE'        => '@DEBUG_CFLAGS@',
     'INC'           => '-I. -I@srcdir@ -I@top_srcdir@ -I@top_srcdir@/libpurple -I@top_srcdir@/pidgin @GTK_CFLAGS@',
-#    'PREREQ_PM'     => { 'Gaim' => '@VERSION@'},
+#    'PREREQ_PM'     => { 'Pidgin' => '@VERSION@'},
     # Do this because the MakeMaker Makefile is dumb, and on clean it moves
     # Makefile to the default setting for MAKEFILE_OLD which is Makefile.old
     # but this breaks running make clean more than once in a row.
diff -r 1342fa79d68c -r cf140d8c878c pidgin/plugins/perl/common/gtkmodule.h
--- a/pidgin/plugins/perl/common/gtkmodule.h	Mon Mar 19 17:35:41 2007 +0000
+++ b/pidgin/plugins/perl/common/gtkmodule.h	Mon Mar 19 17:48:56 2007 +0000
@@ -49,11 +49,11 @@
 
 /* gtkconv.h */
 typedef PidginConversation *		Pidgin__Conversation;
-typedef PurpleUnseenState			Purple__UnseenState;
+typedef PidginUnseenState		Pidgin__UnseenState;
 
 /* gtkconvwin.h */
 typedef PidginWindow *			Pidgin__Conversation__Window;
-typedef PurpleConvPlacementFunc		Purple__Conversation__PlacementFunc;
+typedef PidginConvPlacementFunc		Pidgin__Conversation__PlacementFunc;
 
 /* gtkft.h */
 typedef PidginXferDialog *		Pidgin__Xfer__Dialog;
diff -r 1342fa79d68c -r cf140d8c878c pidgin/plugins/perl/common/typemap
--- a/pidgin/plugins/perl/common/typemap	Mon Mar 19 17:35:41 2007 +0000
+++ b/pidgin/plugins/perl/common/typemap	Mon Mar 19 17:48:56 2007 +0000
@@ -1,20 +1,19 @@
 TYPEMAP
-Gaim::Conversation::PlacementFunc       T_GaimObj
-Gaim::UnseenState                       T_IV
-Gaim::ButtonOrientation                 T_IV
 
 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::BuddyList                  T_PurpleObj
+Pidgin::BuddyList::SortFunction    T_PurpleObj
+Pidgin::Conversation               T_PurpleObj
+Pidgin::Conversation::PlacementFunc       T_PurpleObj
+Pidgin::Conversation::Window       T_PurpleObj
+Pidgin::Xfer::Dialog               T_PurpleObj
+Pidgin::IMHtml                     T_PurpleObj
 Pidgin::IMHtml::Buttons            T_IV
-Pidgin::IMHtml::Funcs              T_GaimObj
-Pidgin::IMHtml::Scalable           T_GaimObj
-Pidgin::IMHtml::Smiley             T_GaimObj
+Pidgin::IMHtml::Funcs              T_PurpleObj
+Pidgin::IMHtml::Scalable           T_PurpleObj
+Pidgin::IMHtml::Smiley             T_PurpleObj
 Pidgin::IMHtml::Options            T_IV
-Pidgin::IMHtmlToolbar              T_GaimObj
-Pidgin::MenuTray                   T_GaimObj
-Pidgin::StatusBox                  T_GaimObj
+Pidgin::IMHtmlToolbar              T_PurpleObj
+Pidgin::MenuTray                   T_PurpleObj
+Pidgin::StatusBox                  T_PurpleObj
+Pidgin::UnseenState                T_IV