changeset 15504:b53b783846a8

merge of '06e221e7ba1b9991d934d6c69e7d29d821d2e567' and '9a6dfa7a96d203a51ba160ccf94bb19e2e557161'
author Sean Egan <seanegan@gmail.com>
date Sat, 03 Feb 2007 08:13:34 +0000
parents 704d40050800 (current diff) 6fde15c1dcfc (diff)
children 762b6547adf9
files pidgin/pixmaps/emblems/16/message-pending.png pidgin/pixmaps/emblems/16/scalable/message-pending.svg pidgin/pixmaps/status/16/invisible.png
diffstat 126 files changed, 3631 insertions(+), 3446 deletions(-) [+]
line wrap: on
line diff
--- a/libpurple/protocols/jabber/jabber.c	Sat Feb 03 05:55:41 2007 +0000
+++ b/libpurple/protocols/jabber/jabber.c	Sat Feb 03 08:13:34 2007 +0000
@@ -1074,7 +1074,8 @@
 	JabberBuddy *jb = NULL;
 
 	if(!b->account->gc)
-		return;
+		return NULL;
+
 	js = b->account->gc->proto_data;
 	if(js)
 		jb = jabber_buddy_find(js, b->name, FALSE);
--- a/libpurple/protocols/jabber/parser.c	Sat Feb 03 05:55:41 2007 +0000
+++ b/libpurple/protocols/jabber/parser.c	Sat Feb 03 08:13:34 2007 +0000
@@ -79,7 +79,7 @@
 			char *attrib_ns = NULL;
 
 			if (attributes[i+2]) {
-				attrib_ns = g_strdup(attributes[i+2]);;
+				attrib_ns = g_strdup((char*)attributes[i+2]);;
 			}
 
 			memcpy(attrib, attributes[i+3], attrib_len);
--- a/libpurple/protocols/yahoo/yahoo.c	Sat Feb 03 05:55:41 2007 +0000
+++ b/libpurple/protocols/yahoo/yahoo.c	Sat Feb 03 08:13:34 2007 +0000
@@ -2811,7 +2811,7 @@
 
 	if (!b || !(account = b->account) || !(gc = gaim_account_get_connection(account)) ||
 					     !(yd = gc->proto_data))
-		return;
+		return NULL;
 
 	f = yahoo_friend_find(gc, b->name);
 	if (!f) {
--- a/libpurple/proxy.c	Sat Feb 03 05:55:41 2007 +0000
+++ b/libpurple/proxy.c	Sat Feb 03 08:13:34 2007 +0000
@@ -597,7 +597,7 @@
 	{
 		int major;
 		p = connect_data->read_buffer + 5;
-		major = strtol((const char *)p, (char **)&p, 10);
+		major = strtol((const char *)p, (char**)&p, 10);
 		error = (major == 0) || (*p != '.');
 		if(!error) {
 			int minor;
--- a/pidgin/gaimcombobox.c	Sat Feb 03 05:55:41 2007 +0000
+++ b/pidgin/gaimcombobox.c	Sat Feb 03 08:13:34 2007 +0000
@@ -414,7 +414,7 @@
         };
 
       combo_box_type = g_type_register_static (GTK_TYPE_BIN,
-                                               "GaimGtkComboBox",
+                                               "PidginComboBox",
                                                &combo_box_info,
                                                0);
 
--- a/pidgin/gaimstock.c	Sat Feb 03 05:55:41 2007 +0000
+++ b/pidgin/gaimstock.c	Sat Feb 03 08:13:34 2007 +0000
@@ -146,18 +146,22 @@
   gboolean medium;
   gboolean huge;
 } const sized_stock_icons [] = {
-	{ PIDGIN_STOCK_STATUS_AVAILABLE,"status", "available.png", 	TRUE, TRUE, TRUE, FALSE },
-	{ PIDGIN_STOCK_STATUS_AWAY, 	"status", "away.png", 		TRUE, TRUE, TRUE, FALSE },
+	{ PIDGIN_STOCK_STATUS_AVAILABLE,   "status", "available.png", 	TRUE, TRUE, TRUE, FALSE },
+	{ PIDGIN_STOCK_STATUS_AVAILABLE_I, "status", "available_i.png", TRUE, FALSE, FALSE, FALSE },
+	{ PIDGIN_STOCK_STATUS_AWAY, 	   "status", "away.png",	TRUE, TRUE, TRUE, FALSE },
+	{ PIDGIN_STOCK_STATUS_AWAY_I, 	"status", "away_i.png",		TRUE, FALSE, FALSE, FALSE },
 	{ PIDGIN_STOCK_STATUS_BUSY, 	"status", "busy.png", 		TRUE, TRUE, TRUE, FALSE },
+	{ PIDGIN_STOCK_STATUS_BUSY_I, 	"status", "busy_i.png", 	TRUE, FALSE, FALSE, FALSE },
 	{ PIDGIN_STOCK_STATUS_CHAT, 	"status", "chat.png",		TRUE, TRUE, TRUE, FALSE },
-	{ PIDGIN_STOCK_STATUS_INVISIBLE,"status", "invisible.png",      TRUE, TRUE, TRUE, FALSE },
 	{ PIDGIN_STOCK_STATUS_XA, 	"status", "extended-away.png",	TRUE, TRUE, TRUE, FALSE },
+	{ PIDGIN_STOCK_STATUS_XA_I, 	"status", "extended-away_i.png",TRUE, FALSE, FALSE, FALSE },
 	{ PIDGIN_STOCK_STATUS_LOGIN, 	"status", "log-in.png",		TRUE, TRUE, TRUE, FALSE },
 	{ PIDGIN_STOCK_STATUS_LOGOUT, 	"status", "log-out.png",	TRUE, TRUE, TRUE, FALSE },
 	{ PIDGIN_STOCK_STATUS_OFFLINE, 	"status", "offline.png",	TRUE, TRUE, TRUE, FALSE },
 	{ PIDGIN_STOCK_STATUS_PERSON, 	"status", "person.png",		TRUE, TRUE, TRUE, FALSE },
 	{ PIDGIN_STOCK_STATUS_OPERATOR,	"status", "operator.png",	TRUE, FALSE, FALSE, FALSE },
 	{ PIDGIN_STOCK_STATUS_HALFOP, 	"status", "half-operator.png",	TRUE, FALSE, FALSE, FALSE },
+	{ PIDGIN_STOCK_STATUS_MESSAGE, 	"status", "message-pending.png",TRUE, FALSE, FALSE, FALSE },
 
 	{ PIDGIN_STOCK_DIALOG_AUTH,	"dialogs", "auth.png",		TRUE, FALSE, FALSE, TRUE },
 	{ PIDGIN_STOCK_DIALOG_COOL,	"dialogs", "cool.png", 		FALSE, FALSE, FALSE, TRUE },
@@ -216,7 +220,7 @@
 }
 
 void
-gaim_gtk_stock_init(void)
+pidgin_stock_init(void)
 {
 	static gboolean stock_initted = FALSE;
 	GtkIconFactory *icon_factory;
--- a/pidgin/gaimstock.h	Sat Feb 03 05:55:41 2007 +0000
+++ b/pidgin/gaimstock.h	Sat Feb 03 08:13:34 2007 +0000
@@ -95,18 +95,22 @@
 #define GAIM_STOCK_VOICE_CHAT      "gaim-voice-chat"
 
 /* Status icons */
-#define PIDGIN_STOCK_STATUS_AVAILABLE "pidgin-status-available"
-#define PIDGIN_STOCK_STATUS_AWAY      "pidgin-status-away"
-#define PIDGIN_STOCK_STATUS_BUSY      "pidgin-status-busy"
-#define PIDGIN_STOCK_STATUS_CHAT      "pidgin-status-chat"
-#define PIDGIN_STOCK_STATUS_INVISIBLE "pidgin-status-invisible"
-#define PIDGIN_STOCK_STATUS_XA        "pidgin-status-xa"
-#define PIDGIN_STOCK_STATUS_LOGIN     "pidgin-status-login"
-#define PIDGIN_STOCK_STATUS_LOGOUT    "pidgin-status-logout"
-#define PIDGIN_STOCK_STATUS_OFFLINE   "pidgin-status-offline"
-#define PIDGIN_STOCK_STATUS_PERSON    "pidgin-status-person"
-#define PIDGIN_STOCK_STATUS_OPERATOR  "pidgin-status-operator"
-#define PIDGIN_STOCK_STATUS_HALFOP    "pidgin-status-halfop"
+#define PIDGIN_STOCK_STATUS_AVAILABLE  "pidgin-status-available"
+#define PIDGIN_STOCK_STATUS_AVAILABLE_I "pidgin-status-available-i"
+#define PIDGIN_STOCK_STATUS_AWAY       "pidgin-status-away"
+#define PIDGIN_STOCK_STATUS_AWAY_I     "pidgin-status-away-i"
+#define PIDGIN_STOCK_STATUS_BUSY       "pidgin-status-busy"
+#define PIDGIN_STOCK_STATUS_BUSY_I     "pidgin-status-busy-i"
+#define PIDGIN_STOCK_STATUS_CHAT       "pidgin-status-chat"
+#define PIDGIN_STOCK_STATUS_XA         "pidgin-status-xa"
+#define PIDGIN_STOCK_STATUS_XA_I       "pidgin-status-xa-i"
+#define PIDGIN_STOCK_STATUS_LOGIN      "pidgin-status-login"
+#define PIDGIN_STOCK_STATUS_LOGOUT     "pidgin-status-logout"
+#define PIDGIN_STOCK_STATUS_OFFLINE    "pidgin-status-offline"
+#define PIDGIN_STOCK_STATUS_PERSON     "pidgin-status-person"
+#define PIDGIN_STOCK_STATUS_OPERATOR   "pidgin-status-operator"
+#define PIDGIN_STOCK_STATUS_HALFOP     "pidgin-status-halfop"
+#define PIDGIN_STOCK_STATUS_MESSAGE    "pidgin-status-message"
 
 /* Dialog icons */
 #define PIDGIN_STOCK_DIALOG_AUTH	"pidgin-dialog-auth"
@@ -139,6 +143,6 @@
 /**
  * Sets up the gaim stock repository.
  */
-void gaim_gtk_stock_init(void);
+void pidgin_stock_init(void);
 
 #endif /* _GAIM_STOCK_H_ */
--- a/pidgin/gtkaccount.c	Sat Feb 03 05:55:41 2007 +0000
+++ b/pidgin/gtkaccount.c	Sat Feb 03 08:13:34 2007 +0000
@@ -64,7 +64,7 @@
 	char *username;
 	char *alias;
 
-} GaimGtkAccountAddUserData;
+} PidginAccountAddUserData;
 
 typedef struct
 {
@@ -84,7 +84,7 @@
 
 typedef struct
 {
-	GaimGtkAccountDialogType type;
+	PidginAccountDialogType type;
 
 	GaimAccount *account;
 	char *protocol_id;
@@ -151,7 +151,7 @@
 	GaimAccount *account;
 	GtkTreeModel *model;
 
-} GaimGtkPulseData;
+} PidginPulseData;
 
 
 static AccountsWindow *accounts_window = NULL;
@@ -218,7 +218,7 @@
 		int width, height;
 		GdkPixbuf *scale;
 
-		gaim_gtk_buddy_icon_get_scale_size(pixbuf, &dialog->prpl_info->icon_spec,
+		pidgin_buddy_icon_get_scale_size(pixbuf, &dialog->prpl_info->icon_spec,
 				GAIM_ICON_SCALE_DISPLAY, &width, &height);
 		scale = gdk_pixbuf_scale_simple(pixbuf, width, height, GDK_INTERP_BILINEAR);
 
@@ -305,7 +305,7 @@
 	dialog = data;
 
 	if (filename != NULL)
-		set_dialog_icon(dialog, gaim_gtk_convert_buddy_icon(dialog->plugin, filename), g_strdup(filename));
+		set_dialog_icon(dialog, pidgin_convert_buddy_icon(dialog->plugin, filename), g_strdup(filename));
 
 	dialog->icon_filesel = NULL;
 }
@@ -313,7 +313,7 @@
 static void
 icon_select_cb(GtkWidget *button, AccountPrefsDialog *dialog)
 {
-	dialog->icon_filesel = gaim_gtk_buddy_icon_chooser_new(GTK_WINDOW(dialog->window), icon_filesel_choose_cb, dialog);
+	dialog->icon_filesel = pidgin_buddy_icon_chooser_new(GTK_WINDOW(dialog->window), icon_filesel_choose_cb, dialog);
 	gtk_widget_show_all(dialog->icon_filesel);
 }
 
@@ -345,7 +345,7 @@
 			}
 			if ((rtmp = strchr(tmp, '\r')) || (rtmp = strchr(tmp, '\n')))
 				*rtmp = '\0';
-			set_dialog_icon(dialog, gaim_gtk_convert_buddy_icon(dialog->plugin, tmp), g_strdup(tmp));
+			set_dialog_icon(dialog, pidgin_convert_buddy_icon(dialog->plugin, tmp), g_strdup(tmp));
 			g_free(tmp);
 		}
 		gtk_drag_finish(dc, TRUE, FALSE, t);
@@ -387,7 +387,7 @@
 		gtk_widget_destroy(dialog->login_frame);
 
 	/* Build the login options frame. */
-	frame = gaim_gtk_make_frame(parent, _("Login Options"));
+	frame = pidgin_make_frame(parent, _("Login Options"));
 
 	/* cringe */
 	dialog->login_frame = gtk_widget_get_parent(gtk_widget_get_parent(frame));
@@ -401,7 +401,7 @@
 	gtk_widget_show(vbox);
 
 	/* Protocol */
-	dialog->protocol_menu = gaim_gtk_protocol_option_menu_new(
+	dialog->protocol_menu = pidgin_protocol_option_menu_new(
 			dialog->protocol_id, G_CALLBACK(set_account_protocol_cb), dialog);
 
 	add_pref_box(dialog, vbox, _("Protocol:"), dialog->protocol_menu);
@@ -551,7 +551,7 @@
 		gtk_widget_destroy(dialog->user_frame);
 
 	/* Build the user options frame. */
-	frame = gaim_gtk_make_frame(parent, _("User Options"));
+	frame = pidgin_make_frame(parent, _("User Options"));
 	dialog->user_frame = gtk_widget_get_parent(gtk_widget_get_parent(frame));
 
 	gtk_box_reorder_child(GTK_BOX(parent), dialog->user_frame, 1);
@@ -628,9 +628,9 @@
 								       TRUE));
 		set_dialog_icon(dialog,
 				g_strdup(gaim_account_get_ui_string(dialog->account,
-						GAIM_GTK_UI, "non-global-buddyicon-cached-path", NULL)),
+						PIDGIN_UI, "non-global-buddyicon-cached-path", NULL)),
 				g_strdup(gaim_account_get_ui_string(dialog->account, 
-						GAIM_GTK_UI, "non-global-buddyicon-path", NULL)));
+						PIDGIN_UI, "non-global-buddyicon-path", NULL)));
 	} else {
 		set_dialog_icon(dialog, NULL, NULL);
 	}
@@ -683,7 +683,7 @@
 	/* Build the protocol options frame. */
 	g_snprintf(buf, sizeof(buf), _("%s Options"), dialog->plugin->info->name);
 
-	frame = gaim_gtk_make_frame(parent, buf);
+	frame = pidgin_make_frame(parent, buf);
 	dialog->protocol_frame =
 		gtk_widget_get_parent(gtk_widget_get_parent(frame));
 
@@ -972,7 +972,7 @@
 	if (dialog->proxy_frame != NULL)
 		gtk_widget_destroy(dialog->proxy_frame);
 
-	frame = gaim_gtk_make_frame(parent, _("Proxy Options"));
+	frame = pidgin_make_frame(parent, _("Proxy Options"));
 	dialog->proxy_frame = gtk_widget_get_parent(gtk_widget_get_parent(frame));
 
 	gtk_box_reorder_child(GTK_BOX(parent), dialog->proxy_frame, 1);
@@ -1077,7 +1077,7 @@
 
 	if (dialog->cached_icon_path != NULL)
 	{
-		const char *icon = gaim_account_get_ui_string(dialog->account, GAIM_GTK_UI, "non-global-buddyicon-cached-path", NULL);
+		const char *icon = gaim_account_get_ui_string(dialog->account, PIDGIN_UI, "non-global-buddyicon-cached-path", NULL);
 		if (dialog->cached_icon_path != NULL && (icon == NULL || strcmp(dialog->cached_icon_path, icon)))
 		{
 			/* The user set an icon, which would've been cached by convert_buddy_icon,
@@ -1152,8 +1152,8 @@
 			icon_change = TRUE;
 		}
 		gaim_account_set_bool(account, "use-global-buddyicon", !gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(dialog->icon_check)));
-		gaim_account_set_ui_string(account, GAIM_GTK_UI, "non-global-buddyicon-cached-path", dialog->cached_icon_path);
-		gaim_account_set_ui_string(account, GAIM_GTK_UI, "non-global-buddyicon-path", dialog->icon_path);
+		gaim_account_set_ui_string(account, PIDGIN_UI, "non-global-buddyicon-cached-path", dialog->cached_icon_path);
+		gaim_account_set_ui_string(account, PIDGIN_UI, "non-global-buddyicon-path", dialog->icon_path);
 		if (gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(dialog->icon_check)))
 		{
 			gaim_account_set_buddy_icon_path(account, dialog->icon_path);
@@ -1162,7 +1162,7 @@
 		else if (gaim_prefs_get_path("/gaim/gtk/accounts/buddyicon") && icon_change)
 		{
 			const char *filename = gaim_prefs_get_path("/gaim/gtk/accounts/buddyicon");
-			char *icon = gaim_gtk_convert_buddy_icon(dialog->plugin, filename);
+			char *icon = pidgin_convert_buddy_icon(dialog->plugin, filename);
 			gaim_account_set_buddy_icon_path(account, filename);
 			gaim_account_set_buddy_icon(account, icon);
 			g_free(icon);
@@ -1339,7 +1339,7 @@
 	if (new)
 		gaim_accounts_add(account);
 	else
-		gaim_signal_emit(gaim_gtk_account_get_handle(), "account-modified", account);
+		gaim_signal_emit(pidgin_account_get_handle(), "account-modified", account);
 
 	/* If this is a new account, then sign on! */
 	if (new && !dialog->registering) {
@@ -1348,7 +1348,7 @@
 		saved_status = gaim_savedstatus_get_current();
 		if (saved_status != NULL) {
 			gaim_savedstatus_activate_for_account(saved_status, account);
-			gaim_account_set_enabled(account, GAIM_GTK_UI, TRUE);
+			gaim_account_set_enabled(account, PIDGIN_UI, TRUE);
 		}
 	}
 
@@ -1375,7 +1375,7 @@
 };
 
 void
-gaim_gtk_account_dialog_show(GaimGtkAccountDialogType type,
+pidgin_account_dialog_show(PidginAccountDialogType type,
 							 GaimAccount *account)
 {
 	AccountPrefsDialog *dialog;
@@ -1424,7 +1424,7 @@
 	dialog->window = win = gtk_window_new(GTK_WINDOW_TOPLEVEL);
 	gtk_window_set_role(GTK_WINDOW(win), "account");
 
-	if (type == GAIM_GTK_ADD_ACCOUNT_DIALOG)
+	if (type == PIDGIN_ADD_ACCOUNT_DIALOG)
 		gtk_window_set_title(GTK_WINDOW(win), _("Add Account"));
 	else
 		gtk_window_set_title(GTK_WINDOW(win), _("Modify Account"));
@@ -1534,7 +1534,7 @@
 signed_on_off_cb(GaimConnection *gc, gpointer user_data)
 {
 	GaimAccount *account;
-	GaimGtkPulseData *pulse_data;
+	PidginPulseData *pulse_data;
 	GtkTreeModel *model;
 	GtkTreeIter iter;
 	GdkPixbuf *pixbuf;
@@ -1563,7 +1563,7 @@
 			g_free(pulse_data);
 		}
 
-		pixbuf = gaim_gtk_create_prpl_icon(account, PIDGIN_PRPL_ICON_MEDIUM);
+		pixbuf = pidgin_create_prpl_icon(account, PIDGIN_PRPL_ICON_MEDIUM);
 		if ((pixbuf != NULL) && gaim_account_is_disconnected(account))
 			gdk_pixbuf_saturate_and_pixelate(pixbuf, pixbuf, 0.0, FALSE);
 
@@ -1774,7 +1774,7 @@
 static gint
 accedit_win_destroy_cb(GtkWidget *w, GdkEvent *event, AccountsWindow *dialog)
 {
-	gaim_gtk_accounts_window_hide();
+	pidgin_accounts_window_hide();
 
 	return 0;
 }
@@ -1815,7 +1815,7 @@
 static void
 add_account_cb(GtkWidget *w, AccountsWindow *dialog)
 {
-	gaim_gtk_account_dialog_show(GAIM_GTK_ADD_ACCOUNT_DIALOG, NULL);
+	pidgin_account_dialog_show(PIDGIN_ADD_ACCOUNT_DIALOG, NULL);
 }
 
 static void
@@ -1827,7 +1827,7 @@
 	gtk_tree_model_get(model, iter, COLUMN_DATA, &account, -1);
 
 	if (account != NULL)
-		gaim_gtk_account_dialog_show(GAIM_GTK_MODIFY_ACCOUNT_DIALOG, account);
+		pidgin_account_dialog_show(PIDGIN_MODIFY_ACCOUNT_DIALOG, account);
 }
 
 static void
@@ -1884,7 +1884,7 @@
 {
 	gtk_widget_destroy(dialog->window);
 
-	gaim_gtk_accounts_window_hide();
+	pidgin_accounts_window_hide();
 }
 
 
@@ -1915,7 +1915,7 @@
 		gaim_savedstatus_activate_for_account(saved_status, account);
 	}
 
-	gaim_account_set_enabled(account, GAIM_GTK_UI, !enabled);
+	gaim_account_set_enabled(account, PIDGIN_UI, !enabled);
 }
 
 static void
@@ -1980,7 +1980,7 @@
 	GdkPixbuf *pixbuf, *buddyicon = NULL;
 	const char *path = NULL;
 
-	pixbuf = gaim_gtk_create_prpl_icon(account, PIDGIN_PRPL_ICON_MEDIUM);
+	pixbuf = pidgin_create_prpl_icon(account, PIDGIN_PRPL_ICON_MEDIUM);
 	if ((pixbuf != NULL) && gaim_account_is_disconnected(account))
 		gdk_pixbuf_saturate_and_pixelate(pixbuf, pixbuf, 0.0, FALSE);
 
@@ -1991,7 +1991,7 @@
 		else
 			path = gaim_prefs_get_path("/gaim/gtk/accounts/buddyicon");
 	} else
-		path = gaim_account_get_ui_string(account, GAIM_GTK_UI, "non-global-buddyicon-path", NULL);
+		path = gaim_account_get_ui_string(account, PIDGIN_UI, "non-global-buddyicon-path", NULL);
 
 	if (path != NULL) {
 		GdkPixbuf *buddyicon_pixbuf = gdk_pixbuf_new_from_file(path, NULL);
@@ -2005,7 +2005,7 @@
 			COLUMN_ICON, pixbuf,
 			COLUMN_BUDDYICON, buddyicon,
 			COLUMN_SCREENNAME, gaim_account_get_username(account),
-			COLUMN_ENABLED, gaim_account_get_enabled(account, GAIM_GTK_UI),
+			COLUMN_ENABLED, gaim_account_get_enabled(account, PIDGIN_UI),
 			COLUMN_PROTOCOL, gaim_account_get_protocol_name(account),
 			COLUMN_DATA, account,
 			-1);
@@ -2111,7 +2111,7 @@
 		(event->type == GDK_2BUTTON_PRESS) &&
 		(strcmp(gtk_tree_view_column_get_title(column), title)))
 	{
-		gaim_gtk_account_dialog_show(GAIM_GTK_MODIFY_ACCOUNT_DIALOG, account);
+		pidgin_account_dialog_show(PIDGIN_MODIFY_ACCOUNT_DIALOG, account);
 		return TRUE;
 	}
 
@@ -2140,7 +2140,7 @@
 	/* Create a helpful first-time-use label */
 	label = gtk_label_new(NULL);
 	/* Translators: Please maintain the use of -> or <- to represent the menu heirarchy */
-	pretty = gaim_gtk_make_pretty_arrows(_(
+	pretty = pidgin_make_pretty_arrows(_(
 						 "<span size='larger' weight='bold'>Welcome to " PIDGIN_NAME "!</span>\n\n"
 						 
 						 "You have no IM accounts configured. To start connecting with " PIDGIN_NAME " "
@@ -2243,7 +2243,7 @@
 }
 
 void
-gaim_gtk_accounts_window_show(void)
+pidgin_accounts_window_show(void)
 {
 	AccountsWindow *dialog;
 	GtkWidget *win;
@@ -2328,7 +2328,7 @@
 	g_signal_connect(G_OBJECT(button), "clicked",
 					 G_CALLBACK(close_accounts_cb), dialog);
 
-	gaim_signal_connect(gaim_gtk_account_get_handle(), "account-modified",
+	gaim_signal_connect(pidgin_account_get_handle(), "account-modified",
 	                    accounts_window,
 	                    GAIM_CALLBACK(account_modified_cb), accounts_window);
 	gaim_prefs_connect_callback(accounts_window,
@@ -2339,7 +2339,7 @@
 }
 
 void
-gaim_gtk_accounts_window_hide(void)
+pidgin_accounts_window_hide(void)
 {
 	if (accounts_window == NULL)
 		return;
@@ -2351,7 +2351,7 @@
 	accounts_window = NULL;
 
 	/* See if we're the main window here. */
-	if (GAIM_GTK_BLIST(gaim_get_blist())->window == NULL &&
+	if (PIDGIN_BLIST(gaim_get_blist())->window == NULL &&
 		gaim_connections_get_all() == NULL) {
 
 		gaim_core_quit();
@@ -2359,7 +2359,7 @@
 }
 
 static void
-free_add_user_data(GaimGtkAccountAddUserData *data)
+free_add_user_data(PidginAccountAddUserData *data)
 {
 	g_free(data->username);
 	g_free(data->alias);
@@ -2367,7 +2367,7 @@
 }
 
 static void
-add_user_cb(GaimGtkAccountAddUserData *data)
+add_user_cb(PidginAccountAddUserData *data)
 {
 	GaimConnection *gc = gaim_account_get_connection(data->account);
 
@@ -2402,7 +2402,7 @@
 }
 
 static void
-gaim_gtk_accounts_notify_added(GaimAccount *account, const char *remote_user,
+pidgin_accounts_notify_added(GaimAccount *account, const char *remote_user,
                                const char *id, const char *alias,
                                const char *msg)
 {
@@ -2413,36 +2413,36 @@
 	gc = gaim_account_get_connection(account);
 
 	buffer = make_info(account, gc, remote_user, id, alias, msg);
-	alert = gaim_gtk_make_mini_dialog(gc, PIDGIN_STOCK_DIALOG_INFO, buffer,
+	alert = pidgin_make_mini_dialog(gc, PIDGIN_STOCK_DIALOG_INFO, buffer,
 					  NULL, NULL, _("Close"), NULL, NULL);
-	gaim_gtk_blist_add_alert(alert);
+	pidgin_blist_add_alert(alert);
 
 	g_free(buffer);
 }
 
 static void
-gaim_gtk_accounts_request_add(GaimAccount *account, const char *remote_user,
+pidgin_accounts_request_add(GaimAccount *account, const char *remote_user,
                               const char *id, const char *alias,
                               const char *msg)
 {
 	char *buffer;
 	GaimConnection *gc;
-	GaimGtkAccountAddUserData *data;
+	PidginAccountAddUserData *data;
 	GtkWidget *alert;
 
 	gc = gaim_account_get_connection(account);
 
-	data = g_new0(GaimGtkAccountAddUserData, 1);
+	data = g_new0(PidginAccountAddUserData, 1);
 	data->account  = account;
 	data->username = g_strdup(remote_user);
 	data->alias    = g_strdup(alias);
 
 	buffer = make_info(account, gc, remote_user, id, alias, msg);
-	alert = gaim_gtk_make_mini_dialog(gc, PIDGIN_STOCK_DIALOG_QUESTION,
+	alert = pidgin_make_mini_dialog(gc, PIDGIN_STOCK_DIALOG_QUESTION,
 					  _("Add buddy to your list?"), buffer, data, 
 					  _("Add"), G_CALLBACK(add_user_cb),
 					  _("Cancel"), G_CALLBACK(free_add_user_data), NULL);
-	gaim_gtk_blist_add_alert(alert);
+	pidgin_blist_add_alert(alert);
 
 	g_free(buffer);
 }
@@ -2479,7 +2479,7 @@
 }
 
 static void *
-gaim_gtk_accounts_request_authorization(GaimAccount *account, const char *remote_user,
+pidgin_accounts_request_authorization(GaimAccount *account, const char *remote_user,
 					const char *id, const char *alias, const char *message, gboolean on_list,
 					GCallback auth_cb, GCallback deny_cb, void *user_data)
 {
@@ -2513,19 +2513,19 @@
 		aa->username = g_strdup(remote_user);
 		aa->alias = g_strdup(alias);
 		aa->account = account;
-		alert = gaim_gtk_make_mini_dialog(gc, PIDGIN_STOCK_DIALOG_QUESTION,
+		alert = pidgin_make_mini_dialog(gc, PIDGIN_STOCK_DIALOG_QUESTION,
 						  _("Authorize buddy?"), buffer, aa,
 						  _("Authorize"), authorize_and_add_cb, 
 						  _("Deny"), deny_no_add_cb, 
 						  NULL);
 	} else {
-		alert = gaim_gtk_make_mini_dialog(gc, PIDGIN_STOCK_DIALOG_QUESTION,
+		alert = pidgin_make_mini_dialog(gc, PIDGIN_STOCK_DIALOG_QUESTION,
 						  _("Authorize buddy?"), buffer, user_data,
 						  _("Authorize"), auth_cb, 
 						  _("Deny"), deny_cb, 
 						  NULL);
 	}
-	gaim_gtk_blist_add_alert(alert);
+	pidgin_blist_add_alert(alert);
 
 	g_free(buffer);
 	
@@ -2533,35 +2533,35 @@
 }
 
 static void
-gaim_gtk_accounts_request_close(void *ui_handle)
+pidgin_accounts_request_close(void *ui_handle)
 {
 	
 }
 
 static GaimAccountUiOps ui_ops =
 {
-	gaim_gtk_accounts_notify_added,
+	pidgin_accounts_notify_added,
 	NULL,
-	gaim_gtk_accounts_request_add,
-	gaim_gtk_accounts_request_authorization,
-	gaim_gtk_accounts_request_close
+	pidgin_accounts_request_add,
+	pidgin_accounts_request_authorization,
+	pidgin_accounts_request_close
 };
 
 GaimAccountUiOps *
-gaim_gtk_accounts_get_ui_ops(void)
+pidgin_accounts_get_ui_ops(void)
 {
 	return &ui_ops;
 }
 
 void *
-gaim_gtk_account_get_handle(void) {
+pidgin_account_get_handle(void) {
 	static int handle;
 
 	return &handle;
 }
 
 void
-gaim_gtk_account_init(void)
+pidgin_account_init(void)
 {
 	gaim_prefs_add_none("/gaim/gtk/accounts");
 	gaim_prefs_add_none("/gaim/gtk/accounts/dialog");
@@ -2569,29 +2569,29 @@
 	gaim_prefs_add_int("/gaim/gtk/accounts/dialog/height", 321);
 	gaim_prefs_add_path("/gaim/gtk/accounts/buddyicon", NULL);
 
-	gaim_signal_register(gaim_gtk_account_get_handle(), "account-modified",
+	gaim_signal_register(pidgin_account_get_handle(), "account-modified",
 						 gaim_marshal_VOID__POINTER, NULL, 1,
 						 gaim_value_new(GAIM_TYPE_SUBTYPE,
 										GAIM_SUBTYPE_ACCOUNT));
 
 	/* Setup some gaim signal handlers. */
 	gaim_signal_connect(gaim_connections_get_handle(), "signed-on",
-						gaim_gtk_account_get_handle(),
+						pidgin_account_get_handle(),
 						GAIM_CALLBACK(signed_on_off_cb), NULL);
 	gaim_signal_connect(gaim_connections_get_handle(), "signed-off",
-						gaim_gtk_account_get_handle(),
+						pidgin_account_get_handle(),
 						GAIM_CALLBACK(signed_on_off_cb), NULL);
 	gaim_signal_connect(gaim_accounts_get_handle(), "account-added",
-						gaim_gtk_account_get_handle(),
+						pidgin_account_get_handle(),
 						GAIM_CALLBACK(add_account_to_liststore), NULL);
 	gaim_signal_connect(gaim_accounts_get_handle(), "account-removed",
-						gaim_gtk_account_get_handle(),
+						pidgin_account_get_handle(),
 						GAIM_CALLBACK(account_removed_cb), NULL);
 	gaim_signal_connect(gaim_accounts_get_handle(), "account-disabled",
-						gaim_gtk_account_get_handle(),
+						pidgin_account_get_handle(),
 						GAIM_CALLBACK(account_abled_cb), GINT_TO_POINTER(FALSE));
 	gaim_signal_connect(gaim_accounts_get_handle(), "account-enabled",
-						gaim_gtk_account_get_handle(),
+						pidgin_account_get_handle(),
 						GAIM_CALLBACK(account_abled_cb), GINT_TO_POINTER(TRUE));
 
 	account_pref_wins =
@@ -2599,7 +2599,7 @@
 }
 
 void
-gaim_gtk_account_uninit(void)
+pidgin_account_uninit(void)
 {
 	/*
 	 * TODO: Need to free all the dialogs in here.  Could probably create
@@ -2608,7 +2608,7 @@
 	 */
 	g_hash_table_destroy(account_pref_wins);
 
-	gaim_signals_disconnect_by_handle(gaim_gtk_account_get_handle());
-	gaim_signals_unregister_by_instance(gaim_gtk_account_get_handle());
+	gaim_signals_disconnect_by_handle(pidgin_account_get_handle());
+	gaim_signals_unregister_by_instance(pidgin_account_get_handle());
 }
 
--- a/pidgin/gtkaccount.h	Sat Feb 03 05:55:41 2007 +0000
+++ b/pidgin/gtkaccount.h	Sat Feb 03 08:13:34 2007 +0000
@@ -22,28 +22,28 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
-#ifndef _GAIM_GTKACCOUNT_H_
-#define _GAIM_GTKACCOUNT_H_
+#ifndef _PIDGINACCOUNT_H_
+#define _PIDGINACCOUNT_H_
 
 #include "account.h"
 
 typedef enum
 {
-	GAIM_GTK_ADD_ACCOUNT_DIALOG,
-	GAIM_GTK_MODIFY_ACCOUNT_DIALOG
+	PIDGIN_ADD_ACCOUNT_DIALOG,
+	PIDGIN_MODIFY_ACCOUNT_DIALOG
 
-} GaimGtkAccountDialogType;
+} PidginAccountDialogType;
 
 
 /**
  * Shows the accounts window.
  */
-void gaim_gtk_accounts_window_show(void);
+void pidgin_accounts_window_show(void);
 
 /**
  * Hides the accounts window.
  */
-void gaim_gtk_accounts_window_hide(void);
+void pidgin_accounts_window_hide(void);
 
 /**
  * Shows an add/modify account dialog.
@@ -51,7 +51,7 @@
  * @param type    The type of dialog.
  * @param account The associated account, or @c NULL for an Add dialog.
  */
-void gaim_gtk_account_dialog_show(GaimGtkAccountDialogType type,
+void pidgin_account_dialog_show(PidginAccountDialogType type,
 								  GaimAccount *account);
 
 /**
@@ -59,23 +59,23 @@
  *
  * @return The UI operations structure.
  */
-GaimAccountUiOps *gaim_gtk_accounts_get_ui_ops(void);
+GaimAccountUiOps *pidgin_accounts_get_ui_ops(void);
 
 /**
  * Returns the gtkaccounts handle
  *
  * @return The handle to the GTK+ account system
  */
-void *gaim_gtk_account_get_handle(void);
+void *pidgin_account_get_handle(void);
 
 /**
  * Initializes the GTK+ account system
  */
-void gaim_gtk_account_init(void);
+void pidgin_account_init(void);
 
 /**
  * Uninitializes the GTK+ account system
  */
-void gaim_gtk_account_uninit(void);
+void pidgin_account_uninit(void);
 
-#endif /* _GAIM_GTKACCOUNT_H_ */
+#endif /* _PIDGINACCOUNT_H_ */
--- a/pidgin/gtkblist.c	Sat Feb 03 05:55:41 2007 +0000
+++ b/pidgin/gtkblist.c	Sat Feb 03 08:13:34 2007 +0000
@@ -73,7 +73,7 @@
 	GtkWidget *entry_for_alias;
 	GtkWidget *account_box;
 
-} GaimGtkAddBuddyData;
+} PidginAddBuddyData;
 
 typedef struct
 {
@@ -89,7 +89,7 @@
 
 	GList *entries;
 
-} GaimGtkAddChatData;
+} PidginAddChatData;
 
 typedef struct
 {
@@ -101,7 +101,7 @@
 	GtkSizeGroup *sg;
 
 	GList *entries;
-} GaimGtkJoinChatData;
+} PidginJoinChatData;
 
 
 static GtkWidget *accountmenu = NULL;
@@ -109,8 +109,8 @@
 static guint visibility_manager_count = 0;
 static gboolean gtk_blist_obscured = FALSE;
 
-static GList *gaim_gtk_blist_sort_methods = NULL;
-static struct gaim_gtk_blist_sort_method *current_sort_method = NULL;
+static GList *pidgin_blist_sort_methods = NULL;
+static struct pidgin_blist_sort_method *current_sort_method = NULL;
 static void sort_method_none(GaimBlistNode *node, GaimBuddyList *blist, GtkTreeIter groupiter, GtkTreeIter *cur, GtkTreeIter *iter);
 
 /* The functions we use for sorting aren't available in gtk 2.0.x, and
@@ -120,23 +120,23 @@
 static void sort_method_status(GaimBlistNode *node, GaimBuddyList *blist, GtkTreeIter groupiter, GtkTreeIter *cur, GtkTreeIter *iter);
 static void sort_method_log(GaimBlistNode *node, GaimBuddyList *blist, GtkTreeIter groupiter, GtkTreeIter *cur, GtkTreeIter *iter);
 #endif
-static GaimGtkBuddyList *gtkblist = NULL;
-
-static gboolean gaim_gtk_blist_refresh_timer(GaimBuddyList *list);
-static void gaim_gtk_blist_update_buddy(GaimBuddyList *list, GaimBlistNode *node, gboolean statusChange);
-static void gaim_gtk_blist_selection_changed(GtkTreeSelection *selection, gpointer data);
-static void gaim_gtk_blist_update(GaimBuddyList *list, GaimBlistNode *node);
-static void gaim_gtk_blist_update_contact(GaimBuddyList *list, GaimBlistNode *node);
+static PidginBuddyList *gtkblist = NULL;
+
+static gboolean pidgin_blist_refresh_timer(GaimBuddyList *list);
+static void pidgin_blist_update_buddy(GaimBuddyList *list, GaimBlistNode *node, gboolean statusChange);
+static void pidgin_blist_selection_changed(GtkTreeSelection *selection, gpointer data);
+static void pidgin_blist_update(GaimBuddyList *list, GaimBlistNode *node);
+static void pidgin_blist_update_contact(GaimBuddyList *list, GaimBlistNode *node);
 static char *gaim_get_tooltip_text(GaimBlistNode *node, gboolean full);
 static const char *item_factory_translate_func (const char *path, gpointer func_data);
 static gboolean get_iter_from_node(GaimBlistNode *node, GtkTreeIter *iter);
 static void redo_buddy_list(GaimBuddyList *list, gboolean remove, gboolean rerender);
-static void gaim_gtk_blist_collapse_contact_cb(GtkWidget *w, GaimBlistNode *node);
+static void pidgin_blist_collapse_contact_cb(GtkWidget *w, GaimBlistNode *node);
 static char *gaim_get_group_title(GaimBlistNode *gnode, gboolean expanded);
 
-static void gaim_gtk_blist_tooltip_destroy(void);
-
-struct _gaim_gtk_blist_node {
+static void pidgin_blist_tooltip_destroy(void);
+
+struct _pidgin_blist_node {
 	GtkTreeRowReference *row;
 	gboolean contact_expanded;
 	gboolean recent_signonoff;
@@ -167,7 +167,7 @@
 		gtk_blist_obscured = TRUE;
 	else if (gtk_blist_obscured) {
 			gtk_blist_obscured = FALSE;
-			gaim_gtk_blist_refresh_timer(gaim_get_blist());
+			pidgin_blist_refresh_timer(gaim_get_blist());
 	}
 
 	/* continue to handle event normally */
@@ -181,7 +181,7 @@
 			gaim_prefs_set_bool("/gaim/gtk/blist/list_visible", FALSE);
 		else {
 			gaim_prefs_set_bool("/gaim/gtk/blist/list_visible", TRUE);
-			gaim_gtk_blist_refresh_timer(gaim_get_blist());
+			pidgin_blist_refresh_timer(gaim_get_blist());
 		}
 	}
 
@@ -195,7 +195,7 @@
 	/* Refresh gtkblist if un-iconifying */
 	if (event->changed_mask & GDK_WINDOW_STATE_ICONIFIED){
 		if (!(event->new_window_state & GDK_WINDOW_STATE_ICONIFIED))
-			gaim_gtk_blist_refresh_timer(gaim_get_blist());
+			pidgin_blist_refresh_timer(gaim_get_blist());
 	}
 
 	return FALSE;
@@ -278,7 +278,7 @@
 
 static void gtk_blist_menu_im_cb(GtkWidget *w, GaimBuddy *b)
 {
-	gaim_gtkdialogs_im_with_user(b->account, b->name);
+	pidgindialogs_im_with_user(b->account, b->name);
 }
 
 static void gtk_blist_menu_send_file_cb(GtkWidget *w, GaimBuddy *b)
@@ -301,7 +301,7 @@
 											   chat->account);
 
 	if (conv != NULL)
-		gaim_gtkconv_present_conversation(conv);
+		pidgin_conv_present_conversation(conv);
 
 	serv_join_chat(chat->account->gc, chat->components);
 }
@@ -334,7 +334,7 @@
 		case GAIM_BLIST_CONTACT_NODE:
 			{
 				GaimContact *contact = (GaimContact *)node;
-				struct _gaim_gtk_blist_node *gtknode = (struct _gaim_gtk_blist_node *)node->ui_data;
+				struct _pidgin_blist_node *gtknode = (struct _pidgin_blist_node *)node->ui_data;
 
 				if (contact->alias || gtknode->contact_expanded)
 					gaim_blist_alias_contact(contact, arg2);
@@ -354,7 +354,7 @@
 		case GAIM_BLIST_GROUP_NODE:
 			dest = gaim_find_group(arg2);
 			if (dest != NULL && strcmp(arg2, ((GaimGroup*) node)->name)) {
-				gaim_gtkdialogs_merge_groups((GaimGroup*) node, arg2);
+				pidgindialogs_merge_groups((GaimGroup*) node, arg2);
 			} else
 				gaim_blist_rename_group((GaimGroup*)node, arg2);
 			break;
@@ -417,7 +417,7 @@
 
 static void gtk_blist_menu_bp_cb(GtkWidget *w, GaimBuddy *b)
 {
-	gaim_gtk_pounce_editor_show(b->account, b->name, NULL);
+	pidgin_pounce_editor_show(b->account, b->name, NULL);
 }
 
 static void gtk_blist_menu_showlog_cb(GtkWidget *w, GaimBlistNode *node)
@@ -426,7 +426,7 @@
 	GaimAccount *account;
 	char *name = NULL;
 
-	gaim_gtk_set_cursor(gtkblist->window, GDK_WATCH);
+	pidgin_set_cursor(gtkblist->window, GDK_WATCH);
 
 	if (GAIM_BLIST_NODE_IS_BUDDY(node)) {
 		GaimBuddy *b = (GaimBuddy*) node;
@@ -443,11 +443,11 @@
 			name = prpl_info->get_chat_name(c->components);
 		}
 	} else if (GAIM_BLIST_NODE_IS_CONTACT(node)) {
-		gaim_gtk_log_show_contact((GaimContact *)node);
-		gaim_gtk_clear_cursor(gtkblist->window);
+		pidgin_log_show_contact((GaimContact *)node);
+		pidgin_clear_cursor(gtkblist->window);
 		return;
 	} else {
-		gaim_gtk_clear_cursor(gtkblist->window);
+		pidgin_clear_cursor(gtkblist->window);
 
 		/* This callback should not have been registered for a node
 		 * that doesn't match the type of one of the blocks above. */
@@ -455,16 +455,16 @@
 	}
 
 	if (name && account) {
-		gaim_gtk_log_show(type, name, account);
+		pidgin_log_show(type, name, account);
 		g_free(name);
 
-		gaim_gtk_clear_cursor(gtkblist->window);
+		pidgin_clear_cursor(gtkblist->window);
 	}
 }
 
 static void gtk_blist_show_systemlog_cb()
 {
-	gaim_gtk_syslog_show();
+	pidgin_syslog_show();
 }
 
 static void gtk_blist_show_onlinehelp_cb()
@@ -473,7 +473,7 @@
 }
 
 static void
-do_join_chat(GaimGtkJoinChatData *data)
+do_join_chat(PidginJoinChatData *data)
 {
 	if (data)
 	{
@@ -506,7 +506,7 @@
 }
 
 static void
-do_joinchat(GtkWidget *dialog, int id, GaimGtkJoinChatData *info)
+do_joinchat(GtkWidget *dialog, int id, PidginJoinChatData *info)
 {
 	switch(id)
 	{
@@ -528,7 +528,7 @@
 static void
 joinchat_set_sensitive_if_input_cb(GtkWidget *entry, gpointer user_data)
 {
-	GaimGtkJoinChatData *data;
+	PidginJoinChatData *data;
 	GList *tmp;
 	const char *text;
 	gboolean required;
@@ -551,13 +551,13 @@
 }
 
 static void
-gaim_gtk_blist_update_privacy_cb(GaimBuddy *buddy)
-{
-	gaim_gtk_blist_update_buddy(gaim_get_blist(), (GaimBlistNode*)(buddy), TRUE);
+pidgin_blist_update_privacy_cb(GaimBuddy *buddy)
+{
+	pidgin_blist_update_buddy(gaim_get_blist(), (GaimBlistNode*)(buddy), TRUE);
 }
 
 static void
-rebuild_joinchat_entries(GaimGtkJoinChatData *data)
+rebuild_joinchat_entries(PidginJoinChatData *data)
 {
 	GaimConnection *gc;
 	GList *list = NULL, *tmp;
@@ -652,7 +652,7 @@
 
 static void
 joinchat_select_account_cb(GObject *w, GaimAccount *account,
-                           GaimGtkJoinChatData *data)
+                           PidginJoinChatData *data)
 {
     data->account = account;
     rebuild_joinchat_entries(data);
@@ -670,7 +670,7 @@
 }
 
 gboolean
-gaim_gtk_blist_joinchat_is_showable()
+pidgin_blist_joinchat_is_showable()
 {
 	GList *c;
 	GaimConnection *gc;
@@ -686,19 +686,19 @@
 }
 
 void
-gaim_gtk_blist_joinchat_show(void)
+pidgin_blist_joinchat_show(void)
 {
 	GtkWidget *hbox, *vbox;
 	GtkWidget *rowbox;
 	GtkWidget *label;
-	GaimGtkBuddyList *gtkblist;
+	PidginBuddyList *gtkblist;
 	GtkWidget *img = NULL;
-	GaimGtkJoinChatData *data = NULL;
-
-	gtkblist = GAIM_GTK_BLIST(gaim_get_blist());
+	PidginJoinChatData *data = NULL;
+
+	gtkblist = PIDGIN_BLIST(gaim_get_blist());
 	img = gtk_image_new_from_stock(PIDGIN_STOCK_DIALOG_QUESTION,
 					gtk_icon_size_from_name(PIDGIN_ICON_SIZE_TANGO_HUGE));
-	data = g_new0(GaimGtkJoinChatData, 1);
+	data = g_new0(PidginJoinChatData, 1);
 
 	data->window = gtk_dialog_new_with_buttons(_("Join a Chat"),
 		NULL, GTK_DIALOG_NO_SEPARATOR,
@@ -737,7 +737,7 @@
 	gtk_box_pack_start(GTK_BOX(rowbox), label, FALSE, FALSE, 0);
 	gtk_size_group_add_widget(data->sg, label);
 
-	data->account_menu = gaim_gtk_account_option_menu_new(NULL, FALSE,
+	data->account_menu = pidgin_account_option_menu_new(NULL, FALSE,
 			G_CALLBACK(joinchat_select_account_cb),
 			chat_account_filter_func, data);
 	gtk_box_pack_start(GTK_BOX(rowbox), data->account_menu, TRUE, TRUE, 0);
@@ -749,7 +749,7 @@
 	gtk_container_add(GTK_CONTAINER(vbox), data->entries_box);
 	gtk_container_set_border_width(GTK_CONTAINER(data->entries_box), 0);
 
-	data->account =	gaim_gtk_account_option_menu_get_selected(data->account_menu);
+	data->account =	pidgin_account_option_menu_get_selected(data->account_menu);
 
 	rebuild_joinchat_entries(data);
 
@@ -807,7 +807,7 @@
 
 		gaim_blist_node_set_bool(node, "collapsed", TRUE);
 	} else if(GAIM_BLIST_NODE_IS_CONTACT(node)) {
-		gaim_gtk_blist_collapse_contact_cb(NULL, node);
+		pidgin_blist_collapse_contact_cb(NULL, node);
 	}
 }
 
@@ -830,7 +830,7 @@
 		else
 			buddy = (GaimBuddy*)node;
 
-		gaim_gtkdialogs_im_with_user(buddy->account, buddy->name);
+		pidgindialogs_im_with_user(buddy->account, buddy->name);
 	} else if (GAIM_BLIST_NODE_IS_CHAT(node)) {
 		gtk_blist_join_chat((GaimChat *)node);
 	} else if (GAIM_BLIST_NODE_IS_GROUP(node)) {
@@ -841,7 +841,7 @@
 	}
 }
 
-static void gaim_gtk_blist_add_chat_cb()
+static void pidgin_blist_add_chat_cb()
 {
 	GtkTreeSelection *sel = gtk_tree_view_get_selection(GTK_TREE_VIEW(gtkblist->treeview));
 	GtkTreeIter iter;
@@ -861,7 +861,7 @@
 	}
 }
 
-static void gaim_gtk_blist_add_buddy_cb()
+static void pidgin_blist_add_buddy_cb()
 {
 	GtkTreeSelection *sel = gtk_tree_view_get_selection(GTK_TREE_VIEW(gtkblist->treeview));
 	GtkTreeIter iter;
@@ -885,16 +885,16 @@
 }
 
 static void
-gaim_gtk_blist_remove_cb (GtkWidget *w, GaimBlistNode *node)
+pidgin_blist_remove_cb (GtkWidget *w, GaimBlistNode *node)
 {
 	if (GAIM_BLIST_NODE_IS_BUDDY(node)) {
-		gaim_gtkdialogs_remove_buddy((GaimBuddy*)node);
+		pidgindialogs_remove_buddy((GaimBuddy*)node);
 	} else if (GAIM_BLIST_NODE_IS_CHAT(node)) {
-		gaim_gtkdialogs_remove_chat((GaimChat*)node);
+		pidgindialogs_remove_chat((GaimChat*)node);
 	} else if (GAIM_BLIST_NODE_IS_GROUP(node)) {
-		gaim_gtkdialogs_remove_group((GaimGroup*)node);
+		pidgindialogs_remove_group((GaimGroup*)node);
 	} else if (GAIM_BLIST_NODE_IS_CONTACT(node)) {
-		gaim_gtkdialogs_remove_contact((GaimContact*)node);
+		pidgindialogs_remove_contact((GaimContact*)node);
 	}
 }
 
@@ -909,7 +909,7 @@
 {
 	struct _expand *ex = data;
 	gtk_tree_view_scroll_to_cell(ex->treeview, ex->path, NULL, FALSE, 0, 0);
-	gaim_gtk_blist_update_contact(NULL, ex->node);
+	pidgin_blist_update_contact(NULL, ex->node);
 
 	gtk_tree_path_free(ex->path);
 	g_free(ex);
@@ -918,9 +918,9 @@
 }
 
 static void
-gaim_gtk_blist_expand_contact_cb(GtkWidget *w, GaimBlistNode *node)
-{
-	struct _gaim_gtk_blist_node *gtknode;
+pidgin_blist_expand_contact_cb(GtkWidget *w, GaimBlistNode *node)
+{
+	struct _pidgin_blist_node *gtknode;
 	GtkTreeIter iter, parent;
 	GaimBlistNode *bnode;
 	GtkTreePath *path;
@@ -928,12 +928,12 @@
 	if(!GAIM_BLIST_NODE_IS_CONTACT(node))
 		return;
 
-	gtknode = (struct _gaim_gtk_blist_node *)node->ui_data;
+	gtknode = (struct _pidgin_blist_node *)node->ui_data;
 
 	gtknode->contact_expanded = TRUE;
 
 	for(bnode = node->child; bnode; bnode = bnode->next) {
-		gaim_gtk_blist_update(NULL, bnode);
+		pidgin_blist_update(NULL, bnode);
 	}
 
 	/* This ensures that the bottom buddy is visible, i.e. not scrolled off the alignment */
@@ -953,20 +953,20 @@
 }
 
 static void
-gaim_gtk_blist_collapse_contact_cb(GtkWidget *w, GaimBlistNode *node)
+pidgin_blist_collapse_contact_cb(GtkWidget *w, GaimBlistNode *node)
 {
 	GaimBlistNode *bnode;
-	struct _gaim_gtk_blist_node *gtknode;
+	struct _pidgin_blist_node *gtknode;
 
 	if(!GAIM_BLIST_NODE_IS_CONTACT(node))
 		return;
 
-	gtknode = (struct _gaim_gtk_blist_node *)node->ui_data;
+	gtknode = (struct _pidgin_blist_node *)node->ui_data;
 
 	gtknode->contact_expanded = FALSE;
 
 	for(bnode = node->child; bnode; bnode = bnode->next) {
-		gaim_gtk_blist_update(NULL, bnode);
+		pidgin_blist_update(NULL, bnode);
 	}
 }
 
@@ -994,10 +994,10 @@
 	else
 		gaim_privacy_allow(account, name, FALSE, FALSE);
 
-	gaim_gtk_blist_update(gaim_get_blist(), node);
-}
-
-void gaim_gtk_append_blist_node_privacy_menu(GtkWidget *menu, GaimBlistNode *node)
+	pidgin_blist_update(gaim_get_blist(), node);
+}
+
+void pidgin_append_blist_node_privacy_menu(GtkWidget *menu, GaimBlistNode *node)
 {
 	GaimBuddy *buddy = (GaimBuddy *)node;
 	GaimAccount *account;
@@ -1012,7 +1012,7 @@
 }
 
 void
-gaim_gtk_append_blist_node_proto_menu(GtkWidget *menu, GaimConnection *gc,
+pidgin_append_blist_node_proto_menu(GtkWidget *menu, GaimConnection *gc,
                                       GaimBlistNode *node)
 {
 	GList *l, *ll;
@@ -1023,25 +1023,25 @@
 
 	for(l = ll = prpl_info->blist_node_menu(node); l; l = l->next) {
 		GaimMenuAction *act = (GaimMenuAction *) l->data;
-		gaim_gtk_append_menu_action(menu, act, node);
+		pidgin_append_menu_action(menu, act, node);
 	}
 	g_list_free(ll);
 }
 
 void
-gaim_gtk_append_blist_node_extended_menu(GtkWidget *menu, GaimBlistNode *node)
+pidgin_append_blist_node_extended_menu(GtkWidget *menu, GaimBlistNode *node)
 {
 	GList *l, *ll;
 
 	for(l = ll = gaim_blist_node_get_extended_menu(node); l; l = l->next) {
 		GaimMenuAction *act = (GaimMenuAction *) l->data;
-		gaim_gtk_append_menu_action(menu, act, node);
+		pidgin_append_menu_action(menu, act, node);
 	}
 	g_list_free(ll);
 }
 
 void
-gaim_gtk_blist_make_buddy_menu(GtkWidget *menu, GaimBuddy *buddy, gboolean sub) {
+pidgin_blist_make_buddy_menu(GtkWidget *menu, GaimBuddy *buddy, gboolean sub) {
 	GaimPluginProtocolInfo *prpl_info;
 	GaimContact *contact;
 	gboolean contact_expanded = FALSE;
@@ -1053,7 +1053,7 @@
 
 	contact = gaim_buddy_get_contact(buddy);
 	if (contact) {
-		contact_expanded = ((struct _gaim_gtk_blist_node *)(((GaimBlistNode*)contact)->ui_data))->contact_expanded;
+		contact_expanded = ((struct _pidgin_blist_node *)(((GaimBlistNode*)contact)->ui_data))->contact_expanded;
 	}
 
 	if (prpl_info && prpl_info->get_info) {
@@ -1085,11 +1085,11 @@
 				G_CALLBACK(gtk_blist_menu_showlog_cb), buddy, 0, 0, NULL);
 	}
 
-	gaim_gtk_append_blist_node_privacy_menu(menu, (GaimBlistNode *)buddy);
-
-	gaim_gtk_append_blist_node_proto_menu(menu, buddy->account->gc,
+	pidgin_append_blist_node_privacy_menu(menu, (GaimBlistNode *)buddy);
+
+	pidgin_append_blist_node_proto_menu(menu, buddy->account->gc,
 										  (GaimBlistNode *)buddy);
-	gaim_gtk_append_blist_node_extended_menu(menu, (GaimBlistNode *)buddy);
+	pidgin_append_blist_node_extended_menu(menu, (GaimBlistNode *)buddy);
 
 	if (((GaimBlistNode*)buddy)->parent->child->next && !sub && !contact_expanded) {
 		gaim_separator(menu);
@@ -1098,7 +1098,7 @@
 				G_CALLBACK(gtk_blist_menu_alias_cb),
 				contact, 0, 0, NULL);
 		gaim_new_item_from_stock(menu, _("Remove"), GTK_STOCK_REMOVE,
-				G_CALLBACK(gaim_gtk_blist_remove_cb),
+				G_CALLBACK(pidgin_blist_remove_cb),
 				contact, 0, 0, NULL);
 	} else if (!sub || contact_expanded) {
 		gaim_separator(menu);
@@ -1106,7 +1106,7 @@
 		gaim_new_item_from_stock(menu, _("_Alias..."), GAIM_STOCK_ALIAS,
 				G_CALLBACK(gtk_blist_menu_alias_cb), buddy, 0, 0, NULL);
 		gaim_new_item_from_stock(menu, _("_Remove"), GTK_STOCK_REMOVE,
-				G_CALLBACK(gaim_gtk_blist_remove_cb), buddy,
+				G_CALLBACK(pidgin_blist_remove_cb), buddy,
 				0, 0, NULL);
 	}
 }
@@ -1153,16 +1153,16 @@
 
 	menu = gtk_menu_new();
 	gaim_new_item_from_stock(menu, _("Add a _Buddy"), GTK_STOCK_ADD,
-				 G_CALLBACK(gaim_gtk_blist_add_buddy_cb), node, 0, 0, NULL);
+				 G_CALLBACK(pidgin_blist_add_buddy_cb), node, 0, 0, NULL);
 	item = gaim_new_item_from_stock(menu, _("Add a C_hat"), GTK_STOCK_ADD,
-				 G_CALLBACK(gaim_gtk_blist_add_chat_cb), node, 0, 0, NULL);
-	gtk_widget_set_sensitive(item, gaim_gtk_blist_joinchat_is_showable());
+				 G_CALLBACK(pidgin_blist_add_chat_cb), node, 0, 0, NULL);
+	gtk_widget_set_sensitive(item, pidgin_blist_joinchat_is_showable());
 	gaim_new_item_from_stock(menu, _("_Delete Group"), GTK_STOCK_REMOVE,
-				 G_CALLBACK(gaim_gtk_blist_remove_cb), node, 0, 0, NULL);
+				 G_CALLBACK(pidgin_blist_remove_cb), node, 0, 0, NULL);
 	gaim_new_item_from_stock(menu, _("_Rename"), NULL,
 				 G_CALLBACK(gtk_blist_menu_alias_cb), node, 0, 0, NULL);
 
-	gaim_gtk_append_blist_node_extended_menu(menu, node);
+	pidgin_append_blist_node_extended_menu(menu, node);
 
 	return menu;
 }
@@ -1184,15 +1184,15 @@
 	gaim_new_item_from_stock(menu, _("View _Log"), GAIM_STOCK_LOG,
 			G_CALLBACK(gtk_blist_menu_showlog_cb), node, 0, 0, NULL);
 
-	gaim_gtk_append_blist_node_proto_menu(menu, c->account->gc, node);
-	gaim_gtk_append_blist_node_extended_menu(menu, node);
+	pidgin_append_blist_node_proto_menu(menu, c->account->gc, node);
+	pidgin_append_blist_node_extended_menu(menu, node);
 
 	gaim_separator(menu);
 
 	gaim_new_item_from_stock(menu, _("_Alias..."), GAIM_STOCK_ALIAS,
 				 G_CALLBACK(gtk_blist_menu_alias_cb), node, 0, 0, NULL);
 	gaim_new_item_from_stock(menu, _("_Remove"), GTK_STOCK_REMOVE,
-				 G_CALLBACK(gaim_gtk_blist_remove_cb), node, 0, 0, NULL);
+				 G_CALLBACK(pidgin_blist_remove_cb), node, 0, 0, NULL);
 
 	return menu;
 }
@@ -1213,28 +1213,28 @@
 	gaim_new_item_from_stock(menu, _("_Alias..."), GAIM_STOCK_ALIAS,
 				 G_CALLBACK(gtk_blist_menu_alias_cb), node, 0, 0, NULL);
 	gaim_new_item_from_stock(menu, _("_Remove"), GTK_STOCK_REMOVE,
-				 G_CALLBACK(gaim_gtk_blist_remove_cb), node, 0, 0, NULL);
+				 G_CALLBACK(pidgin_blist_remove_cb), node, 0, 0, NULL);
 
 	gaim_separator(menu);
 
 	gaim_new_item_from_stock(menu, _("_Collapse"), GTK_STOCK_ZOOM_OUT,
-				 G_CALLBACK(gaim_gtk_blist_collapse_contact_cb),
+				 G_CALLBACK(pidgin_blist_collapse_contact_cb),
 				 node, 0, 0, NULL);
 
-	gaim_gtk_append_blist_node_extended_menu(menu, node);
+	pidgin_append_blist_node_extended_menu(menu, node);
 
 	return menu;
 }
 
 static GtkWidget *
 create_buddy_menu(GaimBlistNode *node, GaimBuddy *b) {
-	struct _gaim_gtk_blist_node *gtknode = (struct _gaim_gtk_blist_node *)node->ui_data;
+	struct _pidgin_blist_node *gtknode = (struct _pidgin_blist_node *)node->ui_data;
 	GtkWidget *menu;
 	GtkWidget *menuitem;
 	gboolean show_offline = gaim_prefs_get_bool("/gaim/gtk/blist/show_offline_buddies");
 
 	menu = gtk_menu_new();
-	gaim_gtk_blist_make_buddy_menu(menu, b, FALSE);
+	pidgin_blist_make_buddy_menu(menu, b, FALSE);
 
 	if(GAIM_BLIST_NODE_IS_CONTACT(node)) {
 		gaim_separator(menu);
@@ -1242,12 +1242,12 @@
 		if(gtknode->contact_expanded) {
 			gaim_new_item_from_stock(menu, _("_Collapse"),
 						 GTK_STOCK_ZOOM_OUT,
-						 G_CALLBACK(gaim_gtk_blist_collapse_contact_cb),
+						 G_CALLBACK(pidgin_blist_collapse_contact_cb),
 						 node, 0, 0, NULL);
 		} else {
 			gaim_new_item_from_stock(menu, _("_Expand"),
 						 GTK_STOCK_ZOOM_IN,
-						 G_CALLBACK(gaim_gtk_blist_expand_contact_cb), node,
+						 G_CALLBACK(pidgin_blist_expand_contact_cb), node,
 						 0, 0, NULL);
 		}
 		if(node->child->next) {
@@ -1267,7 +1267,7 @@
 					continue;
 
 				menuitem = gtk_image_menu_item_new_with_label(buddy->name);
-				buf = gaim_gtk_create_prpl_icon(buddy->account,PIDGIN_PRPL_ICON_SMALL);
+				buf = pidgin_create_prpl_icon(buddy->account,PIDGIN_PRPL_ICON_SMALL);
 				image = gtk_image_new_from_pixbuf(buf);
 				g_object_unref(G_OBJECT(buf));
 				gtk_image_menu_item_set_image(GTK_IMAGE_MENU_ITEM(menuitem),
@@ -1280,7 +1280,7 @@
 				gtk_menu_item_set_submenu(GTK_MENU_ITEM(menuitem), submenu);
 				gtk_widget_show(submenu);
 
-				gaim_gtk_blist_make_buddy_menu(submenu, buddy, TRUE);
+				pidgin_blist_make_buddy_menu(submenu, buddy, TRUE);
 			}
 		}
 	}
@@ -1288,17 +1288,17 @@
 }
 
 static gboolean
-gaim_gtk_blist_show_context_menu(GaimBlistNode *node,
+pidgin_blist_show_context_menu(GaimBlistNode *node,
 								 GtkMenuPositionFunc func,
 								 GtkWidget *tv,
 								 guint button,
 								 guint32 time)
 {
-	struct _gaim_gtk_blist_node *gtknode;
+	struct _pidgin_blist_node *gtknode;
 	GtkWidget *menu = NULL;
 	gboolean handled = FALSE;
 
-	gtknode = (struct _gaim_gtk_blist_node *)node->ui_data;
+	gtknode = (struct _pidgin_blist_node *)node->ui_data;
 
 	/* Create a menu based on the thing we right-clicked on */
 	if (GAIM_BLIST_NODE_IS_GROUP(node)) {
@@ -1351,7 +1351,7 @@
 	GtkTreeSelection *sel;
 	GaimPlugin *prpl = NULL;
 	GaimPluginProtocolInfo *prpl_info = NULL;
-	struct _gaim_gtk_blist_node *gtknode;
+	struct _pidgin_blist_node *gtknode;
 	gboolean handled = FALSE;
 
 	/* Here we figure out which node was clicked */
@@ -1361,19 +1361,19 @@
 	val.g_type = 0;
 	gtk_tree_model_get_value(GTK_TREE_MODEL(gtkblist->treemodel), &iter, NODE_COLUMN, &val);
 	node = g_value_get_pointer(&val);
-	gtknode = (struct _gaim_gtk_blist_node *)node->ui_data;
+	gtknode = (struct _pidgin_blist_node *)node->ui_data;
 
 	/* Right click draws a context menu */
 	if ((event->button == 3) && (event->type == GDK_BUTTON_PRESS)) {
-		handled = gaim_gtk_blist_show_context_menu(node, NULL, tv, 3, event->time);
+		handled = pidgin_blist_show_context_menu(node, NULL, tv, 3, event->time);
 
 	/* CTRL+middle click expands or collapse a contact */
 	} else if ((event->button == 2) && (event->type == GDK_BUTTON_PRESS) &&
 			   (event->state & GDK_CONTROL_MASK) && (GAIM_BLIST_NODE_IS_CONTACT(node))) {
 		if (gtknode->contact_expanded)
-			gaim_gtk_blist_collapse_contact_cb(NULL, node);
+			pidgin_blist_collapse_contact_cb(NULL, node);
 		else
-			gaim_gtk_blist_expand_contact_cb(NULL, node);
+			pidgin_blist_expand_contact_cb(NULL, node);
 		handled = TRUE;
 
 	/* Double middle click gets info */
@@ -1416,7 +1416,7 @@
 }
 
 static gboolean
-gaim_gtk_blist_popup_menu_cb(GtkWidget *tv, void *user_data)
+pidgin_blist_popup_menu_cb(GtkWidget *tv, void *user_data)
 {
 	GaimBlistNode *node;
 	GValue val;
@@ -1434,59 +1434,59 @@
 	node = g_value_get_pointer(&val);
 
 	/* Shift+F10 draws a context menu */
-	handled = gaim_gtk_blist_show_context_menu(node, gaim_gtk_treeview_popup_menu_position_func, tv, 0, GDK_CURRENT_TIME);
+	handled = pidgin_blist_show_context_menu(node, pidgin_treeview_popup_menu_position_func, tv, 0, GDK_CURRENT_TIME);
 
 	return handled;
 }
 
-static void gaim_gtk_blist_buddy_details_cb(gpointer data, guint action, GtkWidget *item)
-{
-	gaim_gtk_set_cursor(gtkblist->window, GDK_WATCH);
+static void pidgin_blist_buddy_details_cb(gpointer data, guint action, GtkWidget *item)
+{
+	pidgin_set_cursor(gtkblist->window, GDK_WATCH);
 
 	gaim_prefs_set_bool("/gaim/gtk/blist/show_buddy_icons",
 			    gtk_check_menu_item_get_active(GTK_CHECK_MENU_ITEM(item)));
 
-	gaim_gtk_clear_cursor(gtkblist->window);
-}
-
-static void gaim_gtk_blist_show_idle_time_cb(gpointer data, guint action, GtkWidget *item)
-{
-	gaim_gtk_set_cursor(gtkblist->window, GDK_WATCH);
+	pidgin_clear_cursor(gtkblist->window);
+}
+
+static void pidgin_blist_show_idle_time_cb(gpointer data, guint action, GtkWidget *item)
+{
+	pidgin_set_cursor(gtkblist->window, GDK_WATCH);
 
 	gaim_prefs_set_bool("/gaim/gtk/blist/show_idle_time",
 			    gtk_check_menu_item_get_active(GTK_CHECK_MENU_ITEM(item)));
 
-	gaim_gtk_clear_cursor(gtkblist->window);
-}
-
-static void gaim_gtk_blist_show_empty_groups_cb(gpointer data, guint action, GtkWidget *item)
-{
-	gaim_gtk_set_cursor(gtkblist->window, GDK_WATCH);
+	pidgin_clear_cursor(gtkblist->window);
+}
+
+static void pidgin_blist_show_empty_groups_cb(gpointer data, guint action, GtkWidget *item)
+{
+	pidgin_set_cursor(gtkblist->window, GDK_WATCH);
 
 	gaim_prefs_set_bool("/gaim/gtk/blist/show_empty_groups",
 			gtk_check_menu_item_get_active(GTK_CHECK_MENU_ITEM(item)));
 
-	gaim_gtk_clear_cursor(gtkblist->window);
-}
-
-static void gaim_gtk_blist_edit_mode_cb(gpointer callback_data, guint callback_action,
+	pidgin_clear_cursor(gtkblist->window);
+}
+
+static void pidgin_blist_edit_mode_cb(gpointer callback_data, guint callback_action,
 		GtkWidget *checkitem)
 {
-	gaim_gtk_set_cursor(gtkblist->window, GDK_WATCH);
+	pidgin_set_cursor(gtkblist->window, GDK_WATCH);
 
 	gaim_prefs_set_bool("/gaim/gtk/blist/show_offline_buddies",
 			gtk_check_menu_item_get_active(GTK_CHECK_MENU_ITEM(checkitem)));
 
-	gaim_gtk_clear_cursor(gtkblist->window);
-}
-
-static void gaim_gtk_blist_mute_sounds_cb(gpointer data, guint action, GtkWidget *item)
+	pidgin_clear_cursor(gtkblist->window);
+}
+
+static void pidgin_blist_mute_sounds_cb(gpointer data, guint action, GtkWidget *item)
 {
 	gaim_prefs_set_bool("/gaim/gtk/sound/mute", GTK_CHECK_MENU_ITEM(item)->active);
 }
 
 static void
-gaim_gtk_blist_mute_pref_cb(const char *name, GaimPrefType type,
+pidgin_blist_mute_pref_cb(const char *name, GaimPrefType type,
 							gconstpointer value, gpointer data)
 {
 	gtk_check_menu_item_set_active(GTK_CHECK_MENU_ITEM(gtk_item_factory_get_item(gtkblist->ift,
@@ -1494,7 +1494,7 @@
 }
 
 static void
-gaim_gtk_blist_sound_method_pref_cb(const char *name, GaimPrefType type,
+pidgin_blist_sound_method_pref_cb(const char *name, GaimPrefType type,
 									gconstpointer value, gpointer data)
 {
 	gboolean sensitive = TRUE;
@@ -1636,10 +1636,10 @@
 }
 
 #ifdef _WIN32
-static void gaim_gtk_blist_drag_begin(GtkWidget *widget,
+static void pidgin_blist_drag_begin(GtkWidget *widget,
 		GdkDragContext *drag_context, gpointer user_data)
 {
-	gaim_gtk_blist_tooltip_destroy();
+	pidgin_blist_tooltip_destroy();
 
 
 	/* Unhook the tooltip-timeout since we don't want a tooltip
@@ -1652,7 +1652,7 @@
 }
 #endif
 
-static void gaim_gtk_blist_drag_data_get_cb(GtkWidget *widget,
+static void pidgin_blist_drag_data_get_cb(GtkWidget *widget,
 											GdkDragContext *dc,
 											GtkSelectionData *data,
 											guint info,
@@ -1762,7 +1762,7 @@
 	}
 }
 
-static void gaim_gtk_blist_drag_data_rcv_cb(GtkWidget *widget, GdkDragContext *dc, guint x, guint y,
+static void pidgin_blist_drag_data_rcv_cb(GtkWidget *widget, GdkDragContext *dc, guint x, guint y,
 			  GtkSelectionData *sd, guint info, guint t)
 {
 	if (gtkblist->drag_timeout) {
@@ -1780,7 +1780,7 @@
 			GtkTreeIter iter;
 			GaimBlistNode *node;
 			GValue val;
-			struct _gaim_gtk_blist_node *gtknode;
+			struct _pidgin_blist_node *gtknode;
 
 			gtk_tree_model_get_iter(GTK_TREE_MODEL(gtkblist->treemodel),
 					&iter, path);
@@ -1956,7 +1956,7 @@
 			}
 		}
 
-		if (gaim_gtk_parse_x_im_contact((const char *)sd->data, FALSE, &account,
+		if (pidgin_parse_x_im_contact((const char *)sd->data, FALSE, &account,
 										&protocol, &username, &alias))
 		{
 			if (account == NULL)
@@ -2050,7 +2050,46 @@
 	}
 }
 
-static GdkPixbuf *gaim_gtk_blist_get_buddy_icon(GaimBlistNode *node,
+/* Altered from do_colorshift in gnome-panel */
+static void
+do_alphashift (GdkPixbuf *dest, GdkPixbuf *src, int shift)
+{
+	gint i, j;
+	gint width, height, has_alpha, srcrowstride, destrowstride;
+	guchar *target_pixels;
+	guchar *original_pixels;
+	guchar *pixsrc;
+	guchar *pixdest;
+	int val;
+	guchar a;
+
+	has_alpha = gdk_pixbuf_get_has_alpha (src);
+	if (!has_alpha)
+	  return;
+
+	width = gdk_pixbuf_get_width (src);
+	height = gdk_pixbuf_get_height (src);
+	srcrowstride = gdk_pixbuf_get_rowstride (src);
+	destrowstride = gdk_pixbuf_get_rowstride (dest);
+	target_pixels = gdk_pixbuf_get_pixels (dest);
+	original_pixels = gdk_pixbuf_get_pixels (src);
+
+	for (i = 0; i < height; i++) {
+		pixdest = target_pixels + i*destrowstride;
+		pixsrc = original_pixels + i*srcrowstride;
+		for (j = 0; j < width; j++) {
+			*(pixdest++) = *(pixsrc++);
+			*(pixdest++) = *(pixsrc++);
+			*(pixdest++) = *(pixsrc++);
+			a = *(pixsrc++);
+			val = a - shift;
+			*(pixdest++) = CLAMP(val, 0, 255);
+		}
+	}
+}
+
+
+static GdkPixbuf *pidgin_blist_get_buddy_icon(GaimBlistNode *node,
 		gboolean scaled, gboolean greyed, gboolean custom)
 {
 	GdkPixbuf *buf, *ret = NULL;
@@ -2136,7 +2175,7 @@
 				gdk_pixbuf_saturate_and_pixelate(buf, buf, 0.25, FALSE);
 		}
 
-		/* i'd use the gaim_gtk_buddy_icon_get_scale_size() thing,
+		/* i'd use the pidgin_buddy_icon_get_scale_size() thing,
 		 * but it won't tell me the original size, which I need for scaling
 		 * purposes */
 		scale_width = orig_width = gdk_pixbuf_get_width(buf);
@@ -2199,7 +2238,7 @@
 #define TOOLTIP_BORDER 12
 #define SMALL_SPACE 6
 #define LARGE_SPACE 12
-#define PRPL_SIZE 22
+#define PRPL_SIZE 16 
 struct tooltip_data {
 	PangoLayout *layout;
 	PangoLayout *name_layout;
@@ -2228,9 +2267,9 @@
 		account = ((GaimChat*)(node))->account;
 	}
 
-	td->status_icon = gaim_gtk_blist_get_status_icon(node, GAIM_STATUS_ICON_LARGE);
-	td->avatar = gaim_gtk_blist_get_buddy_icon(node, !full, FALSE, TRUE);
-	td->prpl_icon = gaim_gtk_create_prpl_icon(account, PIDGIN_PRPL_ICON_MEDIUM);
+	td->status_icon = pidgin_blist_get_status_icon(node, GAIM_STATUS_ICON_LARGE);
+	td->avatar = pidgin_blist_get_buddy_icon(node, !full, FALSE, TRUE);
+	td->prpl_icon = pidgin_create_prpl_icon(account, PIDGIN_PRPL_ICON_SMALL);
 	tooltip_text = gaim_get_tooltip_text(node, full);
 	td->layout = gtk_widget_create_pango_layout(gtkblist->tipwindow, NULL);
 	td->name_layout = gtk_widget_create_pango_layout(gtkblist->tipwindow, NULL);
@@ -2258,7 +2297,7 @@
 	td->name_height = MAX(PANGO_PIXELS(td->name_height), PRPL_SIZE + SMALL_SPACE);
 #if 0  /* PRPL Icon as avatar */
 	if(!td->avatar && full) {
-		td->avatar = gaim_gtk_create_prpl_icon(account, PIDGIN_PRPL_ICON_LARGE);
+		td->avatar = pidgin_create_prpl_icon(account, PIDGIN_PRPL_ICON_LARGE);
 		td->avatar_is_prpl_icon = TRUE;
 	}
 #endif
@@ -2270,7 +2309,7 @@
 	return td;
 }
 
-static void gaim_gtk_blist_paint_tip(GtkWidget *widget, GdkEventExpose *event, GaimBlistNode *node)
+static void pidgin_blist_paint_tip(GtkWidget *widget, GdkEventExpose *event, GaimBlistNode *node)
 {
 	GtkStyle *style;
 	int current_height, max_width;
@@ -2344,14 +2383,11 @@
 				TOOLTIP_BORDER + STATUS_SIZE + SMALL_SPACE, current_height + td->name_height, td->layout);
 
 		current_height += MAX(td->name_height + td->height, td->avatar_height) + TOOLTIP_BORDER;
-		if(l->next)
-			gtk_paint_hline(style, gtkblist->tipwindow->window, GTK_STATE_NORMAL,
-					NULL, NULL, NULL, 4, max_width - 4, current_height-6);
-	}
-}
-
-
-static void gaim_gtk_blist_tooltip_destroy()
+	}
+}
+
+
+static void pidgin_blist_tooltip_destroy()
 {
 	while(gtkblist->tooltipdata) {
 		struct tooltip_data *td = gtkblist->tooltipdata->data;
@@ -2375,13 +2411,13 @@
 	gtkblist->tipwindow = NULL;
 }
 
-static gboolean gaim_gtk_blist_expand_timeout(GtkWidget *tv)
+static gboolean pidgin_blist_expand_timeout(GtkWidget *tv)
 {
 	GtkTreePath *path;
 	GtkTreeIter iter;
 	GaimBlistNode *node;
 	GValue val;
-	struct _gaim_gtk_blist_node *gtknode;
+	struct _pidgin_blist_node *gtknode;
 
 	if (!gtk_tree_view_get_path_at_pos(GTK_TREE_VIEW(tv), gtkblist->tip_rect.x, gtkblist->tip_rect.y, &path, NULL, NULL, NULL))
 		return FALSE;
@@ -2400,7 +2436,7 @@
 	if (!gtknode->contact_expanded) {
 		GtkTreeIter i;
 
-		gaim_gtk_blist_expand_contact_cb(NULL, node);
+		pidgin_blist_expand_contact_cb(NULL, node);
 
 		gtk_tree_view_get_cell_area(GTK_TREE_VIEW(tv), path, NULL, &gtkblist->contact_rect);
 		gdk_drawable_get_size(GDK_DRAWABLE(tv->window), &(gtkblist->contact_rect.width), NULL);
@@ -2419,7 +2455,7 @@
 
 static gboolean buddy_is_displayable(GaimBuddy *buddy)
 {
-	struct _gaim_gtk_blist_node *gtknode;
+	struct _pidgin_blist_node *gtknode;
 
 	if(!buddy)
 		return FALSE;
@@ -2433,7 +2469,7 @@
 			 gaim_blist_node_get_bool((GaimBlistNode*)buddy, "show_offline")));
 }
 
-static gboolean gaim_gtk_blist_tooltip_timeout(GtkWidget *tv)
+static gboolean pidgin_blist_tooltip_timeout(GtkWidget *tv)
 {
 	GtkTreePath *path;
 	GtkTreeIter iter;
@@ -2445,14 +2481,14 @@
 	GdkScreen *screen = NULL;
 #endif
 	gboolean tooltip_top = FALSE;
-	struct _gaim_gtk_blist_node *gtknode;
+	struct _pidgin_blist_node *gtknode;
 	GdkRectangle mon_size;
 
 	/*
 	 * Attempt to free the previous tooltip.  I have a feeling
 	 * this is never needed... but just in case.
 	 */
-	gaim_gtk_blist_tooltip_destroy();
+	pidgin_blist_tooltip_destroy();
 
 	if (!gtk_tree_view_get_path_at_pos(GTK_TREE_VIEW(tv), gtkblist->tip_rect.x, gtkblist->tip_rect.y, &path, NULL, NULL, NULL))
 		return FALSE;
@@ -2513,7 +2549,7 @@
 	gtk_window_set_resizable(GTK_WINDOW(gtkblist->tipwindow), FALSE);
 	gtk_widget_set_name(gtkblist->tipwindow, "gtk-tooltips");
 	g_signal_connect(G_OBJECT(gtkblist->tipwindow), "expose_event",
-			G_CALLBACK(gaim_gtk_blist_paint_tip), NULL);
+			G_CALLBACK(pidgin_blist_paint_tip), NULL);
 	gtk_widget_ensure_style (gtkblist->tipwindow);
 
 
@@ -2571,7 +2607,7 @@
 	return FALSE;
 }
 
-static gboolean gaim_gtk_blist_drag_motion_cb(GtkWidget *tv, GdkDragContext *drag_context,
+static gboolean pidgin_blist_drag_motion_cb(GtkWidget *tv, GdkDragContext *drag_context,
 					      gint x, gint y, guint time, gpointer user_data)
 {
 	GtkTreePath *path;
@@ -2595,11 +2631,11 @@
 
 	if (path)
 		gtk_tree_path_free(path);
-	gtkblist->drag_timeout = g_timeout_add(delay, (GSourceFunc)gaim_gtk_blist_expand_timeout, tv);
+	gtkblist->drag_timeout = g_timeout_add(delay, (GSourceFunc)pidgin_blist_expand_timeout, tv);
 
 	if (gtkblist->mouseover_contact) {
 		if ((y < gtkblist->contact_rect.y) || ((y - gtkblist->contact_rect.height) > gtkblist->contact_rect.y)) {
-			gaim_gtk_blist_collapse_contact_cb(NULL, gtkblist->mouseover_contact);
+			pidgin_blist_collapse_contact_cb(NULL, gtkblist->mouseover_contact);
 			gtkblist->mouseover_contact = NULL;
 		}
 	}
@@ -2607,7 +2643,7 @@
 	return FALSE;
 }
 
-static gboolean gaim_gtk_blist_motion_cb (GtkWidget *tv, GdkEventMotion *event, gpointer null)
+static gboolean pidgin_blist_motion_cb (GtkWidget *tv, GdkEventMotion *event, gpointer null)
 {
 	GtkTreePath *path;
 	int delay;
@@ -2621,7 +2657,7 @@
 		if ((event->y > gtkblist->tip_rect.y) && ((event->y - gtkblist->tip_rect.height) < gtkblist->tip_rect.y))
 			return FALSE;
 		/* We've left the cell.  Remove the timeout and create a new one below */
-		gaim_gtk_blist_tooltip_destroy();
+		pidgin_blist_tooltip_destroy();
 		g_source_remove(gtkblist->timeout);
 	}
 
@@ -2630,11 +2666,11 @@
 
 	if (path)
 		gtk_tree_path_free(path);
-	gtkblist->timeout = g_timeout_add(delay, (GSourceFunc)gaim_gtk_blist_tooltip_timeout, tv);
+	gtkblist->timeout = g_timeout_add(delay, (GSourceFunc)pidgin_blist_tooltip_timeout, tv);
 
 	if (gtkblist->mouseover_contact) {
 		if ((event->y < gtkblist->contact_rect.y) || ((event->y - gtkblist->contact_rect.height) > gtkblist->contact_rect.y)) {
-			gaim_gtk_blist_collapse_contact_cb(NULL, gtkblist->mouseover_contact);
+			pidgin_blist_collapse_contact_cb(NULL, gtkblist->mouseover_contact);
 			gtkblist->mouseover_contact = NULL;
 		}
 	}
@@ -2642,7 +2678,7 @@
 	return FALSE;
 }
 
-static void gaim_gtk_blist_leave_cb (GtkWidget *w, GdkEventCrossing *e, gpointer n)
+static void pidgin_blist_leave_cb (GtkWidget *w, GdkEventCrossing *e, gpointer n)
 {
 
 	if (gtkblist->timeout) {
@@ -2655,12 +2691,12 @@
 		gtkblist->drag_timeout = 0;
 	}
 
-	gaim_gtk_blist_tooltip_destroy();
+	pidgin_blist_tooltip_destroy();
 
 	if (gtkblist->mouseover_contact &&
 		!((e->x > gtkblist->contact_rect.x) && (e->x < (gtkblist->contact_rect.x + gtkblist->contact_rect.width)) &&
 		 (e->y > gtkblist->contact_rect.y) && (e->y < (gtkblist->contact_rect.y + gtkblist->contact_rect.height)))) {
-			gaim_gtk_blist_collapse_contact_cb(NULL, gtkblist->mouseover_contact);
+			pidgin_blist_collapse_contact_cb(NULL, gtkblist->mouseover_contact);
 		gtkblist->mouseover_contact = NULL;
 	}
 }
@@ -2680,45 +2716,45 @@
 {
 	/* Buddies menu */
 	{ N_("/_Buddies"), NULL, NULL, 0, "<Branch>", NULL },
-	{ N_("/Buddies/New Instant _Message..."), "<CTL>M", gaim_gtkdialogs_im, 0, "<StockItem>", GAIM_STOCK_IM },
-	{ N_("/Buddies/Join a _Chat..."), "<CTL>C", gaim_gtk_blist_joinchat_show, 0, "<StockItem>", GAIM_STOCK_CHAT },
-	{ N_("/Buddies/Get User _Info..."), "<CTL>I", gaim_gtkdialogs_info, 0, "<StockItem>", GAIM_STOCK_INFO },
-	{ N_("/Buddies/View User _Log..."), "<CTL>L", gaim_gtkdialogs_log, 0, "<StockItem>", GAIM_STOCK_LOG },
+	{ N_("/Buddies/New Instant _Message..."), "<CTL>M", pidgindialogs_im, 0, "<StockItem>", GAIM_STOCK_IM },
+	{ N_("/Buddies/Join a _Chat..."), "<CTL>C", pidgin_blist_joinchat_show, 0, "<StockItem>", GAIM_STOCK_CHAT },
+	{ N_("/Buddies/Get User _Info..."), "<CTL>I", pidgindialogs_info, 0, "<StockItem>", GAIM_STOCK_INFO },
+	{ N_("/Buddies/View User _Log..."), "<CTL>L", pidgindialogs_log, 0, "<StockItem>", GAIM_STOCK_LOG },
 	{ "/Buddies/sep1", NULL, NULL, 0, "<Separator>", NULL },
-	{ N_("/Buddies/Show _Offline Buddies"), NULL, gaim_gtk_blist_edit_mode_cb, 1, "<CheckItem>", NULL },
-	{ N_("/Buddies/Show _Empty Groups"), NULL, gaim_gtk_blist_show_empty_groups_cb, 1, "<CheckItem>", NULL },
-	{ N_("/Buddies/Show Buddy _Details"), NULL, gaim_gtk_blist_buddy_details_cb, 1, "<CheckItem>", NULL },
-	{ N_("/Buddies/Show Idle _Times"), NULL, gaim_gtk_blist_show_idle_time_cb, 1, "<CheckItem>", NULL },
+	{ N_("/Buddies/Show _Offline Buddies"), NULL, pidgin_blist_edit_mode_cb, 1, "<CheckItem>", NULL },
+	{ N_("/Buddies/Show _Empty Groups"), NULL, pidgin_blist_show_empty_groups_cb, 1, "<CheckItem>", NULL },
+	{ N_("/Buddies/Show Buddy _Details"), NULL, pidgin_blist_buddy_details_cb, 1, "<CheckItem>", NULL },
+	{ N_("/Buddies/Show Idle _Times"), NULL, pidgin_blist_show_idle_time_cb, 1, "<CheckItem>", NULL },
 	{ N_("/Buddies/_Sort Buddies"), NULL, NULL, 0, "<Branch>", NULL },
 	{ "/Buddies/sep2", NULL, NULL, 0, "<Separator>", NULL },
-	{ N_("/Buddies/_Add Buddy..."), "<CTL>B", gaim_gtk_blist_add_buddy_cb, 0, "<StockItem>", GTK_STOCK_ADD },
-	{ N_("/Buddies/Add C_hat..."), NULL, gaim_gtk_blist_add_chat_cb, 0, "<StockItem>", GTK_STOCK_ADD },
+	{ N_("/Buddies/_Add Buddy..."), "<CTL>B", pidgin_blist_add_buddy_cb, 0, "<StockItem>", GTK_STOCK_ADD },
+	{ N_("/Buddies/Add C_hat..."), NULL, pidgin_blist_add_chat_cb, 0, "<StockItem>", GTK_STOCK_ADD },
 	{ N_("/Buddies/Add _Group..."), NULL, gaim_blist_request_add_group, 0, "<StockItem>", GTK_STOCK_ADD },
 	{ "/Buddies/sep3", NULL, NULL, 0, "<Separator>", NULL },
 	{ N_("/Buddies/_Quit"), "<CTL>Q", gaim_core_quit, 0, "<StockItem>", GTK_STOCK_QUIT },
 
 	/* Accounts menu */
 	{ N_("/_Accounts"), NULL, NULL, 0, "<Branch>", NULL },
-	{ N_("/Accounts/Add\\/Edit"), "<CTL>A", gaim_gtk_accounts_window_show, 0, "<StockItem>", GAIM_STOCK_ACCOUNTS },
+	{ N_("/Accounts/Add\\/Edit"), "<CTL>A", pidgin_accounts_window_show, 0, "<StockItem>", GAIM_STOCK_ACCOUNTS },
 
 	/* Tools */
 	{ N_("/_Tools"), NULL, NULL, 0, "<Branch>", NULL },
-	{ N_("/Tools/Buddy _Pounces"), NULL, gaim_gtk_pounces_manager_show, 0, "<StockItem>", GAIM_STOCK_POUNCE },
-	{ N_("/Tools/Plu_gins"), "<CTL>U", gaim_gtk_plugin_dialog_show, 0, "<StockItem>", GAIM_STOCK_PLUGIN },
-	{ N_("/Tools/Pr_eferences"), "<CTL>P", gaim_gtk_prefs_show, 0, "<StockItem>", GTK_STOCK_PREFERENCES },
-	{ N_("/Tools/Pr_ivacy"), NULL, gaim_gtk_privacy_dialog_show, 0, "<StockItem>", PIDGIN_STOCK_DIALOG_ERROR },
+	{ N_("/Tools/Buddy _Pounces"), NULL, pidgin_pounces_manager_show, 0, "<StockItem>", GAIM_STOCK_POUNCE },
+	{ N_("/Tools/Plu_gins"), "<CTL>U", pidgin_plugin_dialog_show, 0, "<StockItem>", GAIM_STOCK_PLUGIN },
+	{ N_("/Tools/Pr_eferences"), "<CTL>P", pidgin_prefs_show, 0, "<StockItem>", GTK_STOCK_PREFERENCES },
+	{ N_("/Tools/Pr_ivacy"), NULL, pidgin_privacy_dialog_show, 0, "<StockItem>", PIDGIN_STOCK_DIALOG_ERROR },
 	{ "/Tools/sep2", NULL, NULL, 0, "<Separator>", NULL },
-	{ N_("/Tools/_File Transfers"), "<CTL>T", gaim_gtkxfer_dialog_show, 0, "<StockItem>", GAIM_STOCK_FILE_TRANSFER },
-	{ N_("/Tools/R_oom List"), NULL, gaim_gtk_roomlist_dialog_show, 0, "<StockItem>", GTK_STOCK_INDEX },
+	{ N_("/Tools/_File Transfers"), "<CTL>T", pidginxfer_dialog_show, 0, "<StockItem>", GAIM_STOCK_FILE_TRANSFER },
+	{ N_("/Tools/R_oom List"), NULL, pidgin_roomlist_dialog_show, 0, "<StockItem>", GTK_STOCK_INDEX },
 	{ N_("/Tools/System _Log"), NULL, gtk_blist_show_systemlog_cb, 0, "<StockItem>", GAIM_STOCK_LOG },
 	{ "/Tools/sep3", NULL, NULL, 0, "<Separator>", NULL },
-	{ N_("/Tools/Mute _Sounds"), "<CTL>S", gaim_gtk_blist_mute_sounds_cb, 0, "<CheckItem>", NULL },
+	{ N_("/Tools/Mute _Sounds"), "<CTL>S", pidgin_blist_mute_sounds_cb, 0, "<CheckItem>", NULL },
 
 	/* Help */
 	{ N_("/_Help"), NULL, NULL, 0, "<Branch>", NULL },
 	{ N_("/Help/Online _Help"), "F1", gtk_blist_show_onlinehelp_cb, 0, "<StockItem>", GTK_STOCK_HELP },
 	{ N_("/Help/_Debug Window"), NULL, toggle_debug, 0, "<StockItem>", GAIM_STOCK_DEBUG },
-	{ N_("/Help/_About"), NULL, gaim_gtkdialogs_about, 0,  "<StockItem>", GAIM_STOCK_ABOUT },
+	{ N_("/Help/_About"), NULL, pidgindialogs_about, 0,  "<StockItem>", GAIM_STOCK_ABOUT },
 };
 
 /*********************************************************
@@ -2864,7 +2900,7 @@
 		/* Last Seen */
 		if (full && !GAIM_BUDDY_IS_ONLINE(b))
 		{
-			struct _gaim_gtk_blist_node *gtknode = ((GaimBlistNode *)c)->ui_data;
+			struct _pidgin_blist_node *gtknode = ((GaimBlistNode *)c)->ui_data;
 			GaimBlistNode *bnode;
 			int lastseen = 0;
 
@@ -2924,18 +2960,18 @@
 		gaim_notify_user_info_destroy(user_info);
 	}
 
-	gaim_signal_emit(gaim_gtk_blist_get_handle(),
+	gaim_signal_emit(pidgin_blist_get_handle(),
 			 "drawing-tooltip", node, str, full);
 
 	return g_string_free(str, FALSE);
 }
 
 GdkPixbuf *
-gaim_gtk_blist_get_emblem(GaimBlistNode *node)
+pidgin_blist_get_emblem(GaimBlistNode *node)
 {
 	GaimBuddy *buddy = NULL;
-	struct _gaim_gtk_blist_node *gtknode = node->ui_data;
-	struct _gaim_gtk_blist_node *gtkbuddynode = NULL;
+	struct _pidgin_blist_node *gtknode = node->ui_data;
+	struct _pidgin_blist_node *gtkbuddynode = NULL;
 	GaimPlugin *prpl;
 	GaimPluginProtocolInfo *prpl_info;
 	const char *name = NULL;
@@ -2949,13 +2985,18 @@
 	} else if(GAIM_BLIST_NODE_IS_BUDDY(node)) {
 		buddy = (GaimBuddy*)node;
 		gtkbuddynode = node->ui_data;
-		if (((struct _gaim_gtk_blist_node*)(node->parent->ui_data))->contact_expanded)
-			return gaim_gtk_create_prpl_icon(((GaimBuddy*)node)->account, PIDGIN_PRPL_ICON_SMALL);
+		if (((struct _pidgin_blist_node*)(node->parent->ui_data))->contact_expanded)
+			return pidgin_create_prpl_icon(((GaimBuddy*)node)->account, PIDGIN_PRPL_ICON_SMALL);
 	} else if(GAIM_BLIST_NODE_IS_CHAT(node)) {
-		return gaim_gtk_create_prpl_icon(((GaimChat*)node)->account, PIDGIN_PRPL_ICON_SMALL);
+		return pidgin_create_prpl_icon(((GaimChat*)node)->account, PIDGIN_PRPL_ICON_SMALL);
 	} else {
 		return NULL;
 	}
+	
+	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);	
+	}
 
 	prpl = gaim_find_prpl(gaim_account_get_protocol_id(buddy->account));
 	if (!prpl)
@@ -2981,12 +3022,12 @@
 
 
 GdkPixbuf *
-gaim_gtk_blist_get_status_icon(GaimBlistNode *node, GaimStatusIconSize size)
+pidgin_blist_get_status_icon(GaimBlistNode *node, GaimStatusIconSize size)
 {
 	GdkPixbuf *ret;
 	const char *protoname = NULL;
-	struct _gaim_gtk_blist_node *gtknode = node->ui_data;
-	struct _gaim_gtk_blist_node *gtkbuddynode = NULL;
+	struct _pidgin_blist_node *gtknode = node->ui_data;
+	struct _pidgin_blist_node *gtkbuddynode = NULL;
 	GaimBuddy *buddy = NULL;
 	GaimChat *chat = NULL;
 	GtkIconSize icon_size = gtk_icon_size_from_name((size == GAIM_STATUS_ICON_LARGE) ? PIDGIN_ICON_SIZE_TANGO_MEDIUM :
@@ -3028,7 +3069,19 @@
 	}
 	
 	if(buddy) {
-		GaimPresence *p = gaim_buddy_get_presence(buddy);
+	  	GaimConversation *conv = gaim_find_conversation_with_account(GAIM_CONV_TYPE_IM,
+									     gaim_buddy_get_name(buddy),
+									     gaim_buddy_get_account(buddy));
+		GaimPresence *p;
+		if(conv != NULL) {
+			PidginConversation *gtkconv = PIDGIN_CONVERSATION(conv);
+			if(gtkconv != NULL && pidgin_conv_is_hidden(gtkconv) && size == GAIM_STATUS_ICON_SMALL) {
+				return gtk_widget_render_icon (GTK_WIDGET(gtkblist->treeview), PIDGIN_STOCK_STATUS_MESSAGE,
+							       icon_size, "GtkTreeView");
+			}
+		}
+		p = gaim_buddy_get_presence(buddy);
+	       
 		if (GAIM_BUDDY_IS_ONLINE(buddy) && gtkbuddynode && gtkbuddynode->recent_signonoff)
 			ret = gtk_widget_render_icon (GTK_WIDGET(gtkblist->treeview), PIDGIN_STOCK_STATUS_LOGIN,
 					icon_size, "GtkTreeView");
@@ -3036,19 +3089,34 @@
 			ret = gtk_widget_render_icon (GTK_WIDGET(gtkblist->treeview), PIDGIN_STOCK_STATUS_LOGOUT,
 					icon_size, "GtkTreeView");
 		else if (gaim_presence_is_status_primitive_active(p, GAIM_STATUS_UNAVAILABLE))
-			ret = gtk_widget_render_icon (GTK_WIDGET(gtkblist->treeview), PIDGIN_STOCK_STATUS_BUSY,
-					icon_size, "GtkTreeView");
+			if (gaim_presence_is_idle(p) && size == GAIM_STATUS_ICON_SMALL)
+				ret = gtk_widget_render_icon (GTK_WIDGET(gtkblist->treeview), PIDGIN_STOCK_STATUS_BUSY_I,
+						icon_size, "GtkTreeView");
+			else
+				ret = gtk_widget_render_icon (GTK_WIDGET(gtkblist->treeview), PIDGIN_STOCK_STATUS_BUSY,
+						icon_size, "GtkTreeView");
 		else if (gaim_presence_is_status_primitive_active(p, GAIM_STATUS_AWAY))
-			ret = gtk_widget_render_icon (GTK_WIDGET(gtkblist->treeview), PIDGIN_STOCK_STATUS_AWAY,
-					icon_size, "GtkTreeView");
+		        if (gaim_presence_is_idle(p) && size == GAIM_STATUS_ICON_SMALL)
+		                ret = gtk_widget_render_icon (GTK_WIDGET(gtkblist->treeview), PIDGIN_STOCK_STATUS_AWAY_I,
+		                                icon_size, "GtkTreeView");
+		 	else
+				ret = gtk_widget_render_icon (GTK_WIDGET(gtkblist->treeview), PIDGIN_STOCK_STATUS_AWAY,
+						icon_size, "GtkTreeView");
 		else if (gaim_presence_is_status_primitive_active(p, GAIM_STATUS_EXTENDED_AWAY))
-			ret = gtk_widget_render_icon (GTK_WIDGET(gtkblist->treeview), PIDGIN_STOCK_STATUS_XA,
-					icon_size, "GtkTreeView");
+			if (gaim_presence_is_idle(p) && size == GAIM_STATUS_ICON_SMALL)
+		        	ret = gtk_widget_render_icon (GTK_WIDGET(gtkblist->treeview), PIDGIN_STOCK_STATUS_XA_I,
+						icon_size, "GtkTreeView");
+			else
+				ret = gtk_widget_render_icon (GTK_WIDGET(gtkblist->treeview), PIDGIN_STOCK_STATUS_XA,
+						icon_size, "GtkTreeView");
 		else if (gaim_presence_is_status_primitive_active(p, GAIM_STATUS_OFFLINE))
 			ret = gtk_widget_render_icon (GTK_WIDGET(gtkblist->treeview), PIDGIN_STOCK_STATUS_OFFLINE,
 					icon_size, "GtkTreeView");
+		else if (gaim_presence_is_idle(p) && size == GAIM_STATUS_ICON_SMALL)
+			ret = gtk_widget_render_icon (GTK_WIDGET(gtkblist->treeview), PIDGIN_STOCK_STATUS_AVAILABLE_I,
+					icon_size, "GtkTreeView");
 		else
-			ret = gtk_widget_render_icon (GTK_WIDGET(gtkblist->treeview), PIDGIN_STOCK_STATUS_AVAILABLE,
+			ret = gtk_widget_render_icon(GTK_WIDGET(gtkblist->treeview), PIDGIN_STOCK_STATUS_AVAILABLE,
 					icon_size, "GtkTreeView");
 	} else if (chat) {
 		ret = gtk_widget_render_icon (GTK_WIDGET(gtkblist->treeview), PIDGIN_STOCK_STATUS_CHAT,
@@ -3059,108 +3127,9 @@
 	}
 
 	return ret;
-
-#if 0
-	if(buddy) {
-		GaimAccount *account;
-		GaimPlugin *prpl;
-		GaimPluginProtocolInfo *prpl_info;
-		GaimConversation *conv = gaim_find_conversation_with_account(GAIM_CONV_TYPE_IM,
-			gaim_buddy_get_name(buddy),
-			gaim_buddy_get_account(buddy));
-
-		account = buddy->account;
-
-		prpl = gaim_find_prpl(gaim_account_get_protocol_id(account));
-		if(!prpl)
-			return NULL;
-
-		prpl_info = GAIM_PLUGIN_PROTOCOL_INFO(prpl);
-
-		if(prpl_info && prpl_info->list_icon) {
-			protoname = prpl_info->list_icon(account, buddy);
-		}
-
-		if(conv != NULL) {
-			GaimGtkConversation *gtkconv = GAIM_GTK_CONVERSATION(conv);
-			if(gtkconv != NULL && gaim_gtkconv_is_hidden(gtkconv)) {
-				/* add pending emblem */
-				if(size == GAIM_STATUS_ICON_SMALL) {
-					emblems[0].filename="pending";
-				}
-				else {
-					emblems[3].filename=emblems[2].filename;
-					emblems[2].filename="pending";
-				}
-			}
-		}
-	}
-
-	if(buddy && GAIM_BUDDY_IS_ONLINE(buddy) &&  gtkbuddynode && gtkbuddynode->recent_signonoff) {
-			filename = g_build_filename(DATADIR, "pixmaps", "gaim", "status", "default", "login.png", NULL);
-	} else if(buddy && !GAIM_BUDDY_IS_ONLINE(buddy) && gtkbuddynode && gtkbuddynode->recent_signonoff) {
-			filename = g_build_filename(DATADIR, "pixmaps", "gaim", "status", "default", "logout.png", NULL);
-	} else if(buddy || chat) {
-		char *image = g_strdup_printf("%s.png", protoname);
-		filename = g_build_filename(DATADIR, "pixmaps", "gaim", "status", "default", image, NULL);
-		g_free(image);
-	} else {
-		/* gaim dude */
-		filename = g_build_filename(DATADIR, "pixmaps", "gaim.png", NULL);
-	}
-
-	status = gdk_pixbuf_new_from_file(filename, NULL);
-	g_free(filename);
-
-	if(!status) {
-		g_string_free(key, TRUE);
-		return NULL;
-	}
-
-	scale = gdk_pixbuf_scale_simple(status, scalesize, scalesize,
-			GDK_INTERP_BILINEAR);
-	g_object_unref(status);
-
-	if(buddy) {
-		presence = gaim_buddy_get_presence(buddy);
-		if (!GAIM_BUDDY_IS_ONLINE(buddy))
-			gdk_pixbuf_saturate_and_pixelate(scale, scale, 0.0, FALSE);
-		else if (gaim_presence_is_idle(presence))
-		{
-			gdk_pixbuf_saturate_and_pixelate(scale, scale, 0.25, FALSE);
-		}
-
-		if (!gaim_privacy_check(buddy->account, gaim_buddy_get_name(buddy)))
-		{
-			GdkPixbuf *emblem;
-			char *filename = g_build_filename(DATADIR, "pixmaps", "gaim", "status", "default", "blocked.png", NULL);
-
-			emblem = gdk_pixbuf_new_from_file(filename, NULL);
-			g_free(filename);
-
-			if (emblem)
-			{
-				gdk_pixbuf_composite(emblem, scale,
-						0, 0, scalesize, scalesize,
-						0, 0,
-						(double)scalesize / gdk_pixbuf_get_width(emblem),
-						(double)scalesize / gdk_pixbuf_get_height(emblem),
-						GDK_INTERP_BILINEAR,
-						224);
-				g_object_unref(emblem);
-			}
-		}
-	}
-
-	/* Insert the new icon into the status icon hash table */
-	g_hash_table_insert (status_icon_hash_table, key, scale);
-	gdk_pixbuf_ref(scale);
-
-	return scale;
-#endif
-}
-
-static gchar *gaim_gtk_blist_get_name_markup(GaimBuddy *b, gboolean selected)
+}
+
+static gchar *pidgin_blist_get_name_markup(GaimBuddy *b, gboolean selected)
 {
 	const char *name;
 	char *esc, *text = NULL;
@@ -3168,9 +3137,22 @@
 	GaimPluginProtocolInfo *prpl_info = NULL;
 	GaimContact *contact;
 	GaimPresence *presence;
-	struct _gaim_gtk_blist_node *gtkcontactnode = NULL;
+	struct _pidgin_blist_node *gtkcontactnode = NULL;
 	char *idletime = NULL, *statustext = NULL;
 	time_t t;
+	GaimConversation *conv = gaim_find_conversation_with_account(GAIM_CONV_TYPE_IM,
+								     gaim_buddy_get_name(b),
+								     gaim_buddy_get_account(b));
+	PidginConversation *gtkconv;
+	gboolean hidden_conv = FALSE;
+
+	if(conv != NULL) {
+		gtkconv = PIDGIN_CONVERSATION(conv);
+		if(gtkconv != NULL && pidgin_conv_is_hidden(gtkconv)) {
+			hidden_conv = TRUE;
+		}
+	}
+	
 	/* XXX Good luck cleaning up this crap */
 
 	contact = (GaimContact*)((GaimBlistNode*)b)->parent;
@@ -3192,9 +3174,19 @@
 			text = g_strdup_printf("<span color='%s'>%s</span>",
 					       dim_grey(), esc);
 			g_free(esc);
+			if (hidden_conv) {
+				char *tmp = text;
+				text = g_strdup_printf("<b>%s</b>", text);
+				g_free(tmp);
+			}
 			return text;
 		}
 		else
+			if (hidden_conv) {
+				char *tmp = esc;
+				esc = g_strdup_printf("<b>%s</b>", esc);
+				g_free(tmp);
+			}
 			return esc;
 	}
 
@@ -3315,11 +3307,17 @@
 	g_free(idletime);
 	g_free(statustext);
 	g_free(esc);
-
+	
+	if (hidden_conv) {
+		char *tmp = text;
+		text = g_strdup_printf("<b>%s</b>", tmp);
+		g_free(tmp);
+	}
+	
 	return text;
 }
 
-static void gaim_gtk_blist_restore_position()
+static void pidgin_blist_restore_position()
 {
 	int blist_x, blist_y, blist_width, blist_height;
 
@@ -3353,7 +3351,7 @@
 	}
 }
 
-static gboolean gaim_gtk_blist_refresh_timer(GaimBuddyList *list)
+static gboolean pidgin_blist_refresh_timer(GaimBuddyList *list)
 {
 	GaimBlistNode *gnode, *cnode;
 
@@ -3371,7 +3369,7 @@
 
 				if (buddy &&
 						gaim_presence_is_idle(gaim_buddy_get_presence(buddy)))
-					gaim_gtk_blist_update_contact(list, (GaimBlistNode*)buddy);
+					pidgin_blist_update_contact(list, (GaimBlistNode*)buddy);
 			}
 		}
 	}
@@ -3380,9 +3378,9 @@
 	return TRUE;
 }
 
-static void gaim_gtk_blist_hide_node(GaimBuddyList *list, GaimBlistNode *node, gboolean update)
-{
-	struct _gaim_gtk_blist_node *gtknode = (struct _gaim_gtk_blist_node *)node->ui_data;
+static void pidgin_blist_hide_node(GaimBuddyList *list, GaimBlistNode *node, gboolean update)
+{
+	struct _pidgin_blist_node *gtknode = (struct _pidgin_blist_node *)node->ui_data;
 	GtkTreeIter iter;
 
 	if (!gtknode || !gtknode->row || !gtkblist)
@@ -3394,7 +3392,7 @@
 		gtk_tree_store_remove(gtkblist->treemodel, &iter);
 		if(update && (GAIM_BLIST_NODE_IS_CONTACT(node) ||
 			GAIM_BLIST_NODE_IS_BUDDY(node) || GAIM_BLIST_NODE_IS_CHAT(node))) {
-			gaim_gtk_blist_update(list, node->parent);
+			pidgin_blist_update(list, node->parent);
 		}
 	}
 	gtk_tree_row_reference_free(gtknode->row);
@@ -3419,7 +3417,7 @@
  * where appropriate.
  */
 static void
-update_menu_bar(GaimGtkBuddyList *gtkblist)
+update_menu_bar(PidginBuddyList *gtkblist)
 {
 	GtkWidget *widget;
 	gboolean sensitive;
@@ -3427,7 +3425,7 @@
 
 	g_return_if_fail(gtkblist != NULL);
 
-	gaim_gtk_blist_update_accounts_menu();
+	pidgin_blist_update_accounts_menu();
 
 	sensitive = (gaim_connections_get_all() != NULL);
 
@@ -3438,10 +3436,10 @@
 	}
 
 	widget = gtk_item_factory_get_widget(gtkblist->ift, N_("/Buddies/Join a Chat..."));
-	gtk_widget_set_sensitive(widget, gaim_gtk_blist_joinchat_is_showable());
+	gtk_widget_set_sensitive(widget, pidgin_blist_joinchat_is_showable());
 
 	widget = gtk_item_factory_get_widget(gtkblist->ift, N_("/Buddies/Add Chat..."));
-	gtk_widget_set_sensitive(widget, gaim_gtk_blist_joinchat_is_showable());
+	gtk_widget_set_sensitive(widget, pidgin_blist_joinchat_is_showable());
 
 	widget = gtk_item_factory_get_widget(gtkblist->ift, N_("/Tools/Buddy Pounces"));
 	gtk_widget_set_sensitive(widget, (gaim_accounts_get_all() != NULL));
@@ -3450,13 +3448,13 @@
 	gtk_widget_set_sensitive(widget, (gaim_connections_get_all() != NULL));
 
 	widget = gtk_item_factory_get_widget(gtkblist->ift, N_("/Tools/Room List"));
-	gtk_widget_set_sensitive(widget, gaim_gtk_roomlist_is_showable());
+	gtk_widget_set_sensitive(widget, pidgin_roomlist_is_showable());
 }
 
 static void
 sign_on_off_cb(GaimConnection *gc, GaimBuddyList *blist)
 {
-	GaimGtkBuddyList *gtkblist = GAIM_GTK_BLIST(blist);
+	PidginBuddyList *gtkblist = PIDGIN_BLIST(blist);
 
 	update_menu_bar(gtkblist);
 }
@@ -3464,7 +3462,7 @@
 static void
 plugin_changed_cb(GaimPlugin *p, gpointer *data)
 {
-	gaim_gtk_blist_update_plugin_actions();
+	pidgin_blist_update_plugin_actions();
 }
 
 static void
@@ -3478,14 +3476,14 @@
 		menu = NULL;
 	}
 
-	convs = gaim_gtk_conversations_find_unseen_list(GAIM_CONV_TYPE_IM, GAIM_UNSEEN_TEXT, TRUE, 0);
+	convs = pidgin_conversations_find_unseen_list(GAIM_CONV_TYPE_IM, GAIM_UNSEEN_TEXT, TRUE, 0);
 	if (!convs)
 		/* no conversations added, don't show the menu */
 		return;
 
 	menu = gtk_menu_new();
 
-	gaim_gtk_conversations_fill_menu(menu, convs);
+	pidgin_conversations_fill_menu(menu, convs);
 	g_list_free(convs);
 	gtk_widget_show_all(menu);
 	gtk_menu_popup(GTK_MENU(menu), NULL, NULL, NULL, NULL, 3,
@@ -3499,10 +3497,10 @@
 
 	switch (event->button) {
 		case 1:
-			convs = gaim_gtk_conversations_find_unseen_list(GAIM_CONV_TYPE_IM,
+			convs = pidgin_conversations_find_unseen_list(GAIM_CONV_TYPE_IM,
 															GAIM_UNSEEN_TEXT, TRUE, 1);
 			if (convs) {
-				gaim_gtkconv_present_conversation((GaimConversation*)convs->data);
+				pidgin_conv_present_conversation((GaimConversation*)convs->data);
 				g_list_free(convs);
 			}
 			break;
@@ -3515,7 +3513,7 @@
 
 static void
 conversation_updated_cb(GaimConversation *conv, GaimConvUpdateType type,
-                        GaimGtkBuddyList *gtkblist)
+                        PidginBuddyList *gtkblist)
 {
 	GList *convs = NULL;
 	GList *l = NULL;
@@ -3526,7 +3524,7 @@
 	if(conv->account != NULL && conv->name != NULL) {
 		GaimBuddy *buddy = gaim_find_buddy(conv->account, conv->name);
 		if(buddy != NULL)
-			gaim_gtk_blist_update_buddy(NULL, (GaimBlistNode *)buddy, TRUE);
+			pidgin_blist_update_buddy(NULL, (GaimBlistNode *)buddy, TRUE);
 	}
 
 	if (gtkblist->menutrayicon) {
@@ -3534,7 +3532,7 @@
 		gtkblist->menutrayicon = NULL;
 	}
 
-	convs = gaim_gtk_conversations_find_unseen_list(GAIM_CONV_TYPE_IM, GAIM_UNSEEN_TEXT, TRUE, 0);
+	convs = pidgin_conversations_find_unseen_list(GAIM_CONV_TYPE_IM, GAIM_UNSEEN_TEXT, TRUE, 0);
 	if (convs) {
 		GtkWidget *img = NULL;
 		GString *tooltip_text = NULL;
@@ -3543,7 +3541,7 @@
 		l = convs;
 		while (l != NULL) {
 			if (GAIM_IS_GTK_CONVERSATION(l->data)) {
-				GaimGtkConversation *gtkconv = GAIM_GTK_CONVERSATION((GaimConversation *)l->data);
+				PidginConversation *gtkconv = PIDGIN_CONVERSATION((GaimConversation *)l->data);
 
 				g_string_append_printf(tooltip_text,
 						ngettext("%d unread message from %s\n", "%d unread messages from %s\n", gtkconv->unseen_count),
@@ -3563,7 +3561,7 @@
 			gtk_widget_show(gtkblist->menutrayicon);
 			g_signal_connect(G_OBJECT(gtkblist->menutrayicon), "button-press-event", G_CALLBACK(menutray_press_cb), NULL);
 
-			gaim_gtk_menu_tray_append(GAIM_GTK_MENU_TRAY(gtkblist->menutray), gtkblist->menutrayicon, tooltip_text->str);
+			pidgin_menu_tray_append(PIDGIN_MENU_TRAY(gtkblist->menutray), gtkblist->menutrayicon, tooltip_text->str);
 		}
 		g_string_free(tooltip_text, TRUE);
 		g_list_free(convs);
@@ -3571,7 +3569,7 @@
 }
 
 static void
-conversation_deleting_cb(GaimConversation *conv, GaimGtkBuddyList *gtkblist)
+conversation_deleting_cb(GaimConversation *conv, PidginBuddyList *gtkblist)
 {
 	conversation_updated_cb(conv, GAIM_CONV_UPDATE_UNSEEN, gtkblist);
 }
@@ -3580,29 +3578,29 @@
  * Public API Functions                                                           *
  **********************************************************************************/
 
-static void gaim_gtk_blist_new_list(GaimBuddyList *blist)
-{
-	GaimGtkBuddyList *gtkblist;
-
-	gtkblist = g_new0(GaimGtkBuddyList, 1);
+static void pidgin_blist_new_list(GaimBuddyList *blist)
+{
+	PidginBuddyList *gtkblist;
+
+	gtkblist = g_new0(PidginBuddyList, 1);
 	gtkblist->connection_errors = g_hash_table_new_full(g_direct_hash,
 												g_direct_equal, NULL, g_free);
 	blist->ui_data = gtkblist;
 }
 
-static void gaim_gtk_blist_new_node(GaimBlistNode *node)
-{
-	node->ui_data = g_new0(struct _gaim_gtk_blist_node, 1);
-}
-
-gboolean gaim_gtk_blist_node_is_contact_expanded(GaimBlistNode *node)
+static void pidgin_blist_new_node(GaimBlistNode *node)
+{
+	node->ui_data = g_new0(struct _pidgin_blist_node, 1);
+}
+
+gboolean pidgin_blist_node_is_contact_expanded(GaimBlistNode *node)
 {
 	if GAIM_BLIST_NODE_IS_BUDDY(node)
 		node = node->parent;
 
 	g_return_val_if_fail(GAIM_BLIST_NODE_IS_CONTACT(node), FALSE);
 
-	return ((struct _gaim_gtk_blist_node *)node->ui_data)->contact_expanded;
+	return ((struct _pidgin_blist_node *)node->ui_data)->contact_expanded;
 }
 
 enum {
@@ -3620,15 +3618,15 @@
 	return _((char *)path);
 }
 
-void gaim_gtk_blist_setup_sort_methods()
-{
-	gaim_gtk_blist_sort_method_reg("none", _("Manually"), sort_method_none);
+void pidgin_blist_setup_sort_methods()
+{
+	pidgin_blist_sort_method_reg("none", _("Manually"), sort_method_none);
 #if GTK_CHECK_VERSION(2,2,1)
-	gaim_gtk_blist_sort_method_reg("alphabetical", _("Alphabetically"), sort_method_alphabetical);
-	gaim_gtk_blist_sort_method_reg("status", _("By status"), sort_method_status);
-	gaim_gtk_blist_sort_method_reg("log_size", _("By log size"), sort_method_log);
+	pidgin_blist_sort_method_reg("alphabetical", _("Alphabetically"), sort_method_alphabetical);
+	pidgin_blist_sort_method_reg("status", _("By status"), sort_method_status);
+	pidgin_blist_sort_method_reg("log_size", _("By log size"), sort_method_log);
 #endif
-	gaim_gtk_blist_sort_method_set(gaim_prefs_get_string("/gaim/gtk/blist/sort_type"));
+	pidgin_blist_sort_method_set(gaim_prefs_get_string("/gaim/gtk/blist/sort_type"));
 }
 
 static void _prefs_change_redo_list()
@@ -3650,7 +3648,7 @@
 
 	if (node)
 	{
-		struct _gaim_gtk_blist_node *gtknode;
+		struct _pidgin_blist_node *gtknode;
 		GtkTreePath *path;
 
 		gtknode = node->ui_data;
@@ -3668,10 +3666,10 @@
 									  gconstpointer val, gpointer data)
 {
 	if(!strcmp(pref_name, "/gaim/gtk/blist/sort_type"))
-		gaim_gtk_blist_sort_method_set(val);
-}
-
-static void account_modified(GaimAccount *account, GaimGtkBuddyList *gtkblist)
+		pidgin_blist_sort_method_set(val);
+}
+
+static void account_modified(GaimAccount *account, PidginBuddyList *gtkblist)
 {
 	GList *list;
 	if (!gtkblist)
@@ -3688,7 +3686,7 @@
 
 static void
 account_status_changed(GaimAccount *account, GaimStatus *old,
-					   GaimStatus *new, GaimGtkBuddyList *gtkblist)
+					   GaimStatus *new, PidginBuddyList *gtkblist)
 {
 	if (!gtkblist)
 		return;
@@ -3697,7 +3695,7 @@
 }
 
 static gboolean
-gtk_blist_window_key_press_cb(GtkWidget *w, GdkEventKey *event, GaimGtkBuddyList *gtkblist)
+gtk_blist_window_key_press_cb(GtkWidget *w, GdkEventKey *event, PidginBuddyList *gtkblist)
 {
 	GtkWidget *imhtml;
 
@@ -3722,7 +3720,7 @@
 }
 
 static gboolean
-headline_box_enter_cb(GtkWidget *widget, GdkEventCrossing *event, GaimGtkBuddyList *gtkblist)
+headline_box_enter_cb(GtkWidget *widget, GdkEventCrossing *event, PidginBuddyList *gtkblist)
 {
 	gdk_window_set_cursor(widget->window, gtkblist->hand_cursor);
 
@@ -3748,7 +3746,7 @@
 
 #if 0
 static gboolean
-headline_box_motion_cb(GtkWidget *widget, GdkEventMotion *event, GaimGtkBuddyList *gtkblist)
+headline_box_motion_cb(GtkWidget *widget, GdkEventMotion *event, PidginBuddyList *gtkblist)
 {
 	gaim_debug_fatal("motion", "%d %d\n", (int)event->x, (int)event->y);
 	if (headline_hover_close((int)event->x, (int)event->y))
@@ -3761,7 +3759,7 @@
 #endif
 
 static gboolean
-headline_box_leave_cb(GtkWidget *widget, GdkEventCrossing *event, GaimGtkBuddyList *gtkblist)
+headline_box_leave_cb(GtkWidget *widget, GdkEventCrossing *event, PidginBuddyList *gtkblist)
 {
 	gdk_window_set_cursor(widget->window, gtkblist->arrow_cursor);
 	if (gtkblist->headline_close) {
@@ -3773,12 +3771,12 @@
 }
 
 static void
-reset_headline(GaimGtkBuddyList *gtkblist)
+reset_headline(PidginBuddyList *gtkblist)
 {
 	gtkblist->headline_callback = NULL;
 	gtkblist->headline_data = NULL;
 	gtkblist->headline_destroy = NULL;
-	gaim_gtk_set_urgent(GTK_WINDOW(gtkblist->window), FALSE);
+	pidgin_set_urgent(GTK_WINDOW(gtkblist->window), FALSE);
 }
 
 static gboolean
@@ -3790,7 +3788,7 @@
 }
 
 static gboolean
-headline_box_press_cb(GtkWidget *widget, GdkEventButton *event, GaimGtkBuddyList *gtkblist)
+headline_box_press_cb(GtkWidget *widget, GdkEventButton *event, PidginBuddyList *gtkblist)
 {
 	gtk_widget_hide(gtkblist->headline_hbox);
 	if (gtkblist->headline_callback && !headline_hover_close((int)event->x, (int)event->y))
@@ -3810,7 +3808,7 @@
 static void
 ce_modify_account_cb(GaimAccount *account)
 {
-	gaim_gtk_account_dialog_show(GAIM_GTK_MODIFY_ACCOUNT_DIALOG, account);
+	pidgin_account_dialog_show(PIDGIN_MODIFY_ACCOUNT_DIALOG, account);
 }
 
 static void
@@ -3868,7 +3866,7 @@
 	/* Create the icon */
 	if ((status_type = gaim_account_get_status_type_with_primitive(account,
 							GAIM_STATUS_OFFLINE))) {
-		pixbuf = gaim_gtk_create_prpl_icon_with_status(account, status_type, 0.5);
+		pixbuf = pidgin_create_prpl_icon_with_status(account, status_type, 0.5);
 		if (pixbuf != NULL) {
 			image = gtk_image_new_from_pixbuf(pixbuf);
 			g_object_unref(pixbuf);
@@ -3900,7 +3898,7 @@
 }
 
 void
-gaim_gtk_blist_update_account_error_state(GaimAccount *account, const char *text)
+pidgin_blist_update_account_error_state(GaimAccount *account, const char *text)
 {
 	GList *l;
 
@@ -3975,9 +3973,9 @@
 /******************************************/
 
 static int
-blist_focus_cb(GtkWidget *widget, gpointer data, GaimGtkBuddyList *gtkblist)
-{
-	gaim_gtk_set_urgent(GTK_WINDOW(gtkblist->window), FALSE);
+blist_focus_cb(GtkWidget *widget, gpointer data, PidginBuddyList *gtkblist)
+{
+	pidgin_set_urgent(GTK_WINDOW(gtkblist->window), FALSE);
 	return 0;
 }
 
@@ -4028,7 +4026,7 @@
 }
 #endif
 
-static void gaim_gtk_blist_show(GaimBuddyList *list)
+static void pidgin_blist_show(GaimBuddyList *list)
 {
 	void *handle;
 	GtkCellRenderer *rend;
@@ -4055,7 +4053,7 @@
 		return;
 	}
 
-	gtkblist = GAIM_GTK_BLIST(list);
+	gtkblist = PIDGIN_BLIST(list);
 
 	gtkblist->empty_avatar = gdk_pixbuf_new(GDK_COLORSPACE_RGB, TRUE, 8, 32, 32);
 	gdk_pixbuf_fill(gtkblist->empty_avatar, 0x00000000);
@@ -4088,11 +4086,11 @@
 										NULL, NULL);
 	gtk_item_factory_create_items(gtkblist->ift, sizeof(blist_menu) / sizeof(*blist_menu),
 								  blist_menu, NULL);
-	gaim_gtk_load_accels();
+	pidgin_load_accels();
 	g_signal_connect(G_OBJECT(accel_group), "accel-changed",
-														G_CALLBACK(gaim_gtk_save_accels_cb), NULL);
+														G_CALLBACK(pidgin_save_accels_cb), NULL);
 	menu = gtk_item_factory_get_widget(gtkblist->ift, "<GaimMain>");
-	gtkblist->menutray = gaim_gtk_menu_tray_new();
+	gtkblist->menutray = pidgin_menu_tray_new();
 	gtk_menu_shell_append(GTK_MENU_SHELL(menu), gtkblist->menutray);
 	gtk_widget_show(gtkblist->menutray);
 	gtk_widget_show(menu);
@@ -4112,7 +4110,7 @@
 #endif
 
 	/* Translators: Please maintain the use of -> and <- to refer to menu heirarchy */
-	pretty = gaim_gtk_make_pretty_arrows(_("<span weight='bold' size='larger'>Welcome to " PIDGIN_NAME "!</span>\n\n"
+	pretty = pidgin_make_pretty_arrows(_("<span weight='bold' size='larger'>Welcome to " PIDGIN_NAME "!</span>\n\n"
 
 					       "You have no accounts enabled. Enable your IM accounts from the "
 					       "<b>Accounts</b> window at <b>Accounts->Add/Edit</b>. Once you "
@@ -4203,12 +4201,12 @@
 	gtkblist->treeview = gtk_tree_view_new_with_model(GTK_TREE_MODEL(gtkblist->treemodel));
 
 	gtk_widget_show(gtkblist->treeview);
-	gtk_widget_set_name(gtkblist->treeview, "gaim_gtkblist_treeview");
+	gtk_widget_set_name(gtkblist->treeview, "pidginblist_treeview");
 /*	gtk_tree_view_set_rules_hint(GTK_TREE_VIEW(gtkblist->treeview), TRUE); */
 
 	/* Set up selection stuff */
 	selection = gtk_tree_view_get_selection(GTK_TREE_VIEW(gtkblist->treeview));
-	g_signal_connect(G_OBJECT(selection), "changed", G_CALLBACK(gaim_gtk_blist_selection_changed), NULL);
+	g_signal_connect(G_OBJECT(selection), "changed", G_CALLBACK(pidgin_blist_selection_changed), NULL);
 
 	/* Set up dnd */
 	gtk_tree_view_enable_model_drag_source(GTK_TREE_VIEW(gtkblist->treeview),
@@ -4218,17 +4216,17 @@
 										 dte, 5,
 										 GDK_ACTION_COPY | GDK_ACTION_MOVE);
 
-	g_signal_connect(G_OBJECT(gtkblist->treeview), "drag-data-received", G_CALLBACK(gaim_gtk_blist_drag_data_rcv_cb), NULL);
-	g_signal_connect(G_OBJECT(gtkblist->treeview), "drag-data-get", G_CALLBACK(gaim_gtk_blist_drag_data_get_cb), NULL);
+	g_signal_connect(G_OBJECT(gtkblist->treeview), "drag-data-received", G_CALLBACK(pidgin_blist_drag_data_rcv_cb), NULL);
+	g_signal_connect(G_OBJECT(gtkblist->treeview), "drag-data-get", G_CALLBACK(pidgin_blist_drag_data_get_cb), NULL);
 #ifdef _WIN32
-	g_signal_connect(G_OBJECT(gtkblist->treeview), "drag-begin", G_CALLBACK(gaim_gtk_blist_drag_begin), NULL);
+	g_signal_connect(G_OBJECT(gtkblist->treeview), "drag-begin", G_CALLBACK(pidgin_blist_drag_begin), NULL);
 #endif
 
-	g_signal_connect(G_OBJECT(gtkblist->treeview), "drag-motion", G_CALLBACK(gaim_gtk_blist_drag_motion_cb), NULL);
+	g_signal_connect(G_OBJECT(gtkblist->treeview), "drag-motion", G_CALLBACK(pidgin_blist_drag_motion_cb), NULL);
 
 	/* Tooltips */
-	g_signal_connect(G_OBJECT(gtkblist->treeview), "motion-notify-event", G_CALLBACK(gaim_gtk_blist_motion_cb), NULL);
-	g_signal_connect(G_OBJECT(gtkblist->treeview), "leave-notify-event", G_CALLBACK(gaim_gtk_blist_leave_cb), NULL);
+	g_signal_connect(G_OBJECT(gtkblist->treeview), "motion-notify-event", G_CALLBACK(pidgin_blist_motion_cb), NULL);
+	g_signal_connect(G_OBJECT(gtkblist->treeview), "leave-notify-event", G_CALLBACK(pidgin_blist_leave_cb), NULL);
 
 	gtk_tree_view_set_headers_visible(GTK_TREE_VIEW(gtkblist->treeview), FALSE);
 
@@ -4238,7 +4236,7 @@
 	gtk_tree_view_set_expander_column(GTK_TREE_VIEW(gtkblist->treeview), column);
 
 	gtkblist->text_column = column = gtk_tree_view_column_new ();
-	rend = gaim_gtk_cell_renderer_expander_new();
+	rend = pidgin_cell_renderer_expander_new();
 	gtk_tree_view_column_pack_start(column, rend, FALSE);
 	gtk_tree_view_column_set_attributes(column, rend,
 					    "expander-visible", GROUP_EXPANDER_COLUMN,
@@ -4248,7 +4246,7 @@
 #endif
 					    NULL);
 
-	rend = gaim_gtk_cell_renderer_expander_new();
+	rend = pidgin_cell_renderer_expander_new();
 	gtk_tree_view_column_pack_start(column, rend, FALSE);
 	gtk_tree_view_column_set_attributes(column, rend,
 					    "expander-visible", CONTACT_EXPANDER_COLUMN,
@@ -4321,11 +4319,11 @@
 	g_signal_connect(G_OBJECT(gtkblist->treeview), "row-collapsed", G_CALLBACK(gtk_blist_row_collapsed_cb), NULL);
 	g_signal_connect(G_OBJECT(gtkblist->treeview), "button-press-event", G_CALLBACK(gtk_blist_button_press_cb), NULL);
 	g_signal_connect(G_OBJECT(gtkblist->treeview), "key-press-event", G_CALLBACK(gtk_blist_key_press_cb), NULL);
-	g_signal_connect(G_OBJECT(gtkblist->treeview), "popup-menu", G_CALLBACK(gaim_gtk_blist_popup_menu_cb), NULL);
+	g_signal_connect(G_OBJECT(gtkblist->treeview), "popup-menu", G_CALLBACK(pidgin_blist_popup_menu_cb), NULL);
 
 	/* Enable CTRL+F searching */
 	gtk_tree_view_set_search_column(GTK_TREE_VIEW(gtkblist->treeview), NAME_COLUMN);
-	gtk_tree_view_set_search_equal_func(GTK_TREE_VIEW(gtkblist->treeview), gaim_gtk_tree_view_search_equal_func, NULL, NULL);
+	gtk_tree_view_set_search_equal_func(GTK_TREE_VIEW(gtkblist->treeview), pidgin_tree_view_search_equal_func, NULL, NULL);
 
 	gtk_box_pack_start(GTK_BOX(gtkblist->vbox), sw, TRUE, TRUE, 0);
 	gtk_container_add(GTK_CONTAINER(sw), gtkblist->treeview);
@@ -4343,7 +4341,7 @@
 	/* Add the statusbox */
 	gtkblist->statusbox = gtk_gaim_status_box_new();
 	gtk_box_pack_start(GTK_BOX(gtkblist->vbox), gtkblist->statusbox, FALSE, TRUE, 0);
-	gtk_widget_set_name(gtkblist->statusbox, "gaim_gtkblist_statusbox");
+	gtk_widget_set_name(gtkblist->statusbox, "pidginblist_statusbox");
 	gtk_container_set_border_width(GTK_CONTAINER(gtkblist->statusbox), 3);
 	gtk_widget_show(gtkblist->statusbox);
 
@@ -4370,20 +4368,20 @@
 
 	/* Update some dynamic things */
 	update_menu_bar(gtkblist);
-	gaim_gtk_blist_update_plugin_actions();
-	gaim_gtk_blist_update_sort_methods();
+	pidgin_blist_update_plugin_actions();
+	pidgin_blist_update_sort_methods();
 
 	/* OK... let's show this bad boy. */
-	gaim_gtk_blist_refresh(list);
-	gaim_gtk_blist_restore_position();
+	pidgin_blist_refresh(list);
+	pidgin_blist_restore_position();
 	gtk_widget_show_all(GTK_WIDGET(gtkblist->vbox));
 	gtk_widget_realize(GTK_WIDGET(gtkblist->window));
 	gaim_blist_set_visible(gaim_prefs_get_bool("/gaim/gtk/blist/list_visible"));
 
 	/* start the refresh timer */
-	gtkblist->refresh_timer = g_timeout_add(30000, (GSourceFunc)gaim_gtk_blist_refresh_timer, list);
-
-	handle = gaim_gtk_blist_get_handle();
+	gtkblist->refresh_timer = g_timeout_add(30000, (GSourceFunc)pidgin_blist_refresh_timer, list);
+
+	handle = pidgin_blist_get_handle();
 
 	/* things that affect how buddies are displayed */
 	gaim_prefs_connect_callback(handle, "/gaim/gtk/blist/show_buddy_icons",
@@ -4401,9 +4399,9 @@
 
 	/* menus */
 	gaim_prefs_connect_callback(handle, "/gaim/gtk/sound/mute",
-			gaim_gtk_blist_mute_pref_cb, NULL);
+			pidgin_blist_mute_pref_cb, NULL);
 	gaim_prefs_connect_callback(handle, "/gaim/gtk/sound/method",
-			gaim_gtk_blist_sound_method_pref_cb, NULL);
+			pidgin_blist_sound_method_pref_cb, NULL);
 
 	/* Setup some gaim signal handlers. */
 	gaim_signal_connect(gaim_accounts_get_handle(), "account-enabled",
@@ -4415,7 +4413,7 @@
 	gaim_signal_connect(gaim_accounts_get_handle(), "account-status-changed",
 			gtkblist, GAIM_CALLBACK(account_status_changed), gtkblist);
 
-	gaim_signal_connect(gaim_gtk_account_get_handle(), "account-modified",
+	gaim_signal_connect(pidgin_account_get_handle(), "account-modified",
 			gtkblist, GAIM_CALLBACK(account_modified), gtkblist);
 
 	gaim_signal_connect(gaim_connections_get_handle(), "signed-on",
@@ -4445,7 +4443,7 @@
 {
 	GaimBlistNode *node;
 
-	gtkblist = GAIM_GTK_BLIST(list);
+	gtkblist = PIDGIN_BLIST(list);
 	if(!gtkblist || !gtkblist->treeview)
 		return;
 
@@ -4457,38 +4455,38 @@
 		 * status.  We shouldn't need to remove otherwise.
 		 */
 		if (remove && !GAIM_BLIST_NODE_IS_GROUP(node))
-			gaim_gtk_blist_hide_node(list, node, FALSE);
+			pidgin_blist_hide_node(list, node, FALSE);
 
 		if (GAIM_BLIST_NODE_IS_BUDDY(node))
-			gaim_gtk_blist_update_buddy(list, node, rerender);
+			pidgin_blist_update_buddy(list, node, rerender);
 		else if (GAIM_BLIST_NODE_IS_CHAT(node))
-			gaim_gtk_blist_update(list, node);
+			pidgin_blist_update(list, node);
 		else if (GAIM_BLIST_NODE_IS_GROUP(node))
-			gaim_gtk_blist_update(list, node);
+			pidgin_blist_update(list, node);
 		node = gaim_blist_node_next(node, FALSE);
 	}
 
 }
 
-void gaim_gtk_blist_refresh(GaimBuddyList *list)
+void pidgin_blist_refresh(GaimBuddyList *list)
 {
 	redo_buddy_list(list, FALSE, TRUE);
 }
 
 void
-gaim_gtk_blist_update_refresh_timeout()
+pidgin_blist_update_refresh_timeout()
 {
 	GaimBuddyList *blist;
-	GaimGtkBuddyList *gtkblist;
+	PidginBuddyList *gtkblist;
 
 	blist = gaim_get_blist();
-	gtkblist = GAIM_GTK_BLIST(gaim_get_blist());
-
-	gtkblist->refresh_timer = g_timeout_add(30000,(GSourceFunc)gaim_gtk_blist_refresh_timer, blist);
+	gtkblist = PIDGIN_BLIST(gaim_get_blist());
+
+	gtkblist->refresh_timer = g_timeout_add(30000,(GSourceFunc)pidgin_blist_refresh_timer, blist);
 }
 
 static gboolean get_iter_from_node(GaimBlistNode *node, GtkTreeIter *iter) {
-	struct _gaim_gtk_blist_node *gtknode = (struct _gaim_gtk_blist_node *)node->ui_data;
+	struct _pidgin_blist_node *gtknode = (struct _pidgin_blist_node *)node->ui_data;
 	GtkTreePath *path;
 
 	if (!gtknode) {
@@ -4515,16 +4513,16 @@
 	return TRUE;
 }
 
-static void gaim_gtk_blist_remove(GaimBuddyList *list, GaimBlistNode *node)
-{
-	struct _gaim_gtk_blist_node *gtknode = node->ui_data;
+static void pidgin_blist_remove(GaimBuddyList *list, GaimBlistNode *node)
+{
+	struct _pidgin_blist_node *gtknode = node->ui_data;
 
 	gaim_request_close_with_handle(node);
 
-	gaim_gtk_blist_hide_node(list, node, TRUE);
+	pidgin_blist_hide_node(list, node, TRUE);
 
 	if(node->parent)
-		gaim_gtk_blist_update(list, node->parent);
+		pidgin_blist_update(list, node->parent);
 
 	/* There's something I don't understand here - Ethan */
 	/* Ethan said that back in 2003, but this g_free has been left commented
@@ -4553,15 +4551,15 @@
 		old_selection = gtkblist->selected_node;
 		gtkblist->selected_node = new_selection;
 		if(new_selection)
-			gaim_gtk_blist_update(NULL, new_selection);
+			pidgin_blist_update(NULL, new_selection);
 		if(old_selection)
-			gaim_gtk_blist_update(NULL, old_selection);
+			pidgin_blist_update(NULL, old_selection);
 	}
 
 	return FALSE;
 }
 
-static void gaim_gtk_blist_selection_changed(GtkTreeSelection *selection, gpointer data)
+static void pidgin_blist_selection_changed(GtkTreeSelection *selection, gpointer data)
 {
 	GaimBlistNode *new_selection = NULL;
 	GtkTreeIter iter;
@@ -4578,7 +4576,7 @@
 static gboolean insert_node(GaimBuddyList *list, GaimBlistNode *node, GtkTreeIter *iter)
 {
 	GtkTreeIter parent_iter, cur, *curptr = NULL;
-	struct _gaim_gtk_blist_node *gtknode = node->ui_data;
+	struct _pidgin_blist_node *gtknode = node->ui_data;
 	GtkTreePath *newpath;
 
 	if(!iter)
@@ -4599,8 +4597,8 @@
 	if(gtknode != NULL) {
 		gtk_tree_row_reference_free(gtknode->row);
 	} else {
-		gaim_gtk_blist_new_node(node);
-		gtknode = (struct _gaim_gtk_blist_node *)node->ui_data;
+		pidgin_blist_new_node(node);
+		gtknode = (struct _pidgin_blist_node *)node->ui_data;
 	}
 
 	newpath = gtk_tree_model_get_path(GTK_TREE_MODEL(gtkblist->treemodel),
@@ -4617,7 +4615,7 @@
 
 	if(node->parent) {
 		GtkTreePath *expand = NULL;
-		struct _gaim_gtk_blist_node *gtkparentnode = node->parent->ui_data;
+		struct _pidgin_blist_node *gtkparentnode = node->parent->ui_data;
 
 		if(GAIM_BLIST_NODE_IS_GROUP(node->parent)) {
 			if(!gaim_blist_node_get_bool(node->parent, "collapsed"))
@@ -4635,9 +4633,9 @@
 	return TRUE;
 }
 
-/*This version of gaim_gtk_blist_update_group can take the original buddy
+/*This version of pidgin_blist_update_group can take the original buddy
 or a group, but has much better algorithmic performance with a pre-known buddy*/
-static void gaim_gtk_blist_update_group(GaimBuddyList *list, GaimBlistNode *node)
+static void pidgin_blist_update_group(GaimBuddyList *list, GaimBlistNode *node)
 {
 	GaimGroup *group;
 	int count;
@@ -4701,7 +4699,7 @@
 				   -1);
 		g_free(title);
 	} else {
-		gaim_gtk_blist_hide_node(list, gnode, TRUE);
+		pidgin_blist_hide_node(list, gnode, TRUE);
 	}
 }
 
@@ -4741,21 +4739,24 @@
 	GdkPixbuf *status, *avatar, *emblem;
 	char *mark;
 	char *idle = NULL;
-	gboolean expanded = ((struct _gaim_gtk_blist_node *)(node->parent->ui_data))->contact_expanded;
+	gboolean expanded = ((struct _pidgin_blist_node *)(node->parent->ui_data))->contact_expanded;
 	gboolean selected = (gtkblist->selected_node == node);
 	gboolean biglist = gaim_prefs_get_bool("/gaim/gtk/blist/show_buddy_icons");
 	presence = gaim_buddy_get_presence(buddy);
 
-	status = gaim_gtk_blist_get_status_icon((GaimBlistNode*)buddy,
+	status = pidgin_blist_get_status_icon((GaimBlistNode*)buddy,
 						GAIM_STATUS_ICON_SMALL);
 
-	avatar = gaim_gtk_blist_get_buddy_icon((GaimBlistNode *)buddy, TRUE, TRUE, TRUE);
+	avatar = pidgin_blist_get_buddy_icon((GaimBlistNode *)buddy, TRUE, TRUE, TRUE);
 	if (!avatar) {
 		g_object_ref(G_OBJECT(gtkblist->empty_avatar));
 		avatar = gtkblist->empty_avatar;
-	}
-	emblem = gaim_gtk_blist_get_emblem((GaimBlistNode*) buddy);
-	mark = gaim_gtk_blist_get_name_markup(buddy, selected);
+	} else if ((!GAIM_BUDDY_IS_ONLINE(buddy) || gaim_presence_is_idle(presence))) {
+		do_alphashift(avatar, avatar, 77);
+	}
+
+	emblem = pidgin_blist_get_emblem((GaimBlistNode*) buddy);
+	mark = pidgin_blist_get_name_markup(buddy, selected);
 
 	if (gaim_prefs_get_bool("/gaim/gtk/blist/show_idle_time") &&
 		gaim_presence_is_idle(presence) &&
@@ -4809,12 +4810,12 @@
 
 /* This is a variation on the original gtk_blist_update_contact. Here we
 	can know in advance which buddy has changed so we can just update that */
-static void gaim_gtk_blist_update_contact(GaimBuddyList *list, GaimBlistNode *node)
+static void pidgin_blist_update_contact(GaimBuddyList *list, GaimBlistNode *node)
 {
 	GaimBlistNode *cnode;
 	GaimContact *contact;
 	GaimBuddy *buddy;
-	struct _gaim_gtk_blist_node *gtknode;
+	struct _pidgin_blist_node *gtknode;
 
 	if (GAIM_BLIST_NODE_IS_BUDDY(node))
 		cnode = node->parent;
@@ -4825,9 +4826,9 @@
 
 	/* First things first, update the group */
 	if (GAIM_BLIST_NODE_IS_BUDDY(node))
-		gaim_gtk_blist_update_group(list, node);
+		pidgin_blist_update_group(list, node);
 	else
-		gaim_gtk_blist_update_group(list, cnode->parent);
+		pidgin_blist_update_group(list, cnode->parent);
 
 	contact = (GaimContact*)cnode;
 	buddy = gaim_contact_get_priority_buddy(contact);
@@ -4839,13 +4840,13 @@
 		if(!insert_node(list, cnode, &iter))
 			return;
 
-		gtknode = (struct _gaim_gtk_blist_node *)cnode->ui_data;
+		gtknode = (struct _pidgin_blist_node *)cnode->ui_data;
 
 		if(gtknode->contact_expanded) {
 			GdkPixbuf *status;
 			char *mark;
 
-			status = gaim_gtk_blist_get_status_icon(cnode,
+			status = pidgin_blist_get_status_icon(cnode,
 					 GAIM_STATUS_ICON_SMALL);
 
 			mark = g_markup_escape_text(gaim_contact_get_alias(contact), -1);
@@ -4867,16 +4868,16 @@
 			buddy_node(buddy, &iter, cnode);
 		}
 	} else {
-		gaim_gtk_blist_hide_node(list, cnode, TRUE);
-	}
-}
-
-
-
-static void gaim_gtk_blist_update_buddy(GaimBuddyList *list, GaimBlistNode *node, gboolean statusChange)
+		pidgin_blist_hide_node(list, cnode, TRUE);
+	}
+}
+
+
+
+static void pidgin_blist_update_buddy(GaimBuddyList *list, GaimBlistNode *node, gboolean statusChange)
 {
 	GaimBuddy *buddy;
-	struct _gaim_gtk_blist_node *gtkparentnode;
+	struct _pidgin_blist_node *gtkparentnode;
 
 	g_return_if_fail(GAIM_BLIST_NODE_IS_BUDDY(node));
 
@@ -4886,9 +4887,9 @@
 	buddy = (GaimBuddy*)node;
 
 	/* First things first, update the contact */
-	gaim_gtk_blist_update_contact(list, node);
-
-	gtkparentnode = (struct _gaim_gtk_blist_node *)node->parent->ui_data;
+	pidgin_blist_update_contact(list, node);
+
+	gtkparentnode = (struct _pidgin_blist_node *)node->parent->ui_data;
 
 	if (gtkparentnode->contact_expanded && buddy_is_displayable(buddy))
 	{
@@ -4900,19 +4901,19 @@
 		buddy_node(buddy, &iter, node);
 
 	} else {
-		gaim_gtk_blist_hide_node(list, node, TRUE);
-	}
-
-}
-
-static void gaim_gtk_blist_update_chat(GaimBuddyList *list, GaimBlistNode *node)
+		pidgin_blist_hide_node(list, node, TRUE);
+	}
+
+}
+
+static void pidgin_blist_update_chat(GaimBuddyList *list, GaimBlistNode *node)
 {
 	GaimChat *chat;
 
 	g_return_if_fail(GAIM_BLIST_NODE_IS_CHAT(node));
 
 	/* First things first, update the group */
-	gaim_gtk_blist_update_group(list, node->parent);
+	pidgin_blist_update_group(list, node->parent);
 
 	chat = (GaimChat*)node;
 
@@ -4926,10 +4927,10 @@
 		if(!insert_node(list, node, &iter))
 			return;
 
-		status = gaim_gtk_blist_get_status_icon(node,
+		status = pidgin_blist_get_status_icon(node,
 				 GAIM_STATUS_ICON_SMALL);
-		emblem = gaim_gtk_blist_get_emblem(node);
-		avatar = gaim_gtk_blist_get_buddy_icon(node, TRUE, FALSE, TRUE);
+		emblem = pidgin_blist_get_emblem(node);
+		avatar = pidgin_blist_get_buddy_icon(node, TRUE, FALSE, TRUE);
 
 		mark = g_markup_escape_text(gaim_chat_get_name(chat), -1);
 
@@ -4949,32 +4950,32 @@
 		if(avatar)
 			g_object_unref(avatar);
 	} else {
-		gaim_gtk_blist_hide_node(list, node, TRUE);
-	}
-}
-
-static void gaim_gtk_blist_update(GaimBuddyList *list, GaimBlistNode *node)
+		pidgin_blist_hide_node(list, node, TRUE);
+	}
+}
+
+static void pidgin_blist_update(GaimBuddyList *list, GaimBlistNode *node)
 {
 	if (list)
-		gtkblist = GAIM_GTK_BLIST(list);
+		gtkblist = PIDGIN_BLIST(list);
 	if(!gtkblist || !gtkblist->treeview || !node)
 		return;
 
 	if (node->ui_data == NULL)
-		gaim_gtk_blist_new_node(node);
+		pidgin_blist_new_node(node);
 
 	switch(node->type) {
 		case GAIM_BLIST_GROUP_NODE:
-			gaim_gtk_blist_update_group(list, node);
+			pidgin_blist_update_group(list, node);
 			break;
 		case GAIM_BLIST_CONTACT_NODE:
-			gaim_gtk_blist_update_contact(list, node);
+			pidgin_blist_update_contact(list, node);
 			break;
 		case GAIM_BLIST_BUDDY_NODE:
-			gaim_gtk_blist_update_buddy(list, node, TRUE);
+			pidgin_blist_update_buddy(list, node, TRUE);
 			break;
 		case GAIM_BLIST_CHAT_NODE:
-			gaim_gtk_blist_update_chat(list, node);
+			pidgin_blist_update_chat(list, node);
 			break;
 		case GAIM_BLIST_OTHER_NODE:
 			return;
@@ -4986,7 +4987,7 @@
 }
 
 
-static void gaim_gtk_blist_destroy(GaimBuddyList *list)
+static void pidgin_blist_destroy(GaimBuddyList *list)
 {
 	if (!gtkblist)
 		return;
@@ -4998,7 +4999,7 @@
 
 	gtk_widget_destroy(gtkblist->window);
 
-	gaim_gtk_blist_tooltip_destroy();
+	pidgin_blist_tooltip_destroy();
 
 	if (gtkblist->refresh_timer)
 		g_source_remove(gtkblist->refresh_timer);
@@ -5024,22 +5025,22 @@
 	g_free(gtkblist);
 	accountmenu = NULL;
 	gtkblist = NULL;
-	gaim_prefs_disconnect_by_handle(gaim_gtk_blist_get_handle());
-}
-
-static void gaim_gtk_blist_set_visible(GaimBuddyList *list, gboolean show)
+	gaim_prefs_disconnect_by_handle(pidgin_blist_get_handle());
+}
+
+static void pidgin_blist_set_visible(GaimBuddyList *list, gboolean show)
 {
 	if (!(gtkblist && gtkblist->window))
 		return;
 
 	if (show) {
 		if(!GAIM_WINDOW_ICONIFIED(gtkblist->window) && !GTK_WIDGET_VISIBLE(gtkblist->window))
-			gaim_signal_emit(gaim_gtk_blist_get_handle(), "gtkblist-unhiding", gtkblist);
-		gaim_gtk_blist_restore_position();
+			gaim_signal_emit(pidgin_blist_get_handle(), "gtkblist-unhiding", gtkblist);
+		pidgin_blist_restore_position();
 		gtk_window_present(GTK_WINDOW(gtkblist->window));
 	} else {
 		if(visibility_manager_count) {
-			gaim_signal_emit(gaim_gtk_blist_get_handle(), "gtkblist-hiding", gtkblist);
+			gaim_signal_emit(pidgin_blist_get_handle(), "gtkblist-hiding", gtkblist);
 			gtk_widget_hide(gtkblist->window);
 		} else {
 			if (!GTK_WIDGET_VISIBLE(gtkblist->window))
@@ -5082,20 +5083,20 @@
 
 static void
 add_buddy_select_account_cb(GObject *w, GaimAccount *account,
-							GaimGtkAddBuddyData *data)
+							PidginAddBuddyData *data)
 {
 	/* Save our account */
 	data->account = account;
 }
 
 static void
-destroy_add_buddy_dialog_cb(GtkWidget *win, GaimGtkAddBuddyData *data)
+destroy_add_buddy_dialog_cb(GtkWidget *win, PidginAddBuddyData *data)
 {
 	g_free(data);
 }
 
 static void
-add_buddy_cb(GtkWidget *w, int resp, GaimGtkAddBuddyData *data)
+add_buddy_cb(GtkWidget *w, int resp, PidginAddBuddyData *data)
 {
 	const char *grp, *who, *whoalias;
 	GaimGroup *g;
@@ -5148,7 +5149,7 @@
 }
 
 static void
-gaim_gtk_blist_request_add_buddy(GaimAccount *account, const char *username,
+pidgin_blist_request_add_buddy(GaimAccount *account, const char *username,
 								 const char *group, const char *alias)
 {
 	GtkWidget *table;
@@ -5156,8 +5157,8 @@
 	GtkWidget *hbox;
 	GtkWidget *vbox;
 	GtkWidget *img;
-	GaimGtkBuddyList *gtkblist;
-	GaimGtkAddBuddyData *data = g_new0(GaimGtkAddBuddyData, 1);
+	PidginBuddyList *gtkblist;
+	PidginAddBuddyData *data = g_new0(PidginAddBuddyData, 1);
 
 	data->account =
 		(account != NULL
@@ -5167,7 +5168,7 @@
 	img = gtk_image_new_from_stock(PIDGIN_STOCK_DIALOG_QUESTION,
 					gtk_icon_size_from_name(PIDGIN_ICON_SIZE_TANGO_HUGE));
 
-	gtkblist = GAIM_GTK_BLIST(gaim_get_blist());
+	gtkblist = PIDGIN_BLIST(gaim_get_blist());
 
 	data->window = gtk_dialog_new_with_buttons(_("Add Buddy"),
 			NULL, GTK_DIALOG_NO_SEPARATOR,
@@ -5233,7 +5234,7 @@
 	gaim_set_accessible_label (data->entry, label);
 
 	g_signal_connect(G_OBJECT(data->entry), "changed",
-					 G_CALLBACK(gaim_gtk_set_sensitive_if_input),
+					 G_CALLBACK(pidgin_set_sensitive_if_input),
 					 data->window);
 
 	label = gtk_label_new(_("Alias:"));
@@ -5267,7 +5268,7 @@
 	gtk_misc_set_alignment(GTK_MISC(label), 0, 0.5);
 	gtk_table_attach_defaults(GTK_TABLE(table), label, 0, 1, 3, 4);
 
-	data->account_box = gaim_gtk_account_option_menu_new(account, FALSE,
+	data->account_box = pidgin_account_option_menu_new(account, FALSE,
 			G_CALLBACK(add_buddy_select_account_cb), NULL, data);
 
 	gtk_table_attach_defaults(GTK_TABLE(table), data->account_box, 1, 2, 3, 4);
@@ -5284,7 +5285,7 @@
 }
 
 static void
-add_chat_cb(GtkWidget *w, GaimGtkAddChatData *data)
+add_chat_cb(GtkWidget *w, PidginAddChatData *data)
 {
 	GHashTable *components;
 	GList *tmp;
@@ -5339,7 +5340,7 @@
 }
 
 static void
-add_chat_resp_cb(GtkWidget *w, int resp, GaimGtkAddChatData *data)
+add_chat_resp_cb(GtkWidget *w, int resp, PidginAddChatData *data)
 {
 	if (resp == GTK_RESPONSE_OK)
 	{
@@ -5361,7 +5362,7 @@
 static void
 addchat_set_sensitive_if_input_cb(GtkWidget *entry, gpointer user_data)
 {
-	GaimGtkAddChatData *data;
+	PidginAddChatData *data;
 	GList *tmp;
 	const char *text;
 	gboolean required;
@@ -5384,7 +5385,7 @@
 }
 
 static void
-rebuild_addchat_entries(GaimGtkAddChatData *data)
+rebuild_addchat_entries(PidginAddChatData *data)
 {
 	GaimConnection *gc;
 	GList *list = NULL, *tmp;
@@ -5480,7 +5481,7 @@
 
 static void
 addchat_select_account_cb(GObject *w, GaimAccount *account,
-						   GaimGtkAddChatData *data)
+						   PidginAddChatData *data)
 {
 	if (strcmp(gaim_account_get_protocol_id(data->account),
 		gaim_account_get_protocol_id(account)) == 0)
@@ -5495,11 +5496,11 @@
 }
 
 static void
-gaim_gtk_blist_request_add_chat(GaimAccount *account, GaimGroup *group,
+pidgin_blist_request_add_chat(GaimAccount *account, GaimGroup *group,
 								const char *alias, const char *name)
 {
-	GaimGtkAddChatData *data;
-	GaimGtkBuddyList *gtkblist;
+	PidginAddChatData *data;
+	PidginBuddyList *gtkblist;
 	GList *l;
 	GaimConnection *gc;
 	GtkWidget *label;
@@ -5534,14 +5535,14 @@
 		}
 	}
 
-	data = g_new0(GaimGtkAddChatData, 1);
+	data = g_new0(PidginAddChatData, 1);
 	data->account = account;
 	data->default_chat_name = g_strdup(name);
 
 	img = gtk_image_new_from_stock(PIDGIN_STOCK_DIALOG_QUESTION,
 					gtk_icon_size_from_name(PIDGIN_ICON_SIZE_TANGO_HUGE));
 
-	gtkblist = GAIM_GTK_BLIST(gaim_get_blist());
+	gtkblist = PIDGIN_BLIST(gaim_get_blist());
 
 	data->sg = gtk_size_group_new(GTK_SIZE_GROUP_HORIZONTAL);
 
@@ -5584,7 +5585,7 @@
 	gtk_size_group_add_widget(data->sg, label);
 	gtk_box_pack_start(GTK_BOX(rowbox), label, FALSE, FALSE, 0);
 
-	data->account_menu = gaim_gtk_account_option_menu_new(account, FALSE,
+	data->account_menu = pidgin_account_option_menu_new(account, FALSE,
 			G_CALLBACK(addchat_select_account_cb),
 			chat_account_filter_func, data);
 	gtk_box_pack_start(GTK_BOX(rowbox), data->account_menu, TRUE, TRUE, 0);
@@ -5649,7 +5650,7 @@
 }
 
 static void
-gaim_gtk_blist_request_add_group(void)
+pidgin_blist_request_add_group(void)
 {
 	gaim_request_input(NULL, _("Add Group"), NULL,
 					   _("Please enter the name of the group to be added."),
@@ -5659,7 +5660,7 @@
 }
 
 void
-gaim_gtk_blist_toggle_visibility()
+pidgin_blist_toggle_visibility()
 {
 	if (gtkblist && gtkblist->window) {
 		if (GTK_WIDGET_VISIBLE(gtkblist->window)) {
@@ -5671,14 +5672,14 @@
 }
 
 void
-gaim_gtk_blist_visibility_manager_add()
+pidgin_blist_visibility_manager_add()
 {
 	visibility_manager_count++;
 	gaim_debug_info("gtkblist", "added visibility manager: %d\n", visibility_manager_count);
 }
 
 void
-gaim_gtk_blist_visibility_manager_remove()
+pidgin_blist_visibility_manager_remove()
 {
 	if (visibility_manager_count)
 		visibility_manager_count--;
@@ -5687,15 +5688,15 @@
 	gaim_debug_info("gtkblist", "removed visibility manager: %d\n", visibility_manager_count);
 }
 
-void gaim_gtk_blist_add_alert(GtkWidget *widget)
+void pidgin_blist_add_alert(GtkWidget *widget)
 {
 	gtk_container_add(GTK_CONTAINER(gtkblist->scrollbook), widget);
 	if (!GTK_WIDGET_HAS_FOCUS(gtkblist->window))
-		gaim_gtk_set_urgent(GTK_WINDOW(gtkblist->window), TRUE);
+		pidgin_set_urgent(GTK_WINDOW(gtkblist->window), TRUE);
 }
 
 void
-gaim_gtk_blist_set_headline(const char *text, GdkPixbuf *pixbuf, GCallback callback,
+pidgin_blist_set_headline(const char *text, GdkPixbuf *pixbuf, GCallback callback,
 			gpointer user_data, GDestroyNotify destroy)
 {
 	/* Destroy any existing headline first */
@@ -5709,32 +5710,32 @@
 	gtkblist->headline_data = user_data;
 	gtkblist->headline_destroy = destroy;
 	if (!GTK_WIDGET_HAS_FOCUS(gtkblist->window))
-		gaim_gtk_set_urgent(GTK_WINDOW(gtkblist->window), TRUE);
+		pidgin_set_urgent(GTK_WINDOW(gtkblist->window), TRUE);
 	gtk_widget_show_all(gtkblist->headline_hbox);
 }
 
 static GaimBlistUiOps blist_ui_ops =
 {
-	gaim_gtk_blist_new_list,
-	gaim_gtk_blist_new_node,
-	gaim_gtk_blist_show,
-	gaim_gtk_blist_update,
-	gaim_gtk_blist_remove,
-	gaim_gtk_blist_destroy,
-	gaim_gtk_blist_set_visible,
-	gaim_gtk_blist_request_add_buddy,
-	gaim_gtk_blist_request_add_chat,
-	gaim_gtk_blist_request_add_group
+	pidgin_blist_new_list,
+	pidgin_blist_new_node,
+	pidgin_blist_show,
+	pidgin_blist_update,
+	pidgin_blist_remove,
+	pidgin_blist_destroy,
+	pidgin_blist_set_visible,
+	pidgin_blist_request_add_buddy,
+	pidgin_blist_request_add_chat,
+	pidgin_blist_request_add_group
 };
 
 
 GaimBlistUiOps *
-gaim_gtk_blist_get_ui_ops(void)
+pidgin_blist_get_ui_ops(void)
 {
 	return &blist_ui_ops;
 }
 
-GaimGtkBuddyList *gaim_gtk_blist_get_default_gtk_blist()
+PidginBuddyList *pidgin_blist_get_default_gtk_blist()
 {
 	return gtkblist;
 }
@@ -5768,7 +5769,7 @@
 }
 
 void *
-gaim_gtk_blist_get_handle() {
+pidgin_blist_get_handle() {
 	static int handle;
 
 	return &handle;
@@ -5776,22 +5777,22 @@
 
 static gboolean buddy_signonoff_timeout_cb(GaimBuddy *buddy)
 {
-	struct _gaim_gtk_blist_node *gtknode = ((GaimBlistNode*)buddy)->ui_data;
+	struct _pidgin_blist_node *gtknode = ((GaimBlistNode*)buddy)->ui_data;
 
 	gtknode->recent_signonoff = FALSE;
 	gtknode->recent_signonoff_timer = 0;
 
-	gaim_gtk_blist_update(NULL, (GaimBlistNode*)buddy);
+	pidgin_blist_update(NULL, (GaimBlistNode*)buddy);
 
 	return FALSE;
 }
 
 static void buddy_signonoff_cb(GaimBuddy *buddy)
 {
-	struct _gaim_gtk_blist_node *gtknode;
+	struct _pidgin_blist_node *gtknode;
 
 	if(!((GaimBlistNode*)buddy)->ui_data) {
-		gaim_gtk_blist_new_node((GaimBlistNode*)buddy);
+		pidgin_blist_new_node((GaimBlistNode*)buddy);
 	}
 
 	gtknode = ((GaimBlistNode*)buddy)->ui_data;
@@ -5804,9 +5805,9 @@
 			(GSourceFunc)buddy_signonoff_timeout_cb, buddy);
 }
 
-void gaim_gtk_blist_init(void)
-{
-	void *gtk_blist_handle = gaim_gtk_blist_get_handle();
+void pidgin_blist_init(void)
+{
+	void *gtk_blist_handle = pidgin_blist_get_handle();
 
 	gaim_signal_connect(gaim_connections_get_handle(), "signed-on",
 						gtk_blist_handle, GAIM_CALLBACK(account_signon_cb),
@@ -5853,63 +5854,63 @@
 
 	gaim_signal_connect(gaim_blist_get_handle(), "buddy-signed-on", gtk_blist_handle, GAIM_CALLBACK(buddy_signonoff_cb), NULL);
 	gaim_signal_connect(gaim_blist_get_handle(), "buddy-signed-off", gtk_blist_handle, GAIM_CALLBACK(buddy_signonoff_cb), NULL);
-	gaim_signal_connect(gaim_blist_get_handle(), "buddy-privacy-changed", gtk_blist_handle, GAIM_CALLBACK(gaim_gtk_blist_update_privacy_cb), NULL);
+	gaim_signal_connect(gaim_blist_get_handle(), "buddy-privacy-changed", gtk_blist_handle, GAIM_CALLBACK(pidgin_blist_update_privacy_cb), NULL);
 }
 
 void
-gaim_gtk_blist_uninit(void) {
-	gaim_signals_unregister_by_instance(gaim_gtk_blist_get_handle());
-	gaim_signals_disconnect_by_handle(gaim_gtk_blist_get_handle());
+pidgin_blist_uninit(void) {
+	gaim_signals_unregister_by_instance(pidgin_blist_get_handle());
+	gaim_signals_disconnect_by_handle(pidgin_blist_get_handle());
 }
 
 /*********************************************************************
  * Buddy List sorting functions                                      *
  *********************************************************************/
 
-GList *gaim_gtk_blist_get_sort_methods()
-{
-	return gaim_gtk_blist_sort_methods;
-}
-
-void gaim_gtk_blist_sort_method_reg(const char *id, const char *name, gaim_gtk_blist_sort_function func)
-{
-	struct gaim_gtk_blist_sort_method *method = g_new0(struct gaim_gtk_blist_sort_method, 1);
+GList *pidgin_blist_get_sort_methods()
+{
+	return pidgin_blist_sort_methods;
+}
+
+void pidgin_blist_sort_method_reg(const char *id, const char *name, pidgin_blist_sort_function func)
+{
+	struct pidgin_blist_sort_method *method = g_new0(struct pidgin_blist_sort_method, 1);
 	method->id = g_strdup(id);
 	method->name = g_strdup(name);
 	method->func = func;
-	gaim_gtk_blist_sort_methods = g_list_append(gaim_gtk_blist_sort_methods, method);
-	gaim_gtk_blist_update_sort_methods();
-}
-
-void gaim_gtk_blist_sort_method_unreg(const char *id){
-	GList *l = gaim_gtk_blist_sort_methods;
+	pidgin_blist_sort_methods = g_list_append(pidgin_blist_sort_methods, method);
+	pidgin_blist_update_sort_methods();
+}
+
+void pidgin_blist_sort_method_unreg(const char *id){
+	GList *l = pidgin_blist_sort_methods;
 
 	while(l) {
-		struct gaim_gtk_blist_sort_method *method = l->data;
+		struct pidgin_blist_sort_method *method = l->data;
 		if(!strcmp(method->id, id)) {
-			gaim_gtk_blist_sort_methods = g_list_delete_link(gaim_gtk_blist_sort_methods, l);
+			pidgin_blist_sort_methods = g_list_delete_link(pidgin_blist_sort_methods, l);
 			g_free(method->id);
 			g_free(method->name);
 			g_free(method);
 			break;
 		}
 	}
-	gaim_gtk_blist_update_sort_methods();
-}
-
-void gaim_gtk_blist_sort_method_set(const char *id){
-	GList *l = gaim_gtk_blist_sort_methods;
+	pidgin_blist_update_sort_methods();
+}
+
+void pidgin_blist_sort_method_set(const char *id){
+	GList *l = pidgin_blist_sort_methods;
 
 	if(!id)
 		id = "none";
 
-	while (l && strcmp(((struct gaim_gtk_blist_sort_method*)l->data)->id, id))
+	while (l && strcmp(((struct pidgin_blist_sort_method*)l->data)->id, id))
 		l = l->next;
 
 	if (l) {
 		current_sort_method = l->data;
 	} else if (!current_sort_method) {
-		gaim_gtk_blist_sort_method_set("none");
+		pidgin_blist_sort_method_set("none");
 		return;
 	}
 	if (!strcmp(id, "none")) {
@@ -6227,7 +6228,7 @@
 static void
 modify_account_cb(GtkWidget *widget, gpointer data)
 {
-	gaim_gtk_account_dialog_show(GAIM_GTK_MODIFY_ACCOUNT_DIALOG, data);
+	pidgin_account_dialog_show(PIDGIN_MODIFY_ACCOUNT_DIALOG, data);
 }
 
 static void
@@ -6239,7 +6240,7 @@
 	saved_status = gaim_savedstatus_get_current();
 	gaim_savedstatus_activate_for_account(saved_status, account);
 
-	gaim_account_set_enabled(account, GAIM_GTK_UI, TRUE);
+	gaim_account_set_enabled(account, PIDGIN_UI, TRUE);
 }
 
 static void
@@ -6247,11 +6248,11 @@
 {
 	GaimAccount *account = data;
 
-	gaim_account_set_enabled(account, GAIM_GTK_UI, FALSE);
+	gaim_account_set_enabled(account, PIDGIN_UI, FALSE);
 }
 
 void
-gaim_gtk_blist_update_accounts_menu(void)
+pidgin_blist_update_accounts_menu(void)
 {
 	GtkWidget *menuitem = NULL, *submenu = NULL;
 	GtkAccelGroup *accel_group = NULL;
@@ -6281,14 +6282,14 @@
 		account = accounts->data;
 		accel_group = gtk_menu_get_accel_group(GTK_MENU(accountmenu));
 
-		if(gaim_account_get_enabled(account, GAIM_GTK_UI)) {
+		if(gaim_account_get_enabled(account, PIDGIN_UI)) {
 			buf = g_strconcat(gaim_account_get_username(account), " (",
 					gaim_account_get_protocol_name(account), ")", NULL);
 			menuitem = gtk_image_menu_item_new_with_label(buf);
 			accel_path_buf = g_strconcat(N_("<GaimMain>/Accounts/"), buf, NULL);
 			g_free(buf);
 			status = gaim_account_get_active_status(account);
-			pixbuf = gaim_gtk_create_prpl_icon_with_status(account, gaim_status_get_type(status), 0.5);
+			pixbuf = pidgin_create_prpl_icon_with_status(account, gaim_status_get_type(status), 0.5);
 			if (pixbuf != NULL)
 			{
 				if (!gaim_account_is_connected(account))
@@ -6387,7 +6388,7 @@
 
 			account = accounts->data;
 
-			if(!gaim_account_get_enabled(account, GAIM_GTK_UI)) {
+			if(!gaim_account_get_enabled(account, PIDGIN_UI)) {
 
 				disabled_accounts = TRUE;
 
@@ -6395,7 +6396,7 @@
 						gaim_account_get_protocol_name(account), ")", NULL);
 				menuitem = gtk_image_menu_item_new_with_label(buf);
 				g_free(buf);
-				pixbuf = gaim_gtk_create_prpl_icon(account, PIDGIN_PRPL_ICON_SMALL);
+				pixbuf = pidgin_create_prpl_icon(account, PIDGIN_PRPL_ICON_SMALL);
 				if (pixbuf != NULL)
 				{
 					if (!gaim_account_is_connected(account))
@@ -6417,7 +6418,7 @@
 static GList *plugin_submenus = NULL;
 
 void
-gaim_gtk_blist_update_plugin_actions(void)
+pidgin_blist_update_plugin_actions(void)
 {
 	GtkWidget *menuitem, *submenu;
 	GaimPlugin *plugin = NULL;
@@ -6472,20 +6473,20 @@
 {
 	if (gtk_check_menu_item_get_active(checkmenuitem))
 	{
-		gaim_gtk_set_cursor(gtkblist->window, GDK_WATCH);
+		pidgin_set_cursor(gtkblist->window, GDK_WATCH);
 		/* This is redundant. I think. */
-		/* gaim_gtk_blist_sort_method_set(id); */
+		/* pidgin_blist_sort_method_set(id); */
 		gaim_prefs_set_string("/gaim/gtk/blist/sort_type", id);
 
-		gaim_gtk_clear_cursor(gtkblist->window);
+		pidgin_clear_cursor(gtkblist->window);
 	}
 }
 
 void
-gaim_gtk_blist_update_sort_methods(void)
+pidgin_blist_update_sort_methods(void)
 {
 	GtkWidget *menuitem = NULL, *activeitem = NULL;
-	GaimGtkBlistSortMethod *method = NULL;
+	PidginBlistSortMethod *method = NULL;
 	GList *l;
 	GSList *sl = NULL;
 	GtkWidget *sortmenu;
@@ -6505,8 +6506,8 @@
 		gtk_widget_destroy(GTK_WIDGET(menuitem));
 	}
 
-	for (l = gaim_gtk_blist_sort_methods; l; l = l->next) {
-		method = (GaimGtkBlistSortMethod *) l->data;
+	for (l = pidgin_blist_sort_methods; l; l = l->next) {
+		method = (PidginBlistSortMethod *) l->data;
 		menuitem = gtk_radio_menu_item_new_with_label(sl, _(method->name));
 		if (!strcmp(m, method->id))
 			activeitem = menuitem;
--- a/pidgin/gtkblist.h	Sat Feb 03 05:55:41 2007 +0000
+++ b/pidgin/gtkblist.h	Sat Feb 03 08:13:34 2007 +0000
@@ -22,10 +22,10 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
-#ifndef _GAIM_GTKBLIST_H_
-#define _GAIM_GTKBLIST_H_
+#ifndef _PIDGINBLIST_H_
+#define _PIDGINBLIST_H_
 
-typedef struct _GaimGtkBuddyList GaimGtkBuddyList;
+typedef struct _PidginBuddyList PidginBuddyList;
 
 enum {
 	STATUS_ICON_COLUMN,
@@ -61,7 +61,7 @@
 /**
  * Like, everything you need to know about the gtk buddy list
  */
-struct _GaimGtkBuddyList {
+struct _PidginBuddyList {
 	GtkWidget *window;
 	GtkWidget *notebook;            /**< The notebook that switches between the real buddy list and the helpful 
 					   instructions page */
@@ -116,9 +116,9 @@
 	GdkPixbuf *empty_avatar;         /**< A 32x32 transparent pixbuf */
 };
 
-#define GAIM_GTK_BLIST(list) ((GaimGtkBuddyList *)(list)->ui_data)
+#define PIDGIN_BLIST(list) ((PidginBuddyList *)(list)->ui_data)
 #define GAIM_IS_GTK_BLIST(list) \
-	((list)->ui_ops == gaim_gtk_blist_get_ui_ops())
+	((list)->ui_ops == pidgin_blist_get_ui_ops())
 
 /**************************************************************************
  * @name GTK+ Buddy List API
@@ -129,35 +129,35 @@
  *
  * @return the handle to the blist system
  */
-void *gaim_gtk_blist_get_handle(void);
+void *pidgin_blist_get_handle(void);
 
 /**
  * Initializes the GTK+ blist system.
  */
-void gaim_gtk_blist_init(void);
+void pidgin_blist_init(void);
 
 /**
  * Uninitializes the GTK+ blist system.
  */
-void gaim_gtk_blist_uninit(void);
+void pidgin_blist_uninit(void);
 
 /**
  * Returns the UI operations structure for the buddy list.
  *
  * @return The GTK+ list operations structure.
  */
-GaimBlistUiOps *gaim_gtk_blist_get_ui_ops(void);
+GaimBlistUiOps *pidgin_blist_get_ui_ops(void);
 
 /**
  * Returns the default gtk buddy list
  *
  * There's normally only one buddy list window, but that isn't a necessity. This function
- * returns the GaimGtkBuddyList we're most likely wanting to work with. This is slightly
+ * returns the PidginBuddyList we're most likely wanting to work with. This is slightly
  * cleaner than an externed global.
  *
  * @return The default GTK+ buddy list
  */
-GaimGtkBuddyList *gaim_gtk_blist_get_default_gtk_blist(void);
+PidginBuddyList *pidgin_blist_get_default_gtk_blist(void);
 
 /**
  * Populates a menu with the items shown on the buddy list for a buddy.
@@ -166,7 +166,7 @@
  * @param buddy The buddy whose menu to get
  * @param sub   TRUE if this is a sub-menu, FALSE otherwise
  */
-void gaim_gtk_blist_make_buddy_menu(GtkWidget *menu, GaimBuddy *buddy, gboolean sub);
+void pidgin_blist_make_buddy_menu(GtkWidget *menu, GaimBuddy *buddy, gboolean sub);
 
 /**
  * Refreshes all the nodes of the buddy list.
@@ -174,10 +174,10 @@
  *
  * @param list   This is the core list that gets updated from
  */
-void gaim_gtk_blist_refresh(GaimBuddyList *list);
+void pidgin_blist_refresh(GaimBuddyList *list);
 
-void gaim_gtk_blist_update_columns(void);
-void gaim_gtk_blist_update_refresh_timeout(void);
+void pidgin_blist_update_columns(void);
+void pidgin_blist_update_refresh_timeout(void);
 
 /**
  * Returns the blist emblem
@@ -187,12 +187,12 @@
  * @return  A newly created GdkPixbuf, or NULL
  */
 GdkPixbuf *
-gaim_gtk_blist_get_emblem(GaimBlistNode *node);
+pidgin_blist_get_emblem(GaimBlistNode *node);
 
 /**
  * Useful for the buddy ticker
  */
-GdkPixbuf *gaim_gtk_blist_get_status_icon(GaimBlistNode *node,
+GdkPixbuf *pidgin_blist_get_status_icon(GaimBlistNode *node,
 		GaimStatusIconSize size);
 
 /**
@@ -204,14 +204,14 @@
  * @param node The node in question.
  * @return A boolean indicating if @a node is part of an expanded contact.
  */
-gboolean gaim_gtk_blist_node_is_contact_expanded(GaimBlistNode *node);
+gboolean pidgin_blist_node_is_contact_expanded(GaimBlistNode *node);
 
 /**
  * Intelligently toggles the visibility of the buddy list. If the buddy
  * list is obscured, it is brought to the front. If it is not obscured,
  * it is hidden. If it is hidden it is shown.
  */
-void gaim_gtk_blist_toggle_visibility(void);
+void pidgin_blist_toggle_visibility(void);
 
 /**
  * Increases the reference count of visibility managers. Callers should 
@@ -221,42 +221,42 @@
  * A visibility manager is something that provides some method for
  * showing the buddy list after it is hidden (e.g. docklet plugin).
  */
-void gaim_gtk_blist_visibility_manager_add(void);
+void pidgin_blist_visibility_manager_add(void);
 
 /**
  * Decreases the reference count of visibility managers. If the count
  * drops below zero, the buddy list is shown.
  */
-void gaim_gtk_blist_visibility_manager_remove(void);
+void pidgin_blist_visibility_manager_remove(void);
 
 /**
  * Adds a mini-alert to the blist scrollbook
  *
  * @param widget   The widget to add
  */
-void gaim_gtk_blist_add_alert(GtkWidget *widget);
+void pidgin_blist_add_alert(GtkWidget *widget);
 
 
 /**************************************************************************
  * @name GTK+ Buddy List sorting functions
  **************************************************************************/
 
-typedef void (*gaim_gtk_blist_sort_function)(GaimBlistNode *new, GaimBuddyList *blist, GtkTreeIter group, GtkTreeIter *cur, GtkTreeIter *iter);
+typedef void (*pidgin_blist_sort_function)(GaimBlistNode *new, GaimBuddyList *blist, GtkTreeIter group, GtkTreeIter *cur, GtkTreeIter *iter);
 
 /**
  * Gets the current list of sort methods.
  *
  * @return A GSlist of sort methods
  */
-GList *gaim_gtk_blist_get_sort_methods(void);
+GList *pidgin_blist_get_sort_methods(void);
 
-struct gaim_gtk_blist_sort_method {
+struct pidgin_blist_sort_method {
 	char *id;
 	char *name;
-	gaim_gtk_blist_sort_function func;
+	pidgin_blist_sort_function func;
 };
 
-typedef struct gaim_gtk_blist_sort_method GaimGtkBlistSortMethod;
+typedef struct pidgin_blist_sort_method PidginBlistSortMethod;
 
 /**
  * Registers a buddy list sorting method.
@@ -266,41 +266,41 @@
  * @param func  A pointer to the function.
  *
  */
-void gaim_gtk_blist_sort_method_reg(const char *id, const char *name, gaim_gtk_blist_sort_function func);
+void pidgin_blist_sort_method_reg(const char *id, const char *name, pidgin_blist_sort_function func);
 
 /**
  * Unregisters a buddy list sorting method.
  *
  * @param id The method's id
  */
-void gaim_gtk_blist_sort_method_unreg(const char *id);
+void pidgin_blist_sort_method_unreg(const char *id);
 
 /**
  * Sets a buddy list sorting method.
  *
  * @param id The method's id.
  */
-void gaim_gtk_blist_sort_method_set(const char *id);
+void pidgin_blist_sort_method_set(const char *id);
 
 /**
  * Sets up the programs default sort methods
  */
-void gaim_gtk_blist_setup_sort_methods(void);
+void pidgin_blist_setup_sort_methods(void);
 
 /**
  * Updates the accounts menu on the GTK+ buddy list window.
  */
-void gaim_gtk_blist_update_accounts_menu(void);
+void pidgin_blist_update_accounts_menu(void);
 
 /**
  * Updates the plugin actions menu on the GTK+ buddy list window.
  */
-void gaim_gtk_blist_update_plugin_actions(void);
+void pidgin_blist_update_plugin_actions(void);
 
 /**
  * Updates the Sorting menu on the GTK+ buddy list window.
  */
-void gaim_gtk_blist_update_sort_methods(void);
+void pidgin_blist_update_sort_methods(void);
 
 /**
  * Determines if showing the join chat dialog is a valid action.
@@ -308,30 +308,30 @@
  * @return Returns TRUE if there are accounts online capable of
  *         joining chat rooms.  Otherwise returns FALSE.
  */
-gboolean gaim_gtk_blist_joinchat_is_showable(void);
+gboolean pidgin_blist_joinchat_is_showable(void);
 
 /**
  * Shows the join chat dialog.
  */
-void gaim_gtk_blist_joinchat_show(void);
+void pidgin_blist_joinchat_show(void);
 
 /**
  * Appends the privacy menu items for a GaimBlistNode
  * TODO: Rename these.
  */
-void gaim_gtk_append_blist_node_privacy_menu(GtkWidget *menu, GaimBlistNode *node);
+void pidgin_append_blist_node_privacy_menu(GtkWidget *menu, GaimBlistNode *node);
 
 /**
  * Appends the protocol specific menu items for a GaimBlistNode
  * TODO: Rename these.
  */
-void gaim_gtk_append_blist_node_proto_menu (GtkWidget *menu, GaimConnection *gc, GaimBlistNode *node);
+void pidgin_append_blist_node_proto_menu (GtkWidget *menu, GaimConnection *gc, GaimBlistNode *node);
 
 /**
  * Appends the extended menu items for a GaimBlistNode
  * TODO: Rename these.
  */
-void gaim_gtk_append_blist_node_extended_menu(GtkWidget *menu, GaimBlistNode *node);
+void pidgin_append_blist_node_extended_menu(GtkWidget *menu, GaimBlistNode *node);
 
 /**
  * Used by the connection API to tell the blist if an account
@@ -342,7 +342,7 @@
  * @param message The connection error message, or NULL if this
  *        account is no longer in an error state.
  */
-void gaim_gtk_blist_update_account_error_state(GaimAccount *account, const char *message);
+void pidgin_blist_update_account_error_state(GaimAccount *account, const char *message);
 
 /**
  * Sets a headline notification
@@ -356,7 +356,7 @@
  * @param user_data The userdata to include in the callback
  * @param destroy   The callback to call when headline is closed or replaced by another headline.
  */
-void gaim_gtk_blist_set_headline(const char *text, GdkPixbuf *pixbuf, GCallback callback, gpointer user_data,
+void pidgin_blist_set_headline(const char *text, GdkPixbuf *pixbuf, GCallback callback, gpointer user_data,
 		GDestroyNotify destroy);
 
-#endif /* _GAIM_GTKBLIST_H_ */
+#endif /* _PIDGINBLIST_H_ */
--- a/pidgin/gtkcelllayout.c	Sat Feb 03 05:55:41 2007 +0000
+++ b/pidgin/gtkcelllayout.c	Sat Feb 03 08:13:34 2007 +0000
@@ -45,7 +45,7 @@
       };
 
       cell_layout_type =
-        g_type_register_static (G_TYPE_INTERFACE, "GaimGtkCellLayout",
+        g_type_register_static (G_TYPE_INTERFACE, "PidginCellLayout",
                                 &cell_layout_info, 0);
 
       g_type_interface_add_prerequisite (cell_layout_type, G_TYPE_OBJECT);
--- a/pidgin/gtkcellrendererexpander.c	Sat Feb 03 05:55:41 2007 +0000
+++ b/pidgin/gtkcellrendererexpander.c	Sat Feb 03 08:13:34 2007 +0000
@@ -32,38 +32,38 @@
 #include <gtk/gtktreeview.h>
 #include "gtkcellrendererexpander.h"
 
-static void gaim_gtk_cell_renderer_expander_get_property  (GObject                    *object,
+static void pidgin_cell_renderer_expander_get_property  (GObject                    *object,
 						      guint                       param_id,
 						      GValue                     *value,
 						      GParamSpec                 *pspec);
-static void gaim_gtk_cell_renderer_expander_set_property  (GObject                    *object,
+static void pidgin_cell_renderer_expander_set_property  (GObject                    *object,
 						      guint                       param_id,
 						      const GValue               *value,
 						      GParamSpec                 *pspec);
-static void gaim_gtk_cell_renderer_expander_init       (GaimGtkCellRendererExpander      *cellexpander);
-static void gaim_gtk_cell_renderer_expander_class_init (GaimGtkCellRendererExpanderClass *class);
-static void gaim_gtk_cell_renderer_expander_get_size   (GtkCellRenderer            *cell,
+static void pidgin_cell_renderer_expander_init       (PidginCellRendererExpander      *cellexpander);
+static void pidgin_cell_renderer_expander_class_init (PidginCellRendererExpanderClass *class);
+static void pidgin_cell_renderer_expander_get_size   (GtkCellRenderer            *cell,
 						   GtkWidget                  *widget,
 						   GdkRectangle               *cell_area,
 						   gint                       *x_offset,
 						   gint                       *y_offset,
 						   gint                       *width,
 						   gint                       *height);
-static void gaim_gtk_cell_renderer_expander_render     (GtkCellRenderer            *cell,
+static void pidgin_cell_renderer_expander_render     (GtkCellRenderer            *cell,
 						   GdkWindow                  *window,
 						   GtkWidget                  *widget,
 						   GdkRectangle               *background_area,
 						   GdkRectangle               *cell_area,
 						   GdkRectangle               *expose_area,
 						   guint                       flags);
-static gboolean gaim_gtk_cell_renderer_expander_activate  (GtkCellRenderer            *r,
+static gboolean pidgin_cell_renderer_expander_activate  (GtkCellRenderer            *r,
 						      GdkEvent                   *event,
 						      GtkWidget                  *widget,
 						      const gchar                *p,
 						      GdkRectangle               *bg,
 						      GdkRectangle               *cell,
 						      GtkCellRendererState        flags);
-static void  gaim_gtk_cell_renderer_expander_finalize (GObject *gobject);
+static void  pidgin_cell_renderer_expander_finalize (GObject *gobject);
 
 enum {
 	LAST_SIGNAL
@@ -77,7 +77,7 @@
 static gpointer parent_class;
 /* static guint expander_cell_renderer_signals [LAST_SIGNAL]; */
 
-GType  gaim_gtk_cell_renderer_expander_get_type (void)
+GType  pidgin_cell_renderer_expander_get_type (void)
 {
 	static GType cell_expander_type = 0;
 	
@@ -85,48 +85,48 @@
 		{
 			static const GTypeInfo cell_expander_info =
 				{
-					sizeof (GaimGtkCellRendererExpanderClass),
+					sizeof (PidginCellRendererExpanderClass),
 					NULL,           /* base_init */
 					NULL,           /* base_finalize */
-					(GClassInitFunc) gaim_gtk_cell_renderer_expander_class_init,
+					(GClassInitFunc) pidgin_cell_renderer_expander_class_init,
 					NULL,           /* class_finalize */
 					NULL,           /* class_data */
-					sizeof (GaimGtkCellRendererExpander),
+					sizeof (PidginCellRendererExpander),
 					0,              /* n_preallocs */
-					(GInstanceInitFunc) gaim_gtk_cell_renderer_expander_init,
+					(GInstanceInitFunc) pidgin_cell_renderer_expander_init,
 					NULL		/* value_table */
 				};
 			
 			cell_expander_type =
 				g_type_register_static (GTK_TYPE_CELL_RENDERER,
-										"GaimGtkCellRendererExpander",
+										"PidginCellRendererExpander",
 										&cell_expander_info, 0);
 		}
 	
 	return cell_expander_type;
 }
 
-static void gaim_gtk_cell_renderer_expander_init (GaimGtkCellRendererExpander *cellexpander)
+static void pidgin_cell_renderer_expander_init (PidginCellRendererExpander *cellexpander)
 {
 	GTK_CELL_RENDERER(cellexpander)->mode = GTK_CELL_RENDERER_MODE_ACTIVATABLE;
 	GTK_CELL_RENDERER(cellexpander)->xpad = 0;
 	GTK_CELL_RENDERER(cellexpander)->ypad = 2;
 }
 
-static void gaim_gtk_cell_renderer_expander_class_init (GaimGtkCellRendererExpanderClass *class)
+static void pidgin_cell_renderer_expander_class_init (PidginCellRendererExpanderClass *class)
 {
 	GObjectClass *object_class = G_OBJECT_CLASS(class);
 	GtkCellRendererClass *cell_class = GTK_CELL_RENDERER_CLASS(class);
 	
 	parent_class = g_type_class_peek_parent (class);
-	object_class->finalize = gaim_gtk_cell_renderer_expander_finalize;
+	object_class->finalize = pidgin_cell_renderer_expander_finalize;
 
-	object_class->get_property = gaim_gtk_cell_renderer_expander_get_property;
-	object_class->set_property = gaim_gtk_cell_renderer_expander_set_property;
+	object_class->get_property = pidgin_cell_renderer_expander_get_property;
+	object_class->set_property = pidgin_cell_renderer_expander_set_property;
 	
-	cell_class->get_size = gaim_gtk_cell_renderer_expander_get_size;
-	cell_class->render   = gaim_gtk_cell_renderer_expander_render;
-	cell_class->activate = gaim_gtk_cell_renderer_expander_activate;
+	cell_class->get_size = pidgin_cell_renderer_expander_get_size;
+	cell_class->render   = pidgin_cell_renderer_expander_render;
+	cell_class->activate = pidgin_cell_renderer_expander_activate;
 	
 	g_object_class_install_property (object_class,
 					 PROP_IS_EXPANDER,
@@ -137,21 +137,21 @@
 							      G_PARAM_READWRITE));
 }
 
-static void gaim_gtk_cell_renderer_expander_finalize (GObject *object)
+static void pidgin_cell_renderer_expander_finalize (GObject *object)
 {
 /*
-	GaimGtkCellRendererExpander *cellexpander = GAIM_GTK_CELL_RENDERER_EXPANDER(object);
+	PidginCellRendererExpander *cellexpander = PIDGIN_CELL_RENDERER_EXPANDER(object);
 */
 
 	(* G_OBJECT_CLASS (parent_class)->finalize) (object);
 }
 
-static void gaim_gtk_cell_renderer_expander_get_property (GObject    *object,
+static void pidgin_cell_renderer_expander_get_property (GObject    *object,
 						     guint      param_id,
 						     GValue     *value,
 						     GParamSpec *psec)
 {
-	GaimGtkCellRendererExpander *cellexpander = GAIM_GTK_CELL_RENDERER_EXPANDER(object);
+	PidginCellRendererExpander *cellexpander = PIDGIN_CELL_RENDERER_EXPANDER(object);
 
 	switch (param_id)
 		{
@@ -165,12 +165,12 @@
 		}
 }
 
-static void gaim_gtk_cell_renderer_expander_set_property (GObject      *object,
+static void pidgin_cell_renderer_expander_set_property (GObject      *object,
 						     guint        param_id,
 						     const GValue *value,
 						     GParamSpec   *pspec)
 {
-	GaimGtkCellRendererExpander *cellexpander = GAIM_GTK_CELL_RENDERER_EXPANDER (object);
+	PidginCellRendererExpander *cellexpander = PIDGIN_CELL_RENDERER_EXPANDER (object);
 
 	switch (param_id)
 		{
@@ -183,12 +183,12 @@
 		}
 }
 
-GtkCellRenderer *gaim_gtk_cell_renderer_expander_new(void)
+GtkCellRenderer *pidgin_cell_renderer_expander_new(void)
 {
 	return g_object_new(GAIM_TYPE_GTK_CELL_RENDERER_EXPANDER, NULL);
 }
 
-static void gaim_gtk_cell_renderer_expander_get_size (GtkCellRenderer *cell,
+static void pidgin_cell_renderer_expander_get_size (GtkCellRenderer *cell,
 						 GtkWidget       *widget,
 						 GdkRectangle    *cell_area,
 						 gint            *x_offset,
@@ -227,7 +227,7 @@
 }
 
 
-static void gaim_gtk_cell_renderer_expander_render (GtkCellRenderer *cell,
+static void pidgin_cell_renderer_expander_render (GtkCellRenderer *cell,
 					       GdkWindow       *window,
 					       GtkWidget       *widget,
 					       GdkRectangle    *background_area,
@@ -235,7 +235,7 @@
 					       GdkRectangle    *expose_area,
 					       guint            flags)
 {
-	GaimGtkCellRendererExpander *cellexpander = (GaimGtkCellRendererExpander *) cell;
+	PidginCellRendererExpander *cellexpander = (PidginCellRendererExpander *) cell;
 	
 	gint width, height;
 	GtkStateType state;
@@ -271,7 +271,7 @@
 			    cell->is_expanded ? GTK_EXPANDER_EXPANDED : GTK_EXPANDER_COLLAPSED);
 }
 
-static gboolean gaim_gtk_cell_renderer_expander_activate(GtkCellRenderer *r,
+static gboolean pidgin_cell_renderer_expander_activate(GtkCellRenderer *r,
 						     GdkEvent *event,
 						     GtkWidget *widget,
 						     const gchar *p,
--- a/pidgin/gtkcellrendererexpander.h	Sat Feb 03 05:55:41 2007 +0000
+++ b/pidgin/gtkcellrendererexpander.h	Sat Feb 03 08:13:34 2007 +0000
@@ -18,8 +18,8 @@
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  *
  */
-#ifndef _GAIM_GTKCELLRENDEREREXPANDER_H_
-#define _GAIM_GTKCELLRENDEREREXPANDER_H_
+#ifndef _PIDGINCELLRENDEREREXPANDER_H_
+#define _PIDGINCELLRENDEREREXPANDER_H_
 
 #include <gtk/gtkcellrenderer.h>
 
@@ -28,32 +28,32 @@
 #endif /* __cplusplus */
 
 
-#define GAIM_TYPE_GTK_CELL_RENDERER_EXPANDER         (gaim_gtk_cell_renderer_expander_get_type())
-#define GAIM_GTK_CELL_RENDERER_EXPANDER(obj)         (G_TYPE_CHECK_INSTANCE_CAST((obj), GAIM_TYPE_GTK_CELL_RENDERER_EXPANDER, GaimGtkCellRendererExpander))
-#define GAIM_GTK_CELL_RENDERER_EXPANDER_CLASS(klass)	(G_TYPE_CHECK_CLASS_CAST ((klass), GAIM_TYPE_GTK_CELL_RENDERER_EXPANDER, GaimGtkCellRendererExpanderClass))
+#define GAIM_TYPE_GTK_CELL_RENDERER_EXPANDER         (pidgin_cell_renderer_expander_get_type())
+#define PIDGIN_CELL_RENDERER_EXPANDER(obj)         (G_TYPE_CHECK_INSTANCE_CAST((obj), GAIM_TYPE_GTK_CELL_RENDERER_EXPANDER, PidginCellRendererExpander))
+#define PIDGIN_CELL_RENDERER_EXPANDER_CLASS(klass)	(G_TYPE_CHECK_CLASS_CAST ((klass), GAIM_TYPE_GTK_CELL_RENDERER_EXPANDER, PidginCellRendererExpanderClass))
 #define GAIM_IS_GTK_CELL_RENDERER_EXPANDER(obj)		(G_TYPE_CHECK_INSTANCE_TYPE ((obj), GAIM_TYPE_GTK_CELL_RENDERER_EXPANDER))
 #define GAIM_IS_GTK_CELL_RENDERER_EXPANDER_CLASS(klass)	(G_TYPE_CHECK_CLASS_TYPE ((klass), GAIM_TYPE_GTK_CELL_RENDERER_EXPANDER))
-#define GAIM_GTK_CELL_RENDERER_EXPANDER_GET_CLASS(obj)         (G_TYPE_INSTANCE_GET_CLASS ((obj), GAIM_TYPE_GTK_CELL_RENDERER_EXPANDER, GaimGtkCellRendererExpanderClass))
+#define PIDGIN_CELL_RENDERER_EXPANDER_GET_CLASS(obj)         (G_TYPE_INSTANCE_GET_CLASS ((obj), GAIM_TYPE_GTK_CELL_RENDERER_EXPANDER, PidginCellRendererExpanderClass))
 
-typedef struct _GaimGtkCellRendererExpander GaimGtkCellRendererExpander;
-typedef struct _GaimGtkCellRendererExpanderClass GaimGtkCellRendererExpanderClass;
+typedef struct _PidginCellRendererExpander PidginCellRendererExpander;
+typedef struct _PidginCellRendererExpanderClass PidginCellRendererExpanderClass;
 
-struct _GaimGtkCellRendererExpander {
+struct _PidginCellRendererExpander {
 	GtkCellRenderer parent;
 
 	gboolean is_expander;
 };
 
-struct _GaimGtkCellRendererExpanderClass {
+struct _PidginCellRendererExpanderClass {
 	GtkCellRendererClass parent_class;
 };
 
-GType            gaim_gtk_cell_renderer_expander_get_type     (void);
-GtkCellRenderer  *gaim_gtk_cell_renderer_expander_new          (void);
+GType            pidgin_cell_renderer_expander_get_type     (void);
+GtkCellRenderer  *pidgin_cell_renderer_expander_new          (void);
 
 
 #ifdef __cplusplus
 }
 #endif /* __cplusplus */
 
-#endif /* _GAIM_GTKCELLRENDEREREXPANDER_H_ */
+#endif /* _PIDGINCELLRENDEREREXPANDER_H_ */
--- a/pidgin/gtkcellrendererprogress.c	Sat Feb 03 05:55:41 2007 +0000
+++ b/pidgin/gtkcellrendererprogress.c	Sat Feb 03 08:13:34 2007 +0000
@@ -30,24 +30,24 @@
 
 #include "gtkcellrendererprogress.h"
 
-static void gaim_gtk_cell_renderer_progress_get_property  (GObject                    *object,
+static void pidgin_cell_renderer_progress_get_property  (GObject                    *object,
 						      guint                       param_id,
 						      GValue                     *value,
 						      GParamSpec                 *pspec);
-static void gaim_gtk_cell_renderer_progress_set_property  (GObject                    *object,
+static void pidgin_cell_renderer_progress_set_property  (GObject                    *object,
 						      guint                       param_id,
 						      const GValue               *value,
 						      GParamSpec                 *pspec);
-static void gaim_gtk_cell_renderer_progress_init       (GaimGtkCellRendererProgress      *cellprogress);
-static void gaim_gtk_cell_renderer_progress_class_init (GaimGtkCellRendererProgressClass *class);
-static void gaim_gtk_cell_renderer_progress_get_size   (GtkCellRenderer            *cell,
+static void pidgin_cell_renderer_progress_init       (PidginCellRendererProgress      *cellprogress);
+static void pidgin_cell_renderer_progress_class_init (PidginCellRendererProgressClass *class);
+static void pidgin_cell_renderer_progress_get_size   (GtkCellRenderer            *cell,
 						   GtkWidget                  *widget,
 						   GdkRectangle               *cell_area,
 						   gint                       *x_offset,
 						   gint                       *y_offset,
 						   gint                       *width,
 						   gint                       *height);
-static void gaim_gtk_cell_renderer_progress_render     (GtkCellRenderer            *cell,
+static void pidgin_cell_renderer_progress_render     (GtkCellRenderer            *cell,
 						   GdkWindow                  *window,
 						   GtkWidget                  *widget,
 						   GdkRectangle               *background_area,
@@ -55,7 +55,7 @@
 						   GdkRectangle               *expose_area,
 						   guint                       flags);
 #if 0
-static gboolean gaim_gtk_cell_renderer_progress_activate  (GtkCellRenderer            *cell,
+static gboolean pidgin_cell_renderer_progress_activate  (GtkCellRenderer            *cell,
 						      GdkEvent                   *event,
 						      GtkWidget                  *widget,
 						      const gchar                *path,
@@ -63,7 +63,7 @@
 						      GdkRectangle               *cell_area,
 						      guint                       flags);
 #endif
-static void  gaim_gtk_cell_renderer_progress_finalize (GObject *gobject);
+static void  pidgin_cell_renderer_progress_finalize (GObject *gobject);
 
 enum {
 	LAST_SIGNAL
@@ -79,7 +79,7 @@
 static gpointer parent_class;
 /* static guint progress_cell_renderer_signals [LAST_SIGNAL]; */
 
-GType  gaim_gtk_cell_renderer_progress_get_type (void)
+GType  pidgin_cell_renderer_progress_get_type (void)
 {
 	static GType cell_progress_type = 0;
 	
@@ -87,47 +87,47 @@
 		{
 			static const GTypeInfo cell_progress_info =
 				{
-					sizeof (GaimGtkCellRendererProgressClass),
+					sizeof (PidginCellRendererProgressClass),
 					NULL,           /* base_init */
 					NULL,           /* base_finalize */
-					(GClassInitFunc) gaim_gtk_cell_renderer_progress_class_init,
+					(GClassInitFunc) pidgin_cell_renderer_progress_class_init,
 					NULL,           /* class_finalize */
 					NULL,           /* class_data */
-					sizeof (GaimGtkCellRendererProgress),
+					sizeof (PidginCellRendererProgress),
 					0,              /* n_preallocs */
-					(GInstanceInitFunc) gaim_gtk_cell_renderer_progress_init,
+					(GInstanceInitFunc) pidgin_cell_renderer_progress_init,
 					NULL		/* value_table */
 				};
 			
 			cell_progress_type =
 				g_type_register_static (GTK_TYPE_CELL_RENDERER,
-										"GaimGtkCellRendererProgress",
+										"PidginCellRendererProgress",
 										&cell_progress_info, 0);
 		}
 	
 	return cell_progress_type;
 }
 
-static void gaim_gtk_cell_renderer_progress_init (GaimGtkCellRendererProgress *cellprogress)
+static void pidgin_cell_renderer_progress_init (PidginCellRendererProgress *cellprogress)
 {
 	GTK_CELL_RENDERER(cellprogress)->mode = GTK_CELL_RENDERER_MODE_INERT;
 	GTK_CELL_RENDERER(cellprogress)->xpad = 2;
 	GTK_CELL_RENDERER(cellprogress)->ypad = 2;
 }
 
-static void gaim_gtk_cell_renderer_progress_class_init (GaimGtkCellRendererProgressClass *class)
+static void pidgin_cell_renderer_progress_class_init (PidginCellRendererProgressClass *class)
 {
 	GObjectClass *object_class = G_OBJECT_CLASS(class);
 	GtkCellRendererClass *cell_class = GTK_CELL_RENDERER_CLASS(class);
 	
 	parent_class = g_type_class_peek_parent (class);
-	object_class->finalize = gaim_gtk_cell_renderer_progress_finalize;
+	object_class->finalize = pidgin_cell_renderer_progress_finalize;
 
-	object_class->get_property = gaim_gtk_cell_renderer_progress_get_property;
-	object_class->set_property = gaim_gtk_cell_renderer_progress_set_property;
+	object_class->get_property = pidgin_cell_renderer_progress_get_property;
+	object_class->set_property = pidgin_cell_renderer_progress_set_property;
 	
-	cell_class->get_size = gaim_gtk_cell_renderer_progress_get_size;
-	cell_class->render   = gaim_gtk_cell_renderer_progress_render;
+	cell_class->get_size = pidgin_cell_renderer_progress_get_size;
+	cell_class->render   = pidgin_cell_renderer_progress_render;
 	
 	g_object_class_install_property (object_class,
 					 PROP_PERCENTAGE,
@@ -152,21 +152,21 @@
 							    G_PARAM_READABLE | G_PARAM_WRITABLE));
 }
 
-static void gaim_gtk_cell_renderer_progress_finalize (GObject *object)
+static void pidgin_cell_renderer_progress_finalize (GObject *object)
 {
 /*
-	GaimGtkCellRendererProgress *cellprogress = GAIM_GTK_CELL_RENDERER_PROGRESS(object);
+	PidginCellRendererProgress *cellprogress = PIDGIN_CELL_RENDERER_PROGRESS(object);
 */
 
 	(* G_OBJECT_CLASS (parent_class)->finalize) (object);
 }
 
-static void gaim_gtk_cell_renderer_progress_get_property (GObject    *object,
+static void pidgin_cell_renderer_progress_get_property (GObject    *object,
 						     guint      param_id,
 						     GValue     *value,
 						     GParamSpec *psec)
 {
-	GaimGtkCellRendererProgress *cellprogress = GAIM_GTK_CELL_RENDERER_PROGRESS(object);
+	PidginCellRendererProgress *cellprogress = PIDGIN_CELL_RENDERER_PROGRESS(object);
 
 	switch (param_id)
 		{
@@ -185,12 +185,12 @@
 		}
 }
 
-static void gaim_gtk_cell_renderer_progress_set_property (GObject      *object,
+static void pidgin_cell_renderer_progress_set_property (GObject      *object,
 						     guint        param_id,
 						     const GValue *value,
 						     GParamSpec   *pspec)
 {
-	GaimGtkCellRendererProgress *cellprogress = GAIM_GTK_CELL_RENDERER_PROGRESS (object);
+	PidginCellRendererProgress *cellprogress = PIDGIN_CELL_RENDERER_PROGRESS (object);
 
 	switch (param_id)
 		{
@@ -212,12 +212,12 @@
 		}
 }
 
-GtkCellRenderer *gaim_gtk_cell_renderer_progress_new(void)
+GtkCellRenderer *pidgin_cell_renderer_progress_new(void)
 {
 	return g_object_new(GAIM_TYPE_GTK_CELL_RENDERER_PROGRESS, NULL);
 }
 
-static void gaim_gtk_cell_renderer_progress_get_size (GtkCellRenderer *cell,
+static void pidgin_cell_renderer_progress_get_size (GtkCellRenderer *cell,
 						 GtkWidget       *widget,
 						 GdkRectangle    *cell_area,
 						 gint            *x_offset,
@@ -253,7 +253,7 @@
 }
 
 
-static void gaim_gtk_cell_renderer_progress_render (GtkCellRenderer *cell,
+static void pidgin_cell_renderer_progress_render (GtkCellRenderer *cell,
 					       GdkWindow       *window,
 					       GtkWidget       *widget,
 					       GdkRectangle    *background_area,
@@ -261,7 +261,7 @@
 					       GdkRectangle    *expose_area,
 					       guint            flags)
 {
-	GaimGtkCellRendererProgress *cellprogress = (GaimGtkCellRendererProgress *) cell;
+	PidginCellRendererProgress *cellprogress = (PidginCellRendererProgress *) cell;
 	
 	gint width, height;
 	GtkStateType state;
--- a/pidgin/gtkcellrendererprogress.h	Sat Feb 03 05:55:41 2007 +0000
+++ b/pidgin/gtkcellrendererprogress.h	Sat Feb 03 08:13:34 2007 +0000
@@ -18,8 +18,8 @@
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  *
  */
-#ifndef _GAIM_GTKCELLRENDERERPROGRESS_H_
-#define _GAIM_GTKCELLRENDERERPROGRESS_H_
+#ifndef _PIDGINCELLRENDERERPROGRESS_H_
+#define _PIDGINCELLRENDERERPROGRESS_H_
 
 #include <gtk/gtkcellrenderer.h>
 
@@ -28,17 +28,17 @@
 #endif /* __cplusplus */
 
 
-#define GAIM_TYPE_GTK_CELL_RENDERER_PROGRESS         (gaim_gtk_cell_renderer_progress_get_type())
-#define GAIM_GTK_CELL_RENDERER_PROGRESS(obj)         (G_TYPE_CHECK_INSTANCE_CAST((obj), GAIM_TYPE_GTK_CELL_RENDERER_PROGRESS, GaimGtkCellRendererProgress))
-#define GAIM_GTK_CELL_RENDERER_PROGRESS_CLASS(klass)	(G_TYPE_CHECK_CLASS_CAST ((klass), GAIM_TYPE_GTK_CELL_RENDERER_PROGRESS, GaimGtkCellRendererProgressClass))
+#define GAIM_TYPE_GTK_CELL_RENDERER_PROGRESS         (pidgin_cell_renderer_progress_get_type())
+#define PIDGIN_CELL_RENDERER_PROGRESS(obj)         (G_TYPE_CHECK_INSTANCE_CAST((obj), GAIM_TYPE_GTK_CELL_RENDERER_PROGRESS, PidginCellRendererProgress))
+#define PIDGIN_CELL_RENDERER_PROGRESS_CLASS(klass)	(G_TYPE_CHECK_CLASS_CAST ((klass), GAIM_TYPE_GTK_CELL_RENDERER_PROGRESS, PidginCellRendererProgressClass))
 #define GAIM_IS_GTK_CELL_PROGRESS_PROGRESS(obj)		(G_TYPE_CHECK_INSTANCE_TYPE ((obj), GAIM_TYPE_GTK_CELL_RENDERER_PROGRESS))
 #define GAIM_IS_GTK_CELL_PROGRESS_PROGRESS_CLASS(klass)	(G_TYPE_CHECK_CLASS_TYPE ((klass), GAIM_TYPE_GTK_CELL_RENDERER_PROGRESS))
-#define GAIM_GTK_CELL_RENDERER_PROGRESS_GET_CLASS(obj)         (G_TYPE_INSTANCE_GET_CLASS ((obj), GAIM_TYPE_GTK_CELL_RENDERER_PROGRESS, GaimGtkCellRendererProgressClass))
+#define PIDGIN_CELL_RENDERER_PROGRESS_GET_CLASS(obj)         (G_TYPE_INSTANCE_GET_CLASS ((obj), GAIM_TYPE_GTK_CELL_RENDERER_PROGRESS, PidginCellRendererProgressClass))
 
-typedef struct _GaimGtkCellRendererProgress GaimGtkCellRendererProgress;
-typedef struct _GaimGtkCellRendererProgressClass GaimGtkCellRendererProgressClass;
+typedef struct _PidginCellRendererProgress PidginCellRendererProgress;
+typedef struct _PidginCellRendererProgressClass PidginCellRendererProgressClass;
 
-struct _GaimGtkCellRendererProgress {
+struct _PidginCellRendererProgress {
 	GtkCellRenderer parent;
 
 	gdouble progress;
@@ -46,16 +46,16 @@
 	gboolean text_set;
 };
 
-struct _GaimGtkCellRendererProgressClass {
+struct _PidginCellRendererProgressClass {
 	GtkCellRendererClass parent_class;
 };
 
-GType            gaim_gtk_cell_renderer_progress_get_type     (void);
-GtkCellRenderer  *gaim_gtk_cell_renderer_progress_new          (void);
+GType            pidgin_cell_renderer_progress_get_type     (void);
+GtkCellRenderer  *pidgin_cell_renderer_progress_new          (void);
 
 
 #ifdef __cplusplus
 }
 #endif /* __cplusplus */
 
-#endif /* _GAIM_GTKCELLRENDERERPROGRESS_H_ */
+#endif /* _PIDGINCELLRENDERERPROGRESS_H_ */
--- a/pidgin/gtkcellview.c	Sat Feb 03 05:55:41 2007 +0000
+++ b/pidgin/gtkcellview.c	Sat Feb 03 08:13:34 2007 +0000
@@ -153,7 +153,7 @@
          NULL
        };
 
-      cell_view_type = g_type_register_static (GTK_TYPE_WIDGET, "GaimGtkCellView",
+      cell_view_type = g_type_register_static (GTK_TYPE_WIDGET, "PidginCellView",
                                                &cell_view_info, 0);
 
       g_type_add_interface_static (cell_view_type, GTK_TYPE_CELL_LAYOUT,
--- a/pidgin/gtkcellviewmenuitem.c	Sat Feb 03 05:55:41 2007 +0000
+++ b/pidgin/gtkcellviewmenuitem.c	Sat Feb 03 08:13:34 2007 +0000
@@ -56,7 +56,7 @@
         };
 
       cell_view_menu_item_type =
-        g_type_register_static (GTK_TYPE_MENU_ITEM, "GaimGtkCellViewMenuItem",
+        g_type_register_static (GTK_TYPE_MENU_ITEM, "PidginCellViewMenuItem",
                                 &cell_view_menu_item_info, 0);
     }
 
--- a/pidgin/gtkconn.c	Sat Feb 03 05:55:41 2007 +0000
+++ b/pidgin/gtkconn.c	Sat Feb 03 08:13:34 2007 +0000
@@ -55,10 +55,10 @@
 static GHashTable *hash = NULL;
 
 static void
-gaim_gtk_connection_connect_progress(GaimConnection *gc,
+pidgin_connection_connect_progress(GaimConnection *gc,
 		const char *text, size_t step, size_t step_count)
 {
-	GaimGtkBuddyList *gtkblist = gaim_gtk_blist_get_default_gtk_blist();
+	PidginBuddyList *gtkblist = pidgin_blist_get_default_gtk_blist();
 	if (!gtkblist)
 		return;
 	gtk_gaim_status_box_set_connecting(GTK_GAIM_STATUS_BOX(gtkblist->statusbox),
@@ -67,13 +67,13 @@
 }
 
 static void
-gaim_gtk_connection_connected(GaimConnection *gc)
+pidgin_connection_connected(GaimConnection *gc)
 {
 	GaimAccount *account;
-	GaimGtkBuddyList *gtkblist;
+	PidginBuddyList *gtkblist;
 
 	account  = gaim_connection_get_account(gc);
-	gtkblist = gaim_gtk_blist_get_default_gtk_blist();
+	gtkblist = pidgin_blist_get_default_gtk_blist();
 
 	if (gtkblist != NULL)
 		gtk_gaim_status_box_set_connecting(GTK_GAIM_STATUS_BOX(gtkblist->statusbox),
@@ -81,13 +81,13 @@
 
 	g_hash_table_remove(hash, account);
 
-	gaim_gtk_blist_update_account_error_state(account, NULL);
+	pidgin_blist_update_account_error_state(account, NULL);
 }
 
 static void
-gaim_gtk_connection_disconnected(GaimConnection *gc)
+pidgin_connection_disconnected(GaimConnection *gc)
 {
-	GaimGtkBuddyList *gtkblist = gaim_gtk_blist_get_default_gtk_blist();
+	PidginBuddyList *gtkblist = pidgin_blist_get_default_gtk_blist();
 	if (!gtkblist)
 		return;
 	gtk_gaim_status_box_set_connecting(GTK_GAIM_STATUS_BOX(gtkblist->statusbox),
@@ -96,7 +96,7 @@
 	if (gaim_connections_get_all() != NULL)
 		return;
 
-	gaim_gtkdialogs_destroy_all();
+	pidgindialogs_destroy_all();
 }
 
 static void
@@ -136,7 +136,7 @@
 }
 
 static void
-gaim_gtk_connection_report_disconnect(GaimConnection *gc, const char *text)
+pidgin_connection_report_disconnect(GaimConnection *gc, const char *text)
 {
 	GaimAccount *account = NULL;
 	GaimAutoRecon *info;
@@ -144,7 +144,7 @@
 	account = gaim_connection_get_account(gc);
 	info = g_hash_table_lookup(hash, account);
 
-	gaim_gtk_blist_update_account_error_state(account, text);
+	pidgin_blist_update_account_error_state(account, text);
 	if (!gc->wants_to_die) {
 		if (info == NULL) {
 			info = g_new0(GaimAutoRecon, 1);
@@ -189,14 +189,14 @@
 		 * disconnected by wants_to_die?  This happens when you sign
 		 * on from somewhere else, or when you enter an invalid password.
 		 */
-		gaim_account_set_enabled(account, GAIM_GTK_UI, FALSE);
+		gaim_account_set_enabled(account, PIDGIN_UI, FALSE);
 	}
 }
 
-static void gaim_gtk_connection_network_connected ()
+static void pidgin_connection_network_connected ()
 {
 	GList *list = gaim_accounts_get_all_active();
-	GaimGtkBuddyList *gtkblist = gaim_gtk_blist_get_default_gtk_blist();
+	PidginBuddyList *gtkblist = pidgin_blist_get_default_gtk_blist();
 
 	if(gtkblist)
 		gtk_gaim_status_box_set_network_available(GTK_GAIM_STATUS_BOX(gtkblist->statusbox), TRUE);
@@ -210,10 +210,10 @@
 	}
 }
 
-static void gaim_gtk_connection_network_disconnected ()
+static void pidgin_connection_network_disconnected ()
 {
 	GList *l = gaim_accounts_get_all_active();
-	GaimGtkBuddyList *gtkblist = gaim_gtk_blist_get_default_gtk_blist();
+	PidginBuddyList *gtkblist = pidgin_blist_get_default_gtk_blist();
 	GaimPluginProtocolInfo *prpl_info = NULL;
 	GaimConnection *gc = NULL;
 	
@@ -237,22 +237,22 @@
 	}
 }
 
-static void gaim_gtk_connection_notice(GaimConnection *gc, const char *text)
+static void pidgin_connection_notice(GaimConnection *gc, const char *text)
 { }
 
 static GaimConnectionUiOps conn_ui_ops =
 {
-	gaim_gtk_connection_connect_progress,
-	gaim_gtk_connection_connected,
-	gaim_gtk_connection_disconnected,
-	gaim_gtk_connection_notice,
-	gaim_gtk_connection_report_disconnect,
-	gaim_gtk_connection_network_connected,
-	gaim_gtk_connection_network_disconnected
+	pidgin_connection_connect_progress,
+	pidgin_connection_connected,
+	pidgin_connection_disconnected,
+	pidgin_connection_notice,
+	pidgin_connection_report_disconnect,
+	pidgin_connection_network_connected,
+	pidgin_connection_network_disconnected
 };
 
 GaimConnectionUiOps *
-gaim_gtk_connections_get_ui_ops(void)
+pidgin_connections_get_ui_ops(void)
 {
 	return &conn_ui_ops;
 }
@@ -262,7 +262,7 @@
 {
 	g_hash_table_remove(hash, account);
 
-	gaim_gtk_blist_update_account_error_state(account, NULL);
+	pidgin_blist_update_account_error_state(account, NULL);
 }
 
 
@@ -271,7 +271,7 @@
 **************************************************************************/
 
 void *
-gaim_gtk_connection_get_handle(void)
+pidgin_connection_get_handle(void)
 {
 	static int handle;
 
@@ -279,21 +279,21 @@
 }
 
 void
-gaim_gtk_connection_init(void)
+pidgin_connection_init(void)
 {
 	hash = g_hash_table_new_full(
 							g_direct_hash, g_direct_equal,
 							NULL, free_auto_recon);
 
 	gaim_signal_connect(gaim_accounts_get_handle(), "account-removed",
-						gaim_gtk_connection_get_handle(),
+						pidgin_connection_get_handle(),
 						GAIM_CALLBACK(account_removed_cb), NULL);
 }
 
 void
-gaim_gtk_connection_uninit(void)
+pidgin_connection_uninit(void)
 {
-	gaim_signals_disconnect_by_handle(gaim_gtk_connection_get_handle());
+	gaim_signals_disconnect_by_handle(pidgin_connection_get_handle());
 
 	g_hash_table_destroy(hash);
 }
--- a/pidgin/gtkconn.h	Sat Feb 03 05:55:41 2007 +0000
+++ b/pidgin/gtkconn.h	Sat Feb 03 08:13:34 2007 +0000
@@ -21,8 +21,8 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
-#ifndef _GAIM_GTKCONN_H_
-#define _GAIM_GTKCONN_H_
+#ifndef _PIDGINCONN_H_
+#define _PIDGINCONN_H_
 
 /**************************************************************************/
 /** @name GTK+ Connection API                                             */
@@ -34,7 +34,7 @@
  *
  * @return UI operations struct
  */
-GaimConnectionUiOps *gaim_gtk_connections_get_ui_ops(void);
+GaimConnectionUiOps *pidgin_connections_get_ui_ops(void);
 
 /*@}*/
 
@@ -43,16 +43,16 @@
  *
  * @return The handle to the GTK+ connection system.
  */
-void *gaim_gtk_connection_get_handle(void);
+void *pidgin_connection_get_handle(void);
 
 /**
  * Initializes the GTK+ connection system.
  */
-void gaim_gtk_connection_init(void);
+void pidgin_connection_init(void);
 
 /**
  * Uninitializes the GTK+ connection system.
  */
-void gaim_gtk_connection_uninit(void);
+void pidgin_connection_uninit(void);
 
-#endif /* _GAIM_GTKCONN_H_ */
+#endif /* _PIDGINCONN_H_ */
--- a/pidgin/gtkconv.c	Sat Feb 03 05:55:41 2007 +0000
+++ b/pidgin/gtkconv.c	Sat Feb 03 08:13:34 2007 +0000
@@ -72,16 +72,16 @@
 
 typedef  enum
 {
-	GAIM_GTKCONV_SET_TITLE 			= 1 << 0,
-	GAIM_GTKCONV_BUDDY_ICON			= 1 << 1,
-	GAIM_GTKCONV_MENU			= 1 << 2,
-	GAIM_GTKCONV_TAB_ICON			= 1 << 3,
-	GAIM_GTKCONV_TOPIC			= 1 << 4,
-	GAIM_GTKCONV_SMILEY_THEME		= 1 << 5,
-	GAIM_GTKCONV_COLORIZE_TITLE		= 1 << 6
-}GaimGtkConvFields;
-
-#define	GAIM_GTKCONV_ALL	((1 << 7) - 1)
+	PIDGIN_CONV_SET_TITLE 			= 1 << 0,
+	PIDGIN_CONV_BUDDY_ICON			= 1 << 1,
+	PIDGIN_CONV_MENU			= 1 << 2,
+	PIDGIN_CONV_TAB_ICON			= 1 << 3,
+	PIDGIN_CONV_TOPIC			= 1 << 4,
+	PIDGIN_CONV_SMILEY_THEME		= 1 << 5,
+	PIDGIN_CONV_COLORIZE_TITLE		= 1 << 6
+}PidginConvFields;
+
+#define	PIDGIN_CONV_ALL	((1 << 7) - 1)
 
 #define SEND_COLOR "#204a87"
 #define RECV_COLOR "#cc0000"
@@ -143,32 +143,32 @@
 static GtkWidget *invite_dialog = NULL;
 static GtkWidget *warn_close_dialog = NULL;
 
-static GaimGtkWindow *hidden_convwin = NULL;
+static PidginWindow *hidden_convwin = NULL;
 static GList *window_list = NULL;
 
 
-static gboolean update_send_to_selection(GaimGtkWindow *win);
-static void generate_send_to_items(GaimGtkWindow *win);
+static gboolean update_send_to_selection(PidginWindow *win);
+static void generate_send_to_items(PidginWindow *win);
 
 /* Prototypes. <-- because Paco-Paco hates this comment. */
-static void got_typing_keypress(GaimGtkConversation *gtkconv, gboolean first);
-static void gray_stuff_out(GaimGtkConversation *gtkconv);
+static void got_typing_keypress(PidginConversation *gtkconv, gboolean first);
+static void gray_stuff_out(PidginConversation *gtkconv);
 static GList *generate_invite_user_names(GaimConnection *gc);
 static void add_chat_buddy_common(GaimConversation *conv, GaimConvChatBuddy *cb, const char *old_name);
 static gboolean tab_complete(GaimConversation *conv);
-static void gaim_gtkconv_updated(GaimConversation *conv, GaimConvUpdateType type);
-static void gtkconv_set_unseen(GaimGtkConversation *gtkconv, GaimUnseenState state);
-static void update_typing_icon(GaimGtkConversation *gtkconv);
+static void pidgin_conv_updated(GaimConversation *conv, GaimConvUpdateType type);
+static void gtkconv_set_unseen(PidginConversation *gtkconv, GaimUnseenState state);
+static void update_typing_icon(PidginConversation *gtkconv);
 static const char *item_factory_translate_func (const char *path, gpointer func_data);
-gboolean gaim_gtkconv_has_focus(GaimConversation *conv);
-static void gaim_gtkconv_custom_smiley_allocated(GdkPixbufLoader *loader, gpointer user_data);
-static void gaim_gtkconv_custom_smiley_closed(GdkPixbufLoader *loader, gpointer user_data);
+gboolean pidgin_conv_has_focus(GaimConversation *conv);
+static void pidgin_conv_custom_smiley_allocated(GdkPixbufLoader *loader, gpointer user_data);
+static void pidgin_conv_custom_smiley_closed(GdkPixbufLoader *loader, gpointer user_data);
 static GdkColor* generate_nick_colors(guint *numcolors, GdkColor background);
 static gboolean color_is_visible(GdkColor foreground, GdkColor background, int color_contrast, int brightness_contrast);
-static void gaim_gtkconv_update_fields(GaimConversation *conv, GaimGtkConvFields fields);
-static void focus_out_from_menubar(GtkWidget *wid, GaimGtkWindow *win);
-
-static GdkColor *get_nick_color(GaimGtkConversation *gtkconv, const char *name) {
+static void pidgin_conv_update_fields(GaimConversation *conv, PidginConvFields fields);
+static void focus_out_from_menubar(GtkWidget *wid, PidginWindow *win);
+
+static GdkColor *get_nick_color(PidginConversation *gtkconv, const char *name) {
 	static GdkColor col;
 	GtkStyle *style = gtk_widget_get_style(gtkconv->imhtml);
 	float scale;
@@ -192,7 +192,7 @@
  **************************************************************************/
 
 static gint
-close_conv_cb(GtkWidget *w, GaimGtkConversation *gtkconv)
+close_conv_cb(GtkWidget *w, PidginConversation *gtkconv)
 {
 	GList *list = g_list_copy(gtkconv->convs);
 
@@ -211,7 +211,7 @@
 }
 
 static gboolean
-size_allocate_cb(GtkWidget *w, GtkAllocation *allocation, GaimGtkConversation *gtkconv)
+size_allocate_cb(GtkWidget *w, GtkAllocation *allocation, PidginConversation *gtkconv)
 {
 	GaimConversation *conv = gtkconv->active_conv;
 
@@ -254,7 +254,7 @@
 }
 
 static void
-default_formatize(GaimGtkConversation *c)
+default_formatize(PidginConversation *c)
 {
 	GaimConversation *conv = c->active_conv;
 
@@ -319,13 +319,13 @@
 }
 
 static void
-clear_formatting_cb(GtkIMHtml *imhtml, GaimGtkConversation *gtkconv)
+clear_formatting_cb(GtkIMHtml *imhtml, PidginConversation *gtkconv)
 {
 	default_formatize(gtkconv);
 }
 
 static const char *
-gaim_gtk_get_cmd_prefix(void)
+pidgin_get_cmd_prefix(void)
 {
 	return "/";
 }
@@ -386,9 +386,9 @@
 clear_command_cb(GaimConversation *conv,
                  const char *cmd, char **args, char **error, void *data)
 {
-	GaimGtkConversation *gtkconv = NULL;
-
-	gtkconv = GAIM_GTK_CONVERSATION(conv);
+	PidginConversation *gtkconv = NULL;
+
+	gtkconv = PIDGIN_CONVERSATION(conv);
 
 	gtk_imhtml_clear(GTK_IMHTML(gtkconv->imhtml));
 	return GAIM_CMD_STATUS_OK;
@@ -434,7 +434,7 @@
 }
 
 static void
-send_history_add(GaimGtkConversation *gtkconv, const char *message)
+send_history_add(PidginConversation *gtkconv, const char *message)
 {
 	GList *first;
 
@@ -445,7 +445,7 @@
 }
 
 static void
-reset_default_size(GaimGtkConversation *gtkconv)
+reset_default_size(PidginConversation *gtkconv)
 {
 	GaimConversation *conv = gtkconv->active_conv;
 	if (gaim_conversation_get_type(conv) == GAIM_CONV_TYPE_CHAT)
@@ -459,13 +459,13 @@
 static gboolean
 check_for_and_do_command(GaimConversation *conv)
 {
-	GaimGtkConversation *gtkconv;
+	PidginConversation *gtkconv;
 	char *cmd;
 	const char *prefix;
 	GtkTextIter start;
 
-	gtkconv = GAIM_GTK_CONVERSATION(conv);
-	prefix = gaim_gtk_get_cmd_prefix();
+	gtkconv = PIDGIN_CONVERSATION(conv);
+	prefix = pidgin_get_cmd_prefix();
 
 	cmd = gtk_imhtml_get_text(GTK_IMHTML(gtkconv->entry), NULL, NULL);
 	gtk_text_buffer_get_start_iter(GTK_IMHTML(gtkconv->entry)->text_buffer, &start);
@@ -524,7 +524,7 @@
 }
 
 static void
-send_cb(GtkWidget *widget, GaimGtkConversation *gtkconv)
+send_cb(GtkWidget *widget, PidginConversation *gtkconv)
 {
 	GaimConversation *conv = gtkconv->active_conv;
 	GaimAccount *account;
@@ -603,7 +603,7 @@
 }
 
 static void
-add_remove_cb(GtkWidget *widget, GaimGtkConversation *gtkconv)
+add_remove_cb(GtkWidget *widget, PidginConversation *gtkconv)
 {
 	GaimAccount *account;
 	const char *name;
@@ -617,7 +617,7 @@
 
 		b = gaim_find_buddy(account, name);
 		if (b != NULL)
-			gaim_gtkdialogs_remove_buddy(b);
+			pidgindialogs_remove_buddy(b);
 		else if (account != NULL && gaim_account_is_connected(account))
 			gaim_blist_request_add_buddy(account, (char *)name, NULL, NULL);
 	} else if (gaim_conversation_get_type(conv) == GAIM_CONV_TYPE_CHAT) {
@@ -625,15 +625,15 @@
 
 		c = gaim_blist_find_chat(account, name);
 		if (c != NULL)
-			gaim_gtkdialogs_remove_chat(c);
+			pidgindialogs_remove_chat(c);
 		else if (account != NULL && gaim_account_is_connected(account))
 			gaim_blist_request_add_chat(account, NULL, NULL, name);
 	}
 
-	gtk_widget_grab_focus(GAIM_GTK_CONVERSATION(conv)->entry);
-}
-
-static void chat_do_info(GaimGtkConversation *gtkconv, const char *who)
+	gtk_widget_grab_focus(PIDGIN_CONVERSATION(conv)->entry);
+}
+
+static void chat_do_info(PidginConversation *gtkconv, const char *who)
 {
 	GaimConversation *conv = gtkconv->active_conv;
 	GaimPluginProtocolInfo *prpl_info = NULL;
@@ -658,7 +658,7 @@
 
 
 static void
-info_cb(GtkWidget *widget, GaimGtkConversation *gtkconv)
+info_cb(GtkWidget *widget, PidginConversation *gtkconv)
 {
 	GaimConversation *conv = gtkconv->active_conv;
 
@@ -669,7 +669,7 @@
 		gtk_widget_grab_focus(gtkconv->entry);
 	} else if (gaim_conversation_get_type(conv) == GAIM_CONV_TYPE_CHAT) {
 		/* Get info of the person currently selected in the GtkTreeView */
-		GaimGtkChatPane *gtkchat;
+		PidginChatPane *gtkchat;
 		GtkTreeIter iter;
 		GtkTreeModel *model;
 		GtkTreeSelection *sel;
@@ -691,7 +691,7 @@
 }
 
 static void
-block_cb(GtkWidget *widget, GaimGtkConversation *gtkconv)
+block_cb(GtkWidget *widget, PidginConversation *gtkconv)
 {
 	GaimConversation *conv = gtkconv->active_conv;
 	GaimAccount *account;
@@ -699,13 +699,13 @@
 	account = gaim_conversation_get_account(conv);
 
 	if (account != NULL && gaim_account_is_connected(account))
-		gaim_gtk_request_add_block(account, gaim_conversation_get_name(conv));
-
-	gtk_widget_grab_focus(GAIM_GTK_CONVERSATION(conv)->entry);
-}
-
-static void
-unblock_cb(GtkWidget *widget, GaimGtkConversation *gtkconv)
+		pidgin_request_add_block(account, gaim_conversation_get_name(conv));
+
+	gtk_widget_grab_focus(PIDGIN_CONVERSATION(conv)->entry);
+}
+
+static void
+unblock_cb(GtkWidget *widget, PidginConversation *gtkconv)
 {
 	GaimConversation *conv = gtkconv->active_conv;
 	GaimAccount *account;
@@ -713,18 +713,18 @@
 	account = gaim_conversation_get_account(conv);
 
 	if (account != NULL && gaim_account_is_connected(account))
-		gaim_gtk_request_add_permit(account, gaim_conversation_get_name(conv));
-
-	gtk_widget_grab_focus(GAIM_GTK_CONVERSATION(conv)->entry);
+		pidgin_request_add_permit(account, gaim_conversation_get_name(conv));
+
+	gtk_widget_grab_focus(PIDGIN_CONVERSATION(conv)->entry);
 }
 
 static void
 do_invite(GtkWidget *w, int resp, InviteBuddyInfo *info)
 {
 	const char *buddy, *message;
-	GaimGtkConversation *gtkconv;
-
-	gtkconv = GAIM_GTK_CONVERSATION(info->conv);
+	PidginConversation *gtkconv;
+
+	gtkconv = PIDGIN_CONVERSATION(info->conv);
 
 	if (resp == GTK_RESPONSE_OK) {
 		buddy   = gtk_entry_get_text(GTK_ENTRY(GTK_COMBO(info->entry)->entry));
@@ -769,7 +769,7 @@
 
 		if (strcmp(convprotocol, gaim_account_get_protocol_id(buddy->account)))
 		{
-			gaim_notify_error(GAIM_GTK_CONVERSATION(info->conv), NULL,
+			gaim_notify_error(PIDGIN_CONVERSATION(info->conv), NULL,
 							  _("That buddy is not on the same protocol as this "
 								"chat."), NULL);
 		}
@@ -784,18 +784,18 @@
 		char *username = NULL;
 		GaimAccount *account;
 
-		if (gaim_gtk_parse_x_im_contact((const char *)sd->data, FALSE, &account,
+		if (pidgin_parse_x_im_contact((const char *)sd->data, FALSE, &account,
 										&protocol, &username, NULL))
 		{
 			if (account == NULL)
 			{
-				gaim_notify_error(GAIM_GTK_CONVERSATION(info->conv), NULL,
+				gaim_notify_error(PIDGIN_CONVERSATION(info->conv), NULL,
 					_("You are not currently signed on with an account that "
 					  "can invite that buddy."), NULL);
 			}
 			else if (strcmp(convprotocol, gaim_account_get_protocol_id(account)))
 			{
-				gaim_notify_error(GAIM_GTK_CONVERSATION(info->conv), NULL,
+				gaim_notify_error(PIDGIN_CONVERSATION(info->conv), NULL,
 								  _("That buddy is not on the same protocol as this "
 									"chat."), NULL);
 			}
@@ -819,14 +819,14 @@
 };
 
 static void
-invite_cb(GtkWidget *widget, GaimGtkConversation *gtkconv)
+invite_cb(GtkWidget *widget, PidginConversation *gtkconv)
 {
 	GaimConversation *conv = gtkconv->active_conv;
 	InviteBuddyInfo *info = NULL;
 
 	if (invite_dialog == NULL) {
 		GaimConnection *gc;
-		GaimGtkWindow *gtkwin;
+		PidginWindow *gtkwin;
 		GtkWidget *label;
 		GtkWidget *vbox, *hbox;
 		GtkWidget *table;
@@ -839,7 +839,7 @@
 		info->conv = conv;
 
 		gc        = gaim_conversation_get_gc(conv);
-		gtkwin    = gaim_gtkconv_get_window(gtkconv);
+		gtkwin    = pidgin_conv_get_window(gtkconv);
 
 		/* Create the new dialog. */
 		invite_dialog = gtk_dialog_new_with_buttons(
@@ -959,7 +959,7 @@
 static void
 menu_new_conv_cb(gpointer data, guint action, GtkWidget *widget)
 {
-	gaim_gtkdialogs_im();
+	pidgindialogs_im();
 }
 
 static void
@@ -971,7 +971,7 @@
 	gchar *text;
 
 	if ((fp = g_fopen(filename, "w+")) == NULL) {
-		gaim_notify_error(GAIM_GTK_CONVERSATION(conv), NULL, _("Unable to open file."), NULL);
+		gaim_notify_error(PIDGIN_CONVERSATION(conv), NULL, _("Unable to open file."), NULL);
 		return;
 	}
 
@@ -980,7 +980,7 @@
 	fprintf(fp, _("<h1>Conversation with %s</h1>\n"), name);
 
 	text = gtk_imhtml_get_markup(
-		GTK_IMHTML(GAIM_GTK_CONVERSATION(conv)->imhtml));
+		GTK_IMHTML(PIDGIN_CONVERSATION(conv)->imhtml));
 	fprintf(fp, "%s", text);
 	g_free(text);
 
@@ -995,13 +995,13 @@
 static void
 menu_save_as_cb(gpointer data, guint action, GtkWidget *widget)
 {
-	GaimGtkWindow *win = data;
-	GaimConversation *conv = gaim_gtk_conv_window_get_active_conversation(win);
+	PidginWindow *win = data;
+	GaimConversation *conv = pidgin_conv_window_get_active_conversation(win);
 	gchar *buf;
 
 	buf = g_strdup_printf("%s.html", gaim_normalize(conv->account, conv->name));
 
-	gaim_request_file(GAIM_GTK_CONVERSATION(conv), _("Save Conversation"),
+	gaim_request_file(PIDGIN_CONVERSATION(conv), _("Save Conversation"),
 					  gaim_escape_filename(buf),
 					  TRUE, G_CALLBACK(savelog_writefile_cb), NULL, conv);
 
@@ -1011,17 +1011,17 @@
 static void
 menu_view_log_cb(gpointer data, guint action, GtkWidget *widget)
 {
-	GaimGtkWindow *win = data;
+	PidginWindow *win = data;
 	GaimConversation *conv;
 	GaimLogType type;
-	GaimGtkBuddyList *gtkblist;
+	PidginBuddyList *gtkblist;
 	GdkCursor *cursor;
 	const char *name;
 	GaimAccount *account;
 	GSList *buddies;
 	GSList *cur;
 
-	conv = gaim_gtk_conv_window_get_active_conversation(win);
+	conv = pidgin_conv_window_get_active_conversation(win);
 
 	if (gaim_conversation_get_type(conv) == GAIM_CONV_TYPE_IM)
 		type = GAIM_LOG_IM;
@@ -1030,7 +1030,7 @@
 	else
 		return;
 
-	gtkblist = gaim_gtk_blist_get_default_gtk_blist();
+	gtkblist = pidgin_blist_get_default_gtk_blist();
 
 	cursor = gdk_cursor_new(GDK_WATCH);
 	gdk_window_set_cursor(gtkblist->window->window, cursor);
@@ -1051,7 +1051,7 @@
 		GaimBlistNode *node = cur->data;
 		if ((node != NULL) && ((node->prev != NULL) || (node->next != NULL)))
 		{
-			gaim_gtk_log_show_contact((GaimContact *)node->parent);
+			pidgin_log_show_contact((GaimContact *)node->parent);
 			g_slist_free(buddies);
 			gdk_window_set_cursor(gtkblist->window->window, NULL);
 			gdk_window_set_cursor(win->window->window, NULL);
@@ -1060,7 +1060,7 @@
 	}
 	g_slist_free(buddies);
 
-	gaim_gtk_log_show(type, name, account);
+	pidgin_log_show(type, name, account);
 
 	gdk_window_set_cursor(gtkblist->window->window, NULL);
 	gdk_window_set_cursor(win->window->window, NULL);
@@ -1069,38 +1069,38 @@
 static void
 menu_clear_cb(gpointer data, guint action, GtkWidget *widget)
 {
-	GaimGtkWindow *win = data;
+	PidginWindow *win = data;
 	GaimConversation *conv;
-	GaimGtkConversation *gtkconv;
-
-	conv = gaim_gtk_conv_window_get_active_conversation(win);
-	gtkconv = GAIM_GTK_CONVERSATION(conv);
+	PidginConversation *gtkconv;
+
+	conv = pidgin_conv_window_get_active_conversation(win);
+	gtkconv = PIDGIN_CONVERSATION(conv);
 
 	gtk_imhtml_clear(GTK_IMHTML(gtkconv->imhtml));
 }
 
 struct _search {
-	GaimGtkWindow *gtkwin;
+	PidginWindow *gtkwin;
 	GtkWidget *entry;
 };
 
 static void do_search_cb(GtkWidget *widget, gint resp, struct _search *s)
 {
 	GaimConversation *conv;
-	GaimGtkConversation *gtk_active_conv;
+	PidginConversation *gtk_active_conv;
 	GList *iter;
 
-	conv = gaim_gtk_conv_window_get_active_conversation(s->gtkwin);
-	gtk_active_conv = GAIM_GTK_CONVERSATION(conv);
+	conv = pidgin_conv_window_get_active_conversation(s->gtkwin);
+	gtk_active_conv = PIDGIN_CONVERSATION(conv);
 
 	switch (resp)
 	{
 		case GTK_RESPONSE_OK:
 			/* clear highlighting except the active conversation window
 			 * highlight the keywords in the active conversation window */
-			for (iter = gaim_gtk_conv_window_get_gtkconvs(s->gtkwin) ; iter ; iter = iter->next)
+			for (iter = pidgin_conv_window_get_gtkconvs(s->gtkwin) ; iter ; iter = iter->next)
 			{
-				GaimGtkConversation *gtkconv = iter->data;
+				PidginConversation *gtkconv = iter->data;
 
 				if (gtkconv != gtk_active_conv)
 				{
@@ -1117,9 +1117,9 @@
 		case GTK_RESPONSE_DELETE_EVENT:
 		case GTK_RESPONSE_CLOSE:
 			/* clear the keyword highlighting in all the conversation windows */
-			for (iter = gaim_gtk_conv_window_get_gtkconvs(s->gtkwin); iter; iter=iter->next)
+			for (iter = pidgin_conv_window_get_gtkconvs(s->gtkwin); iter; iter=iter->next)
 			{
-				GaimGtkConversation *gconv = iter->data;
+				PidginConversation *gconv = iter->data;
 				gtk_imhtml_search_clear(GTK_IMHTML(gconv->imhtml));
 			}
 
@@ -1133,7 +1133,7 @@
 static void
 menu_find_cb(gpointer data, guint action, GtkWidget *widget)
 {
-	GaimGtkWindow *gtkwin = data;
+	PidginWindow *gtkwin = data;
 	GtkWidget *hbox;
 	GtkWidget *img = gtk_image_new_from_stock(PIDGIN_STOCK_DIALOG_QUESTION,
 						  gtk_icon_size_from_name(PIDGIN_ICON_SIZE_TANGO_HUGE));
@@ -1181,7 +1181,7 @@
 	gtk_entry_set_activates_default(GTK_ENTRY(s->entry), TRUE);
 	gtk_label_set_mnemonic_widget(GTK_LABEL(label), GTK_WIDGET(s->entry));
 	g_signal_connect(G_OBJECT(s->entry), "changed",
-					 G_CALLBACK(gaim_gtk_set_sensitive_if_input),
+					 G_CALLBACK(pidgin_set_sensitive_if_input),
 					 gtkwin->dialogs.search);
 	gtk_box_pack_start(GTK_BOX(hbox), s->entry, FALSE, FALSE, 0);
 
@@ -1192,8 +1192,8 @@
 static void
 menu_send_file_cb(gpointer data, guint action, GtkWidget *widget)
 {
-	GaimGtkWindow *win = data;
-	GaimConversation *conv = gaim_gtk_conv_window_get_active_conversation(win);
+	PidginWindow *win = data;
+	GaimConversation *conv = pidgin_conv_window_get_active_conversation(win);
 
 	if (gaim_conversation_get_type(conv) == GAIM_CONV_TYPE_IM) {
 		serv_send_file(gaim_conversation_get_gc(conv), gaim_conversation_get_name(conv), NULL);
@@ -1204,23 +1204,23 @@
 static void
 menu_add_pounce_cb(gpointer data, guint action, GtkWidget *widget)
 {
-	GaimGtkWindow *win = data;
+	PidginWindow *win = data;
 	GaimConversation *conv;
 
-	conv = gaim_gtk_conv_window_get_active_gtkconv(win)->active_conv;
-
-	gaim_gtk_pounce_editor_show(gaim_conversation_get_account(conv),
+	conv = pidgin_conv_window_get_active_gtkconv(win)->active_conv;
+
+	pidgin_pounce_editor_show(gaim_conversation_get_account(conv),
 								gaim_conversation_get_name(conv), NULL);
 }
 
 static void
 menu_insert_link_cb(gpointer data, guint action, GtkWidget *widget)
 {
-	GaimGtkWindow *win = data;
-	GaimGtkConversation *gtkconv;
+	PidginWindow *win = data;
+	PidginConversation *gtkconv;
 	GtkIMHtmlToolbar *toolbar;
 
-	gtkconv    = gaim_gtk_conv_window_get_active_gtkconv(win);
+	gtkconv    = pidgin_conv_window_get_active_gtkconv(win);
 	toolbar = GTK_IMHTMLTOOLBAR(gtkconv->toolbar);
 
 	gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(toolbar->link),
@@ -1230,12 +1230,12 @@
 static void
 menu_insert_image_cb(gpointer data, guint action, GtkWidget *widget)
 {
-	GaimGtkWindow *win = data;
+	PidginWindow *win = data;
 	GaimConversation *conv;
-	GaimGtkConversation *gtkconv;
+	PidginConversation *gtkconv;
 	GtkIMHtmlToolbar *toolbar;
 
-	gtkconv = gaim_gtk_conv_window_get_active_gtkconv(win);
+	gtkconv = pidgin_conv_window_get_active_gtkconv(win);
 	conv    = gtkconv->active_conv;
 	toolbar = GTK_IMHTMLTOOLBAR(gtkconv->toolbar);
 
@@ -1246,12 +1246,12 @@
 static void
 menu_alias_cb(gpointer data, guint action, GtkWidget *widget)
 {
-	GaimGtkWindow *win = data;
+	PidginWindow *win = data;
 	GaimConversation *conv;
 	GaimAccount *account;
 	const char *name;
 
-	conv    = gaim_gtk_conv_window_get_active_conversation(win);
+	conv    = pidgin_conv_window_get_active_conversation(win);
 	account = gaim_conversation_get_account(conv);
 	name    = gaim_conversation_get_name(conv);
 
@@ -1260,87 +1260,87 @@
 
 		b = gaim_find_buddy(account, name);
 		if (b != NULL)
-			gaim_gtkdialogs_alias_buddy(b);
+			pidgindialogs_alias_buddy(b);
 	} else if (gaim_conversation_get_type(conv) == GAIM_CONV_TYPE_CHAT) {
 		GaimChat *c;
 
 		c = gaim_blist_find_chat(account, name);
 		if (c != NULL)
-			gaim_gtkdialogs_alias_chat(c);
+			pidgindialogs_alias_chat(c);
 	}
 }
 
 static void
 menu_get_info_cb(gpointer data, guint action, GtkWidget *widget)
 {
-	GaimGtkWindow *win = data;
+	PidginWindow *win = data;
 	GaimConversation *conv;
 
-	conv = gaim_gtk_conv_window_get_active_conversation(win);
-
-	info_cb(NULL, GAIM_GTK_CONVERSATION(conv));
+	conv = pidgin_conv_window_get_active_conversation(win);
+
+	info_cb(NULL, PIDGIN_CONVERSATION(conv));
 }
 
 static void
 menu_invite_cb(gpointer data, guint action, GtkWidget *widget)
 {
-	GaimGtkWindow *win = data;
+	PidginWindow *win = data;
 	GaimConversation *conv;
 
-	conv = gaim_gtk_conv_window_get_active_conversation(win);
-
-	invite_cb(NULL, GAIM_GTK_CONVERSATION(conv));
+	conv = pidgin_conv_window_get_active_conversation(win);
+
+	invite_cb(NULL, PIDGIN_CONVERSATION(conv));
 }
 
 static void
 menu_block_cb(gpointer data, guint action, GtkWidget *widget)
 {
-	GaimGtkWindow *win = data;
+	PidginWindow *win = data;
 	GaimConversation *conv;
 
-	conv = gaim_gtk_conv_window_get_active_conversation(win);
-
-	block_cb(NULL, GAIM_GTK_CONVERSATION(conv));
+	conv = pidgin_conv_window_get_active_conversation(win);
+
+	block_cb(NULL, PIDGIN_CONVERSATION(conv));
 }
 
 static void
 menu_unblock_cb(gpointer data, guint action, GtkWidget *widget)
 {
-	GaimGtkWindow *win = data;
+	PidginWindow *win = data;
 	GaimConversation *conv;
 
-	conv = gaim_gtk_conv_window_get_active_conversation(win);
-
-	unblock_cb(NULL, GAIM_GTK_CONVERSATION(conv));
+	conv = pidgin_conv_window_get_active_conversation(win);
+
+	unblock_cb(NULL, PIDGIN_CONVERSATION(conv));
 }
 
 static void
 menu_add_remove_cb(gpointer data, guint action, GtkWidget *widget)
 {
-	GaimGtkWindow *win = data;
+	PidginWindow *win = data;
 	GaimConversation *conv;
 
-	conv = gaim_gtk_conv_window_get_active_conversation(win);
-
-	add_remove_cb(NULL, GAIM_GTK_CONVERSATION(conv));
+	conv = pidgin_conv_window_get_active_conversation(win);
+
+	add_remove_cb(NULL, PIDGIN_CONVERSATION(conv));
 }
 
 static void
 menu_close_conv_cb(gpointer data, guint action, GtkWidget *widget)
 {
-	GaimGtkWindow *win = data;
-
-	close_conv_cb(NULL, GAIM_GTK_CONVERSATION(gaim_gtk_conv_window_get_active_conversation(win)));
+	PidginWindow *win = data;
+
+	close_conv_cb(NULL, PIDGIN_CONVERSATION(pidgin_conv_window_get_active_conversation(win)));
 }
 
 static void
 menu_logging_cb(gpointer data, guint action, GtkWidget *widget)
 {
-	GaimGtkWindow *win = data;
+	PidginWindow *win = data;
 	GaimConversation *conv;
 	gboolean logging;
 
-	conv = gaim_gtk_conv_window_get_active_conversation(win);
+	conv = pidgin_conv_window_get_active_conversation(win);
 
 	if (conv == NULL)
 		return;
@@ -1384,16 +1384,16 @@
 static void
 menu_sounds_cb(gpointer data, guint action, GtkWidget *widget)
 {
-	GaimGtkWindow *win = data;
+	PidginWindow *win = data;
 	GaimConversation *conv;
-	GaimGtkConversation *gtkconv;
-
-	conv = gaim_gtk_conv_window_get_active_conversation(win);
+	PidginConversation *gtkconv;
+
+	conv = pidgin_conv_window_get_active_conversation(win);
 
 	if (!conv)
 		return;
 
-	gtkconv = GAIM_GTK_CONVERSATION(conv);
+	gtkconv = PIDGIN_CONVERSATION(conv);
 
 	gtkconv->make_sound =
 		gtk_check_menu_item_get_active(GTK_CHECK_MENU_ITEM(widget));
@@ -1407,7 +1407,7 @@
 }
 
 static void
-chat_do_im(GaimGtkConversation *gtkconv, const char *who)
+chat_do_im(PidginConversation *gtkconv, const char *who)
 {
 	GaimConversation *conv = gtkconv->active_conv;
 	GaimAccount *account;
@@ -1432,16 +1432,16 @@
 	if(!real_who)
 		return;
 
-	gaim_gtkdialogs_im_with_user(account, real_who);
+	pidgindialogs_im_with_user(account, real_who);
 
 	g_free(real_who);
 }
 
 static void
-ignore_cb(GtkWidget *w, GaimGtkConversation *gtkconv)
+ignore_cb(GtkWidget *w, PidginConversation *gtkconv)
 {
 	GaimConversation *conv = gtkconv->active_conv;
-	GaimGtkChatPane *gtkchat;
+	PidginChatPane *gtkchat;
 	GaimConvChatBuddy *cbuddy;
 	GaimConvChat *chat;
 	GaimConvChatBuddyFlags flags;
@@ -1481,7 +1481,7 @@
 }
 
 static void
-menu_chat_im_cb(GtkWidget *w, GaimGtkConversation *gtkconv)
+menu_chat_im_cb(GtkWidget *w, PidginConversation *gtkconv)
 {
 	const char *who = g_object_get_data(G_OBJECT(w), "user_data");
 
@@ -1489,7 +1489,7 @@
 }
 
 static void
-menu_chat_send_file_cb(GtkWidget *w, GaimGtkConversation *gtkconv)
+menu_chat_send_file_cb(GtkWidget *w, PidginConversation *gtkconv)
 {
 	GaimConversation *conv = gtkconv->active_conv;
 	const char *who = g_object_get_data(G_OBJECT(w), "user_data");
@@ -1499,7 +1499,7 @@
 }
 
 static void
-menu_chat_info_cb(GtkWidget *w, GaimGtkConversation *gtkconv)
+menu_chat_info_cb(GtkWidget *w, PidginConversation *gtkconv)
 {
 	char *who;
 
@@ -1509,7 +1509,7 @@
 }
 
 static void
-menu_chat_get_away_cb(GtkWidget *w, GaimGtkConversation *gtkconv)
+menu_chat_get_away_cb(GtkWidget *w, PidginConversation *gtkconv)
 {
 	GaimConversation *conv = gtkconv->active_conv;
 	GaimPluginProtocolInfo *prpl_info = NULL;
@@ -1535,7 +1535,7 @@
 }
 
 static void
-menu_chat_add_remove_cb(GtkWidget *w, GaimGtkConversation *gtkconv)
+menu_chat_add_remove_cb(GtkWidget *w, PidginConversation *gtkconv)
 {
 	GaimConversation *conv = gtkconv->active_conv;
 	GaimAccount *account;
@@ -1547,15 +1547,15 @@
 	b       = gaim_find_buddy(account, name);
 
 	if (b != NULL)
-		gaim_gtkdialogs_remove_buddy(b);
+		pidgindialogs_remove_buddy(b);
 	else if (account != NULL && gaim_account_is_connected(account))
 		gaim_blist_request_add_buddy(account, name, NULL, NULL);
 
-	gtk_widget_grab_focus(GAIM_GTK_CONVERSATION(conv)->entry);
+	gtk_widget_grab_focus(PIDGIN_CONVERSATION(conv)->entry);
 }
 
 static GtkTextMark *
-get_mark_for_user(GaimGtkConversation *gtkconv, const char *who)
+get_mark_for_user(PidginConversation *gtkconv, const char *who)
 {
 	GtkTextBuffer *buf = gtk_text_view_get_buffer(GTK_TEXT_VIEW(gtkconv->imhtml));
 	char *tmp = g_strconcat("user:", who, NULL);
@@ -1566,7 +1566,7 @@
 }
 
 static void
-menu_last_said_cb(GtkWidget *w, GaimGtkConversation *gtkconv)
+menu_last_said_cb(GtkWidget *w, PidginConversation *gtkconv)
 {
 	GtkTextMark *mark;
 	const char *who;
@@ -1607,7 +1607,7 @@
 
 	if (!is_me) {
 		button = gaim_new_item_from_stock(menu, _("IM"), GAIM_STOCK_IM,
-					G_CALLBACK(menu_chat_im_cb), GAIM_GTK_CONVERSATION(conv), 0, 0, NULL);
+					G_CALLBACK(menu_chat_im_cb), PIDGIN_CONVERSATION(conv), 0, 0, NULL);
 
 		if (gc == NULL)
 			gtk_widget_set_sensitive(button, FALSE);
@@ -1619,7 +1619,7 @@
 		{
 			button = gaim_new_item_from_stock(menu, _("Send File"),
 				GAIM_STOCK_FILE_TRANSFER, G_CALLBACK(menu_chat_send_file_cb),
-				GAIM_GTK_CONVERSATION(conv), 0, 0, NULL);
+				PIDGIN_CONVERSATION(conv), 0, 0, NULL);
 
 			if (gc == NULL || prpl_info == NULL ||
 			    !(!prpl_info->can_receive_file || prpl_info->can_receive_file(gc, who)))
@@ -1633,10 +1633,10 @@
 
 		if (gaim_conv_chat_is_user_ignored(GAIM_CONV_CHAT(conv), who))
 			button = gaim_new_item_from_stock(menu, _("Un-Ignore"), GAIM_STOCK_IGNORE,
-							G_CALLBACK(ignore_cb), GAIM_GTK_CONVERSATION(conv), 0, 0, NULL);
+							G_CALLBACK(ignore_cb), PIDGIN_CONVERSATION(conv), 0, 0, NULL);
 		else
 			button = gaim_new_item_from_stock(menu, _("Ignore"), GAIM_STOCK_IGNORE,
-							G_CALLBACK(ignore_cb), GAIM_GTK_CONVERSATION(conv), 0, 0, NULL);
+							G_CALLBACK(ignore_cb), PIDGIN_CONVERSATION(conv), 0, 0, NULL);
 
 		if (gc == NULL)
 			gtk_widget_set_sensitive(button, FALSE);
@@ -1646,7 +1646,7 @@
 
 	if (prpl_info && (prpl_info->get_info || prpl_info->get_cb_info)) {
 		button = gaim_new_item_from_stock(menu, _("Info"), GAIM_STOCK_INFO,
-						G_CALLBACK(menu_chat_info_cb), GAIM_GTK_CONVERSATION(conv), 0, 0, NULL);
+						G_CALLBACK(menu_chat_info_cb), PIDGIN_CONVERSATION(conv), 0, 0, NULL);
 
 		if (gc == NULL)
 			gtk_widget_set_sensitive(button, FALSE);
@@ -1656,7 +1656,7 @@
 
 	if (prpl_info && prpl_info->get_cb_away) {
 		button = gaim_new_item_from_stock(menu, _("Get Away Message"), GAIM_STOCK_AWAY,
-					G_CALLBACK(menu_chat_get_away_cb), GAIM_GTK_CONVERSATION(conv), 0, 0, NULL);
+					G_CALLBACK(menu_chat_get_away_cb), PIDGIN_CONVERSATION(conv), 0, 0, NULL);
 
 		if (gc == NULL)
 			gtk_widget_set_sensitive(button, FALSE);
@@ -1667,10 +1667,10 @@
 	if (!is_me && prpl_info && !(prpl_info->options & OPT_PROTO_UNIQUE_CHATNAME)) {
 		if ((buddy = gaim_find_buddy(conv->account, who)) != NULL)
 			button = gaim_new_item_from_stock(menu, _("Remove"), GTK_STOCK_REMOVE,
-						G_CALLBACK(menu_chat_add_remove_cb), GAIM_GTK_CONVERSATION(conv), 0, 0, NULL);
+						G_CALLBACK(menu_chat_add_remove_cb), PIDGIN_CONVERSATION(conv), 0, 0, NULL);
 		else
 			button = gaim_new_item_from_stock(menu, _("Add"), GTK_STOCK_ADD,
-						G_CALLBACK(menu_chat_add_remove_cb), GAIM_GTK_CONVERSATION(conv), 0, 0, NULL);
+						G_CALLBACK(menu_chat_add_remove_cb), PIDGIN_CONVERSATION(conv), 0, 0, NULL);
 
 		if (gc == NULL)
 			gtk_widget_set_sensitive(button, FALSE);
@@ -1679,17 +1679,17 @@
 	}
 
 	button = gaim_new_item_from_stock(menu, _("Last said"), GTK_STOCK_INDEX,
-						G_CALLBACK(menu_last_said_cb), GAIM_GTK_CONVERSATION(conv), 0, 0, NULL);
+						G_CALLBACK(menu_last_said_cb), PIDGIN_CONVERSATION(conv), 0, 0, NULL);
 	g_object_set_data_full(G_OBJECT(button), "user_data", g_strdup(who), g_free);
-	if (!get_mark_for_user(GAIM_GTK_CONVERSATION(conv), who))
+	if (!get_mark_for_user(PIDGIN_CONVERSATION(conv), who))
 		gtk_widget_set_sensitive(button, FALSE);
 
 	if (buddy != NULL)
 	{
 		if (gaim_account_is_connected(conv->account))
-			gaim_gtk_append_blist_node_proto_menu(menu, conv->account->gc,
+			pidgin_append_blist_node_proto_menu(menu, conv->account->gc,
 												  (GaimBlistNode *)buddy);
-		gaim_gtk_append_blist_node_extended_menu(menu, (GaimBlistNode *)buddy);
+		pidgin_append_blist_node_extended_menu(menu, (GaimBlistNode *)buddy);
 		gtk_widget_show_all(menu);
 	}
 
@@ -1698,10 +1698,10 @@
 
 
 static gint
-gtkconv_chat_popup_menu_cb(GtkWidget *widget, GaimGtkConversation *gtkconv)
+gtkconv_chat_popup_menu_cb(GtkWidget *widget, PidginConversation *gtkconv)
 {
 	GaimConversation *conv = gtkconv->active_conv;
-	GaimGtkChatPane *gtkchat;
+	PidginChatPane *gtkchat;
 	GaimConnection *gc;
 	GaimAccount *account;
 	GtkTreeSelection *sel;
@@ -1710,7 +1710,7 @@
 	GtkWidget *menu;
 	gchar *who;
 
-	gtkconv = GAIM_GTK_CONVERSATION(conv);
+	gtkconv = PIDGIN_CONVERSATION(conv);
 	gtkchat = gtkconv->u.chat;
 	account = gaim_conversation_get_account(conv);
 	gc      = account->gc;
@@ -1724,7 +1724,7 @@
 	gtk_tree_model_get(GTK_TREE_MODEL(model), &iter, CHAT_USERS_NAME_COLUMN, &who, -1);
 	menu = create_chat_menu (conv, who, gc);
 	gtk_menu_popup(GTK_MENU(menu), NULL, NULL,
-				   gaim_gtk_treeview_popup_menu_position_func, widget,
+				   pidgin_treeview_popup_menu_position_func, widget,
 				   0, GDK_CURRENT_TIME);
 	g_free(who);
 
@@ -1734,10 +1734,10 @@
 
 static gint
 right_click_chat_cb(GtkWidget *widget, GdkEventButton *event,
-					GaimGtkConversation *gtkconv)
+					PidginConversation *gtkconv)
 {
 	GaimConversation *conv = gtkconv->active_conv;
-	GaimGtkChatPane *gtkchat;
+	PidginChatPane *gtkchat;
 	GaimConnection *gc;
 	GaimAccount *account;
 	GtkTreePath *path;
@@ -1786,16 +1786,16 @@
 }
 
 static void
-move_to_next_unread_tab(GaimGtkConversation *gtkconv, gboolean forward)
-{
-	GaimGtkConversation *next_gtkconv = NULL;
-	GaimGtkWindow *win;
+move_to_next_unread_tab(PidginConversation *gtkconv, gboolean forward)
+{
+	PidginConversation *next_gtkconv = NULL;
+	PidginWindow *win;
 	int initial, i, total, diff;
 
 	win   = gtkconv->win;
 	initial = gtk_notebook_page_num(GTK_NOTEBOOK(win->notebook),
 	                                gtkconv->tab_cont);
-	total = gaim_gtk_conv_window_get_gtkconv_count(win);
+	total = pidgin_conv_window_get_gtkconv_count(win);
 	/* By adding total here, the moduli calculated later will always have two
 	 * positive arguments. x % y where x < 0 is not guaranteed to return a
 	 * positive number.
@@ -1803,29 +1803,29 @@
 	diff = (forward ? 1 : -1) + total;
 
 	for (i = (initial + diff) % total; i != initial; i = (i + diff) % total) {
-		next_gtkconv = gaim_gtk_conv_window_get_gtkconv_at_index(win, i);
+		next_gtkconv = pidgin_conv_window_get_gtkconv_at_index(win, i);
 		if (next_gtkconv->unseen_state > 0)
 			break;
 	}
 
 	if (i == initial) { /* no new messages */
 		i = (i + diff) % total;
-		next_gtkconv = gaim_gtk_conv_window_get_gtkconv_at_index(win, i);
+		next_gtkconv = pidgin_conv_window_get_gtkconv_at_index(win, i);
 	}
 
 	if (next_gtkconv != NULL && next_gtkconv != gtkconv)
-		gaim_gtk_conv_window_switch_gtkconv(win, next_gtkconv);
+		pidgin_conv_window_switch_gtkconv(win, next_gtkconv);
 }
 
 static gboolean
 entry_key_press_cb(GtkWidget *entry, GdkEventKey *event, gpointer data)
 {
-	GaimGtkWindow *win;
+	PidginWindow *win;
 	GaimConversation *conv;
-	GaimGtkConversation *gtkconv;
+	PidginConversation *gtkconv;
 	int curconv;
 
-	gtkconv  = (GaimGtkConversation *)data;
+	gtkconv  = (PidginConversation *)data;
 	conv     = gtkconv->active_conv;
 	win      = gtkconv->win;
 	curconv = gtk_notebook_get_current_page(GTK_NOTEBOOK(win->notebook));
@@ -1923,7 +1923,7 @@
 
 			case GDK_Page_Down:
 			case ']':
-				if (!gaim_gtk_conv_window_get_gtkconv_at_index(win, curconv + 1))
+				if (!pidgin_conv_window_get_gtkconv_at_index(win, curconv + 1))
 					gtk_notebook_set_current_page(GTK_NOTEBOOK(win->notebook), 0);
 				else
 					gtk_notebook_set_current_page(GTK_NOTEBOOK(win->notebook), curconv + 1);
@@ -1932,7 +1932,7 @@
 
 			case GDK_Page_Up:
 			case '[':
-				if (!gaim_gtk_conv_window_get_gtkconv_at_index(win, curconv - 1))
+				if (!pidgin_conv_window_get_gtkconv_at_index(win, curconv - 1))
 					gtk_notebook_set_current_page(GTK_NOTEBOOK(win->notebook), -1);
 				else
 					gtk_notebook_set_current_page(GTK_NOTEBOOK(win->notebook), curconv - 1);
@@ -1975,7 +1975,7 @@
 		if (event->keyval > '0' && event->keyval <= '9')
 		{
 			guint switchto = event->keyval - '1';
-			if (switchto < gaim_gtk_conv_window_get_gtkconv_count(win))
+			if (switchto < pidgin_conv_window_get_gtkconv_count(win))
 				gtk_notebook_set_current_page(GTK_NOTEBOOK(win->notebook), switchto);
 
 			return TRUE;
@@ -2036,7 +2036,7 @@
 static gboolean
 refocus_entry_cb(GtkWidget *widget, GdkEventKey *event, gpointer data)
 {
-	GaimGtkConversation *gtkconv = data;
+	PidginConversation *gtkconv = data;
 
 	/* If we have a valid key for the conversation display, then exit */
 	if ((event->state & GDK_CONTROL_MASK) ||
@@ -2063,16 +2063,16 @@
 }
 
 void
-gaim_gtkconv_switch_active_conversation(GaimConversation *conv)
-{
-	GaimGtkConversation *gtkconv;
+pidgin_conv_switch_active_conversation(GaimConversation *conv)
+{
+	PidginConversation *gtkconv;
 	GaimConversation *old_conv;
 	GtkIMHtml *entry;
 	const char *protocol_name;
 
 	g_return_if_fail(conv != NULL);
 
-	gtkconv = GAIM_GTK_CONVERSATION(conv);
+	gtkconv = PIDGIN_CONVERSATION(conv);
 	old_conv = gtkconv->active_conv;
 
 	if (old_conv == conv)
@@ -2158,7 +2158,7 @@
 			(conv->features & GAIM_CONNECTION_FORMATTING_WBFO));
 	}
 
-	gaim_signal_emit(gaim_gtk_conversations_get_handle(), "conversation-switched", conv);
+	gaim_signal_emit(pidgin_conversations_get_handle(), "conversation-switched", conv);
 
 	gray_stuff_out(gtkconv);
 	update_typing_icon(gtkconv);
@@ -2178,14 +2178,14 @@
 		return;
 
 	conv = gaim_conversation_new(GAIM_CONV_TYPE_IM, account, name);
-	gaim_gtkconv_switch_active_conversation(conv);
+	pidgin_conv_switch_active_conversation(conv);
 }
 
 static void
 insert_text_cb(GtkTextBuffer *textbuffer, GtkTextIter *position,
 			   gchar *new_text, gint new_text_length, gpointer user_data)
 {
-	GaimGtkConversation *gtkconv = (GaimGtkConversation *)user_data;
+	PidginConversation *gtkconv = (PidginConversation *)user_data;
 	GaimConversation *conv;
 
 	g_return_if_fail(gtkconv != NULL);
@@ -2203,7 +2203,7 @@
 delete_text_cb(GtkTextBuffer *textbuffer, GtkTextIter *start_pos,
 			   GtkTextIter *end_pos, gpointer user_data)
 {
-	GaimGtkConversation *gtkconv = (GaimGtkConversation *)user_data;
+	PidginConversation *gtkconv = (PidginConversation *)user_data;
 	GaimConversation *conv;
 	GaimConvIm *im;
 
@@ -2235,7 +2235,7 @@
  * A bunch of buddy icon functions
  **************************************************************************/
 GdkPixbuf *
-gaim_gtkconv_get_tab_icon(GaimConversation *conv, gboolean small_icon)
+pidgin_conv_get_tab_icon(GaimConversation *conv, gboolean small_icon)
 {
 	GaimAccount *account = NULL;
 	const char *name = NULL;
@@ -2260,14 +2260,14 @@
 			if (ops && ops->update)
 				ops->update(NULL, (GaimBlistNode*)b);
 
-			status = gaim_gtk_blist_get_status_icon((GaimBlistNode*)b,
+			status = pidgin_blist_get_status_icon((GaimBlistNode*)b,
 				(small_icon ? GAIM_STATUS_ICON_SMALL : GAIM_STATUS_ICON_LARGE));
 		}
 	}
 
 	/* If they don't have a buddy icon, then use the PRPL icon */
 	if (status == NULL)
-		status = gaim_gtk_create_prpl_icon(account, small_icon ? PIDGIN_PRPL_ICON_SMALL : PIDGIN_PRPL_ICON_LARGE);
+		status = pidgin_create_prpl_icon(account, small_icon ? PIDGIN_PRPL_ICON_SMALL : PIDGIN_PRPL_ICON_LARGE);
 
 	return status;
 }
@@ -2275,18 +2275,18 @@
 static void
 update_tab_icon(GaimConversation *conv)
 {
-	GaimGtkConversation *gtkconv;
-	GaimGtkWindow *win;
+	PidginConversation *gtkconv;
+	PidginWindow *win;
 	GdkPixbuf *status = NULL;
 
 	g_return_if_fail(conv != NULL);
 
-	gtkconv = GAIM_GTK_CONVERSATION(conv);
+	gtkconv = PIDGIN_CONVERSATION(conv);
 	win = gtkconv->win;
 	if (conv != gtkconv->active_conv)
 		return;
 
-	status = gaim_gtkconv_get_tab_icon(conv, TRUE);
+	status = pidgin_conv_get_tab_icon(conv, TRUE);
 
 	g_return_if_fail(status != NULL);
 
@@ -2296,11 +2296,11 @@
 	if (status != NULL)
 		g_object_unref(status);
 
-	if (gaim_gtk_conv_window_is_active_conversation(conv) &&
+	if (pidgin_conv_window_is_active_conversation(conv) &&
 		(gaim_conversation_get_type(conv) != GAIM_CONV_TYPE_IM ||
 		 gtkconv->u.im->anim == NULL))
 	{
-		status = gaim_gtkconv_get_tab_icon(conv, FALSE);
+		status = pidgin_conv_get_tab_icon(conv, FALSE);
 
 		gtk_window_set_icon(GTK_WINDOW(win->window), status);
 
@@ -2317,7 +2317,7 @@
  */
 static gboolean reset_auto_resize_cb(gpointer data)
 {
-	GaimGtkConversation *gtkconv = (GaimGtkConversation *)data;
+	PidginConversation *gtkconv = (PidginConversation *)data;
 	gtkconv->auto_resize = FALSE;
 	return FALSE;
 }
@@ -2325,7 +2325,7 @@
 static gboolean
 redraw_icon(gpointer data)
 {
-	GaimGtkConversation *gtkconv = (GaimGtkConversation *)data;
+	PidginConversation *gtkconv = (PidginConversation *)data;
 	GaimConversation *conv = gtkconv->active_conv;
 	GaimAccount *account;
 	GaimPluginProtocolInfo *prpl_info = NULL;
@@ -2335,7 +2335,7 @@
 	gint delay;
 	int scale_width, scale_height;
 
-	gtkconv = GAIM_GTK_CONVERSATION(conv);
+	gtkconv = PIDGIN_CONVERSATION(conv);
 	account = gaim_conversation_get_account(conv);
 	if(account && account->gc)
 		prpl_info = GAIM_PLUGIN_PROTOCOL_INFO(account->gc->prpl);
@@ -2346,7 +2346,7 @@
 	gdk_pixbuf_animation_iter_advance(gtkconv->u.im->iter, NULL);
 	buf = gdk_pixbuf_animation_iter_get_pixbuf(gtkconv->u.im->iter);
 
-	gaim_gtk_buddy_icon_get_scale_size(buf, &prpl_info->icon_spec,
+	pidgin_buddy_icon_get_scale_size(buf, &prpl_info->icon_spec,
 			GAIM_ICON_SCALE_DISPLAY, &scale_width, &scale_height);
 
 	/* this code is ugly, and scares me */
@@ -2372,7 +2372,7 @@
 }
 
 static void
-start_anim(GtkObject *obj, GaimGtkConversation *gtkconv)
+start_anim(GtkObject *obj, PidginConversation *gtkconv)
 {
 	int delay;
 
@@ -2394,10 +2394,10 @@
 }
 
 static void
-remove_icon(GtkWidget *widget, GaimGtkConversation *gtkconv)
+remove_icon(GtkWidget *widget, PidginConversation *gtkconv)
 {
 	GaimConversation *conv = gtkconv->active_conv;
-	GaimGtkWindow *gtkwin;
+	PidginWindow *gtkwin;
 
 	g_return_if_fail(conv != NULL);
 
@@ -2427,7 +2427,7 @@
 static void
 saveicon_writefile_cb(void *user_data, const char *filename)
 {
-	GaimGtkConversation *gtkconv = (GaimGtkConversation *)user_data;
+	PidginConversation *gtkconv = (PidginConversation *)user_data;
 	GaimConversation *conv = gtkconv->active_conv;
 	FILE *fp;
 	GaimBuddyIcon *icon;
@@ -2452,7 +2452,7 @@
 }
 
 static const char *
-custom_icon_pref_name(GaimGtkConversation *gtkconv)
+custom_icon_pref_name(PidginConversation *gtkconv)
 {
 	GaimConversation *conv;
 	GaimAccount *account;
@@ -2472,34 +2472,34 @@
 custom_icon_sel_cb(const char *filename, gpointer data)
 {
 	if (filename) {
-		GaimGtkConversation *gtkconv = data;
+		PidginConversation *gtkconv = data;
 		GaimConversation *conv = gtkconv->active_conv;
 		GaimAccount *account = gaim_conversation_get_account(conv);
-		gaim_gtk_set_custom_buddy_icon(account, gaim_conversation_get_name(conv), filename);
-	}
-}
-
-static void
-set_custom_icon_cb(GtkWidget *widget, GaimGtkConversation *gtkconv)
-{
-	GtkWidget *win = gaim_gtk_buddy_icon_chooser_new(GTK_WINDOW(gtkconv->win->window),
+		pidgin_set_custom_buddy_icon(account, gaim_conversation_get_name(conv), filename);
+	}
+}
+
+static void
+set_custom_icon_cb(GtkWidget *widget, PidginConversation *gtkconv)
+{
+	GtkWidget *win = pidgin_buddy_icon_chooser_new(GTK_WINDOW(gtkconv->win->window),
 						custom_icon_sel_cb, gtkconv);
 	gtk_widget_show_all(win);
 }
 
 static void
-remove_custom_icon_cb(GtkWidget *widget, GaimGtkConversation *gtkconv)
+remove_custom_icon_cb(GtkWidget *widget, PidginConversation *gtkconv)
 {
 	GaimConversation *conv;
 	GaimAccount *account;
 
 	conv = gtkconv->active_conv;
 	account = gaim_conversation_get_account(conv);
-	gaim_gtk_set_custom_buddy_icon(account, gaim_conversation_get_name(conv), NULL);
-}
-
-static void
-icon_menu_save_cb(GtkWidget *widget, GaimGtkConversation *gtkconv)
+	pidgin_set_custom_buddy_icon(account, gaim_conversation_get_name(conv), NULL);
+}
+
+static void
+icon_menu_save_cb(GtkWidget *widget, PidginConversation *gtkconv)
 {
 	GaimConversation *conv = gtkconv->active_conv;
 	const gchar *ext;
@@ -2520,7 +2520,7 @@
 }
 
 static void
-stop_anim(GtkObject *obj, GaimGtkConversation *gtkconv)
+stop_anim(GtkObject *obj, PidginConversation *gtkconv)
 {
 	if (gtkconv->u.im->icon_timer != 0)
 		g_source_remove(gtkconv->u.im->icon_timer);
@@ -2530,7 +2530,7 @@
 
 
 static void
-toggle_icon_animate_cb(GtkWidget *w, GaimGtkConversation *gtkconv)
+toggle_icon_animate_cb(GtkWidget *w, PidginConversation *gtkconv)
 {
 	gtkconv->u.im->animate =
 		gtk_check_menu_item_get_active(GTK_CHECK_MENU_ITEM(w));
@@ -2542,7 +2542,7 @@
 }
 
 static gboolean
-icon_menu(GtkObject *obj, GdkEventButton *e, GaimGtkConversation *gtkconv)
+icon_menu(GtkObject *obj, GdkEventButton *e, PidginConversation *gtkconv)
 {
 	static GtkWidget *menu = NULL;
 	const char *pref;
@@ -2594,24 +2594,24 @@
 static void
 menu_buddyicon_cb(gpointer data, guint action, GtkWidget *widget)
 {
-	GaimGtkWindow *win = data;
+	PidginWindow *win = data;
 	GaimConversation *conv;
-	GaimGtkConversation *gtkconv;
+	PidginConversation *gtkconv;
 	gboolean active;
 
-	conv = gaim_gtk_conv_window_get_active_conversation(win);
+	conv = pidgin_conv_window_get_active_conversation(win);
 
 	if (!conv)
 		return;
 
 	g_return_if_fail(gaim_conversation_get_type(conv) == GAIM_CONV_TYPE_IM);
 
-	gtkconv = GAIM_GTK_CONVERSATION(conv);
+	gtkconv = PIDGIN_CONVERSATION(conv);
 
 	active = gtk_check_menu_item_get_active(GTK_CHECK_MENU_ITEM(widget));
 	gtkconv->u.im->show_icon = active;
 	if (active)
-		gaim_gtkconv_update_buddy_icon(conv);
+		pidgin_conv_update_buddy_icon(conv);
 	else
 		remove_icon(NULL, gtkconv);
 }
@@ -2620,22 +2620,22 @@
  * End of the bunch of buddy icon functions
  **************************************************************************/
 void
-gaim_gtkconv_present_conversation(GaimConversation *conv)
-{
-	GaimGtkConversation *gtkconv = GAIM_GTK_CONVERSATION(conv);
+pidgin_conv_present_conversation(GaimConversation *conv)
+{
+	PidginConversation *gtkconv = PIDGIN_CONVERSATION(conv);
 
 	if(gtkconv->win==hidden_convwin) {
-		gaim_gtk_conv_window_remove_gtkconv(hidden_convwin, gtkconv);
-		gaim_gtkconv_placement_place(gtkconv);
-	}
-
-	gaim_gtkconv_switch_active_conversation(conv);
-	gaim_gtk_conv_window_switch_gtkconv(gtkconv->win, gtkconv);
+		pidgin_conv_window_remove_gtkconv(hidden_convwin, gtkconv);
+		pidgin_conv_placement_place(gtkconv);
+	}
+
+	pidgin_conv_switch_active_conversation(conv);
+	pidgin_conv_window_switch_gtkconv(gtkconv->win, gtkconv);
 	gtk_window_present(GTK_WINDOW(gtkconv->win->window));
 }
 
 GList *
-gaim_gtk_conversations_find_unseen_list(GaimConversationType type,
+pidgin_conversations_find_unseen_list(GaimConversationType type,
 										GaimUnseenState min_state,
 										gboolean hidden_only,
 										guint max_count)
@@ -2654,7 +2654,7 @@
 
 	for (; l != NULL && (max_count == 0 || c < max_count); l = l->next) {
 		GaimConversation *conv = (GaimConversation*)l->data;
-		GaimGtkConversation *gtkconv = GAIM_GTK_CONVERSATION(conv);
+		PidginConversation *gtkconv = PIDGIN_CONVERSATION(conv);
 
 		if(gtkconv->active_conv != conv)
 			continue;
@@ -2675,11 +2675,11 @@
 unseen_conv_menu_cb(GtkMenuItem *item, GaimConversation *conv)
 {
 	g_return_if_fail(conv != NULL);
-	gaim_gtkconv_present_conversation(conv);
+	pidgin_conv_present_conversation(conv);
 }
 
 guint
-gaim_gtk_conversations_fill_menu(GtkWidget *menu, GList *convs)
+pidgin_conversations_fill_menu(GtkWidget *menu, GList *convs)
 {
 	GList *l;
 	guint ret=0;
@@ -2689,10 +2689,10 @@
 
 	for (l = convs; l != NULL ; l = l->next) {
 		GaimConversation *conv = (GaimConversation*)l->data;
-		GaimGtkConversation *gtkconv = GAIM_GTK_CONVERSATION(conv);
+		PidginConversation *gtkconv = PIDGIN_CONVERSATION(conv);
 
 		GtkWidget *icon = gtk_image_new();
-		GdkPixbuf *pbuf = gaim_gtkconv_get_tab_icon(conv, TRUE);
+		GdkPixbuf *pbuf = pidgin_conv_get_tab_icon(conv, TRUE);
 		GtkWidget *item;
 		gchar *text = g_strdup_printf("%s (%d)",
 				gtk_label_get_text(GTK_LABEL(gtkconv->tab_label)),
@@ -2712,8 +2712,8 @@
 	return ret;
 }
 
-GaimGtkWindow *
-gaim_gtkconv_get_window(GaimGtkConversation *gtkconv)
+PidginWindow *
+pidgin_conv_get_window(PidginConversation *gtkconv)
 {
 	g_return_val_if_fail(gtkconv != NULL, NULL);
 	return gtkconv->win;
@@ -2795,7 +2795,7 @@
 sound_method_pref_changed_cb(const char *name, GaimPrefType type,
 							 gconstpointer value, gpointer data)
 {
-	GaimGtkWindow *win = data;
+	PidginWindow *win = data;
 	const char *method = value;
 
 	if (!strcmp(method, "none"))
@@ -2806,7 +2806,7 @@
 	}
 	else
 	{
-		GaimGtkConversation *gtkconv = gaim_gtk_conv_window_get_active_gtkconv(win);
+		PidginConversation *gtkconv = pidgin_conv_window_get_active_gtkconv(win);
 
 		if (gtkconv != NULL)
 			gtk_check_menu_item_set_active(GTK_CHECK_MENU_ITEM(win->menu.sounds),
@@ -2820,7 +2820,7 @@
 show_buddy_icons_pref_changed_cb(const char *name, GaimPrefType type,
 								 gconstpointer value, gpointer data)
 {
-	GaimGtkWindow *win = data;
+	PidginWindow *win = data;
 	gboolean show_icons = GPOINTER_TO_INT(value);
 
 	if (!show_icons)
@@ -2831,7 +2831,7 @@
 	}
 	else
 	{
-		GaimGtkConversation *gtkconv = gaim_gtk_conv_window_get_active_gtkconv(win);
+		PidginConversation *gtkconv = pidgin_conv_window_get_active_gtkconv(win);
 
 		if (gtkconv != NULL)
 			gtk_check_menu_item_set_active(GTK_CHECK_MENU_ITEM(win->menu.show_icon),
@@ -2842,15 +2842,15 @@
 }
 
 static void
-regenerate_options_items(GaimGtkWindow *win)
+regenerate_options_items(PidginWindow *win)
 {
 	GtkWidget *menu;
 	GList *list;
-	GaimGtkConversation *gtkconv;
+	PidginConversation *gtkconv;
 	GaimConversation *conv;
 	GaimBuddy *buddy;
 
-	gtkconv = gaim_gtk_conv_window_get_active_gtkconv(win);
+	gtkconv = pidgin_conv_window_get_active_gtkconv(win);
 	conv = gtkconv->active_conv;
 	buddy = gaim_find_buddy(conv->account, conv->name);
 
@@ -2868,9 +2868,9 @@
 	if (buddy)
 	{
 		if (gaim_account_is_connected(conv->account))
-			gaim_gtk_append_blist_node_proto_menu(menu, conv->account->gc,
+			pidgin_append_blist_node_proto_menu(menu, conv->account->gc,
 												  (GaimBlistNode *)buddy);
-		gaim_gtk_append_blist_node_extended_menu(menu, (GaimBlistNode *)buddy);
+		pidgin_append_blist_node_extended_menu(menu, (GaimBlistNode *)buddy);
 	}
 
 	if ((list = gtk_container_get_children(GTK_CONTAINER(menu))) == NULL)
@@ -2885,7 +2885,7 @@
 
 static void menubar_activated(GtkWidget *item, gpointer data)
 {
-	GaimGtkWindow *win = data;
+	PidginWindow *win = data;
 	regenerate_options_items(win);
 
 	/* The following are to make sure the 'More' submenu is not regenerated every time
@@ -2895,7 +2895,7 @@
 }
 
 static void
-focus_out_from_menubar(GtkWidget *wid, GaimGtkWindow *win)
+focus_out_from_menubar(GtkWidget *wid, PidginWindow *win)
 {
 	/* The menubar has been deactivated. Make sure the 'More' submenu is regenerated next time
 	 * the 'Conversation' menu pops up. */
@@ -2906,7 +2906,7 @@
 }
 
 static GtkWidget *
-setup_menubar(GaimGtkWindow *win)
+setup_menubar(PidginWindow *win)
 {
 	GtkAccelGroup *accel_group;
 	const char *method;
@@ -2926,7 +2926,7 @@
 	gtk_item_factory_create_items(win->menu.item_factory, menu_item_count,
 	                              menu_items, win);
 	g_signal_connect(G_OBJECT(accel_group), "accel-changed",
-	                 G_CALLBACK(gaim_gtk_save_accels_cb), NULL);
+	                 G_CALLBACK(pidgin_save_accels_cb), NULL);
 
 	/* Make sure the 'Conversation -> More' menuitems are regenerated whenever
 	 * the 'Conversation' menu pops up because the entries can change after the
@@ -3029,7 +3029,7 @@
 	gaim_prefs_connect_callback(win, "/gaim/gtk/conversations/im/show_buddy_icons",
 				    show_buddy_icons_pref_changed_cb, win);
 
-	win->menu.tray = gaim_gtk_menu_tray_new();
+	win->menu.tray = pidgin_menu_tray_new();
 	gtk_menu_shell_append(GTK_MENU_SHELL(win->menu.menubar),
 	                      win->menu.tray);
 	gtk_widget_show(win->menu.tray);
@@ -3045,7 +3045,7 @@
  **************************************************************************/
 
 static void
-got_typing_keypress(GaimGtkConversation *gtkconv, gboolean first)
+got_typing_keypress(PidginConversation *gtkconv, gboolean first)
 {
 	GaimConversation *conv = gtkconv->active_conv;
 	GaimConvIm *im;
@@ -3073,9 +3073,9 @@
 }
 
 static void
-update_typing_icon(GaimGtkConversation *gtkconv)
-{
-	GaimGtkWindow *gtkwin;
+update_typing_icon(PidginConversation *gtkconv)
+{
+	PidginWindow *gtkwin;
 	GaimConvIm *im = NULL;
 	GaimConversation *conv = gtkconv->active_conv;
 	char *stock_id;
@@ -3104,14 +3104,14 @@
 	if (gtkwin->menu.typing_icon == NULL)
 	{
 		gtkwin->menu.typing_icon = gtk_image_new_from_stock(stock_id, GTK_ICON_SIZE_MENU);
-		gaim_gtk_menu_tray_append(GAIM_GTK_MENU_TRAY(gtkwin->menu.tray),
+		pidgin_menu_tray_append(PIDGIN_MENU_TRAY(gtkwin->menu.tray),
 								  gtkwin->menu.typing_icon,
 								  tooltip);
 	}
 	else
 	{
 		gtk_image_set_from_stock(GTK_IMAGE(gtkwin->menu.typing_icon), stock_id, GTK_ICON_SIZE_MENU);
-		gaim_gtk_menu_tray_set_tooltip(GAIM_GTK_MENU_TRAY(gtkwin->menu.tray),
+		pidgin_menu_tray_set_tooltip(PIDGIN_MENU_TRAY(gtkwin->menu.tray),
 									   gtkwin->menu.typing_icon,
 									   tooltip);
 	}
@@ -3120,7 +3120,7 @@
 }
 
 static gboolean
-update_send_to_selection(GaimGtkWindow *win)
+update_send_to_selection(PidginWindow *win)
 {
 	GaimAccount *account;
 	GaimConversation *conv;
@@ -3128,7 +3128,7 @@
 	GList *child;
 	GaimBuddy *b;
 
-	conv = gaim_gtk_conv_window_get_active_conversation(win);
+	conv = pidgin_conv_window_get_active_conversation(win);
 
 	if (conv == NULL)
 		return FALSE;
@@ -3196,9 +3196,9 @@
 
 	/* Create a pixmap for the protocol icon. */
 	if (buddy != NULL)
-		pixbuf = gaim_gtk_blist_get_status_icon((GaimBlistNode*)buddy, GAIM_STATUS_ICON_SMALL);
+		pixbuf = pidgin_blist_get_status_icon((GaimBlistNode*)buddy, GAIM_STATUS_ICON_SMALL);
 	else
-		pixbuf = gaim_gtk_create_prpl_icon(account, 0.5);
+		pixbuf = pidgin_create_prpl_icon(account, 0.5);
 
 	/* Now convert it to GtkImage */
 	if (pixbuf == NULL)
@@ -3263,17 +3263,17 @@
 }
 
 static void
-generate_send_to_items(GaimGtkWindow *win)
+generate_send_to_items(PidginWindow *win)
 {
 	GtkWidget *menu;
 	GSList *group = NULL;
 	GtkSizeGroup *sg = gtk_size_group_new(GTK_SIZE_GROUP_HORIZONTAL);
-	GaimGtkConversation *gtkconv;
+	PidginConversation *gtkconv;
 	GSList *l, *buds;
 
 	g_return_if_fail(win != NULL);
 
-	gtkconv = gaim_gtk_conv_window_get_active_gtkconv(win);
+	gtkconv = pidgin_conv_window_get_active_gtkconv(win);
 
 	g_return_if_fail(gtkconv != NULL);
 
@@ -3434,8 +3434,8 @@
 static void
 add_chat_buddy_common(GaimConversation *conv, GaimConvChatBuddy *cb, const char *old_name)
 {
-	GaimGtkConversation *gtkconv;
-	GaimGtkChatPane *gtkchat;
+	PidginConversation *gtkconv;
+	PidginChatPane *gtkchat;
 	GaimConvChat *chat;
 	GaimConnection *gc;
 	GaimPluginProtocolInfo *prpl_info;
@@ -3452,7 +3452,7 @@
 	flags = GPOINTER_TO_INT(cb->flags);
 
 	chat    = GAIM_CONV_CHAT(conv);
-	gtkconv = GAIM_GTK_CONVERSATION(conv);
+	gtkconv = PIDGIN_CONVERSATION(conv);
 	gtkchat = gtkconv->u.chat;
 	gc      = gaim_conversation_get_gc(conv);
 
@@ -3580,7 +3580,7 @@
 static gboolean
 tab_complete(GaimConversation *conv)
 {
-	GaimGtkConversation *gtkconv;
+	PidginConversation *gtkconv;
 	GtkTextIter cursor, word_start, start_buffer;
 	int start;
 	int most_matched = -1;
@@ -3591,7 +3591,7 @@
 	GList *matches = NULL;
 	gboolean command = FALSE;
 
-	gtkconv = GAIM_GTK_CONVERSATION(conv);
+	gtkconv = PIDGIN_CONVERSATION(conv);
 
 	gtk_text_buffer_get_start_iter(gtkconv->entry_buffer, &start_buffer);
 	gtk_text_buffer_get_iter_at_mark(gtkconv->entry_buffer, &cursor,
@@ -3620,7 +3620,7 @@
 		start--;
 	}
 
-	prefix = gaim_gtk_get_cmd_prefix();
+	prefix = pidgin_get_cmd_prefix();
 	if (start == -1 && (strlen(text) >= strlen(prefix)) && !strncmp(text, prefix, strlen(prefix))) {
 		command = TRUE;
 		gtk_text_iter_forward_chars(&word_start, strlen(prefix));
@@ -3651,7 +3651,7 @@
 	} else if (gaim_conversation_get_type(conv) == GAIM_CONV_TYPE_CHAT) {
 		GaimConvChat *chat = GAIM_CONV_CHAT(conv);
 		GList *l = gaim_conv_chat_get_users(chat);
-		GtkTreeModel *model = gtk_tree_view_get_model(GTK_TREE_VIEW(GAIM_GTK_CONVERSATION(conv)->u.chat->list));
+		GtkTreeModel *model = gtk_tree_view_get_model(GTK_TREE_VIEW(PIDGIN_CONVERSATION(conv)->u.chat->list));
 		GtkTreeIter iter;
 		int f;
 
@@ -3747,12 +3747,12 @@
 	return TRUE;
 }
 
-static void topic_callback(GtkWidget *w, GaimGtkConversation *gtkconv)
+static void topic_callback(GtkWidget *w, PidginConversation *gtkconv)
 {
 	GaimPluginProtocolInfo *prpl_info = NULL;
 	GaimConnection *gc;
 	GaimConversation *conv = gtkconv->active_conv;
-	GaimGtkChatPane *gtkchat;
+	PidginChatPane *gtkchat;
 	char *new_topic;
 	const char *current_topic;
 
@@ -3764,7 +3764,7 @@
 	if(prpl_info->set_chat_topic == NULL)
 		return;
 
-	gtkconv = GAIM_GTK_CONVERSATION(conv);
+	gtkconv = PIDGIN_CONVERSATION(conv);
 	gtkchat = gtkconv->u.chat;
 	new_topic = g_strdup(gtk_entry_get_text(GTK_ENTRY(gtkchat->topic_text)));
 	current_topic = gaim_conv_chat_get_topic(GAIM_CONV_CHAT(conv));
@@ -3822,7 +3822,7 @@
 static void
 update_chat_alias(GaimBuddy *buddy, GaimConversation *conv, GaimConnection *gc, GaimPluginProtocolInfo *prpl_info)
 {
-	GaimGtkConversation *gtkconv = GAIM_GTK_CONVERSATION(conv);
+	PidginConversation *gtkconv = PIDGIN_CONVERSATION(conv);
 	GaimConvChat *chat = GAIM_CONV_CHAT(conv);
 	GtkTreeModel *model;
 	char *normalized_name;
@@ -3929,7 +3929,7 @@
 		return;
 
 	/* This is safe because this callback is only used in chats, not IMs. */
-	model = gtk_tree_view_get_model(GTK_TREE_VIEW(GAIM_GTK_CONVERSATION(conv)->u.chat->list));
+	model = gtk_tree_view_get_model(GTK_TREE_VIEW(PIDGIN_CONVERSATION(conv)->u.chat->list));
 
 	if (!gtk_tree_model_get_iter_first(GTK_TREE_MODEL(model), &iter))
 		return;
@@ -3974,7 +3974,7 @@
 	buddy_cb_common(buddy, conv, FALSE);
 }
 
-static void send_menu_cb(GtkWidget *widget, GaimGtkConversation *gtkconv)
+static void send_menu_cb(GtkWidget *widget, PidginConversation *gtkconv)
 {
 	g_signal_emit_by_name(gtkconv->entry, "message_send");
 }
@@ -3983,7 +3983,7 @@
 entry_popup_menu_cb(GtkIMHtml *imhtml, GtkMenu *menu, gpointer data)
 {
 	GtkWidget *menuitem;
-	GaimGtkConversation *gtkconv = data;
+	PidginConversation *gtkconv = data;
 
 	g_return_if_fail(menu != NULL);
 	g_return_if_fail(gtkconv != NULL);
@@ -4001,7 +4001,7 @@
 }
 
 
-static void resize_imhtml_cb(GaimGtkConversation *gtkconv)
+static void resize_imhtml_cb(PidginConversation *gtkconv)
 {
 	GtkTextBuffer *buffer;
 	GtkTextIter iter;
@@ -4043,11 +4043,11 @@
 }
 
 static GtkWidget *
-setup_chat_pane(GaimGtkConversation *gtkconv)
+setup_chat_pane(PidginConversation *gtkconv)
 {
 	GaimPluginProtocolInfo *prpl_info;
 	GaimConversation *conv = gtkconv->active_conv;
-	GaimGtkChatPane *gtkchat;
+	PidginChatPane *gtkchat;
 	GaimConnection *gc;
 	GtkWidget *vpaned, *hpaned;
 	GtkWidget *vbox, *hbox, *frame;
@@ -4107,8 +4107,8 @@
 	gtk_widget_show(hpaned);
 
 	/* Setup gtkihmtml. */
-	frame = gaim_gtk_create_imhtml(FALSE, &gtkconv->imhtml, NULL, &imhtml_sw);
-	gtk_widget_set_name(gtkconv->imhtml, "gaim_gtkconv_imhtml");
+	frame = pidgin_create_imhtml(FALSE, &gtkconv->imhtml, NULL, &imhtml_sw);
+	gtk_widget_set_name(gtkconv->imhtml, "pidgin_conv_imhtml");
 	gtk_imhtml_show_comments(GTK_IMHTML(gtkconv->imhtml), TRUE);
 	gtk_paned_pack1(GTK_PANED(hpaned), frame, TRUE, TRUE);
 	gtk_widget_show(frame);
@@ -4219,14 +4219,14 @@
 	gtk_widget_show(vbox);
 
 	/* Setup the toolbar, entry widget and all signals */
-	frame = gaim_gtk_create_imhtml(TRUE, &gtkconv->entry, &gtkconv->toolbar, NULL);
+	frame = pidgin_create_imhtml(TRUE, &gtkconv->entry, &gtkconv->toolbar, NULL);
 	gtk_box_pack_start(GTK_BOX(vbox), frame, TRUE, TRUE, 0);
 	gtk_widget_show(frame);
 
 	g_signal_connect(G_OBJECT(gtkconv->entry), "populate-popup",
 					 G_CALLBACK(entry_popup_menu_cb), gtkconv);
 
-	gtk_widget_set_name(gtkconv->entry, "gaim_gtkconv_entry");
+	gtk_widget_set_name(gtkconv->entry, "pidgin_conv_entry");
 	gtk_imhtml_set_protocol_name(GTK_IMHTML(gtkconv->entry),
 								 gaim_account_get_protocol_name(conv->account));
 	gtk_widget_set_size_request(gtkconv->lower_hbox, -1,
@@ -4260,7 +4260,7 @@
 }
 
 static GtkWidget *
-setup_im_pane(GaimGtkConversation *gtkconv)
+setup_im_pane(PidginConversation *gtkconv)
 {
 	GaimConversation *conv = gtkconv->active_conv;
 	GtkWidget *frame;
@@ -4281,8 +4281,8 @@
 	gtk_widget_show(vbox);
 
 	/* Setup the gtkimhtml widget */
-	frame = gaim_gtk_create_imhtml(FALSE, &gtkconv->imhtml, NULL, &imhtml_sw);
-	gtk_widget_set_name(gtkconv->imhtml, "gaim_gtkconv_imhtml");
+	frame = pidgin_create_imhtml(FALSE, &gtkconv->imhtml, NULL, &imhtml_sw);
+	gtk_widget_set_name(gtkconv->imhtml, "pidgin_conv_imhtml");
 	gtk_imhtml_show_comments(GTK_IMHTML(gtkconv->imhtml),TRUE);
 	gtk_box_pack_start(GTK_BOX(vbox), frame, TRUE, TRUE, 0);
 	gtk_widget_show(frame);
@@ -4318,14 +4318,14 @@
 	gtk_widget_show(vbox2);
 
 	/* Setup the toolbar, entry widget and all signals */
-	frame = gaim_gtk_create_imhtml(TRUE, &gtkconv->entry, &gtkconv->toolbar, NULL);
+	frame = pidgin_create_imhtml(TRUE, &gtkconv->entry, &gtkconv->toolbar, NULL);
 	gtk_box_pack_start(GTK_BOX(vbox2), frame, TRUE, TRUE, 0);
 	gtk_widget_show(frame);
 
 	g_signal_connect(G_OBJECT(gtkconv->entry), "populate-popup",
 					 G_CALLBACK(entry_popup_menu_cb), gtkconv);
 
-	gtk_widget_set_name(gtkconv->entry, "gaim_gtkconv_entry");
+	gtk_widget_set_name(gtkconv->entry, "pidgin_conv_entry");
 	gtk_imhtml_set_protocol_name(GTK_IMHTML(gtkconv->entry),
 								 gaim_account_get_protocol_name(conv->account));
 	gtk_widget_set_size_request(gtkconv->lower_hbox, -1,
@@ -4374,16 +4374,16 @@
 static void
 conv_dnd_recv(GtkWidget *widget, GdkDragContext *dc, guint x, guint y,
               GtkSelectionData *sd, guint info, guint t,
-              GaimGtkConversation *gtkconv)
+              PidginConversation *gtkconv)
 {
 	GaimConversation *conv = gtkconv->active_conv;
-	GaimGtkWindow *win = gtkconv->win;
+	PidginWindow *win = gtkconv->win;
 	GaimConversation *c;
 	if (sd->target == gdk_atom_intern("GAIM_BLIST_NODE", FALSE))
 	{
 		GaimBlistNode *n = NULL;
 		GaimBuddy *b;
-		GaimGtkConversation *gtkconv = NULL;
+		PidginConversation *gtkconv = NULL;
 
 		n = *(GaimBlistNode **)sd->data;
 
@@ -4401,25 +4401,25 @@
 		 */
 		c = gaim_find_conversation_with_account(GAIM_CONV_TYPE_IM, b->name, b->account);
 		if (c != NULL) {
-			GaimGtkWindow *oldwin;
-			gtkconv = GAIM_GTK_CONVERSATION(c);
+			PidginWindow *oldwin;
+			gtkconv = PIDGIN_CONVERSATION(c);
 			oldwin = gtkconv->win;
 			if (oldwin != win) {
-				gaim_gtk_conv_window_remove_gtkconv(oldwin, gtkconv);
-				gaim_gtk_conv_window_add_gtkconv(win, gtkconv);
+				pidgin_conv_window_remove_gtkconv(oldwin, gtkconv);
+				pidgin_conv_window_add_gtkconv(win, gtkconv);
 			}
 		} else {
 			c = gaim_conversation_new(GAIM_CONV_TYPE_IM, b->account, b->name);
-			gtkconv = GAIM_GTK_CONVERSATION(c);
+			gtkconv = PIDGIN_CONVERSATION(c);
 			if (gtkconv->win != win)
 			{
-				gaim_gtk_conv_window_remove_gtkconv(gtkconv->win, gtkconv);
-				gaim_gtk_conv_window_add_gtkconv(win, gtkconv);
+				pidgin_conv_window_remove_gtkconv(gtkconv->win, gtkconv);
+				pidgin_conv_window_add_gtkconv(win, gtkconv);
 			}
 		}
 
 		/* Make this conversation the active conversation */
-		gaim_gtk_conv_window_switch_gtkconv(win, gtkconv);
+		pidgin_conv_window_switch_gtkconv(win, gtkconv);
 
 		gtk_drag_finish(dc, TRUE, (dc->action == GDK_ACTION_MOVE), t);
 	}
@@ -4428,9 +4428,9 @@
 		char *protocol = NULL;
 		char *username = NULL;
 		GaimAccount *account;
-		GaimGtkConversation *gtkconv;
-
-		if (gaim_gtk_parse_x_im_contact((const char *)sd->data, FALSE, &account,
+		PidginConversation *gtkconv;
+
+		if (pidgin_parse_x_im_contact((const char *)sd->data, FALSE, &account,
 						&protocol, &username, NULL))
 		{
 			if (account == NULL)
@@ -4442,11 +4442,11 @@
 			else
 			{
 				c = gaim_conversation_new(GAIM_CONV_TYPE_IM, account, username);
-				gtkconv = GAIM_GTK_CONVERSATION(c);
+				gtkconv = PIDGIN_CONVERSATION(c);
 				if (gtkconv->win != win)
 				{
-					gaim_gtk_conv_window_remove_gtkconv(gtkconv->win, gtkconv);
-					gaim_gtk_conv_window_add_gtkconv(win, gtkconv);
+					pidgin_conv_window_remove_gtkconv(gtkconv->win, gtkconv);
+					pidgin_conv_window_add_gtkconv(win, gtkconv);
 				}
 			}
 		}
@@ -4473,8 +4473,8 @@
 	{"application/x-im-contact", 0, GTK_IMHTML_DRAG_NUM + 1}
 };
 
-static GaimGtkConversation *
-gaim_gtk_conv_find_gtkconv(GaimConversation * conv)
+static PidginConversation *
+pidgin_conv_find_gtkconv(GaimConversation * conv)
 {
 	GaimBuddy *bud = gaim_find_buddy(conv->account, conv->name), *b;
 	GaimContact *c;
@@ -4506,15 +4506,15 @@
 	g_return_if_fail(bnode);
 	g_return_if_fail(GAIM_BLIST_NODE_IS_BUDDY(bnode));
 
-	for (list = gaim_gtk_conv_windows_get_list(); list; list = list->next)
+	for (list = pidgin_conv_windows_get_list(); list; list = list->next)
 	{
-		GaimGtkWindow *win = list->data;
-		GaimConversation *conv = gaim_gtk_conv_window_get_active_conversation(win);
+		PidginWindow *win = list->data;
+		GaimConversation *conv = pidgin_conv_window_get_active_conversation(win);
 
 		if (gaim_conversation_get_type(conv) != GAIM_CONV_TYPE_IM)
 			continue;
 
-		gaim_gtkconv_update_fields(conv, GAIM_GTKCONV_MENU);
+		pidgin_conv_update_fields(conv, PIDGIN_CONV_MENU);
 	}
 }
 
@@ -4524,20 +4524,20 @@
 static void
 private_gtkconv_new(GaimConversation *conv, gboolean hidden)
 {
-	GaimGtkConversation *gtkconv;
+	PidginConversation *gtkconv;
 	GaimConversationType conv_type = gaim_conversation_get_type(conv);
 	GtkWidget *pane = NULL;
 	GtkWidget *tab_cont;
 
-	if (conv_type == GAIM_CONV_TYPE_IM && (gtkconv = gaim_gtk_conv_find_gtkconv(conv))) {
+	if (conv_type == GAIM_CONV_TYPE_IM && (gtkconv = pidgin_conv_find_gtkconv(conv))) {
 		conv->ui_data = gtkconv;
 		if (!g_list_find(gtkconv->convs, conv))
 			gtkconv->convs = g_list_prepend(gtkconv->convs, conv);
-		gaim_gtkconv_switch_active_conversation(conv);
+		pidgin_conv_switch_active_conversation(conv);
 		return;
 	}
 
-	gtkconv = g_new0(GaimGtkConversation, 1);
+	gtkconv = g_new0(PidginConversation, 1);
 	conv->ui_data = gtkconv;
 	gtkconv->active_conv = conv;
 	gtkconv->convs = g_list_prepend(gtkconv->convs, conv);
@@ -4550,11 +4550,11 @@
 	gtkconv->unseen_count = 0;
 
 	if (conv_type == GAIM_CONV_TYPE_IM) {
-		gtkconv->u.im = g_malloc0(sizeof(GaimGtkImPane));
+		gtkconv->u.im = g_malloc0(sizeof(PidginImPane));
 
 		pane = setup_im_pane(gtkconv);
 	} else if (conv_type == GAIM_CONV_TYPE_CHAT) {
-		gtkconv->u.chat = g_malloc0(sizeof(GaimGtkChatPane));
+		gtkconv->u.chat = g_malloc0(sizeof(PidginChatPane));
 		pane = setup_chat_pane(gtkconv);
 	}
 
@@ -4600,7 +4600,7 @@
 
 	/* Setup the container for the tab. */
 	gtkconv->tab_cont = tab_cont = gtk_vbox_new(FALSE, GAIM_HIG_BOX_SPACE);
-	g_object_set_data(G_OBJECT(tab_cont), "GaimGtkConversation", gtkconv);
+	g_object_set_data(G_OBJECT(tab_cont), "PidginConversation", gtkconv);
 	gtk_container_set_border_width(GTK_CONTAINER(tab_cont), GAIM_HIG_BOX_SPACE);
 	gtk_container_add(GTK_CONTAINER(tab_cont), pane);
 	gtk_widget_show(pane);
@@ -4622,9 +4622,9 @@
 	                         gtkconv->entry);
 
 	if (hidden)
-		gaim_gtk_conv_window_add_gtkconv(hidden_convwin, gtkconv);
+		pidgin_conv_window_add_gtkconv(hidden_convwin, gtkconv);
 	else
-		gaim_gtkconv_placement_place(gtkconv);
+		pidgin_conv_placement_place(gtkconv);
 
 	if (nick_colors == NULL) {
 		nbr_nick_colors = NUM_NICK_COLORS;
@@ -4633,13 +4633,13 @@
 }
 
 static void
-gaim_gtkconv_new_hidden(GaimConversation *conv)
+pidgin_conv_new_hidden(GaimConversation *conv)
 {
 	private_gtkconv_new(conv, TRUE);
 }
 
 void
-gaim_gtkconv_new(GaimConversation *conv)
+pidgin_conv_new(GaimConversation *conv)
 {
 	private_gtkconv_new(conv, FALSE);
 }
@@ -4648,16 +4648,16 @@
 received_im_msg_cb(GaimAccount *account, char *sender, char *message,
 				   GaimConversation *conv, GaimMessageFlags flags)
 {
-	GaimConversationUiOps *ui_ops = gaim_gtk_conversations_get_conv_ui_ops();
+	GaimConversationUiOps *ui_ops = pidgin_conversations_get_conv_ui_ops();
 	if (conv != NULL)
 		return;
 
 	/* create hidden conv if hide_new pref is always */
 	if (strcmp(gaim_prefs_get_string("/gaim/gtk/conversations/im/hide_new"), "always") == 0)
 	{
-		ui_ops->create_conversation = gaim_gtkconv_new_hidden;
+		ui_ops->create_conversation = pidgin_conv_new_hidden;
 		gaim_conversation_new(GAIM_CONV_TYPE_IM, account, sender);
-		ui_ops->create_conversation = gaim_gtkconv_new;
+		ui_ops->create_conversation = pidgin_conv_new;
 		return;
 	}
 
@@ -4665,24 +4665,24 @@
 	if (strcmp(gaim_prefs_get_string("/gaim/gtk/conversations/im/hide_new"), "away") == 0 &&
 	    !gaim_status_is_available(gaim_account_get_active_status(account)))
 	{
-		ui_ops->create_conversation = gaim_gtkconv_new_hidden;
+		ui_ops->create_conversation = pidgin_conv_new_hidden;
 		gaim_conversation_new(GAIM_CONV_TYPE_IM, account, sender);
-		ui_ops->create_conversation = gaim_gtkconv_new;
+		ui_ops->create_conversation = pidgin_conv_new;
 		return;
 	}
 }
 
 static void
-gaim_gtkconv_destroy(GaimConversation *conv)
-{
-	GaimGtkConversation *gtkconv = GAIM_GTK_CONVERSATION(conv);
+pidgin_conv_destroy(GaimConversation *conv)
+{
+	PidginConversation *gtkconv = PIDGIN_CONVERSATION(conv);
 
 	gtkconv->convs = g_list_remove(gtkconv->convs, conv);
 	/* Don't destroy ourselves until all our convos are gone */
 	if (gtkconv->convs)
 		return;
 
-	gaim_gtk_conv_window_remove_gtkconv(gtkconv->win, gtkconv);
+	pidgin_conv_window_remove_gtkconv(gtkconv->win, gtkconv);
 
 	/* If the "Save Conversation" or "Save Icon" dialogs are open then close them */
 	gaim_request_close_with_handle(gtkconv);
@@ -4715,13 +4715,13 @@
 
 
 static void
-gaim_gtkconv_write_im(GaimConversation *conv, const char *who,
+pidgin_conv_write_im(GaimConversation *conv, const char *who,
 					  const char *message, GaimMessageFlags flags,
 					  time_t mtime)
 {
-	GaimGtkConversation *gtkconv;
-
-	gtkconv = GAIM_GTK_CONVERSATION(conv);
+	PidginConversation *gtkconv;
+
+	gtkconv = PIDGIN_CONVERSATION(conv);
 
 	if (conv != gtkconv->active_conv &&
 	    flags & GAIM_MESSAGE_ACTIVE_ONLY)
@@ -4730,7 +4730,7 @@
 		 * calling gaim_conv_im_write(), so they get suppressed here,
 		 * before being written to the log. */
 		gaim_debug_info("gtkconv",
-		                "Suppressing message for an inactive conversation in gaim_gtkconv_write_im()\n");
+		                "Suppressing message for an inactive conversation in pidgin_conv_write_im()\n");
 		return;
 	}
 
@@ -4754,7 +4754,7 @@
 
 		if (btn_event->button == 2
 				&& event->type == GDK_2BUTTON_PRESS) {
-			chat_do_info(GAIM_GTK_CONVERSATION(conv), buddyname);
+			chat_do_info(PIDGIN_CONVERSATION(conv), buddyname);
 
 			return TRUE;
 		} else if (btn_event->button == 3
@@ -4787,7 +4787,7 @@
 }
 
 static GtkTextTag *get_buddy_tag(GaimConversation *conv, const char *who) {
-	GaimGtkConversation *gtkconv = GAIM_GTK_CONVERSATION(conv);
+	PidginConversation *gtkconv = PIDGIN_CONVERSATION(conv);
 	GtkTextTag *buddytag;
 	gchar *str;
 
@@ -4811,12 +4811,12 @@
 }
 
 static void
-gaim_gtkconv_write_conv(GaimConversation *conv, const char *name, const char *alias,
+pidgin_conv_write_conv(GaimConversation *conv, const char *name, const char *alias,
 						const char *message, GaimMessageFlags flags,
 						time_t mtime)
 {
-	GaimGtkConversation *gtkconv;
-	GaimGtkWindow *win;
+	PidginConversation *gtkconv;
+	PidginWindow *win;
 	GaimConnection *gc;
 	GaimAccount *account;
 	GaimPluginProtocolInfo *prpl_info;
@@ -4838,7 +4838,7 @@
 	int tag_count = 0;
 	
 	g_return_if_fail(conv != NULL);
-	gtkconv = GAIM_GTK_CONVERSATION(conv);
+	gtkconv = PIDGIN_CONVERSATION(conv);
 	g_return_if_fail(gtkconv != NULL);
 
 	if (conv != gtkconv->active_conv)
@@ -4850,14 +4850,14 @@
 			 * you wanted, call gaim_conv_im_write() instead of
 			 * gaim_conversation_write(). */
 			gaim_debug_info("gtkconv",
-			                "Suppressing message for an inactive conversation in gaim_gtkconv_write_conv()\n");
+			                "Suppressing message for an inactive conversation in pidgin_conv_write_conv()\n");
 			return;
 		}
 
 		/* Set the active conversation to the one that just messaged us. */
 		/* TODO: consider not doing this if the account is offline or something */
 		if (flags & (GAIM_MESSAGE_SEND | GAIM_MESSAGE_RECV))
-			gaim_gtkconv_switch_active_conversation(conv);
+			pidgin_conv_switch_active_conversation(conv);
 	}
 
 	type = gaim_conversation_get_type(conv);
@@ -4868,7 +4868,7 @@
 
 	displaying = g_strdup(message);
 	plugin_return = GPOINTER_TO_INT(gaim_signal_emit_return_1(
-							gaim_gtk_conversations_get_handle(), (type == GAIM_CONV_TYPE_IM ?
+							pidgin_conversations_get_handle(), (type == GAIM_CONV_TYPE_IM ?
 							"displaying-im-msg" : "displaying-chat-msg"),
 							account, name, &displaying, conv, flags));
 	if (plugin_return)
@@ -4876,22 +4876,21 @@
 		g_free(displaying);
 		return;
 	}
-	message = displaying;
-	length = strlen(message) + 1;
+	length = strlen(displaying) + 1;
 
 	/* Awful hack to work around GtkIMHtml's inefficient rendering of messages with lots of formatting changes.
 	 * If a message has over 100 '<' characters, strip formatting before appending it. Hopefully nobody actually
 	 * needs that much formatting, anyway.
 	 */
-	for (bracket = strchr(message, '<'); bracket && *(bracket + 1); bracket = strchr(bracket + 1, '<'))
+	for (bracket = strchr(displaying, '<'); bracket && *(bracket + 1); bracket = strchr(bracket + 1, '<'))
 		tag_count++;
-	
+
 	if (tag_count > 100) {
-		char *tmp = message;
-		message = displaying = gaim_markup_strip_html(message);
+		char *tmp = displaying;
+		displaying = gaim_markup_strip_html(tmp);
 		g_free(tmp);
-	}	
-	
+	}
+
 	win = gtkconv->win;
 	prpl_info = GAIM_PLUGIN_PROTOCOL_INFO(gc->prpl);
 
@@ -4933,7 +4932,7 @@
 	if (gtk_text_buffer_get_char_count(gtk_text_view_get_buffer(GTK_TEXT_VIEW(gtkconv->imhtml))))
 		gtk_imhtml_append_text(GTK_IMHTML(gtkconv->imhtml), "<BR>", gtk_font_options_all);
 
-	mdate = gaim_signal_emit_return_1(gaim_gtk_conversations_get_handle(),
+	mdate = gaim_signal_emit_return_1(pidgin_conversations_get_handle(),
 	                                  "conversation-timestamp",
 	                                  conv, mtime);
 	if (mdate == NULL)
@@ -4964,27 +4963,27 @@
 	if (flags & GAIM_MESSAGE_SYSTEM) {
 		g_snprintf(buf2, sizeof(buf2),
 			   "<FONT %s><FONT SIZE=\"2\"><!--(%s) --></FONT><B>%s</B></FONT>",
-			   sml_attrib ? sml_attrib : "", mdate, message);
+			   sml_attrib ? sml_attrib : "", mdate, displaying);
 
 		gtk_imhtml_append_text(GTK_IMHTML(gtkconv->imhtml), buf2, gtk_font_options_all);
 
 	} else if (flags & GAIM_MESSAGE_ERROR) {
 		g_snprintf(buf2, sizeof(buf2),
 			   "<FONT COLOR=\"#ff0000\"><FONT %s><FONT SIZE=\"2\"><!--(%s) --></FONT><B>%s</B></FONT></FONT>",
-			   sml_attrib ? sml_attrib : "", mdate, message);
+			   sml_attrib ? sml_attrib : "", mdate, displaying);
 
 		gtk_imhtml_append_text(GTK_IMHTML(gtkconv->imhtml), buf2, gtk_font_options_all);
 
 	} else if (flags & GAIM_MESSAGE_NO_LOG) {
 		g_snprintf(buf2, BUF_LONG,
 			   "<B><FONT %s COLOR=\"#777777\">%s</FONT></B>",
-			   sml_attrib ? sml_attrib : "", message);
+			   sml_attrib ? sml_attrib : "", displaying);
 
 		gtk_imhtml_append_text(GTK_IMHTML(gtkconv->imhtml), buf2, gtk_font_options_all);
 	} else if (flags & GAIM_MESSAGE_RAW) {
-		gtk_imhtml_append_text(GTK_IMHTML(gtkconv->imhtml), message, gtk_font_options_all);
+		gtk_imhtml_append_text(GTK_IMHTML(gtkconv->imhtml), displaying, gtk_font_options_all);
 	} else {
-		char *new_message = g_memdup(message, length);
+		char *new_message = g_memdup(displaying, length);
 		char *alias_escaped = (alias ? g_markup_escape_text(alias, strlen(alias)) : g_strdup(""));
 		/* The initial offset is to deal with
 		 * escaped entities making the string longer */
@@ -5161,7 +5160,7 @@
 	g_free(sml_attrib);
 
 	/* Tab highlighting stuff */
-	if (!(flags & GAIM_MESSAGE_SEND) && !gaim_gtkconv_has_focus(conv))
+	if (!(flags & GAIM_MESSAGE_SEND) && !pidgin_conv_has_focus(conv))
 	{
 		GaimUnseenState unseen = GAIM_UNSEEN_NONE;
 
@@ -5178,17 +5177,17 @@
 		gtkconv_set_unseen(gtkconv, unseen);
 	}
 
-	gaim_signal_emit(gaim_gtk_conversations_get_handle(),
+	gaim_signal_emit(pidgin_conversations_get_handle(),
 		(type == GAIM_CONV_TYPE_IM ? "displayed-im-msg" : "displayed-chat-msg"),
-		account, name, message, conv, flags);
+		account, name, displaying, conv, flags);
 	g_free(displaying);
 }
 static void
-gaim_gtkconv_chat_add_users(GaimConversation *conv, GList *cbuddies, gboolean new_arrivals)
+pidgin_conv_chat_add_users(GaimConversation *conv, GList *cbuddies, gboolean new_arrivals)
 {
 	GaimConvChat *chat;
-	GaimGtkConversation *gtkconv;
-	GaimGtkChatPane *gtkchat;
+	PidginConversation *gtkconv;
+	PidginChatPane *gtkchat;
 	GtkListStore *ls;
 	GList *l;
 
@@ -5196,7 +5195,7 @@
 	int num_users;
 
 	chat    = GAIM_CONV_CHAT(conv);
-	gtkconv = GAIM_GTK_CONVERSATION(conv);
+	gtkconv = PIDGIN_CONVERSATION(conv);
 	gtkchat = gtkconv->u.chat;
 
 	num_users = g_list_length(gaim_conv_chat_get_users(chat));
@@ -5229,12 +5228,12 @@
 }
 
 static void
-gaim_gtkconv_chat_rename_user(GaimConversation *conv, const char *old_name,
+pidgin_conv_chat_rename_user(GaimConversation *conv, const char *old_name,
 			      const char *new_name, const char *new_alias)
 {
 	GaimConvChat *chat;
-	GaimGtkConversation *gtkconv;
-	GaimGtkChatPane *gtkchat;
+	PidginConversation *gtkconv;
+	PidginChatPane *gtkchat;
 	GaimConvChatBuddyFlags flags;
 	GaimConvChatBuddy *cbuddy;
 	GtkTreeIter iter;
@@ -5242,7 +5241,7 @@
 	int f = 1;
 
 	chat    = GAIM_CONV_CHAT(conv);
-	gtkconv = GAIM_GTK_CONVERSATION(conv);
+	gtkconv = PIDGIN_CONVERSATION(conv);
 	gtkchat = gtkconv->u.chat;
 
 	model = gtk_tree_view_get_model(GTK_TREE_VIEW(gtkchat->list));
@@ -5277,11 +5276,11 @@
 }
 
 static void
-gaim_gtkconv_chat_remove_users(GaimConversation *conv, GList *users)
+pidgin_conv_chat_remove_users(GaimConversation *conv, GList *users)
 {
 	GaimConvChat *chat;
-	GaimGtkConversation *gtkconv;
-	GaimGtkChatPane *gtkchat;
+	PidginConversation *gtkconv;
+	PidginChatPane *gtkchat;
 	GtkTreeIter iter;
 	GtkTreeModel *model;
 	GList *l;
@@ -5290,7 +5289,7 @@
 	gboolean f;
 
 	chat    = GAIM_CONV_CHAT(conv);
-	gtkconv = GAIM_GTK_CONVERSATION(conv);
+	gtkconv = PIDGIN_CONVERSATION(conv);
 	gtkchat = gtkconv->u.chat;
 
 	num_users = g_list_length(gaim_conv_chat_get_users(chat));
@@ -5330,20 +5329,20 @@
 }
 
 static void
-gaim_gtkconv_chat_update_user(GaimConversation *conv, const char *user)
+pidgin_conv_chat_update_user(GaimConversation *conv, const char *user)
 {
 	GaimConvChat *chat;
 	GaimConvChatBuddyFlags flags;
 	GaimConvChatBuddy *cbuddy;
-	GaimGtkConversation *gtkconv;
-	GaimGtkChatPane *gtkchat;
+	PidginConversation *gtkconv;
+	PidginChatPane *gtkchat;
 	GtkTreeIter iter;
 	GtkTreeModel *model;
 	int f = 1;
 	char *alias = NULL;
 
 	chat    = GAIM_CONV_CHAT(conv);
-	gtkconv = GAIM_GTK_CONVERSATION(conv);
+	gtkconv = PIDGIN_CONVERSATION(conv);
 	gtkchat = gtkconv->u.chat;
 
 	model = gtk_tree_view_get_model(GTK_TREE_VIEW(gtkchat->list));
@@ -5385,23 +5384,23 @@
 }
 
 gboolean
-gaim_gtkconv_has_focus(GaimConversation *conv)
-{
-	GaimGtkConversation *gtkconv = GAIM_GTK_CONVERSATION(conv);
-	GaimGtkWindow *win;
+pidgin_conv_has_focus(GaimConversation *conv)
+{
+	PidginConversation *gtkconv = PIDGIN_CONVERSATION(conv);
+	PidginWindow *win;
 	gboolean has_focus;
 
 	win = gtkconv->win;
 
 	g_object_get(G_OBJECT(win->window), "has-toplevel-focus", &has_focus, NULL);
 
-	if (has_focus && gaim_gtk_conv_window_is_active_conversation(conv))
+	if (has_focus && pidgin_conv_window_is_active_conversation(conv))
 		return TRUE;
 
 	return FALSE;
 }
 
-static void gaim_gtkconv_custom_smiley_allocated(GdkPixbufLoader *loader, gpointer user_data)
+static void pidgin_conv_custom_smiley_allocated(GdkPixbufLoader *loader, gpointer user_data)
 {
 	GtkIMHtmlSmiley *smiley;
 
@@ -5411,11 +5410,11 @@
 	if (smiley->icon)
 		g_object_ref(G_OBJECT(smiley->icon));
 #ifdef DEBUG_CUSTOM_SMILEY
-	gaim_debug_info("custom-smiley", "gaim_gtkconv_custom_smiley_allocated(): got GdkPixbufAnimation %p for smiley '%s'\n", smiley->icon, smiley->smile);
+	gaim_debug_info("custom-smiley", "pidgin_conv_custom_smiley_allocated(): got GdkPixbufAnimation %p for smiley '%s'\n", smiley->icon, smiley->smile);
 #endif
 }
 
-static void gaim_gtkconv_custom_smiley_closed(GdkPixbufLoader *loader, gpointer user_data)
+static void pidgin_conv_custom_smiley_closed(GdkPixbufLoader *loader, gpointer user_data)
 {
 	GtkIMHtmlSmiley *smiley;
 	GtkWidget *icon = NULL;
@@ -5425,7 +5424,7 @@
 	smiley = (GtkIMHtmlSmiley *)user_data;
 	if (!smiley->imhtml) {
 #ifdef DEBUG_CUSTOM_SMILEY
-		gaim_debug_error("custom-smiley", "gaim_gtkconv_custom_smiley_closed(): orphan smiley found: %p\n", smiley);
+		gaim_debug_error("custom-smiley", "pidgin_conv_custom_smiley_closed(): orphan smiley found: %p\n", smiley);
 #endif
 		g_object_unref(G_OBJECT(loader));
 		smiley->loader = NULL;
@@ -5437,7 +5436,7 @@
 		icon = gtk_image_new_from_animation(smiley->icon);
 
 #ifdef DEBUG_CUSTOM_SMILEY
-		gaim_debug_info("custom-smiley", "gaim_gtkconv_custom_smiley_closed(): got GtkImage %p from GtkPixbufAnimation %p for smiley '%s'\n",
+		gaim_debug_info("custom-smiley", "pidgin_conv_custom_smiley_closed(): got GtkImage %p from GtkPixbufAnimation %p for smiley '%s'\n",
 				icon, smiley->icon, smiley->smile);
 #endif
 		if (icon) {
@@ -5483,8 +5482,8 @@
 		smiley->loader = gdk_pixbuf_loader_new();
 		smiley->icon = NULL;
 
-		g_signal_connect(smiley->loader, "area_prepared", G_CALLBACK(gaim_gtkconv_custom_smiley_allocated), smiley);
-		g_signal_connect(smiley->loader, "closed", G_CALLBACK(gaim_gtkconv_custom_smiley_closed), smiley);
+		g_signal_connect(smiley->loader, "area_prepared", G_CALLBACK(pidgin_conv_custom_smiley_allocated), smiley);
+		g_signal_connect(smiley->loader, "closed", G_CALLBACK(pidgin_conv_custom_smiley_closed), smiley);
 
 		return TRUE;
 	}
@@ -5500,8 +5499,8 @@
 	smiley->loader = loader;
 	smiley->flags  = smiley->flags | GTK_IMHTML_SMILEY_CUSTOM;
 
-	g_signal_connect(smiley->loader, "area_prepared", G_CALLBACK(gaim_gtkconv_custom_smiley_allocated), smiley);
-	g_signal_connect(smiley->loader, "closed", G_CALLBACK(gaim_gtkconv_custom_smiley_closed), smiley);
+	g_signal_connect(smiley->loader, "area_prepared", G_CALLBACK(pidgin_conv_custom_smiley_allocated), smiley);
+	g_signal_connect(smiley->loader, "closed", G_CALLBACK(pidgin_conv_custom_smiley_closed), smiley);
 
 	gtk_imhtml_associate_smiley(imhtml, sml, smiley);
 
@@ -5509,9 +5508,9 @@
 }
 
 static gboolean
-gaim_gtkconv_custom_smiley_add(GaimConversation *conv, const char *smile, gboolean remote)
-{
-	GaimGtkConversation *gtkconv;
+pidgin_conv_custom_smiley_add(GaimConversation *conv, const char *smile, gboolean remote)
+{
+	PidginConversation *gtkconv;
 	struct smiley_list *list;
 	const char *sml = NULL, *conv_sml;
 
@@ -5520,13 +5519,13 @@
 	}
 
 	/* If smileys are off, return false */
-	if (gaim_gtkthemes_smileys_disabled())
+	if (pidginthemes_smileys_disabled())
 		return FALSE;
 
 	/* If possible add this smiley to the current theme.
 	 * The addition is only temporary: custom smilies aren't saved to disk. */
 	conv_sml = gaim_account_get_protocol_name(conv->account);
-	gtkconv = GAIM_GTK_CONVERSATION(conv);
+	gtkconv = PIDGIN_CONVERSATION(conv);
 
 	for (list = (struct smiley_list *)current_smiley_theme->list; list; list = list->next) {
 		if (!strcmp(list->sml, conv_sml)) {
@@ -5546,16 +5545,16 @@
 }
 
 static void
-gaim_gtkconv_custom_smiley_write(GaimConversation *conv, const char *smile,
+pidgin_conv_custom_smiley_write(GaimConversation *conv, const char *smile,
                                       const guchar *data, gsize size)
 {
-	GaimGtkConversation *gtkconv;
+	PidginConversation *gtkconv;
 	GtkIMHtmlSmiley *smiley;
 	GdkPixbufLoader *loader;
 	const char *sml;
 
 	sml = gaim_account_get_protocol_name(conv->account);
-	gtkconv = GAIM_GTK_CONVERSATION(conv);
+	gtkconv = PIDGIN_CONVERSATION(conv);
 	smiley = gtk_imhtml_smiley_get(GTK_IMHTML(gtkconv->imhtml), sml, smile);
 
 	if (!smiley)
@@ -5569,9 +5568,9 @@
 }
 
 static void
-gaim_gtkconv_custom_smiley_close(GaimConversation *conv, const char *smile)
-{
-	GaimGtkConversation *gtkconv;
+pidgin_conv_custom_smiley_close(GaimConversation *conv, const char *smile)
+{
+	PidginConversation *gtkconv;
 	GtkIMHtmlSmiley *smiley;
 	GdkPixbufLoader *loader;
 	const char *sml;
@@ -5580,7 +5579,7 @@
 	g_return_if_fail(smile != NULL);
 
 	sml = gaim_account_get_protocol_name(conv->account);
-	gtkconv = GAIM_GTK_CONVERSATION(conv);
+	gtkconv = PIDGIN_CONVERSATION(conv);
 	smiley = gtk_imhtml_smiley_get(GTK_IMHTML(gtkconv->imhtml), sml, smile);
 
 	if (!smiley)
@@ -5600,9 +5599,9 @@
 }
 
 static void
-gaim_gtkconv_send_confirm(GaimConversation *conv, const char *message)
-{
-	GaimGtkConversation *gtkconv = GAIM_GTK_CONVERSATION(conv);
+pidgin_conv_send_confirm(GaimConversation *conv, const char *message)
+{
+	PidginConversation *gtkconv = PIDGIN_CONVERSATION(conv);
 
 	gtk_imhtml_append_text(GTK_IMHTML(gtkconv->entry), message, 0);
 }
@@ -5613,9 +5612,9 @@
  * account signs on or off.
  */
 static void
-gray_stuff_out(GaimGtkConversation *gtkconv)
-{
-	GaimGtkWindow *win;
+gray_stuff_out(PidginConversation *gtkconv)
+{
+	PidginWindow *win;
 	GaimConversation *conv = gtkconv->active_conv;
 	GaimConnection *gc;
 	GaimPluginProtocolInfo *prpl_info = NULL;
@@ -5623,7 +5622,7 @@
 	GtkIMHtmlButtons buttons;
 	GaimAccount *account;
 
-	win     = gaim_gtkconv_get_window(gtkconv);
+	win     = pidgin_conv_get_window(gtkconv);
 	gc      = gaim_conversation_get_gc(conv);
 	account = gaim_conversation_get_account(conv);
 
@@ -5779,7 +5778,7 @@
 	/*
 	 * Update the window's icon
 	 */
-	if (gaim_gtk_conv_window_is_active_conversation(conv))
+	if (pidgin_conv_window_is_active_conversation(conv))
 	{
 		if ((gaim_conversation_get_type(conv) == GAIM_CONV_TYPE_IM) &&
 				(gtkconv->u.im->anim))
@@ -5788,7 +5787,7 @@
 				gdk_pixbuf_animation_get_static_image(gtkconv->u.im->anim);
 			g_object_ref(window_icon);
 		} else {
-			window_icon = gaim_gtkconv_get_tab_icon(conv, FALSE);
+			window_icon = pidgin_conv_get_tab_icon(conv, FALSE);
 		}
 		gtk_window_set_icon(GTK_WINDOW(win->window), window_icon);
 		if (window_icon != NULL)
@@ -5797,47 +5796,47 @@
 }
 
 static void
-gaim_gtkconv_update_fields(GaimConversation *conv, GaimGtkConvFields fields)
-{
-	GaimGtkConversation *gtkconv;
-	GaimGtkWindow *win;
-
-	gtkconv = GAIM_GTK_CONVERSATION(conv);
+pidgin_conv_update_fields(GaimConversation *conv, PidginConvFields fields)
+{
+	PidginConversation *gtkconv;
+	PidginWindow *win;
+
+	gtkconv = PIDGIN_CONVERSATION(conv);
 	if (!gtkconv)
 		return;
-	win = gaim_gtkconv_get_window(gtkconv);
+	win = pidgin_conv_get_window(gtkconv);
 	if (!win)
 		return;
 
-	if (fields & GAIM_GTKCONV_SET_TITLE)
+	if (fields & PIDGIN_CONV_SET_TITLE)
 	{
 		gaim_conversation_autoset_title(conv);
 	}
 
-	if (fields & GAIM_GTKCONV_BUDDY_ICON)
+	if (fields & PIDGIN_CONV_BUDDY_ICON)
 	{
 		if (gaim_conversation_get_type(conv) == GAIM_CONV_TYPE_IM)
-			gaim_gtkconv_update_buddy_icon(conv);
-	}
-
-	if (fields & GAIM_GTKCONV_MENU)
+			pidgin_conv_update_buddy_icon(conv);
+	}
+
+	if (fields & PIDGIN_CONV_MENU)
 	{
-		gray_stuff_out(GAIM_GTK_CONVERSATION(conv));
+		gray_stuff_out(PIDGIN_CONVERSATION(conv));
 		generate_send_to_items(win);
 	}
 
-	if (fields & GAIM_GTKCONV_TAB_ICON)
+	if (fields & PIDGIN_CONV_TAB_ICON)
 	{
 		update_tab_icon(conv);
 		generate_send_to_items(win);		/* To update the icons in SendTo menu */
 	}
 
-	if ((fields & GAIM_GTKCONV_TOPIC) &&
+	if ((fields & PIDGIN_CONV_TOPIC) &&
 				gaim_conversation_get_type(conv) == GAIM_CONV_TYPE_CHAT)
 	{
 		const char *topic;
 		GaimConvChat *chat = GAIM_CONV_CHAT(conv);
-		GaimGtkChatPane *gtkchat = gtkconv->u.chat;
+		PidginChatPane *gtkchat = gtkconv->u.chat;
 
 		if (gtkchat->topic_text != NULL)
 		{
@@ -5849,11 +5848,11 @@
 		}
 	}
 
-	if (fields & GAIM_GTKCONV_SMILEY_THEME)
-		gaim_gtkthemes_smiley_themeize(GAIM_GTK_CONVERSATION(conv)->imhtml);
-
-	if ((fields & GAIM_GTKCONV_COLORIZE_TITLE) ||
-			(fields & GAIM_GTKCONV_SET_TITLE))
+	if (fields & PIDGIN_CONV_SMILEY_THEME)
+		pidginthemes_smiley_themeize(PIDGIN_CONVERSATION(conv)->imhtml);
+
+	if ((fields & PIDGIN_CONV_COLORIZE_TITLE) ||
+			(fields & PIDGIN_CONV_SET_TITLE))
 	{
 		char *title;
 		GaimConvIm *im = NULL;
@@ -5922,11 +5921,11 @@
 		else
 			gtk_label_set_text(GTK_LABEL(gtkconv->tab_label), title);
 
-		if (gaim_gtk_conv_window_is_active_conversation(conv))
+		if (pidgin_conv_window_is_active_conversation(conv))
 			update_typing_icon(gtkconv);
 
 		gtk_label_set_text(GTK_LABEL(gtkconv->menu_label), title);
-		if (gaim_gtk_conv_window_is_active_conversation(conv))
+		if (pidgin_conv_window_is_active_conversation(conv))
 			gtk_window_set_title(GTK_WINDOW(win->window), title);
 
 		g_free(title);
@@ -5934,74 +5933,74 @@
 }
 
 static void
-gaim_gtkconv_updated(GaimConversation *conv, GaimConvUpdateType type)
-{
-	GaimGtkConvFields flags = 0;
+pidgin_conv_updated(GaimConversation *conv, GaimConvUpdateType type)
+{
+	PidginConvFields flags = 0;
 
 	g_return_if_fail(conv != NULL);
 
 	if (type == GAIM_CONV_UPDATE_ACCOUNT)
 	{
-		flags = GAIM_GTKCONV_ALL;
+		flags = PIDGIN_CONV_ALL;
 	}
 	else if (type == GAIM_CONV_UPDATE_TYPING ||
 	         type == GAIM_CONV_UPDATE_UNSEEN ||
 	         type == GAIM_CONV_UPDATE_TITLE)
 	{
-		flags = GAIM_GTKCONV_COLORIZE_TITLE;
+		flags = PIDGIN_CONV_COLORIZE_TITLE;
 	}
 	else if (type == GAIM_CONV_UPDATE_TOPIC)
 	{
-		flags = GAIM_GTKCONV_TOPIC;
+		flags = PIDGIN_CONV_TOPIC;
 	}
 	else if (type == GAIM_CONV_ACCOUNT_ONLINE ||
 	         type == GAIM_CONV_ACCOUNT_OFFLINE)
 	{
-		flags = GAIM_GTKCONV_MENU | GAIM_GTKCONV_TAB_ICON | GAIM_GTKCONV_SET_TITLE;
+		flags = PIDGIN_CONV_MENU | PIDGIN_CONV_TAB_ICON | PIDGIN_CONV_SET_TITLE;
 	}
 	else if (type == GAIM_CONV_UPDATE_AWAY)
 	{
-		flags = GAIM_GTKCONV_TAB_ICON;
+		flags = PIDGIN_CONV_TAB_ICON;
 	}
 	else if (type == GAIM_CONV_UPDATE_ADD ||
 	         type == GAIM_CONV_UPDATE_REMOVE ||
 	         type == GAIM_CONV_UPDATE_CHATLEFT)
 	{
-		flags = GAIM_GTKCONV_SET_TITLE | GAIM_GTKCONV_MENU;
+		flags = PIDGIN_CONV_SET_TITLE | PIDGIN_CONV_MENU;
 	}
 	else if (type == GAIM_CONV_UPDATE_ICON)
 	{
-		flags = GAIM_GTKCONV_BUDDY_ICON;
+		flags = PIDGIN_CONV_BUDDY_ICON;
 	}
 	else if (type == GAIM_CONV_UPDATE_FEATURES)
 	{
-		flags = GAIM_GTKCONV_MENU;
-	}
-
-	gaim_gtkconv_update_fields(conv, flags);
+		flags = PIDGIN_CONV_MENU;
+	}
+
+	pidgin_conv_update_fields(conv, flags);
 }
 
 static GaimConversationUiOps conversation_ui_ops =
 {
-	gaim_gtkconv_new,
-	gaim_gtkconv_destroy,              /* destroy_conversation */
+	pidgin_conv_new,
+	pidgin_conv_destroy,              /* destroy_conversation */
 	NULL,                              /* write_chat           */
-	gaim_gtkconv_write_im,             /* write_im             */
-	gaim_gtkconv_write_conv,           /* write_conv           */
-	gaim_gtkconv_chat_add_users,       /* chat_add_users       */
-	gaim_gtkconv_chat_rename_user,     /* chat_rename_user     */
-	gaim_gtkconv_chat_remove_users,    /* chat_remove_users    */
-	gaim_gtkconv_chat_update_user,     /* chat_update_user     */
-	gaim_gtkconv_present_conversation, /* present              */
-	gaim_gtkconv_has_focus,            /* has_focus            */
-	gaim_gtkconv_custom_smiley_add,    /* custom_smiley_add    */
-	gaim_gtkconv_custom_smiley_write,  /* custom_smiley_write  */
-	gaim_gtkconv_custom_smiley_close,  /* custom_smiley_close  */
-	gaim_gtkconv_send_confirm,         /* send_confirm         */
+	pidgin_conv_write_im,             /* write_im             */
+	pidgin_conv_write_conv,           /* write_conv           */
+	pidgin_conv_chat_add_users,       /* chat_add_users       */
+	pidgin_conv_chat_rename_user,     /* chat_rename_user     */
+	pidgin_conv_chat_remove_users,    /* chat_remove_users    */
+	pidgin_conv_chat_update_user,     /* chat_update_user     */
+	pidgin_conv_present_conversation, /* present              */
+	pidgin_conv_has_focus,            /* has_focus            */
+	pidgin_conv_custom_smiley_add,    /* custom_smiley_add    */
+	pidgin_conv_custom_smiley_write,  /* custom_smiley_write  */
+	pidgin_conv_custom_smiley_close,  /* custom_smiley_close  */
+	pidgin_conv_send_confirm,         /* send_confirm         */
 };
 
 GaimConversationUiOps *
-gaim_gtk_conversations_get_conv_ui_ops(void)
+pidgin_conversations_get_conv_ui_ops(void)
 {
 	return &conversation_ui_ops;
 }
@@ -6010,10 +6009,10 @@
  * Public conversation utility functions
  **************************************************************************/
 void
-gaim_gtkconv_update_buddy_icon(GaimConversation *conv)
-{
-	GaimGtkConversation *gtkconv;
-	GaimGtkWindow *win;
+pidgin_conv_update_buddy_icon(GaimConversation *conv)
+{
+	PidginConversation *gtkconv;
+	PidginWindow *win;
 
 	GdkPixbufLoader *loader;
 	GdkPixbufAnimation *anim;
@@ -6039,7 +6038,7 @@
 	g_return_if_fail(GAIM_IS_GTK_CONVERSATION(conv));
 	g_return_if_fail(gaim_conversation_get_type(conv) == GAIM_CONV_TYPE_IM);
 
-	gtkconv = GAIM_GTK_CONVERSATION(conv);
+	gtkconv = PIDGIN_CONVERSATION(conv);
 	win = gtkconv->win;
 	if (conv != gtkconv->active_conv)
 		return;
@@ -6135,7 +6134,7 @@
 			start_anim(NULL, gtkconv);
 	}
 
-	gaim_gtk_buddy_icon_get_scale_size(buf, &prpl_info->icon_spec,
+	pidgin_buddy_icon_get_scale_size(buf, &prpl_info->icon_spec,
 			GAIM_ICON_SCALE_DISPLAY, &scale_width, &scale_height);
 	scale = gdk_pixbuf_scale_simple(buf,
 				MAX(gdk_pixbuf_get_width(buf) * scale_width /
@@ -6175,7 +6174,7 @@
 	gtk_widget_show(frame);
 
 	/* The buddy icon code needs badly to be fixed. */
-	if(gaim_gtk_conv_window_is_active_conversation(conv))
+	if(pidgin_conv_window_is_active_conversation(conv))
 	{
 		buf = gdk_pixbuf_animation_get_static_image(gtkconv->u.im->anim);
 		gtk_window_set_icon(GTK_WINDOW(win->window), buf);
@@ -6183,21 +6182,21 @@
 }
 
 void
-gaim_gtkconv_update_buttons_by_protocol(GaimConversation *conv)
-{
-	GaimGtkWindow *win;
+pidgin_conv_update_buttons_by_protocol(GaimConversation *conv)
+{
+	PidginWindow *win;
 
 	if (!GAIM_IS_GTK_CONVERSATION(conv))
 		return;
 
-	win = GAIM_GTK_CONVERSATION(conv)->win;
-
-	if (win != NULL && gaim_gtk_conv_window_is_active_conversation(conv))
-		gray_stuff_out(GAIM_GTK_CONVERSATION(conv));
+	win = PIDGIN_CONVERSATION(conv)->win;
+
+	if (win != NULL && pidgin_conv_window_is_active_conversation(conv))
+		gray_stuff_out(PIDGIN_CONVERSATION(conv));
 }
 
 int
-gaim_gtkconv_get_tab_at_xy(GaimGtkWindow *win, int x, int y, gboolean *to_right)
+pidgin_conv_get_tab_at_xy(PidginWindow *win, int x, int y, gboolean *to_right)
 {
 	gint nb_x, nb_y, x_rel, y_rel;
 	GtkNotebook *notebook;
@@ -6271,7 +6270,7 @@
 {
 	GList *l;
 	GaimConversation *conv;
-	GaimGtkConversation *gtkconv;
+	PidginConversation *gtkconv;
 
 	for (l = gaim_get_conversations(); l != NULL; l = l->next) {
 		conv = (GaimConversation *)l->data;
@@ -6279,7 +6278,7 @@
 		if (!GAIM_IS_GTK_CONVERSATION(conv))
 			continue;
 
-		gtkconv = GAIM_GTK_CONVERSATION(conv);
+		gtkconv = PIDGIN_CONVERSATION(conv);
 
 		if (value)
 			gtk_widget_show(gtkconv->close);
@@ -6295,7 +6294,7 @@
 #ifdef USE_GTKSPELL
 	GList *cl;
 	GaimConversation *conv;
-	GaimGtkConversation *gtkconv;
+	PidginConversation *gtkconv;
 	GtkSpell *spell;
 
 	for (cl = gaim_get_conversations(); cl != NULL; cl = cl->next) {
@@ -6305,10 +6304,10 @@
 		if (!GAIM_IS_GTK_CONVERSATION(conv))
 			continue;
 
-		gtkconv = GAIM_GTK_CONVERSATION(conv);
+		gtkconv = PIDGIN_CONVERSATION(conv);
 
 		if (value)
-			gaim_gtk_setup_gtkspell(GTK_TEXT_VIEW(gtkconv->entry));
+			pidgin_setup_gtkspell(GTK_TEXT_VIEW(gtkconv->entry));
 		else {
 			spell = gtkspell_get_from_text_view(GTK_TEXT_VIEW(gtkconv->entry));
 			gtkspell_detach(spell);
@@ -6323,11 +6322,11 @@
 {
 	GList *l;
 	GtkPositionType pos;
-	GaimGtkWindow *win;
+	PidginWindow *win;
 
 	pos = GPOINTER_TO_INT(value);
 
-	for (l = gaim_gtk_conv_windows_get_list(); l != NULL; l = l->next) {
+	for (l = pidgin_conv_windows_get_list(); l != NULL; l = l->next) {
 		win = l->data;
 
 		gtk_notebook_set_tab_pos(GTK_NOTEBOOK(win->notebook), pos&~8);
@@ -6340,8 +6339,8 @@
 {
 	GList *l;
 	GaimConversation *conv;
-	GaimGtkConversation *gtkconv;
-	GaimGtkWindow *win;
+	PidginConversation *gtkconv;
+	PidginWindow *win;
 
 	for (l = gaim_get_conversations(); l != NULL; l = l->next)
 	{
@@ -6350,7 +6349,7 @@
 		if (!GAIM_IS_GTK_CONVERSATION(conv))
 			continue;
 
-		gtkconv = GAIM_GTK_CONVERSATION(conv);
+		gtkconv = PIDGIN_CONVERSATION(conv);
 		win     = gtkconv->win;
 
 		gtk_check_menu_item_set_active(
@@ -6368,8 +6367,8 @@
 {
 	GList *l;
 	GaimConversation *conv;
-	GaimGtkConversation *gtkconv;
-	GaimGtkWindow *win;
+	PidginConversation *gtkconv;
+	PidginWindow *win;
 
 	for (l = gaim_get_conversations(); l != NULL; l = l->next)
 	{
@@ -6378,7 +6377,7 @@
 		if (!GAIM_IS_GTK_CONVERSATION(conv))
 			continue;
 
-		gtkconv = GAIM_GTK_CONVERSATION(conv);
+		gtkconv = PIDGIN_CONVERSATION(conv);
 		win     = gtkconv->win;
 
 		gtk_check_menu_item_set_active(
@@ -6398,8 +6397,8 @@
 {
 	GList *l;
 	GaimConversation *conv;
-	GaimGtkConversation *gtkconv;
-	GaimGtkWindow *win;
+	PidginConversation *gtkconv;
+	PidginWindow *win;
 
 	if (!gaim_prefs_get_bool("/gaim/gtk/conversations/im/show_buddy_icons"))
 		return;
@@ -6407,15 +6406,15 @@
 	/* Set the "animate" flag for each icon based on the new preference */
 	for (l = gaim_get_ims(); l != NULL; l = l->next) {
 		conv = (GaimConversation *)l->data;
-		gtkconv = GAIM_GTK_CONVERSATION(conv);
+		gtkconv = PIDGIN_CONVERSATION(conv);
 		gtkconv->u.im->animate = GPOINTER_TO_INT(value);
 	}
 
 	/* Now either stop or start animation for the active conversation in each window */
-	for (l = gaim_gtk_conv_windows_get_list(); l != NULL; l = l->next) {
+	for (l = pidgin_conv_windows_get_list(); l != NULL; l = l->next) {
 		win = l->data;
-		conv = gaim_gtk_conv_window_get_active_conversation(win);
-		gaim_gtkconv_update_buddy_icon(conv);
+		conv = pidgin_conv_window_get_active_conversation(win);
+		pidgin_conv_update_buddy_icon(conv);
 	}
 }
 
@@ -6429,7 +6428,7 @@
 		GaimConversation *conv = l->data;
 
 		if (gaim_conversation_get_type(conv) == GAIM_CONV_TYPE_IM)
-			gaim_gtkconv_update_buddy_icon(conv);
+			pidgin_conv_update_buddy_icon(conv);
 	}
 }
 
@@ -6446,7 +6445,7 @@
 {
 	GList *l;
 	GaimConversation *conv = NULL;
-	GaimGtkConversation *gtkconv;
+	PidginConversation *gtkconv;
 
 	if(strcmp(gaim_prefs_get_string("/gaim/gtk/conversations/im/hide_new"), "away")!=0)
 		return;
@@ -6467,8 +6466,8 @@
 		if (!l)
 			break;
 
-		gaim_gtk_conv_window_remove_gtkconv(hidden_convwin, gtkconv);
-		gaim_gtkconv_placement_place(gtkconv);
+		pidgin_conv_window_remove_gtkconv(hidden_convwin, gtkconv);
+		pidgin_conv_placement_place(gtkconv);
 
 		/* TODO: do we need to do anything for any other conversations that are in the same gtkconv here?
 		 * I'm a little concerned that not doing so will cause the "pending" indicator in the gtkblist not to be cleared. -DAA*/
@@ -6482,7 +6481,7 @@
 {
 	GList *l;
 	GaimConversation *conv = NULL;
-	GaimGtkConversation *gtkconv;
+	PidginConversation *gtkconv;
 	gboolean when_away = FALSE;
 
 	if(!hidden_convwin)
@@ -6505,8 +6504,8 @@
 							gaim_conversation_get_account(conv))))
 			continue;
 
-		gaim_gtk_conv_window_remove_gtkconv(hidden_convwin, gtkconv);
-		gaim_gtkconv_placement_place(gtkconv);
+		pidgin_conv_window_remove_gtkconv(hidden_convwin, gtkconv);
+		pidgin_conv_placement_place(gtkconv);
 	}
 }
 
@@ -6520,15 +6519,15 @@
 	if (strcmp(name, "/gaim/gtk/conversations/placement"))
 		return;
 
-	func = gaim_gtkconv_placement_get_fnc(value);
+	func = pidgin_conv_placement_get_fnc(value);
 
 	if (func == NULL)
 		return;
 
-	gaim_gtkconv_placement_set_current_func(func);
-}
-
-static GaimGtkConversation *
+	pidgin_conv_placement_set_current_func(func);
+}
+
+static PidginConversation *
 get_gtkconv_with_contact(GaimContact *contact)
 {
 	GaimBlistNode *node;
@@ -6541,7 +6540,7 @@
 		GaimConversation *conv;
 		conv = gaim_find_conversation_with_account(GAIM_CONV_TYPE_IM, buddy->name, buddy->account);
 		if (conv)
-			return GAIM_GTK_CONVERSATION(conv);
+			return PIDGIN_CONVERSATION(conv);
 	}
 	return NULL;
 }
@@ -6560,8 +6559,8 @@
 		 * one of the contacts containing the buddy corresponding to
 		 * a conversation.  It's easier to just update them all. */
 		/* if (gaim_conversation_get_account(conv) == account) */
-			gaim_gtkconv_update_fields(conv, GAIM_GTKCONV_TAB_ICON |
-							GAIM_GTKCONV_MENU | GAIM_GTKCONV_COLORIZE_TITLE);
+			pidgin_conv_update_fields(conv, PIDGIN_CONV_TAB_ICON |
+							PIDGIN_CONV_MENU | PIDGIN_CONV_COLORIZE_TITLE);
 	}
 }
 
@@ -6573,7 +6572,7 @@
 
 	conv = gaim_find_conversation_with_account(GAIM_CONV_TYPE_IM, buddy->name, buddy->account);
 	if (conv)
-		gaim_gtkconv_update_fields(conv, GAIM_GTKCONV_TAB_ICON);
+		pidgin_conv_update_fields(conv, PIDGIN_CONV_TAB_ICON);
 
 	return FALSE;
 }
@@ -6581,16 +6580,16 @@
 static void
 update_buddy_status_changed(GaimBuddy *buddy, GaimStatus *old, GaimStatus *newstatus)
 {
-	GaimGtkConversation *gtkconv;
+	PidginConversation *gtkconv;
 	GaimConversation *conv;
 
 	gtkconv = get_gtkconv_with_contact(gaim_buddy_get_contact(buddy));
 	if (gtkconv)
 	{
 		conv = gtkconv->active_conv;
-		gaim_gtkconv_update_fields(conv, GAIM_GTKCONV_TAB_ICON | GAIM_GTKCONV_COLORIZE_TITLE);
+		pidgin_conv_update_fields(conv, PIDGIN_CONV_TAB_ICON | PIDGIN_CONV_COLORIZE_TITLE);
 		if ((gaim_status_is_online(old) ^ gaim_status_is_online(newstatus)) != 0)
-			gaim_gtkconv_update_fields(conv, GAIM_GTKCONV_MENU);
+			pidgin_conv_update_fields(conv, PIDGIN_CONV_MENU);
 	}
 
 	/* In case a conversation is started after the buddy has signed-on/off */
@@ -6600,13 +6599,13 @@
 static void
 update_buddy_privacy_changed(GaimBuddy *buddy)
 {
-	GaimGtkConversation *gtkconv;
+	PidginConversation *gtkconv;
 	GaimConversation *conv;
 
 	gtkconv = get_gtkconv_with_contact(gaim_buddy_get_contact(buddy));
 	if (gtkconv) {
 		conv = gtkconv->active_conv;
-		gaim_gtkconv_update_fields(conv, GAIM_GTKCONV_TAB_ICON | GAIM_GTKCONV_MENU);
+		pidgin_conv_update_fields(conv, PIDGIN_CONV_TAB_ICON | PIDGIN_CONV_MENU);
 	}
 }
 
@@ -6617,7 +6616,7 @@
 
 	conv = gaim_find_conversation_with_account(GAIM_CONV_TYPE_IM, buddy->name, buddy->account);
 	if (conv)
-		gaim_gtkconv_update_fields(conv, GAIM_GTKCONV_TAB_ICON);
+		pidgin_conv_update_fields(conv, PIDGIN_CONV_TAB_ICON);
 }
 
 static void
@@ -6627,7 +6626,7 @@
 
 	conv = gaim_find_conversation_with_account(GAIM_CONV_TYPE_IM, buddy->name, buddy->account);
 	if (conv)
-		gaim_gtkconv_update_fields(conv, GAIM_GTKCONV_BUDDY_ICON);
+		pidgin_conv_update_fields(conv, PIDGIN_CONV_BUDDY_ICON);
 }
 
 static void
@@ -6651,40 +6650,40 @@
 static void
 update_conversation_switched(GaimConversation *conv)
 {
-	gaim_gtkconv_update_fields(conv, GAIM_GTKCONV_TAB_ICON | GAIM_GTKCONV_SET_TITLE |
-					GAIM_GTKCONV_MENU | GAIM_GTKCONV_BUDDY_ICON);
+	pidgin_conv_update_fields(conv, PIDGIN_CONV_TAB_ICON | PIDGIN_CONV_SET_TITLE |
+					PIDGIN_CONV_MENU | PIDGIN_CONV_BUDDY_ICON);
 }
 
 static void
 update_buddy_typing(GaimAccount *account, const char *who)
 {
 	GaimConversation *conv;
-	GaimGtkConversation *gtkconv;
+	PidginConversation *gtkconv;
 
 	conv = gaim_find_conversation_with_account(GAIM_CONV_TYPE_IM, who, account);
 	if (!conv)
 		return;
 
-	gtkconv = GAIM_GTK_CONVERSATION(conv);
+	gtkconv = PIDGIN_CONVERSATION(conv);
 	if (gtkconv && gtkconv->active_conv == conv)
-		gaim_gtkconv_update_fields(conv, GAIM_GTKCONV_COLORIZE_TITLE);
+		pidgin_conv_update_fields(conv, PIDGIN_CONV_COLORIZE_TITLE);
 }
 
 static void
 update_chat(GaimConversation *conv)
 {
-	gaim_gtkconv_update_fields(conv, GAIM_GTKCONV_TOPIC |
-					GAIM_GTKCONV_MENU | GAIM_GTKCONV_SET_TITLE);
+	pidgin_conv_update_fields(conv, PIDGIN_CONV_TOPIC |
+					PIDGIN_CONV_MENU | PIDGIN_CONV_SET_TITLE);
 }
 
 static void
 update_chat_topic(GaimConversation *conv, const char *old, const char *new)
 {
-	gaim_gtkconv_update_fields(conv, GAIM_GTKCONV_TOPIC);
+	pidgin_conv_update_fields(conv, PIDGIN_CONV_TOPIC);
 }
 
 void *
-gaim_gtk_conversations_get_handle(void)
+pidgin_conversations_get_handle(void)
 {
 	static int handle;
 
@@ -6692,9 +6691,9 @@
 }
 
 void
-gaim_gtk_conversations_init(void)
-{
-	void *handle = gaim_gtk_conversations_get_handle();
+pidgin_conversations_init(void)
+{
+	void *handle = pidgin_conversations_get_handle();
 	void *blist_handle = gaim_blist_get_handle();
 
 	/* Conversations */
@@ -6773,9 +6772,9 @@
 	gaim_signal_register(handle, "conversation-dragging",
 	                     gaim_marshal_VOID__POINTER_POINTER, NULL, 2,
 	                     gaim_value_new(GAIM_TYPE_BOXED,
-	                                    "GaimGtkWindow *"),
+	                                    "PidginWindow *"),
 	                     gaim_value_new(GAIM_TYPE_BOXED,
-	                                    "GaimGtkWindow *"));
+	                                    "PidginWindow *"));
 
 	gaim_signal_register(handle, "conversation-timestamp",
 #if SIZEOF_TIME_T == 4
@@ -6880,7 +6879,7 @@
 
 	gaim_conversations_set_ui_ops(&conversation_ui_ops);
 
-	hidden_convwin = gaim_gtk_conv_window_new();
+	hidden_convwin = pidgin_conv_window_new();
 	window_list = g_list_remove(window_list, hidden_convwin);
 
 	gaim_signal_connect(gaim_accounts_get_handle(), "account-status-changed",
@@ -6907,7 +6906,7 @@
 						handle, GAIM_CALLBACK(update_buddy_typing), NULL);
 	gaim_signal_connect(gaim_conversations_get_handle(), "buddy-typing-stopped",
 						handle, GAIM_CALLBACK(update_buddy_typing), NULL);
-	gaim_signal_connect(gaim_gtk_conversations_get_handle(), "conversation-switched",
+	gaim_signal_connect(pidgin_conversations_get_handle(), "conversation-switched",
 						handle, GAIM_CALLBACK(update_conversation_switched), NULL);
 	gaim_signal_connect(gaim_conversations_get_handle(), "chat-left", handle,
 						GAIM_CALLBACK(update_chat), NULL);
@@ -6916,17 +6915,17 @@
 	gaim_signal_connect(gaim_conversations_get_handle(), "chat-topic-changed", handle,
 						GAIM_CALLBACK(update_chat_topic), NULL);
 	gaim_signal_connect_priority(gaim_conversations_get_handle(), "conversation-updated", handle,
-						GAIM_CALLBACK(gaim_gtkconv_updated), NULL,
+						GAIM_CALLBACK(pidgin_conv_updated), NULL,
 						GAIM_SIGNAL_PRIORITY_LOWEST);
 }
 
 void
-gaim_gtk_conversations_uninit(void)
-{
-	gaim_prefs_disconnect_by_handle(gaim_gtk_conversations_get_handle());
-	gaim_signals_disconnect_by_handle(gaim_gtk_conversations_get_handle());
-	gaim_signals_unregister_by_instance(gaim_gtk_conversations_get_handle());
-	gaim_gtk_conv_window_destroy(hidden_convwin);
+pidgin_conversations_uninit(void)
+{
+	gaim_prefs_disconnect_by_handle(pidgin_conversations_get_handle());
+	gaim_signals_disconnect_by_handle(pidgin_conversations_get_handle());
+	gaim_signals_unregister_by_instance(pidgin_conversations_get_handle());
+	pidgin_conv_window_destroy(hidden_convwin);
 	hidden_convwin=NULL;
 }
 
@@ -7003,17 +7002,17 @@
 #include "gtkimhtmltoolbar.h"
 
 static void
-do_close(GtkWidget *w, int resp, GaimGtkWindow *win)
+do_close(GtkWidget *w, int resp, PidginWindow *win)
 {
 	gtk_widget_destroy(warn_close_dialog);
 	warn_close_dialog = NULL;
 
 	if (resp == GTK_RESPONSE_OK)
-		gaim_gtk_conv_window_destroy(win);
-}
-
-static void
-build_warn_close_dialog(GaimGtkWindow *gtkwin)
+		pidgin_conv_window_destroy(win);
+}
+
+static void
+build_warn_close_dialog(PidginWindow *gtkwin)
 {
 	GtkWidget *label;
 	GtkWidget *vbox, *hbox;
@@ -7074,14 +7073,14 @@
 static gboolean
 close_win_cb(GtkWidget *w, GdkEventAny *e, gpointer d)
 {
-	GaimGtkWindow *win = d;
+	PidginWindow *win = d;
 	GList *l;
 
 	/* If there are unread messages then show a warning dialog */
-	for (l = gaim_gtk_conv_window_get_gtkconvs(win);
+	for (l = pidgin_conv_window_get_gtkconvs(win);
 	     l != NULL; l = l->next)
 	{
-		GaimGtkConversation *gtkconv = l->data;
+		PidginConversation *gtkconv = l->data;
 		if (gaim_conversation_get_type(gtkconv->active_conv) == GAIM_CONV_TYPE_IM &&
 				gtkconv->unseen_state >= GAIM_UNSEEN_TEXT)
 		{
@@ -7092,13 +7091,13 @@
 		}
 	}
 
-	gaim_gtk_conv_window_destroy(win);
+	pidgin_conv_window_destroy(win);
 
 	return TRUE;
 }
 
 static void
-gtkconv_set_unseen(GaimGtkConversation *gtkconv, GaimUnseenState state)
+gtkconv_set_unseen(PidginConversation *gtkconv, GaimUnseenState state)
 {
 	if (state == GAIM_UNSEEN_NONE)
 	{
@@ -7125,8 +7124,8 @@
 static gint
 focus_win_cb(GtkWidget *w, GdkEventFocus *e, gpointer d)
 {
-	GaimGtkWindow *win = d;
-	GaimGtkConversation *gtkconv = gaim_gtk_conv_window_get_active_gtkconv(win);
+	PidginWindow *win = d;
+	PidginConversation *gtkconv = pidgin_conv_window_get_active_gtkconv(win);
 
 	gtkconv_set_unseen(gtkconv, GAIM_UNSEEN_NONE);
 
@@ -7144,7 +7143,7 @@
 #endif
 
 static void
-notebook_init_grab(GaimGtkWindow *gtkwin, GtkWidget *widget)
+notebook_init_grab(PidginWindow *gtkwin, GtkWidget *widget)
 {
 	static GdkCursor *cursor = NULL;
 
@@ -7172,7 +7171,7 @@
 }
 
 static gboolean
-notebook_motion_cb(GtkWidget *widget, GdkEventButton *e, GaimGtkWindow *win)
+notebook_motion_cb(GtkWidget *widget, GdkEventButton *e, PidginWindow *win)
 {
 
 	/*
@@ -7190,17 +7189,17 @@
 		    }
 	}
 	else { /* Otherwise, draw the arrows. */
-		GaimGtkWindow *dest_win;
+		PidginWindow *dest_win;
 		GtkNotebook *dest_notebook;
 		GtkWidget *tab;
 		gint nb_x, nb_y, page_num;
 		gint arrow1_x, arrow1_y, arrow2_x, arrow2_y;
 		gboolean horiz_tabs = FALSE;
-		GaimGtkConversation *gtkconv;
+		PidginConversation *gtkconv;
 		gboolean to_right = FALSE;
 
 		/* Get the window that the cursor is over. */
-		dest_win = gaim_gtk_conv_window_get_at_xy(e->x_root, e->y_root);
+		dest_win = pidgin_conv_window_get_at_xy(e->x_root, e->y_root);
 
 		if (dest_win == NULL) {
 			dnd_hints_hide_all();
@@ -7215,7 +7214,7 @@
 		arrow1_x = arrow2_x = nb_x;
 		arrow1_y = arrow2_y = nb_y;
 
-		page_num = gaim_gtkconv_get_tab_at_xy(dest_win,
+		page_num = pidgin_conv_get_tab_at_xy(dest_win,
 		                                      e->x_root, e->y_root, &to_right);
 		to_right = to_right && (win != dest_win);
 
@@ -7225,7 +7224,7 @@
 			    horiz_tabs = TRUE;
 		    }
 
-		gtkconv = gaim_gtk_conv_window_get_gtkconv_at_index(dest_win, page_num);
+		gtkconv = pidgin_conv_window_get_gtkconv_at_index(dest_win, page_num);
 		tab = gtkconv->tabby;
 
 		if (horiz_tabs) {
@@ -7262,7 +7261,7 @@
 }
 
 static gboolean
-notebook_leave_cb(GtkWidget *widget, GdkEventCrossing *e, GaimGtkWindow *win)
+notebook_leave_cb(GtkWidget *widget, GdkEventCrossing *e, PidginWindow *win)
 {
 	if (win->in_drag)
 		return FALSE;
@@ -7283,7 +7282,7 @@
  * THANK YOU GALEON!
  */
 static gboolean
-notebook_press_cb(GtkWidget *widget, GdkEventButton *e, GaimGtkWindow *win)
+notebook_press_cb(GtkWidget *widget, GdkEventButton *e, PidginWindow *win)
 {
 	gint nb_x, nb_y, x_rel, y_rel;
 	int tab_clicked;
@@ -7291,13 +7290,13 @@
 	GtkWidget *tab;
 
 	if (e->button == 2) {
-		GaimGtkConversation *gtkconv;
-		tab_clicked = gaim_gtkconv_get_tab_at_xy(win, e->x_root, e->y_root, NULL);
+		PidginConversation *gtkconv;
+		tab_clicked = pidgin_conv_get_tab_at_xy(win, e->x_root, e->y_root, NULL);
 
 		if (tab_clicked == -1)
 			return FALSE;
 
-		gtkconv = gaim_gtk_conv_window_get_gtkconv_at_index(win, tab_clicked);
+		gtkconv = pidgin_conv_window_get_gtkconv_at_index(win, tab_clicked);
 		close_conv_cb(NULL, gtkconv);
 		return TRUE;
 	}
@@ -7317,7 +7316,7 @@
 	* Make sure a tab was actually clicked. The arrow buttons
 	* mess things up.
 	*/
-	tab_clicked = gaim_gtkconv_get_tab_at_xy(win, e->x_root, e->y_root, NULL);
+	tab_clicked = pidgin_conv_get_tab_at_xy(win, e->x_root, e->y_root, NULL);
 
 	if (tab_clicked == -1)
 		return FALSE;
@@ -7371,11 +7370,11 @@
 }
 
 static gboolean
-notebook_release_cb(GtkWidget *widget, GdkEventButton *e, GaimGtkWindow *win)
-{
-	GaimGtkWindow *dest_win;
+notebook_release_cb(GtkWidget *widget, GdkEventButton *e, PidginWindow *win)
+{
+	PidginWindow *dest_win;
 	GaimConversation *conv;
-	GaimGtkConversation *gtkconv;
+	PidginConversation *gtkconv;
 	gint dest_page_num = 0;
 	gboolean new_window = FALSE;
 	gboolean to_right = FALSE;
@@ -7428,16 +7427,16 @@
 
 	dnd_hints_hide_all();
 
-	dest_win = gaim_gtk_conv_window_get_at_xy(e->x_root, e->y_root);
-
-	conv = gaim_gtk_conv_window_get_active_conversation(win);
+	dest_win = pidgin_conv_window_get_at_xy(e->x_root, e->y_root);
+
+	conv = pidgin_conv_window_get_active_conversation(win);
 
 	if (dest_win == NULL) {
 		/* If the current window doesn't have any other conversations,
 		* there isn't much point transferring the conv to a new window. */
-		if (gaim_gtk_conv_window_get_gtkconv_count(win) > 1) {
+		if (pidgin_conv_window_get_gtkconv_count(win) > 1) {
 			/* Make a new window to stick this to. */
-			dest_win = gaim_gtk_conv_window_new();
+			dest_win = pidgin_conv_window_new();
 			new_window = TRUE;
 		}
 	}
@@ -7445,23 +7444,23 @@
 	if (dest_win == NULL)
 		return FALSE;
 
-	gaim_signal_emit(gaim_gtk_conversations_get_handle(),
+	gaim_signal_emit(pidgin_conversations_get_handle(),
 	                 "conversation-dragging", win, dest_win);
 
 	/* Get the destination page number. */
 	if (!new_window)
-		dest_page_num = gaim_gtkconv_get_tab_at_xy(dest_win,
+		dest_page_num = pidgin_conv_get_tab_at_xy(dest_win,
 		                                           e->x_root, e->y_root, &to_right);
 
-	gtkconv = gaim_gtk_conv_window_get_gtkconv_at_index(win, win->drag_tab);
+	gtkconv = pidgin_conv_window_get_gtkconv_at_index(win, win->drag_tab);
 
 	if (win == dest_win) {
 		gtk_notebook_reorder_child(GTK_NOTEBOOK(win->notebook), gtkconv->tab_cont, dest_page_num);
 	} else {
-		gaim_gtk_conv_window_remove_gtkconv(win, gtkconv);
-		gaim_gtk_conv_window_add_gtkconv(dest_win, gtkconv);
+		pidgin_conv_window_remove_gtkconv(win, gtkconv);
+		pidgin_conv_window_add_gtkconv(dest_win, gtkconv);
 		gtk_notebook_reorder_child(GTK_NOTEBOOK(dest_win->notebook), gtkconv->tab_cont, dest_page_num + to_right);
-		gaim_gtk_conv_window_switch_gtkconv(dest_win, gtkconv);
+		pidgin_conv_window_switch_gtkconv(dest_win, gtkconv);
 		if (new_window) {
 			gint win_width, win_height;
 
@@ -7472,11 +7471,11 @@
 			                e->x_root - (win_width  / 2),
 			                e->y_root - (win_height / 2));
 
-			gaim_gtk_conv_window_show(dest_win);
+			pidgin_conv_window_show(dest_win);
 		}
 	}
 
-	gtk_widget_grab_focus(GAIM_GTK_CONVERSATION(conv)->entry);
+	gtk_widget_grab_focus(PIDGIN_CONVERSATION(conv)->entry);
 
 	return TRUE;
 }
@@ -7486,24 +7485,24 @@
 before_switch_conv_cb(GtkNotebook *notebook, GtkWidget *page, gint page_num,
                       gpointer user_data)
 {
-	GaimGtkWindow *win;
+	PidginWindow *win;
 	GaimConversation *conv;
-	GaimGtkConversation *gtkconv;
+	PidginConversation *gtkconv;
 
 	win = user_data;
-	conv = gaim_gtk_conv_window_get_active_conversation(win);
+	conv = pidgin_conv_window_get_active_conversation(win);
 
 	g_return_if_fail(conv != NULL);
 
 	if (gaim_conversation_get_type(conv) != GAIM_CONV_TYPE_IM)
 		return;
 
-	gtkconv = GAIM_GTK_CONVERSATION(conv);
+	gtkconv = PIDGIN_CONVERSATION(conv);
 
 	stop_anim(NULL, gtkconv);
 }
 static void
-close_window(GtkWidget *w, GaimGtkWindow *win)
+close_window(GtkWidget *w, PidginWindow *win)
 {
 	close_win_cb(w, NULL, win);
 }
@@ -7511,43 +7510,43 @@
 static void
 detach_tab_cb(GtkWidget *w, GObject *menu)
 {
-	GaimGtkWindow *win, *new_window;
-	GaimGtkConversation *gtkconv;
+	PidginWindow *win, *new_window;
+	PidginConversation *gtkconv;
 
 	gtkconv = g_object_get_data(menu, "clicked_tab");
 
 	if (!gtkconv)
 		return;
 
-	win = gaim_gtkconv_get_window(gtkconv);
+	win = pidgin_conv_get_window(gtkconv);
 	/* Nothing to do if there's only one tab in the window */
-	if (gaim_gtk_conv_window_get_gtkconv_count(win) == 1)
+	if (pidgin_conv_window_get_gtkconv_count(win) == 1)
 		return;
 
-	gaim_gtk_conv_window_remove_gtkconv(win, gtkconv);
-
-	new_window = gaim_gtk_conv_window_new();
-	gaim_gtk_conv_window_add_gtkconv(new_window, gtkconv);
-	gaim_gtk_conv_window_show(new_window);
+	pidgin_conv_window_remove_gtkconv(win, gtkconv);
+
+	new_window = pidgin_conv_window_new();
+	pidgin_conv_window_add_gtkconv(new_window, gtkconv);
+	pidgin_conv_window_show(new_window);
 }
 
 static void
 close_others_cb(GtkWidget *w, GObject *menu)
 {
 	GList *iter;
-	GaimGtkConversation *gtkconv;
-	GaimGtkWindow *win;
+	PidginConversation *gtkconv;
+	PidginWindow *win;
 
 	gtkconv = g_object_get_data(menu, "clicked_tab");
 
 	if (!gtkconv)
 		return;
 
-	win = gaim_gtkconv_get_window(gtkconv);
-
-	for (iter = gaim_gtk_conv_window_get_gtkconvs(win); iter; )
+	win = pidgin_conv_get_window(gtkconv);
+
+	for (iter = pidgin_conv_window_get_gtkconvs(win); iter; )
 	{
-		GaimGtkConversation *gconv = iter->data;
+		PidginConversation *gconv = iter->data;
 		iter = iter->next;
 
 		if (gconv != gtkconv)
@@ -7559,7 +7558,7 @@
 
 static void close_tab_cb(GtkWidget *w, GObject *menu)
 {
-	GaimGtkConversation *gtkconv;
+	PidginConversation *gtkconv;
 
 	gtkconv = g_object_get_data(menu, "clicked_tab");
 
@@ -7568,16 +7567,16 @@
 }
 
 static gboolean
-right_click_menu_cb(GtkNotebook *notebook, GdkEventButton *event, GaimGtkWindow *win)
+right_click_menu_cb(GtkNotebook *notebook, GdkEventButton *event, PidginWindow *win)
 {
 	GtkWidget *item, *menu;
-	GaimGtkConversation *gtkconv;
+	PidginConversation *gtkconv;
 
 	if (event->type != GDK_BUTTON_PRESS || event->button != 3)
 		return FALSE;
 
-	gtkconv = gaim_gtk_conv_window_get_gtkconv_at_index(win,
-			gaim_gtkconv_get_tab_at_xy(win, event->x_root, event->y_root, NULL));
+	gtkconv = pidgin_conv_window_get_gtkconv_at_index(win,
+			pidgin_conv_get_tab_at_xy(win, event->x_root, event->y_root, NULL));
 
 	if (g_object_get_data(G_OBJECT(notebook->menu), "clicked_tab"))
 	{
@@ -7623,19 +7622,19 @@
 switch_conv_cb(GtkNotebook *notebook, GtkWidget *page, gint page_num,
                gpointer user_data)
 {
-	GaimGtkWindow *win;
+	PidginWindow *win;
 	GaimConversation *conv;
-	GaimGtkConversation *gtkconv;
+	PidginConversation *gtkconv;
 	const char *sound_method;
 
 	win = user_data;
-	gtkconv = gaim_gtk_conv_window_get_gtkconv_at_index(win, page_num);
+	gtkconv = pidgin_conv_window_get_gtkconv_at_index(win, page_num);
 	conv = gtkconv->active_conv;
 
 	g_return_if_fail(conv != NULL);
 
 	/* clear unseen flag if conversation is not hidden */
-	if(!gaim_gtkconv_is_hidden(gtkconv)) {
+	if(!pidgin_conv_is_hidden(gtkconv)) {
 		gtkconv_set_unseen(gtkconv, GAIM_UNSEEN_NONE);
 	}
 
@@ -7647,7 +7646,7 @@
 	generate_send_to_items(win);
 	regenerate_options_items(win);
 
-	gaim_gtkconv_switch_active_conversation(conv);
+	pidgin_conv_switch_active_conversation(conv);
 
 	sound_method = gaim_prefs_get_string("/gaim/gtk/sound/method");
 	if (strcmp(sound_method, "none") != 0)
@@ -7675,7 +7674,7 @@
 	    (gtkconv->u.im->animate))
 		start_anim(NULL, gtkconv);
 
-	gaim_signal_emit(gaim_gtk_conversations_get_handle(), "conversation-switched", conv);
+	gaim_signal_emit(pidgin_conversations_get_handle(), "conversation-switched", conv);
 }
 
 /**************************************************************************
@@ -7683,20 +7682,20 @@
  **************************************************************************/
 
 GList *
-gaim_gtk_conv_windows_get_list()
+pidgin_conv_windows_get_list()
 {
 	return window_list;
 }
 
-GaimGtkWindow *
-gaim_gtk_conv_window_new()
-{
-	GaimGtkWindow *win;
+PidginWindow *
+pidgin_conv_window_new()
+{
+	PidginWindow *win;
 	GtkPositionType pos;
 	GtkWidget *testidea;
 	GtkWidget *menubar;
 
-	win = g_malloc0(sizeof(GaimGtkWindow));
+	win = g_malloc0(sizeof(PidginWindow));
 
 	window_list = g_list_append(window_list, win);
 
@@ -7767,7 +7766,7 @@
 }
 
 void
-gaim_gtk_conv_window_destroy(GaimGtkWindow *win)
+pidgin_conv_window_destroy(PidginWindow *win)
 {
 	gaim_prefs_disconnect_by_handle(win);
 	window_list = g_list_remove(window_list, win);
@@ -7781,7 +7780,7 @@
 	if (win->gtkconvs) {
 		while (win->gtkconvs) {
 			GList *nextgtk = win->gtkconvs->next;
-			GaimGtkConversation *gtkconv = win->gtkconvs->data;
+			PidginConversation *gtkconv = win->gtkconvs->data;
 			GList *nextcore = gtkconv->convs->next;
 			GaimConversation *conv = gtkconv->convs->data;
 			gaim_conversation_destroy(conv);
@@ -7802,25 +7801,25 @@
 }
 
 void
-gaim_gtk_conv_window_show(GaimGtkWindow *win)
+pidgin_conv_window_show(PidginWindow *win)
 {
 	gtk_widget_show(win->window);
 }
 
 void
-gaim_gtk_conv_window_hide(GaimGtkWindow *win)
+pidgin_conv_window_hide(PidginWindow *win)
 {
 	gtk_widget_hide(win->window);
 }
 
 void
-gaim_gtk_conv_window_raise(GaimGtkWindow *win)
+pidgin_conv_window_raise(PidginWindow *win)
 {
 	gdk_window_raise(GDK_WINDOW(win->window->window));
 }
 
 void
-gaim_gtk_conv_window_switch_gtkconv(GaimGtkWindow *win, GaimGtkConversation *gtkconv)
+pidgin_conv_window_switch_gtkconv(PidginWindow *win, PidginConversation *gtkconv)
 {
 	gtk_notebook_set_current_page(GTK_NOTEBOOK(win->notebook),
 	                              gtk_notebook_page_num(GTK_NOTEBOOK(win->notebook),
@@ -7828,10 +7827,10 @@
 }
 
 void
-gaim_gtk_conv_window_add_gtkconv(GaimGtkWindow *win, GaimGtkConversation *gtkconv)
+pidgin_conv_window_add_gtkconv(PidginWindow *win, PidginConversation *gtkconv)
 {
 	GaimConversation *conv = gtkconv->active_conv;
-	GaimGtkConversation *focus_gtkconv;
+	PidginConversation *focus_gtkconv;
 	GtkWidget *tabby, *menu_tabby;
 	GtkWidget *tab_cont = gtkconv->tab_cont;
 	GtkWidget *close_image;
@@ -7948,7 +7947,7 @@
 	gtk_widget_show(menu_tabby);
 
 	if (gaim_conversation_get_type(conv) == GAIM_CONV_TYPE_IM)
-		gaim_gtkconv_update_buddy_icon(conv);
+		pidgin_conv_update_buddy_icon(conv);
 
 	/* Add this pane to the conversation's notebook. */
 	gtk_notebook_append_page_menu(GTK_NOTEBOOK(win->notebook), tab_cont, tabby, menu_tabby);
@@ -7957,7 +7956,7 @@
 
 	gtk_widget_show(tab_cont);
 
-	if (gaim_gtk_conv_window_get_gtkconv_count(win) == 1) {
+	if (pidgin_conv_window_get_gtkconv_count(win) == 1) {
 		/* Er, bug in notebooks? Switch to the page manually. */
 		gtk_notebook_set_current_page(GTK_NOTEBOOK(win->notebook), 0);
 
@@ -7966,16 +7965,16 @@
 	} else
 		gtk_notebook_set_show_tabs(GTK_NOTEBOOK(win->notebook), TRUE);
 
-	focus_gtkconv = g_list_nth_data(gaim_gtk_conv_window_get_gtkconvs(win),
+	focus_gtkconv = g_list_nth_data(pidgin_conv_window_get_gtkconvs(win),
 	                             gtk_notebook_get_current_page(GTK_NOTEBOOK(win->notebook)));
 	gtk_widget_grab_focus(focus_gtkconv->entry);
 
-	if (gaim_gtk_conv_window_get_gtkconv_count(win) == 1)
+	if (pidgin_conv_window_get_gtkconv_count(win) == 1)
 		update_send_to_selection(win);
 }
 
 void
-gaim_gtk_conv_window_remove_gtkconv(GaimGtkWindow *win, GaimGtkConversation *gtkconv)
+pidgin_conv_window_remove_gtkconv(PidginWindow *win, PidginConversation *gtkconv)
 {
 	unsigned int index;
 	GaimConversationType conv_type;
@@ -7989,7 +7988,7 @@
 	gtk_notebook_remove_page(GTK_NOTEBOOK(win->notebook), index);
 
 	/* go back to tabless if need be */
-	if (gaim_gtk_conv_window_get_gtkconv_count(win) <= 2) {
+	if (pidgin_conv_window_get_gtkconv_count(win) <= 2) {
 		gtk_notebook_set_show_tabs(GTK_NOTEBOOK(win->notebook),
 		                           gaim_prefs_get_bool("/gaim/gtk/conversations/tabs"));
 	}
@@ -7997,22 +7996,22 @@
 	win->gtkconvs = g_list_remove(win->gtkconvs, gtkconv);
 
 	if (!win->gtkconvs && win != hidden_convwin)
-		gaim_gtk_conv_window_destroy(win);
-}
-
-GaimGtkConversation *
-gaim_gtk_conv_window_get_gtkconv_at_index(const GaimGtkWindow *win, int index)
+		pidgin_conv_window_destroy(win);
+}
+
+PidginConversation *
+pidgin_conv_window_get_gtkconv_at_index(const PidginWindow *win, int index)
 {
 	GtkWidget *tab_cont;
 
 	if (index == -1)
 		index = 0;
 	tab_cont = gtk_notebook_get_nth_page(GTK_NOTEBOOK(win->notebook), index);
-	return tab_cont ? g_object_get_data(G_OBJECT(tab_cont), "GaimGtkConversation") : NULL;
-}
-
-GaimGtkConversation *
-gaim_gtk_conv_window_get_active_gtkconv(const GaimGtkWindow *win)
+	return tab_cont ? g_object_get_data(G_OBJECT(tab_cont), "PidginConversation") : NULL;
+}
+
+PidginConversation *
+pidgin_conv_window_get_active_gtkconv(const PidginWindow *win)
 {
 	int index;
 	GtkWidget *tab_cont;
@@ -8023,27 +8022,27 @@
 	tab_cont = gtk_notebook_get_nth_page(GTK_NOTEBOOK(win->notebook), index);
 	if (!tab_cont)
 		return NULL;
-	return g_object_get_data(G_OBJECT(tab_cont), "GaimGtkConversation");
+	return g_object_get_data(G_OBJECT(tab_cont), "PidginConversation");
 }
 
 
 GaimConversation *
-gaim_gtk_conv_window_get_active_conversation(const GaimGtkWindow *win)
-{
-	GaimGtkConversation *gtkconv;
-
-	gtkconv = gaim_gtk_conv_window_get_active_gtkconv(win);
+pidgin_conv_window_get_active_conversation(const PidginWindow *win)
+{
+	PidginConversation *gtkconv;
+
+	gtkconv = pidgin_conv_window_get_active_gtkconv(win);
 	return gtkconv ? gtkconv->active_conv : NULL;
 }
 
 gboolean
-gaim_gtk_conv_window_is_active_conversation(const GaimConversation *conv)
-{
-	return conv == gaim_gtk_conv_window_get_active_conversation(GAIM_GTK_CONVERSATION(conv)->win);
+pidgin_conv_window_is_active_conversation(const GaimConversation *conv)
+{
+	return conv == pidgin_conv_window_get_active_conversation(PIDGIN_CONVERSATION(conv)->win);
 }
 
 gboolean
-gaim_gtk_conv_window_has_focus(GaimGtkWindow *win)
+pidgin_conv_window_has_focus(PidginWindow *win)
 {
 	gboolean has_focus = FALSE;
 
@@ -8052,10 +8051,10 @@
 	return has_focus;
 }
 
-GaimGtkWindow *
-gaim_gtk_conv_window_get_at_xy(int x, int y)
-{
-	GaimGtkWindow *win;
+PidginWindow *
+pidgin_conv_window_get_at_xy(int x, int y)
+{
+	PidginWindow *win;
 	GdkWindow *gdkwin;
 	GList *l;
 
@@ -8064,7 +8063,7 @@
 	if (gdkwin)
 		gdkwin = gdk_window_get_toplevel(gdkwin);
 
-	for (l = gaim_gtk_conv_windows_get_list(); l != NULL; l = l->next) {
+	for (l = pidgin_conv_windows_get_list(); l != NULL; l = l->next) {
 		win = l->data;
 
 		if (gdkwin == win->window->window)
@@ -8075,28 +8074,28 @@
 }
 
 GList *
-gaim_gtk_conv_window_get_gtkconvs(GaimGtkWindow *win)
+pidgin_conv_window_get_gtkconvs(PidginWindow *win)
 {
 	return win->gtkconvs;
 }
 
 guint
-gaim_gtk_conv_window_get_gtkconv_count(GaimGtkWindow *win)
+pidgin_conv_window_get_gtkconv_count(PidginWindow *win)
 {
 	return g_list_length(win->gtkconvs);
 }
 
-GaimGtkWindow *
-gaim_gtk_conv_window_first_with_type(GaimConversationType type)
+PidginWindow *
+pidgin_conv_window_first_with_type(GaimConversationType type)
 {
 	GList *wins, *convs;
-	GaimGtkWindow *win;
-	GaimGtkConversation *conv;
+	PidginWindow *win;
+	PidginConversation *conv;
 
 	if (type == GAIM_CONV_TYPE_UNKNOWN)
 		return NULL;
 
-	for (wins = gaim_gtk_conv_windows_get_list(); wins != NULL; wins = wins->next) {
+	for (wins = pidgin_conv_windows_get_list(); wins != NULL; wins = wins->next) {
 		win = wins->data;
 
 		for (convs = win->gtkconvs;
@@ -8113,17 +8112,17 @@
 	return NULL;
 }
 
-GaimGtkWindow *
-gaim_gtk_conv_window_last_with_type(GaimConversationType type)
+PidginWindow *
+pidgin_conv_window_last_with_type(GaimConversationType type)
 {
 	GList *wins, *convs;
-	GaimGtkWindow *win;
-	GaimGtkConversation *conv;
+	PidginWindow *win;
+	PidginConversation *conv;
 
 	if (type == GAIM_CONV_TYPE_UNKNOWN)
 		return NULL;
 
-	for (wins = g_list_last(gaim_gtk_conv_windows_get_list());
+	for (wins = g_list_last(pidgin_conv_windows_get_list());
 	     wins != NULL;
 	     wins = wins->prev) {
 
@@ -8160,55 +8159,55 @@
 
 /* This one places conversations in the last made window. */
 static void
-conv_placement_last_created_win(GaimGtkConversation *conv)
-{
-	GaimGtkWindow *win;
-
-	GList *l = g_list_last(gaim_gtk_conv_windows_get_list());
+conv_placement_last_created_win(PidginConversation *conv)
+{
+	PidginWindow *win;
+
+	GList *l = g_list_last(pidgin_conv_windows_get_list());
 	win = l ? l->data : NULL;;
 
 	if (win == NULL) {
-		win = gaim_gtk_conv_window_new();
-
-		gaim_gtk_conv_window_add_gtkconv(win, conv);
-		gaim_gtk_conv_window_show(win);
+		win = pidgin_conv_window_new();
+
+		pidgin_conv_window_add_gtkconv(win, conv);
+		pidgin_conv_window_show(win);
 	} else {
-		gaim_gtk_conv_window_add_gtkconv(win, conv);
+		pidgin_conv_window_add_gtkconv(win, conv);
 	}
 }
 
 /* This one places conversations in the last made window of the same type. */
 static void
-conv_placement_last_created_win_type(GaimGtkConversation *conv)
-{
-	GaimGtkWindow *win;
-
-	win = gaim_gtk_conv_window_last_with_type(gaim_conversation_get_type(conv->active_conv));
+conv_placement_last_created_win_type(PidginConversation *conv)
+{
+	PidginWindow *win;
+
+	win = pidgin_conv_window_last_with_type(gaim_conversation_get_type(conv->active_conv));
 
 	if (win == NULL) {
-		win = gaim_gtk_conv_window_new();
-
-		gaim_gtk_conv_window_add_gtkconv(win, conv);
-		gaim_gtk_conv_window_show(win);
+		win = pidgin_conv_window_new();
+
+		pidgin_conv_window_add_gtkconv(win, conv);
+		pidgin_conv_window_show(win);
 	} else
-		gaim_gtk_conv_window_add_gtkconv(win, conv);
+		pidgin_conv_window_add_gtkconv(win, conv);
 }
 
 /* This one places each conversation in its own window. */
 static void
-conv_placement_new_window(GaimGtkConversation *conv)
-{
-	GaimGtkWindow *win;
-
-	win = gaim_gtk_conv_window_new();
-
-	gaim_gtk_conv_window_add_gtkconv(win, conv);
-
-	gaim_gtk_conv_window_show(win);
+conv_placement_new_window(PidginConversation *conv)
+{
+	PidginWindow *win;
+
+	win = pidgin_conv_window_new();
+
+	pidgin_conv_window_add_gtkconv(win, conv);
+
+	pidgin_conv_window_show(win);
 }
 
 static GaimGroup *
-conv_get_group(GaimGtkConversation *conv)
+conv_get_group(PidginConversation *conv)
 {
 	GaimGroup *group = NULL;
 
@@ -8240,7 +8239,7 @@
  * open windows will get a new window.
  */
 static void
-conv_placement_by_group(GaimGtkConversation *conv)
+conv_placement_by_group(PidginConversation *conv)
 {
 	GaimConversationType type;
 	GaimGroup *group = NULL;
@@ -8251,9 +8250,9 @@
 	group = conv_get_group(conv);
 
 	/* Go through the list of IMs and find one with this group. */
-	for (wl = gaim_gtk_conv_windows_get_list(); wl != NULL; wl = wl->next) {
-		GaimGtkWindow *win2;
-		GaimGtkConversation *conv2;
+	for (wl = pidgin_conv_windows_get_list(); wl != NULL; wl = wl->next) {
+		PidginWindow *win2;
+		PidginConversation *conv2;
 		GaimGroup *group2 = NULL;
 
 		win2 = wl->data;
@@ -8266,7 +8265,7 @@
 			group2 = conv_get_group(conv2);
 
 			if (group == group2) {
-				gaim_gtk_conv_window_add_gtkconv(win2, conv);
+				pidgin_conv_window_add_gtkconv(win2, conv);
 
 				return;
 			}
@@ -8279,7 +8278,7 @@
 
 /* This groups things by account.  Otherwise, the same semantics as above */
 static void
-conv_placement_by_account(GaimGtkConversation *conv)
+conv_placement_by_account(PidginConversation *conv)
 {
 	GaimConversationType type;
 	GList *wins, *convs;
@@ -8289,9 +8288,9 @@
 	type = gaim_conversation_get_type(conv->active_conv);
 
 	/* Go through the list of IMs and find one with this group. */
-	for (wins = gaim_gtk_conv_windows_get_list(); wins != NULL; wins = wins->next) {
-		GaimGtkWindow *win2;
-		GaimGtkConversation *conv2;
+	for (wins = pidgin_conv_windows_get_list(); wins != NULL; wins = wins->next) {
+		PidginWindow *win2;
+		PidginConversation *conv2;
 
 		win2 = wins->data;
 
@@ -8301,7 +8300,7 @@
 			conv2 = convs->data;
 
 			if (account == gaim_conversation_get_account(conv2->active_conv)) {
-				gaim_gtk_conv_window_add_gtkconv(win2, conv);
+				pidgin_conv_window_add_gtkconv(win2, conv);
 				return;
 			}
 		}
@@ -8359,7 +8358,7 @@
 }
 
 GList *
-gaim_gtkconv_placement_get_options(void)
+pidgin_conv_placement_get_options(void)
 {
 	GList *n, *list = NULL;
 	ConvPlacementData *data;
@@ -8377,7 +8376,7 @@
 
 
 void
-gaim_gtkconv_placement_add_fnc(const char *id, const char *name,
+pidgin_conv_placement_add_fnc(const char *id, const char *name,
                             GaimConvPlacementFunc fnc)
 {
 	g_return_if_fail(id   != NULL);
@@ -8390,7 +8389,7 @@
 }
 
 void
-gaim_gtkconv_placement_remove_fnc(const char *id)
+pidgin_conv_placement_remove_fnc(const char *id)
 {
 	ConvPlacementData *data = get_conv_placement_data(id);
 
@@ -8405,7 +8404,7 @@
 }
 
 const char *
-gaim_gtkconv_placement_get_name(const char *id)
+pidgin_conv_placement_get_name(const char *id)
 {
 	ConvPlacementData *data;
 
@@ -8420,7 +8419,7 @@
 }
 
 GaimConvPlacementFunc
-gaim_gtkconv_placement_get_fnc(const char *id)
+pidgin_conv_placement_get_fnc(const char *id)
 {
 	ConvPlacementData *data;
 
@@ -8435,7 +8434,7 @@
 }
 
 void
-gaim_gtkconv_placement_set_current_func(GaimConvPlacementFunc func)
+pidgin_conv_placement_set_current_func(GaimConvPlacementFunc func)
 {
 	g_return_if_fail(func != NULL);
 
@@ -8447,13 +8446,13 @@
 }
 
 GaimConvPlacementFunc
-gaim_gtkconv_placement_get_current_func(void)
+pidgin_conv_placement_get_current_func(void)
 {
 	return place_conv;
 }
 
 void
-gaim_gtkconv_placement_place(GaimGtkConversation *gtkconv)
+pidgin_conv_placement_place(PidginConversation *gtkconv)
 {
 	if (place_conv)
 		place_conv(gtkconv);
@@ -8462,7 +8461,7 @@
 }
 
 gboolean
-gaim_gtkconv_is_hidden(GaimGtkConversation *gtkconv)
+pidgin_conv_is_hidden(PidginConversation *gtkconv)
 {
 	g_return_val_if_fail(gtkconv != NULL, FALSE);
 
--- a/pidgin/gtkconv.h	Sat Feb 03 05:55:41 2007 +0000
+++ b/pidgin/gtkconv.h	Sat Feb 03 08:13:34 2007 +0000
@@ -22,12 +22,12 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
-#ifndef _GAIM_GTKCONVERSATION_H_
-#define _GAIM_GTKCONVERSATION_H_
+#ifndef _PIDGIN_CONVERSATION_H_
+#define _PIDGIN_CONVERSATION_H_
 
-typedef struct _GaimGtkImPane       GaimGtkImPane;
-typedef struct _GaimGtkChatPane     GaimGtkChatPane;
-typedef struct _GaimGtkConversation GaimGtkConversation;
+typedef struct _PidginImPane       PidginImPane;
+typedef struct _PidginChatPane     PidginChatPane;
+typedef struct _PidginConversation PidginConversation;
 
 /**
  * Unseen text states.
@@ -52,12 +52,12 @@
 	CHAT_USERS_COLUMNS
 };
 
-#define GAIM_GTK_CONVERSATION(conv) \
-	((GaimGtkConversation *)(conv)->ui_data)
+#define PIDGIN_CONVERSATION(conv) \
+	((PidginConversation *)(conv)->ui_data)
 
 #define GAIM_IS_GTK_CONVERSATION(conv) \
 	(gaim_conversation_get_ui_ops(conv) == \
-	 gaim_gtk_conversations_get_conv_ui_ops())
+	 pidgin_conversations_get_conv_ui_ops())
 
 #include "gtkgaim.h"
 #include "conversation.h"
@@ -76,7 +76,7 @@
 /**
  * A GTK+ Instant Message pane.
  */
-struct _GaimGtkImPane
+struct _PidginImPane
 {
 	GtkWidget *block;
 	GtkWidget *send_file;
@@ -98,7 +98,7 @@
 /**
  * GTK+ Chat panes.
  */
-struct _GaimGtkChatPane
+struct _PidginChatPane
 {
 	GtkWidget *count;
 	GtkWidget *list;
@@ -108,13 +108,13 @@
 /**
  * A GTK+ conversation pane.
  */
-struct _GaimGtkConversation
+struct _PidginConversation
 {
 	GaimConversation *active_conv;
 	GList *convs;
 	GList *send_history;
 
-	GaimGtkWindow *win;
+	PidginWindow *win;
 
 	gboolean make_sound;
 
@@ -151,8 +151,8 @@
 
 	union
 	{
-		GaimGtkImPane   *im;
-		GaimGtkChatPane *chat;
+		PidginImPane   *im;
+		PidginChatPane *chat;
 
 	} u;
 };
@@ -169,28 +169,28 @@
  *
  * @return The GTK+ conversation operations structure.
  */
-GaimConversationUiOps *gaim_gtk_conversations_get_conv_ui_ops(void);
+GaimConversationUiOps *pidgin_conversations_get_conv_ui_ops(void);
 
 /**
  * Updates the buddy icon on a conversation.
  *
  * @param conv The conversation.
  */
-void gaim_gtkconv_update_buddy_icon(GaimConversation *conv);
+void pidgin_conv_update_buddy_icon(GaimConversation *conv);
 
 /**
  * Sets the active conversation within a GTK-conversation.
  *
  * @param conv The conversation
  */
-void gaim_gtkconv_switch_active_conversation(GaimConversation *conv);
+void pidgin_conv_switch_active_conversation(GaimConversation *conv);
 
 /**
  * Updates conversation buttons by protocol.
  *
  * @param conv The conversation.
  */
-void gaim_gtkconv_update_buttons_by_protocol(GaimConversation *conv);
+void pidgin_conv_update_buttons_by_protocol(GaimConversation *conv);
 
 /**
  * Returns a list of conversations of the given type which have an unseen
@@ -208,7 +208,7 @@
  * @return             List of GaimConversation matching criteria, or NULL.
  */
 GList *
-gaim_gtk_conversations_find_unseen_list(GaimConversationType type,
+pidgin_conversations_find_unseen_list(GaimConversationType type,
 										GaimUnseenState min_state,
 										gboolean hidden_only,
 										guint max_count);
@@ -222,20 +222,20 @@
  * @return       Number of conversations added to menu.
  */
 guint
-gaim_gtk_conversations_fill_menu(GtkWidget *menu, GList *convs);
+pidgin_conversations_fill_menu(GtkWidget *menu, GList *convs);
 
 /**
  * Presents a gaim conversation to the user.
  *
  * @param conv The conversation.
  */
-void gaim_gtkconv_present_conversation(GaimConversation *conv);
+void pidgin_conv_present_conversation(GaimConversation *conv);
 
-GaimGtkWindow *gaim_gtkconv_get_window(GaimGtkConversation *gtkconv);
-GdkPixbuf *gaim_gtkconv_get_tab_icon(GaimConversation *conv, gboolean small_icon);
-void gaim_gtkconv_new(GaimConversation *conv);
-int gaim_gtkconv_get_tab_at_xy(GaimGtkWindow *win, int x, int y, gboolean *to_right);
-gboolean gaim_gtkconv_is_hidden(GaimGtkConversation *gtkconv);
+PidginWindow *pidgin_conv_get_window(PidginConversation *gtkconv);
+GdkPixbuf *pidgin_conv_get_tab_icon(GaimConversation *conv, gboolean small_icon);
+void pidgin_conv_new(GaimConversation *conv);
+int pidgin_conv_get_tab_at_xy(PidginWindow *win, int x, int y, gboolean *to_right);
+gboolean pidgin_conv_is_hidden(PidginConversation *gtkconv);
 /*@}*/
 
 /**************************************************************************/
@@ -248,18 +248,18 @@
  *
  * @return The conversations subsystem handle.
  */
-void *gaim_gtk_conversations_get_handle(void);
+void *pidgin_conversations_get_handle(void);
 
 /**
  * Initializes the GTK+ conversations subsystem.
  */
-void gaim_gtk_conversations_init(void);
+void pidgin_conversations_init(void);
 
 /**
  * Uninitialized the GTK+ conversation subsystem.
  */
-void gaim_gtk_conversations_uninit(void);
+void pidgin_conversations_uninit(void);
 
 /*@}*/
 
-#endif /* _GAIM_GTKCONVERSATION_H_ */
+#endif /* _PIDGIN_CONVERSATION_H_ */
--- a/pidgin/gtkconvwin.h	Sat Feb 03 05:55:41 2007 +0000
+++ b/pidgin/gtkconvwin.h	Sat Feb 03 08:13:34 2007 +0000
@@ -22,10 +22,10 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
-#ifndef _GAIM_GTKCONVERSATION_WINDOW_H_
-#define _GAIM_GTKCONVERSATION_WINDOW_H_
+#ifndef _PIDGIN_CONVERSATION_WINDOW_H_
+#define _PIDGIN_CONVERSATION_WINDOW_H_
 
-typedef struct _GaimGtkWindow       GaimGtkWindow;
+typedef struct _PidginWindow       PidginWindow;
 
 
 /**************************************************************************
@@ -37,7 +37,7 @@
  * A GTK+ representation of a graphical window containing one or more
  * conversations.
  */
-struct _GaimGtkWindow
+struct _PidginWindow
 {
 	GtkWidget *window;           /**< The window.                      */
 	GtkWidget *notebook;         /**< The notebook of conversations.   */
@@ -104,26 +104,26 @@
  **************************************************************************/
 /*@{*/
 
-GaimGtkWindow * gaim_gtk_conv_window_new(void);
-void gaim_gtk_conv_window_destroy(GaimGtkWindow *win);
-GList *gaim_gtk_conv_windows_get_list(void);
-void gaim_gtk_conv_window_show(GaimGtkWindow *win);
-void gaim_gtk_conv_window_hide(GaimGtkWindow *win);
-void gaim_gtk_conv_window_raise(GaimGtkWindow *win);
-void gaim_gtk_conv_window_switch_gtkconv(GaimGtkWindow *win, GaimGtkConversation *gtkconv);
-void gaim_gtk_conv_window_add_gtkconv(GaimGtkWindow *win, GaimGtkConversation *gtkconv);
-void gaim_gtk_conv_window_remove_gtkconv(GaimGtkWindow *win, GaimGtkConversation *gtkconv);
-GaimGtkConversation *gaim_gtk_conv_window_get_gtkconv_at_index(const GaimGtkWindow *win, int index);
-GaimGtkConversation *gaim_gtk_conv_window_get_active_gtkconv(const GaimGtkWindow *win);
-GaimConversation *gaim_gtk_conv_window_get_active_conversation(const GaimGtkWindow *win);
-gboolean gaim_gtk_conv_window_is_active_conversation(const GaimConversation *conv);
-gboolean gaim_gtk_conv_window_has_focus(GaimGtkWindow *win);
-GaimGtkWindow *gaim_gtk_conv_window_get_at_xy(int x, int y);
-GList *gaim_gtk_conv_window_get_gtkconvs(GaimGtkWindow *win);
-guint gaim_gtk_conv_window_get_gtkconv_count(GaimGtkWindow *win);
+PidginWindow * pidgin_conv_window_new(void);
+void pidgin_conv_window_destroy(PidginWindow *win);
+GList *pidgin_conv_windows_get_list(void);
+void pidgin_conv_window_show(PidginWindow *win);
+void pidgin_conv_window_hide(PidginWindow *win);
+void pidgin_conv_window_raise(PidginWindow *win);
+void pidgin_conv_window_switch_gtkconv(PidginWindow *win, PidginConversation *gtkconv);
+void pidgin_conv_window_add_gtkconv(PidginWindow *win, PidginConversation *gtkconv);
+void pidgin_conv_window_remove_gtkconv(PidginWindow *win, PidginConversation *gtkconv);
+PidginConversation *pidgin_conv_window_get_gtkconv_at_index(const PidginWindow *win, int index);
+PidginConversation *pidgin_conv_window_get_active_gtkconv(const PidginWindow *win);
+GaimConversation *pidgin_conv_window_get_active_conversation(const PidginWindow *win);
+gboolean pidgin_conv_window_is_active_conversation(const GaimConversation *conv);
+gboolean pidgin_conv_window_has_focus(PidginWindow *win);
+PidginWindow *pidgin_conv_window_get_at_xy(int x, int y);
+GList *pidgin_conv_window_get_gtkconvs(PidginWindow *win);
+guint pidgin_conv_window_get_gtkconv_count(PidginWindow *win);
 
-GaimGtkWindow *gaim_gtk_conv_window_first_with_type(GaimConversationType type);
-GaimGtkWindow *gaim_gtk_conv_window_last_with_type(GaimConversationType type);
+PidginWindow *pidgin_conv_window_first_with_type(GaimConversationType type);
+PidginWindow *pidgin_conv_window_last_with_type(GaimConversationType type);
 
 /*@}*/
 
@@ -132,17 +132,17 @@
  **************************************************************************/
 /*@{*/
 
-typedef void (*GaimConvPlacementFunc)(GaimGtkConversation *);
+typedef void (*GaimConvPlacementFunc)(PidginConversation *);
 
-GList *gaim_gtkconv_placement_get_options(void);
-void gaim_gtkconv_placement_add_fnc(const char *id, const char *name, GaimConvPlacementFunc fnc);
-void gaim_gtkconv_placement_remove_fnc(const char *id);
-const char *gaim_gtkconv_placement_get_name(const char *id);
-GaimConvPlacementFunc gaim_gtkconv_placement_get_fnc(const char *id);
-void gaim_gtkconv_placement_set_current_func(GaimConvPlacementFunc func);
-GaimConvPlacementFunc gaim_gtkconv_placement_get_current_func(void);
-void gaim_gtkconv_placement_place(GaimGtkConversation *gtkconv);
+GList *pidgin_conv_placement_get_options(void);
+void pidgin_conv_placement_add_fnc(const char *id, const char *name, GaimConvPlacementFunc fnc);
+void pidgin_conv_placement_remove_fnc(const char *id);
+const char *pidgin_conv_placement_get_name(const char *id);
+GaimConvPlacementFunc pidgin_conv_placement_get_fnc(const char *id);
+void pidgin_conv_placement_set_current_func(GaimConvPlacementFunc func);
+GaimConvPlacementFunc pidgin_conv_placement_get_current_func(void);
+void pidgin_conv_placement_place(PidginConversation *gtkconv);
 
 /*@}*/
 
-#endif /* _GAIM_GTKCONVERSATION_WINDOW_H_ */
+#endif /* _PIDGIN_CONVERSATION_WINDOW_H_ */
--- a/pidgin/gtkdebug.c	Sat Feb 03 05:55:41 2007 +0000
+++ b/pidgin/gtkdebug.c	Sat Feb 03 08:13:34 2007 +0000
@@ -87,7 +87,7 @@
 static gint
 debug_window_destroy(GtkWidget *w, GdkEvent *event, void *unused)
 {
-	gaim_prefs_disconnect_by_handle(gaim_gtk_debug_get_handle());
+	gaim_prefs_disconnect_by_handle(pidgin_debug_get_handle());
 
 #ifdef HAVE_REGEX_H
 	if(debug_win->timer != 0) {
@@ -198,7 +198,7 @@
 	gtk_entry_set_activates_default(GTK_ENTRY(f->entry), TRUE);
 	gtk_label_set_mnemonic_widget(GTK_LABEL(label), GTK_WIDGET(f->entry));
 	g_signal_connect(G_OBJECT(f->entry), "changed",
-					 G_CALLBACK(gaim_gtk_set_sensitive_if_input),
+					 G_CALLBACK(pidgin_set_sensitive_if_input),
 					 win->find);
 	gtk_box_pack_start(GTK_BOX(hbox), f->entry, FALSE, FALSE, 0);
 
@@ -712,7 +712,7 @@
 	g_signal_connect(G_OBJECT(win->window), "configure_event",
 	                 G_CALLBACK(configure_cb), win);
 
-	handle = gaim_gtk_debug_get_handle();
+	handle = pidgin_debug_get_handle();
 	
 #ifdef HAVE_REGEX_H
 	/* the list store for all the messages */
@@ -874,7 +874,7 @@
 	}
 
 	/* Add the gtkimhtml */
-	frame = gaim_gtk_create_imhtml(FALSE, &win->text, NULL, NULL);
+	frame = pidgin_create_imhtml(FALSE, &win->text, NULL, NULL);
 	gtk_imhtml_set_format_functions(GTK_IMHTML(win->text),
 									GTK_IMHTML_ALL ^ GTK_IMHTML_SMILEY ^ GTK_IMHTML_IMAGE);
 	gtk_box_pack_start(GTK_BOX(vbox), frame, TRUE, TRUE, 0);
@@ -898,9 +898,9 @@
 				 gconstpointer value, gpointer data)
 {
 	if (value)
-		gaim_gtk_debug_window_show();
+		pidgin_debug_window_show();
 	else
-		gaim_gtk_debug_window_hide();
+		pidgin_debug_window_hide();
 }
 
 static void
@@ -956,7 +956,7 @@
 #endif
 
 void
-gaim_gtk_debug_init(void)
+pidgin_debug_init(void)
 {
 	/* Debug window preferences. */
 	/*
@@ -1010,13 +1010,13 @@
 }
 
 void
-gaim_gtk_debug_uninit(void)
+pidgin_debug_uninit(void)
 {
 	gaim_debug_set_ui_ops(NULL);
 }
 
 void
-gaim_gtk_debug_window_show(void)
+pidgin_debug_window_show(void)
 {
 	if (debug_win == NULL)
 		debug_win = debug_window_new();
@@ -1027,7 +1027,7 @@
 }
 
 void
-gaim_gtk_debug_window_hide(void)
+pidgin_debug_window_hide(void)
 {
 	if (debug_win != NULL) {
 		gtk_widget_destroy(debug_win->window);
@@ -1036,7 +1036,7 @@
 }
 
 static void
-gaim_gtk_debug_print(GaimDebugLevel level, const char *category,
+pidgin_debug_print(GaimDebugLevel level, const char *category,
 					 const char *arg_s)
 {
 #ifdef HAVE_REGEX_H
@@ -1106,17 +1106,17 @@
 
 static GaimDebugUiOps ops =
 {
-	gaim_gtk_debug_print,
+	pidgin_debug_print,
 };
 
 GaimDebugUiOps *
-gaim_gtk_debug_get_ui_ops(void)
+pidgin_debug_get_ui_ops(void)
 {
 	return &ops;
 }
 
 void *
-gaim_gtk_debug_get_handle() {
+pidgin_debug_get_handle() {
 	static int handle;
 
 	return &handle;
--- a/pidgin/gtkdebug.h	Sat Feb 03 05:55:41 2007 +0000
+++ b/pidgin/gtkdebug.h	Sat Feb 03 08:13:34 2007 +0000
@@ -22,43 +22,43 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
-#ifndef _GAIM_GTKDEBUG_H_
-#define _GAIM_GTKDEBUG_H_
+#ifndef _PIDGINDEBUG_H_
+#define _PIDGINDEBUG_H_
 
 #include "debug.h"
 
 /**
  * Initializes the GTK+ debug system.
  */
-void gaim_gtk_debug_init(void);
+void pidgin_debug_init(void);
 
 /**
  * Uninitialized the GTK+ debug system.
  */
-void gaim_gtk_debug_uninit(void);
+void pidgin_debug_uninit(void);
 
 /**
  * Get the handle for the GTK+ debug system.
  *
  * @return the handle to the debug system
  */
-void *gaim_gtk_debug_get_handle(void);
+void *pidgin_debug_get_handle(void);
 
 /**
  * Shows the debug window.
  */
-void gaim_gtk_debug_window_show(void);
+void pidgin_debug_window_show(void);
 
 /**
  * Hides the debug window.
  */
-void gaim_gtk_debug_window_hide(void);
+void pidgin_debug_window_hide(void);
 
 /**
  * Returns the UI operations structure for GTK+ debug output.
  *
  * @return The GTK+ UI debug operations structure.
  */
-GaimDebugUiOps *gaim_gtk_debug_get_ui_ops(void);
+GaimDebugUiOps *pidgin_debug_get_ui_ops(void);
 
-#endif /* _GAIM_GTKDEBUG_H_ */
+#endif /* _PIDGINDEBUG_H_ */
--- a/pidgin/gtkdialogs.c	Sat Feb 03 05:55:41 2007 +0000
+++ b/pidgin/gtkdialogs.c	Sat Feb 03 08:13:34 2007 +0000
@@ -233,7 +233,7 @@
 };
 
 void
-gaim_gtkdialogs_destroy_all()
+pidgindialogs_destroy_all()
 {
 	while (dialogwindows) {
 		gtk_widget_destroy(dialogwindows->data);
@@ -251,7 +251,7 @@
 /* This function puts the version number onto the pixmap we use in the 'about' 
  * screen in Gaim. */
 static void
-gaim_gtk_logo_versionize(GdkPixbuf **original, GtkWidget *widget) {
+pidgin_logo_versionize(GdkPixbuf **original, GtkWidget *widget) {
 	GdkPixmap *pixmap;
 	GtkStyle *style;
 	PangoContext *context;
@@ -286,7 +286,7 @@
 	g_object_unref(G_OBJECT(pixmap));
 }
 
-void gaim_gtkdialogs_about()
+void pidgindialogs_about()
 {
 	GtkWidget *hbox;
 	GtkWidget *vbox;
@@ -326,7 +326,7 @@
 	filename = g_build_filename(DATADIR, "pixmaps", "gaim", "logo.png", NULL);
 	pixbuf = gdk_pixbuf_new_from_file(filename, NULL);
 	g_free(filename);
-	gaim_gtk_logo_versionize(&pixbuf, logo);
+	pidgin_logo_versionize(&pixbuf, logo);
 	gtk_widget_destroy(logo);
 	logo = gtk_image_new_from_pixbuf(pixbuf);
 	gdk_pixbuf_unref(pixbuf);
@@ -335,7 +335,7 @@
 	atk_object_set_description(obj, PIDGIN_NAME " " VERSION);
 	gtk_box_pack_start(GTK_BOX(vbox), logo, FALSE, FALSE, 0);
 
-	frame = gaim_gtk_create_imhtml(FALSE, &text, NULL, NULL);
+	frame = pidgin_create_imhtml(FALSE, &text, NULL, NULL);
 	gtk_imhtml_set_format_functions(GTK_IMHTML(text), GTK_IMHTML_ALL ^ GTK_IMHTML_SMILEY);
 	gtk_box_pack_start(GTK_BOX(vbox), frame, TRUE, TRUE, 0);
 
@@ -665,7 +665,7 @@
 }
 
 static void
-gaim_gtkdialogs_im_cb(gpointer data, GaimRequestFields *fields)
+pidgindialogs_im_cb(gpointer data, GaimRequestFields *fields)
 {
 	GaimAccount *account;
 	const char *username;
@@ -673,11 +673,11 @@
 	account  = gaim_request_fields_get_account(fields, "account");
 	username = gaim_request_fields_get_string(fields,  "screenname");
 
-	gaim_gtkdialogs_im_with_user(account, username);
+	pidgindialogs_im_with_user(account, username);
 }
 
 void
-gaim_gtkdialogs_im(void)
+pidgindialogs_im(void)
 {
 	GaimRequestFields *fields;
 	GaimRequestFieldGroup *group;
@@ -706,13 +706,13 @@
 						_("Please enter the screen name or alias of the person "
 						  "you would like to IM."),
 						fields,
-						_("OK"), G_CALLBACK(gaim_gtkdialogs_im_cb),
+						_("OK"), G_CALLBACK(pidgindialogs_im_cb),
 						_("Cancel"), NULL,
 						NULL);
 }
 
 void
-gaim_gtkdialogs_im_with_user(GaimAccount *account, const char *username)
+pidgindialogs_im_with_user(GaimAccount *account, const char *username)
 {
 	GaimConversation *conv;
 
@@ -724,11 +724,11 @@
 	if (conv == NULL)
 		conv = gaim_conversation_new(GAIM_CONV_TYPE_IM, account, username);
 
-	gaim_gtkconv_present_conversation(conv);
+	pidgin_conv_present_conversation(conv);
 }
 
 static gboolean
-gaim_gtkdialogs_ee(const char *ee)
+pidgindialogs_ee(const char *ee)
 {
 	GtkWidget *window;
 	GtkWidget *hbox;
@@ -793,7 +793,7 @@
 }
 
 static void
-gaim_gtkdialogs_info_cb(gpointer data, GaimRequestFields *fields)
+pidgindialogs_info_cb(gpointer data, GaimRequestFields *fields)
 {
 	char *username;
 	gboolean found = FALSE;
@@ -805,7 +805,7 @@
 		gaim_request_fields_get_string(fields,  "screenname")));
 
 	if (username != NULL && gaim_str_has_suffix(username, "rocksmyworld"))
-		found = gaim_gtkdialogs_ee(username);
+		found = pidgindialogs_ee(username);
 
 	if (!found && username != NULL && *username != '\0' && account != NULL)
 		serv_get_info(gaim_account_get_connection(account), username);
@@ -814,7 +814,7 @@
 }
 
 void
-gaim_gtkdialogs_info(void)
+pidgindialogs_info(void)
 {
 	GaimRequestFields *fields;
 	GaimRequestFieldGroup *group;
@@ -843,13 +843,13 @@
 						_("Please enter the screen name or alias of the person "
 						  "whose info you would like to view."),
 						fields,
-						_("OK"), G_CALLBACK(gaim_gtkdialogs_info_cb),
+						_("OK"), G_CALLBACK(pidgindialogs_info_cb),
 						_("Cancel"), NULL,
 						NULL);
 }
 
 static void
-gaim_gtkdialogs_log_cb(gpointer data, GaimRequestFields *fields)
+pidgindialogs_log_cb(gpointer data, GaimRequestFields *fields)
 {
 	char *username;
 	GaimAccount *account;
@@ -862,10 +862,10 @@
 
 	if (username != NULL && *username != '\0' && account != NULL)
 	{
-		GaimGtkBuddyList *gtkblist = gaim_gtk_blist_get_default_gtk_blist();
+		PidginBuddyList *gtkblist = pidgin_blist_get_default_gtk_blist();
 		GSList *buddies;
 
-		gaim_gtk_set_cursor(gtkblist->window, GDK_WATCH);
+		pidgin_set_cursor(gtkblist->window, GDK_WATCH);
 
 		buddies = gaim_find_buddies(account, username);
 		for (cur = buddies; cur != NULL; cur = cur->next)
@@ -873,18 +873,18 @@
 			GaimBlistNode *node = cur->data;
 			if ((node != NULL) && ((node->prev != NULL) || (node->next != NULL)))
 			{
-				gaim_gtk_log_show_contact((GaimContact *)node->parent);
+				pidgin_log_show_contact((GaimContact *)node->parent);
 				g_slist_free(buddies);
-				gaim_gtk_clear_cursor(gtkblist->window);
+				pidgin_clear_cursor(gtkblist->window);
 				g_free(username);
 				return;
 			}
 		}
 		g_slist_free(buddies);
 
-		gaim_gtk_log_show(GAIM_LOG_IM, username, account);
+		pidgin_log_show(GAIM_LOG_IM, username, account);
 
-		gaim_gtk_clear_cursor(gtkblist->window);
+		pidgin_clear_cursor(gtkblist->window);
 	}
 
 	g_free(username);
@@ -894,7 +894,7 @@
  * TODO - This needs to deal with logs of all types, not just IM logs.
  */
 void
-gaim_gtkdialogs_log(void)
+pidgindialogs_log(void)
 {
 	GaimRequestFields *fields;
 	GaimRequestFieldGroup *group;
@@ -934,38 +934,38 @@
 						_("Please enter the screen name or alias of the person "
 						  "whose log you would like to view."),
 						fields,
-						_("OK"), G_CALLBACK(gaim_gtkdialogs_log_cb),
+						_("OK"), G_CALLBACK(pidgindialogs_log_cb),
 						_("Cancel"), NULL,
 						NULL);
 }
 
 static void
-gaim_gtkdialogs_alias_contact_cb(GaimContact *contact, const char *new_alias)
+pidgindialogs_alias_contact_cb(GaimContact *contact, const char *new_alias)
 {
 	gaim_contact_set_alias(contact, new_alias);
 }
 
 void
-gaim_gtkdialogs_alias_contact(GaimContact *contact)
+pidgindialogs_alias_contact(GaimContact *contact)
 {
 	g_return_if_fail(contact != NULL);
 
 	gaim_request_input(NULL, _("Alias Contact"), NULL,
 					   _("Enter an alias for this contact."),
 					   contact->alias, FALSE, FALSE, NULL,
-					   _("Alias"), G_CALLBACK(gaim_gtkdialogs_alias_contact_cb),
+					   _("Alias"), G_CALLBACK(pidgindialogs_alias_contact_cb),
 					   _("Cancel"), NULL, contact);
 }
 
 static void
-gaim_gtkdialogs_alias_buddy_cb(GaimBuddy *buddy, const char *new_alias)
+pidgindialogs_alias_buddy_cb(GaimBuddy *buddy, const char *new_alias)
 {
 	gaim_blist_alias_buddy(buddy, new_alias);
 	serv_alias_buddy(buddy);
 }
 
 void
-gaim_gtkdialogs_alias_buddy(GaimBuddy *buddy)
+pidgindialogs_alias_buddy(GaimBuddy *buddy)
 {
 	gchar *secondary;
 
@@ -975,32 +975,32 @@
 
 	gaim_request_input(NULL, _("Alias Buddy"), NULL,
 					   secondary, buddy->alias, FALSE, FALSE, NULL,
-					   _("Alias"), G_CALLBACK(gaim_gtkdialogs_alias_buddy_cb),
+					   _("Alias"), G_CALLBACK(pidgindialogs_alias_buddy_cb),
 					   _("Cancel"), NULL, buddy);
 
 	g_free(secondary);
 }
 
 static void
-gaim_gtkdialogs_alias_chat_cb(GaimChat *chat, const char *new_alias)
+pidgindialogs_alias_chat_cb(GaimChat *chat, const char *new_alias)
 {
 	gaim_blist_alias_chat(chat, new_alias);
 }
 
 void
-gaim_gtkdialogs_alias_chat(GaimChat *chat)
+pidgindialogs_alias_chat(GaimChat *chat)
 {
 	g_return_if_fail(chat != NULL);
 
 	gaim_request_input(NULL, _("Alias Chat"), NULL,
 					   _("Enter an alias for this chat."),
 					   chat->alias, FALSE, FALSE, NULL,
-					   _("Alias"), G_CALLBACK(gaim_gtkdialogs_alias_chat_cb),
+					   _("Alias"), G_CALLBACK(pidgindialogs_alias_chat_cb),
 					   _("Cancel"), NULL, chat);
 }
 
 static void
-gaim_gtkdialogs_remove_contact_cb(GaimContact *contact)
+pidgindialogs_remove_contact_cb(GaimContact *contact)
 {
 	GaimBlistNode *bnode, *cnode;
 	GaimGroup *group;
@@ -1016,7 +1016,7 @@
 }
 
 void
-gaim_gtkdialogs_remove_contact(GaimContact *contact)
+pidgindialogs_remove_contact(GaimContact *contact)
 {
 	GaimBuddy *buddy = gaim_contact_get_priority_buddy(contact);
 
@@ -1025,7 +1025,7 @@
 
 	if (((GaimBlistNode*)contact)->child == (GaimBlistNode*)buddy &&
 			!((GaimBlistNode*)buddy)->next) {
-		gaim_gtkdialogs_remove_buddy(buddy);
+		pidgindialogs_remove_buddy(buddy);
 	} else {
 		gchar *text;
 		text = g_strdup_printf(
@@ -1039,7 +1039,7 @@
 					buddy->name, contact->totalsize - 1);
 
 		gaim_request_action(contact, NULL, _("Remove Contact"), text, 0, contact, 2,
-				_("_Remove Contact"), G_CALLBACK(gaim_gtkdialogs_remove_contact_cb),
+				_("_Remove Contact"), G_CALLBACK(pidgindialogs_remove_contact_cb),
 				_("Cancel"), NULL);
 
 		g_free(text);
@@ -1053,14 +1053,14 @@
 }
 
 static void
-gaim_gtkdialogs_merge_groups_cb(struct _GaimGroupMergeObject *GGP)
+pidgindialogs_merge_groups_cb(struct _GaimGroupMergeObject *GGP)
 {
 	gaim_blist_rename_group(GGP->parent, GGP->new_name);
 	free_ggmo(GGP);
 }
 
 void
-gaim_gtkdialogs_merge_groups(GaimGroup *source, const char *new_name)
+pidgindialogs_merge_groups(GaimGroup *source, const char *new_name)
 {
 	gchar *text;
 	struct _GaimGroupMergeObject *ggp;
@@ -1077,14 +1077,14 @@
 	ggp->new_name = g_strdup(new_name);
 	
 	gaim_request_action(source, NULL, _("Merge Groups"), text, 0, ggp, 2,
-			_("_Merge Groups"), G_CALLBACK(gaim_gtkdialogs_merge_groups_cb),
+			_("_Merge Groups"), G_CALLBACK(pidgindialogs_merge_groups_cb),
 			_("Cancel"), G_CALLBACK(free_ggmo));
 
 	g_free(text);
 }
 
 static void
-gaim_gtkdialogs_remove_group_cb(GaimGroup *group)
+pidgindialogs_remove_group_cb(GaimGroup *group)
 {
 	GaimBlistNode *cnode, *bnode;
 
@@ -1121,7 +1121,7 @@
 }
 
 void
-gaim_gtkdialogs_remove_group(GaimGroup *group)
+pidgindialogs_remove_group(GaimGroup *group)
 {
 	gchar *text;
 
@@ -1131,7 +1131,7 @@
 						   group->name);
 
 	gaim_request_action(group, NULL, _("Remove Group"), text, 0, group, 2,
-						_("_Remove Group"), G_CALLBACK(gaim_gtkdialogs_remove_group_cb),
+						_("_Remove Group"), G_CALLBACK(pidgindialogs_remove_group_cb),
 						_("Cancel"), NULL);
 
 	g_free(text);
@@ -1139,7 +1139,7 @@
 
 /* XXX - Some of this should be moved into the core, methinks. */
 static void
-gaim_gtkdialogs_remove_buddy_cb(GaimBuddy *buddy)
+pidgindialogs_remove_buddy_cb(GaimBuddy *buddy)
 {
 	GaimGroup *group;
 	gchar *name;
@@ -1158,7 +1158,7 @@
 }
 
 void
-gaim_gtkdialogs_remove_buddy(GaimBuddy *buddy)
+pidgindialogs_remove_buddy(GaimBuddy *buddy)
 {
 	gchar *text;
 
@@ -1168,20 +1168,20 @@
 						   buddy->name);
 
 	gaim_request_action(buddy, NULL, _("Remove Buddy"), text, 0, buddy, 2,
-						_("_Remove Buddy"), G_CALLBACK(gaim_gtkdialogs_remove_buddy_cb),
+						_("_Remove Buddy"), G_CALLBACK(pidgindialogs_remove_buddy_cb),
 						_("Cancel"), NULL);
 
 	g_free(text);
 }
 
 static void
-gaim_gtkdialogs_remove_chat_cb(GaimChat *chat)
+pidgindialogs_remove_chat_cb(GaimChat *chat)
 {
 	gaim_blist_remove_chat(chat);
 }
 
 void
-gaim_gtkdialogs_remove_chat(GaimChat *chat)
+pidgindialogs_remove_chat(GaimChat *chat)
 {
 	const gchar *name;
 	gchar *text;
@@ -1193,7 +1193,7 @@
 			name ? name : "");
 
 	gaim_request_action(chat, NULL, _("Remove Chat"), text, 0, chat, 2,
-						_("_Remove Chat"), G_CALLBACK(gaim_gtkdialogs_remove_chat_cb),
+						_("_Remove Chat"), G_CALLBACK(pidgindialogs_remove_chat_cb),
 						_("Cancel"), NULL);
 
 	g_free(text);
--- a/pidgin/gtkdialogs.h	Sat Feb 03 05:55:41 2007 +0000
+++ b/pidgin/gtkdialogs.h	Sat Feb 03 08:13:34 2007 +0000
@@ -21,8 +21,8 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
-#ifndef _GAIM_GTKDIALOGS_H_
-#define _GAIM_GTKDIALOGS_H_
+#ifndef _PIDGINDIALOGS_H_
+#define _PIDGINDIALOGS_H_
 
 #include "gtkgaim.h"
 
@@ -30,21 +30,21 @@
 #include "conversation.h"
 
 /* Functions in gtkdialogs.c (these should actually stay in this file) */
-void gaim_gtkdialogs_destroy_all(void);
-void gaim_gtkdialogs_about(void);
-void gaim_gtkdialogs_im(void);
-void gaim_gtkdialogs_im_with_user(GaimAccount *, const char *);
-void gaim_gtkdialogs_info(void);
-void gaim_gtkdialogs_log(void);
-void gaim_gtkdialogs_alias_contact(GaimContact *);
-void gaim_gtkdialogs_alias_buddy(GaimBuddy *);
-void gaim_gtkdialogs_alias_chat(GaimChat *);
+void pidgindialogs_destroy_all(void);
+void pidgindialogs_about(void);
+void pidgindialogs_im(void);
+void pidgindialogs_im_with_user(GaimAccount *, const char *);
+void pidgindialogs_info(void);
+void pidgindialogs_log(void);
+void pidgindialogs_alias_contact(GaimContact *);
+void pidgindialogs_alias_buddy(GaimBuddy *);
+void pidgindialogs_alias_chat(GaimChat *);
 
-void gaim_gtkdialogs_remove_buddy(GaimBuddy *);
-void gaim_gtkdialogs_remove_group(GaimGroup *);
-void gaim_gtkdialogs_remove_chat(GaimChat *);
-void gaim_gtkdialogs_remove_contact(GaimContact *);
-void gaim_gtkdialogs_merge_groups(GaimGroup *, const char *);
+void pidgindialogs_remove_buddy(GaimBuddy *);
+void pidgindialogs_remove_group(GaimGroup *);
+void pidgindialogs_remove_chat(GaimChat *);
+void pidgindialogs_remove_contact(GaimContact *);
+void pidgindialogs_merge_groups(GaimGroup *, const char *);
 
 /* Everything after this should probably be moved elsewhere */
 
@@ -55,4 +55,4 @@
 			gtk_window_set_type_hint(GTK_WINDOW(x), GDK_WINDOW_TYPE_HINT_DIALOG)
 #define GAIM_WINDOW_ICONIFIED(x) (gdk_window_get_state(GTK_WIDGET(x)->window) & GDK_WINDOW_STATE_ICONIFIED)
 
-#endif /* _GAIM_GTKDIALOGS_H_ */
+#endif /* _PIDGINDIALOGS_H_ */
--- a/pidgin/gtkdocklet-x11.c	Sat Feb 03 05:55:41 2007 +0000
+++ b/pidgin/gtkdocklet-x11.c	Sat Feb 03 08:13:34 2007 +0000
@@ -59,7 +59,7 @@
 	
 	g_source_remove(embed_timeout);
 	embed_timeout = 0;
-	gaim_gtk_docklet_embedded();
+	pidgin_docklet_embedded();
 }
 
 static void
@@ -67,7 +67,7 @@
 {
 	gaim_debug(GAIM_DEBUG_INFO, "docklet", "destroyed\n");
 
-	gaim_gtk_docklet_remove();
+	pidgin_docklet_remove();
 
 	g_object_unref(G_OBJECT(docklet));
 	docklet = NULL;
@@ -81,7 +81,7 @@
 	if (event->type != GDK_BUTTON_RELEASE)
 		return;
 
-	gaim_gtk_docklet_clicked(event->button);
+	pidgin_docklet_clicked(event->button);
 }
 
 static void
@@ -210,7 +210,7 @@
 	if (embed_timeout)
 		g_source_remove(embed_timeout);
 	
-	gaim_gtk_docklet_remove();
+	pidgin_docklet_remove();
 	
 	g_signal_handlers_disconnect_by_func(G_OBJECT(docklet), G_CALLBACK(docklet_x11_destroyed_cb), NULL);
 	gtk_widget_destroy(GTK_WIDGET(docklet));
@@ -236,7 +236,7 @@
 	 * area becomes available.
 	 */
 	gaim_debug_info("docklet", "failed to embed within timeout\n");
-	gaim_gtk_docklet_remove();
+	pidgin_docklet_remove();
 	
 	return FALSE;
 }
@@ -280,7 +280,7 @@
 	 * get embedded.  Ideally, we would only call docklet_embedded() when the
 	 * icon was actually embedded.
 	 */
-	gaim_gtk_docklet_embedded();
+	pidgin_docklet_embedded();
 	embed_timeout = g_timeout_add(EMBED_TIMEOUT, docklet_x11_embed_timeout_cb, NULL);
 
 	gaim_debug(GAIM_DEBUG_INFO, "docklet", "created\n");
@@ -303,5 +303,5 @@
 void
 docklet_ui_init()
 {
-	gaim_gtk_docklet_set_ui_ops(&ui_ops);
+	pidgin_docklet_set_ui_ops(&ui_ops);
 }
--- a/pidgin/gtkdocklet.c	Sat Feb 03 05:55:41 2007 +0000
+++ b/pidgin/gtkdocklet.c	Sat Feb 03 08:13:34 2007 +0000
@@ -93,11 +93,11 @@
 	GList *l_im = NULL;
 	GList *l_chat = NULL;
 
-	l_im = gaim_gtk_conversations_find_unseen_list(GAIM_CONV_TYPE_IM,
+	l_im = pidgin_conversations_find_unseen_list(GAIM_CONV_TYPE_IM,
 						       GAIM_UNSEEN_TEXT,
 						       FALSE, max);
 
-	l_chat = gaim_gtk_conversations_find_unseen_list(GAIM_CONV_TYPE_CHAT,
+	l_chat = pidgin_conversations_find_unseen_list(GAIM_CONV_TYPE_CHAT,
 		 					 GAIM_UNSEEN_NICK,
 							 FALSE, max);
 
@@ -144,7 +144,7 @@
 			GString *tooltip_text = g_string_new("");
 			for (l = convs, count = 0 ; l != NULL ; l = l->next, count++) {
 				if (GAIM_IS_GTK_CONVERSATION(l->data)) {
-					GaimGtkConversation *gtkconv = GAIM_GTK_CONVERSATION((GaimConversation *)l->data);
+					PidginConversation *gtkconv = PIDGIN_CONVERSATION((GaimConversation *)l->data);
 					if (count == DOCKLET_TOOLTIP_LINE_LIMIT - 1)
 						g_string_append(tooltip_text, _("Right-click for more unread messages...\n"));
 					else
@@ -187,7 +187,7 @@
 		GaimAccount *account = (GaimAccount*)l->data;
 		GaimStatus *account_status;
 
-		if (!gaim_account_get_enabled(account, GAIM_GTK_UI))
+		if (!gaim_account_get_enabled(account, PIDGIN_UI))
 			continue;
 
 		if (gaim_account_is_disconnected(account))
@@ -306,7 +306,7 @@
 			if (!visible)
 				ui_ops->create();
 			else if (!visibility_manager) {
-				gaim_gtk_blist_visibility_manager_add();
+				pidgin_blist_visibility_manager_add();
 				visibility_manager = TRUE;
 			}
 		}
@@ -315,7 +315,7 @@
 			ui_ops->destroy();
 	} else {
 		if (visibility_manager) {
-			gaim_gtk_blist_visibility_manager_remove();
+			pidgin_blist_visibility_manager_remove();
 			visibility_manager = FALSE;
 		}
 		docklet_update_status();
@@ -386,7 +386,7 @@
 {
 	GaimSavedStatus *saved_status;
 	saved_status = gaim_savedstatus_get_current();
-	gaim_gtk_status_editor_show(FALSE,
+	pidgin_status_editor_show(FALSE,
 		gaim_savedstatus_is_transient(saved_status) ? saved_status : NULL);
 }
 
@@ -436,7 +436,7 @@
 	if (sf)
 		g_signal_connect(G_OBJECT(menuitem), "activate", sf, data);
 
-	pixbuf = gaim_gtk_create_gaim_icon_with_status(primitive, 0.5);
+	pixbuf = pidgin_create_gaim_icon_with_status(primitive, 0.5);
 	image = gtk_image_new_from_pixbuf(pixbuf);
 	g_object_unref(pixbuf);
 	gtk_image_menu_item_set_image(GTK_IMAGE_MENU_ITEM(menuitem), image);
@@ -489,7 +489,7 @@
 	gaim_separator(submenu);
 
 	new_menu_item_with_gaim_icon(submenu, _("New..."), GAIM_STATUS_AVAILABLE, G_CALLBACK(show_custom_status_editor_cb), NULL, 0, 0, NULL);
-	new_menu_item_with_gaim_icon(submenu, _("Saved..."), GAIM_STATUS_AVAILABLE, G_CALLBACK(gaim_gtk_status_window_show), NULL, 0, 0, NULL);
+	new_menu_item_with_gaim_icon(submenu, _("Saved..."), GAIM_STATUS_AVAILABLE, G_CALLBACK(pidgin_status_window_show), NULL, 0, 0, NULL);
 
 	return menuitem;
 }
@@ -520,7 +520,7 @@
 			gaim_debug_warning("docklet",
 				"status indicates messages pending, but no conversations with unseen messages were found.");
 		} else {
-			gaim_gtk_conversations_fill_menu(submenu, l);
+			pidgin_conversations_fill_menu(submenu, l);
 			g_list_free(l);
 			gtk_menu_item_set_submenu(GTK_MENU_ITEM(menuitem), submenu);
 		}
@@ -531,7 +531,7 @@
 
 	gaim_separator(menu);
 
-	menuitem = gaim_new_item_from_stock(menu, _("New Message..."), GAIM_STOCK_IM, G_CALLBACK(gaim_gtkdialogs_im), NULL, 0, 0, NULL);
+	menuitem = gaim_new_item_from_stock(menu, _("New Message..."), GAIM_STOCK_IM, G_CALLBACK(pidgindialogs_im), NULL, 0, 0, NULL);
 	if (status == DOCKLET_STATUS_OFFLINE)
 		gtk_widget_set_sensitive(menuitem, FALSE);
 
@@ -540,9 +540,9 @@
 
 	gaim_separator(menu);
 
-	gaim_new_item_from_stock(menu, _("Accounts"), GAIM_STOCK_ACCOUNTS, G_CALLBACK(gaim_gtk_accounts_window_show), NULL, 0, 0, NULL);
-	gaim_new_item_from_stock(menu, _("Plugins"), GAIM_STOCK_PLUGIN, G_CALLBACK(gaim_gtk_plugin_dialog_show), NULL, 0, 0, NULL);
-	gaim_new_item_from_stock(menu, _("Preferences"), GTK_STOCK_PREFERENCES, G_CALLBACK(gaim_gtk_prefs_show), NULL, 0, 0, NULL);
+	gaim_new_item_from_stock(menu, _("Accounts"), GAIM_STOCK_ACCOUNTS, G_CALLBACK(pidgin_accounts_window_show), NULL, 0, 0, NULL);
+	gaim_new_item_from_stock(menu, _("Plugins"), GAIM_STOCK_PLUGIN, G_CALLBACK(pidgin_plugin_dialog_show), NULL, 0, 0, NULL);
+	gaim_new_item_from_stock(menu, _("Preferences"), GTK_STOCK_PREFERENCES, G_CALLBACK(pidgin_prefs_show), NULL, 0, 0, NULL);
 
 	gaim_separator(menu);
 
@@ -580,18 +580,18 @@
  * public api for ui_ops
  **************************************************************************/
 void
-gaim_gtk_docklet_clicked(int button_type)
+pidgin_docklet_clicked(int button_type)
 {
 	switch (button_type) {
 		case 1:
 			if (status == DOCKLET_STATUS_ONLINE_PENDING || status == DOCKLET_STATUS_AWAY_PENDING) {
 				GList *l = get_pending_list(1);
 				if (l != NULL) {
-					gaim_gtkconv_present_conversation((GaimConversation *)l->data);
+					pidgin_conv_present_conversation((GaimConversation *)l->data);
 					g_list_free(l);
 				}
 			} else {
-				gaim_gtk_blist_toggle_visibility();
+				pidgin_blist_toggle_visibility();
 			}
 			break;
 		case 3:
@@ -601,11 +601,11 @@
 }
 
 void
-gaim_gtk_docklet_embedded()
+pidgin_docklet_embedded()
 {
 	if (!visibility_manager
 	    && strcmp(gaim_prefs_get_string("/gaim/gtk/docklet/show"), "pending")) {
-		gaim_gtk_blist_visibility_manager_add();
+		pidgin_blist_visibility_manager_add();
 		visibility_manager = TRUE;
 	}
 	visible = TRUE;
@@ -615,11 +615,11 @@
 }
 
 void
-gaim_gtk_docklet_remove()
+pidgin_docklet_remove()
 {
 	if (visible) {
 		if (visibility_manager) {
-			gaim_gtk_blist_visibility_manager_remove();
+			pidgin_blist_visibility_manager_remove();
 			visibility_manager = FALSE;
 		}
 		if (docklet_blinking_timer) {
@@ -632,25 +632,25 @@
 }
 
 void
-gaim_gtk_docklet_set_ui_ops(struct docklet_ui_ops *ops)
+pidgin_docklet_set_ui_ops(struct docklet_ui_ops *ops)
 {
 	ui_ops = ops;
 }
 
 void*
-gaim_gtk_docklet_get_handle()
+pidgin_docklet_get_handle()
 {
 	static int i;
 	return &i;
 }
 
 void
-gaim_gtk_docklet_init()
+pidgin_docklet_init()
 {
 	void *conn_handle = gaim_connections_get_handle();
 	void *conv_handle = gaim_conversations_get_handle();
 	void *accounts_handle = gaim_accounts_get_handle();
-	void *docklet_handle = gaim_gtk_docklet_get_handle();
+	void *docklet_handle = pidgin_docklet_get_handle();
 
 	gaim_prefs_add_none("/gaim/gtk/docklet");
 	gaim_prefs_add_bool("/gaim/gtk/docklet/blink", FALSE);
@@ -685,7 +685,7 @@
 }
 
 void
-gaim_gtk_docklet_uninit()
+pidgin_docklet_uninit()
 {
 	if (visible && ui_ops && ui_ops->destroy)
 		ui_ops->destroy();
--- a/pidgin/gtkdocklet.h	Sat Feb 03 05:55:41 2007 +0000
+++ b/pidgin/gtkdocklet.h	Sat Feb 03 08:13:34 2007 +0000
@@ -47,14 +47,14 @@
 
 
 /* functions in gtkdocklet.c */
-void gaim_gtk_docklet_clicked(int);
-void gaim_gtk_docklet_embedded(void);
-void gaim_gtk_docklet_remove(void);
-void gaim_gtk_docklet_set_ui_ops(struct docklet_ui_ops *);
-void gaim_gtk_docklet_unload(void);
-void gaim_gtk_docklet_init(void);
-void gaim_gtk_docklet_uninit(void);
-void*gaim_gtk_docklet_get_handle(void);
+void pidgin_docklet_clicked(int);
+void pidgin_docklet_embedded(void);
+void pidgin_docklet_remove(void);
+void pidgin_docklet_set_ui_ops(struct docklet_ui_ops *);
+void pidgin_docklet_unload(void);
+void pidgin_docklet_init(void);
+void pidgin_docklet_uninit(void);
+void*pidgin_docklet_get_handle(void);
 
 /* function in gtkdocklet-{x11,win32}.c */
 void docklet_ui_init(void);
--- a/pidgin/gtkeventloop.c	Sat Feb 03 05:55:41 2007 +0000
+++ b/pidgin/gtkeventloop.c	Sat Feb 03 08:13:34 2007 +0000
@@ -30,29 +30,29 @@
 #include "win32dep.h"
 #endif
 
-#define GAIM_GTK_READ_COND  (G_IO_IN | G_IO_HUP | G_IO_ERR)
-#define GAIM_GTK_WRITE_COND (G_IO_OUT | G_IO_HUP | G_IO_ERR | G_IO_NVAL)
+#define PIDGIN_READ_COND  (G_IO_IN | G_IO_HUP | G_IO_ERR)
+#define PIDGIN_WRITE_COND (G_IO_OUT | G_IO_HUP | G_IO_ERR | G_IO_NVAL)
 
-typedef struct _GaimGtkIOClosure {
+typedef struct _PidginIOClosure {
 	GaimInputFunction function;
 	guint result;
 	gpointer data;
 
-} GaimGtkIOClosure;
+} PidginIOClosure;
 
-static void gaim_gtk_io_destroy(gpointer data)
+static void pidgin_io_destroy(gpointer data)
 {
 	g_free(data);
 }
 
-static gboolean gaim_gtk_io_invoke(GIOChannel *source, GIOCondition condition, gpointer data)
+static gboolean pidgin_io_invoke(GIOChannel *source, GIOCondition condition, gpointer data)
 {
-	GaimGtkIOClosure *closure = data;
+	PidginIOClosure *closure = data;
 	GaimInputCondition gaim_cond = 0;
 
-	if (condition & GAIM_GTK_READ_COND)
+	if (condition & PIDGIN_READ_COND)
 		gaim_cond |= GAIM_INPUT_READ;
-	if (condition & GAIM_GTK_WRITE_COND)
+	if (condition & PIDGIN_WRITE_COND)
 		gaim_cond |= GAIM_INPUT_WRITE;
 
 #if 0
@@ -67,7 +67,7 @@
 		gaim_debug(GAIM_DEBUG_MISC, "gtk_eventloop",
 			   "CLOSURE received GIOCondition of 0x%x, which does not"
 			   " match 0x%x (READ) or 0x%x (WRITE)\n",
-			   condition, GAIM_GTK_READ_COND, GAIM_GTK_WRITE_COND);
+			   condition, PIDGIN_READ_COND, PIDGIN_WRITE_COND);
 #endif /* DEBUG */
 
 		return TRUE;
@@ -80,10 +80,10 @@
 	return TRUE;
 }
 
-static guint gaim_gtk_input_add(gint fd, GaimInputCondition condition, GaimInputFunction function,
+static guint pidgin_input_add(gint fd, GaimInputCondition condition, GaimInputFunction function,
 							   gpointer data)
 {
-	GaimGtkIOClosure *closure = g_new0(GaimGtkIOClosure, 1);
+	PidginIOClosure *closure = g_new0(PidginIOClosure, 1);
 	GIOChannel *channel;
 	GIOCondition cond = 0;
 
@@ -91,9 +91,9 @@
 	closure->data = data;
 
 	if (condition & GAIM_INPUT_READ)
-		cond |= GAIM_GTK_READ_COND;
+		cond |= PIDGIN_READ_COND;
 	if (condition & GAIM_INPUT_WRITE)
-		cond |= GAIM_GTK_WRITE_COND;
+		cond |= PIDGIN_WRITE_COND;
 
 #ifdef _WIN32
 	channel = wgaim_g_io_channel_win32_new_socket(fd);
@@ -101,7 +101,7 @@
 	channel = g_io_channel_unix_new(fd);
 #endif
 	closure->result = g_io_add_watch_full(channel, G_PRIORITY_DEFAULT, cond,
-					      gaim_gtk_io_invoke, closure, gaim_gtk_io_destroy);
+					      pidgin_io_invoke, closure, pidgin_io_destroy);
 
 #if 0
 	gaim_debug(GAIM_DEBUG_MISC, "gtk_eventloop",
@@ -117,12 +117,12 @@
 {
 	g_timeout_add,
 	(guint (*)(guint))g_source_remove,
-	gaim_gtk_input_add,
+	pidgin_input_add,
 	(guint (*)(guint))g_source_remove
 };
 
 GaimEventLoopUiOps *
-gaim_gtk_eventloop_get_ui_ops(void)
+pidgin_eventloop_get_ui_ops(void)
 {
 	return &eventloop_ops;
 }
--- a/pidgin/gtkeventloop.h	Sat Feb 03 05:55:41 2007 +0000
+++ b/pidgin/gtkeventloop.h	Sat Feb 03 08:13:34 2007 +0000
@@ -22,8 +22,8 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
-#ifndef _GAIM_GTKEVENTLOOP_H_
-#define _GAIM_GTKEVENTLOOP_H_
+#ifndef _PIDGINEVENTLOOP_H_
+#define _PIDGINEVENTLOOP_H_
 
 #include "eventloop.h"
 
@@ -32,6 +32,6 @@
  *
  * @return The GTK+ event loop UI operations structure.
  */
-GaimEventLoopUiOps *gaim_gtk_eventloop_get_ui_ops(void);
+GaimEventLoopUiOps *pidgin_eventloop_get_ui_ops(void);
 
-#endif /* _GAIM_GTKEVENTLOOP_H_ */
+#endif /* _PIDGINEVENTLOOP_H_ */
--- a/pidgin/gtkft.c	Sat Feb 03 05:55:41 2007 +0000
+++ b/pidgin/gtkft.c	Sat Feb 03 08:13:34 2007 +0000
@@ -38,10 +38,10 @@
 #include "gaimstock.h"
 #include "gtkutils.h"
 
-#define GAIM_GTKXFER(xfer) \
-	(GaimGtkXferUiData *)(xfer)->ui_data
+#define PIDGINXFER(xfer) \
+	(PidginXferUiData *)(xfer)->ui_data
 
-struct _GaimGtkXferDialog
+struct _PidginXferDialog
 {
 	gboolean keep_open;
 	gboolean auto_clear;
@@ -89,9 +89,9 @@
 
 	char *name;
 
-} GaimGtkXferUiData;
+} PidginXferUiData;
 
-static GaimGtkXferDialog *xfer_dialog = NULL;
+static PidginXferDialog *xfer_dialog = NULL;
 
 enum
 {
@@ -112,12 +112,12 @@
 get_xfer_info_strings(GaimXfer *xfer, char **kbsec, char **time_elapsed,
 					  char **time_remaining)
 {
-	GaimGtkXferUiData *data;
+	PidginXferUiData *data;
 	double kb_sent, kb_rem;
 	double kbps = 0.0;
 	time_t elapsed, now;
 
-	data = GAIM_GTKXFER(xfer);
+	data = PIDGINXFER(xfer);
 
 	if (xfer->end_time != 0)
 		now = xfer->end_time;
@@ -183,7 +183,7 @@
 }
 
 static void
-update_title_progress(GaimGtkXferDialog *dialog)
+update_title_progress(PidginXferDialog *dialog)
 {
 	gboolean valid;
 	GtkTreeIter iter;
@@ -235,16 +235,16 @@
 }
 
 static void
-update_detailed_info(GaimGtkXferDialog *dialog, GaimXfer *xfer)
+update_detailed_info(PidginXferDialog *dialog, GaimXfer *xfer)
 {
-	GaimGtkXferUiData *data;
+	PidginXferUiData *data;
 	char *kbsec, *time_elapsed, *time_remaining;
 	char *status, *utf8;
 
 	if (dialog == NULL || xfer == NULL)
 		return;
 
-	data = GAIM_GTKXFER(xfer);
+	data = PIDGINXFER(xfer);
 
 	get_xfer_info_strings(xfer, &kbsec, &time_elapsed, &time_remaining);
 
@@ -322,7 +322,7 @@
 }
 
 static void
-update_buttons(GaimGtkXferDialog *dialog, GaimXfer *xfer)
+update_buttons(PidginXferDialog *dialog, GaimXfer *xfer)
 {
 	if (dialog->selected_xfer == NULL) {
 		gtk_widget_set_sensitive(dialog->expander, FALSE);
@@ -385,7 +385,7 @@
 }
 
 static void
-ensure_row_selected(GaimGtkXferDialog *dialog)
+ensure_row_selected(PidginXferDialog *dialog)
 {
 	GtkTreeIter iter;
 	GtkTreeSelection *selection;
@@ -405,17 +405,17 @@
 static gint
 delete_win_cb(GtkWidget *w, GdkEventAny *e, gpointer d)
 {
-	GaimGtkXferDialog *dialog;
+	PidginXferDialog *dialog;
 
-	dialog = (GaimGtkXferDialog *)d;
+	dialog = (PidginXferDialog *)d;
 
-	gaim_gtkxfer_dialog_hide(dialog);
+	pidginxfer_dialog_hide(dialog);
 
 	return TRUE;
 }
 
 static void
-toggle_keep_open_cb(GtkWidget *w, GaimGtkXferDialog *dialog)
+toggle_keep_open_cb(GtkWidget *w, PidginXferDialog *dialog)
 {
 	dialog->keep_open = !dialog->keep_open;
 	gaim_prefs_set_bool("/gaim/gtk/filetransfer/keep_open",
@@ -423,7 +423,7 @@
 }
 
 static void
-toggle_clear_finished_cb(GtkWidget *w, GaimGtkXferDialog *dialog)
+toggle_clear_finished_cb(GtkWidget *w, PidginXferDialog *dialog)
 {
 	dialog->auto_clear = !dialog->auto_clear;
 	gaim_prefs_set_bool("/gaim/gtk/filetransfer/clear_finished",
@@ -431,7 +431,7 @@
 }
 
 static void
-selection_changed_cb(GtkTreeSelection *selection, GaimGtkXferDialog *dialog)
+selection_changed_cb(GtkTreeSelection *selection, PidginXferDialog *dialog)
 {
 	GtkTreeIter iter;
 	GaimXfer *xfer = NULL;
@@ -464,7 +464,7 @@
 }
 
 static void
-open_button_cb(GtkButton *button, GaimGtkXferDialog *dialog)
+open_button_cb(GtkButton *button, PidginXferDialog *dialog)
 {
 #ifdef _WIN32
 	/* If using Win32... */
@@ -556,31 +556,31 @@
 }
 
 static void
-pause_button_cb(GtkButton *button, GaimGtkXferDialog *dialog)
+pause_button_cb(GtkButton *button, PidginXferDialog *dialog)
 {
 }
 
 static void
-resume_button_cb(GtkButton *button, GaimGtkXferDialog *dialog)
+resume_button_cb(GtkButton *button, PidginXferDialog *dialog)
 {
 }
 
 static void
-remove_button_cb(GtkButton *button, GaimGtkXferDialog *dialog)
+remove_button_cb(GtkButton *button, PidginXferDialog *dialog)
 {
-	gaim_gtkxfer_dialog_remove_xfer(dialog, dialog->selected_xfer);
+	pidginxfer_dialog_remove_xfer(dialog, dialog->selected_xfer);
 }
 
 static void
-stop_button_cb(GtkButton *button, GaimGtkXferDialog *dialog)
+stop_button_cb(GtkButton *button, PidginXferDialog *dialog)
 {
 	gaim_xfer_cancel_local(dialog->selected_xfer);
 }
 
 static void
-close_button_cb(GtkButton *button, GaimGtkXferDialog *dialog)
+close_button_cb(GtkButton *button, PidginXferDialog *dialog)
 {
-	gaim_gtkxfer_dialog_hide(dialog);
+	pidginxfer_dialog_hide(dialog);
 }
 
 
@@ -588,7 +588,7 @@
  * Dialog Building Functions
  **************************************************************************/
 static GtkWidget *
-setup_tree(GaimGtkXferDialog *dialog)
+setup_tree(PidginXferDialog *dialog)
 {
 	GtkWidget *sw;
 	GtkWidget *tree;
@@ -640,7 +640,7 @@
 	gtk_tree_view_append_column(GTK_TREE_VIEW(tree), column);
 
 	/* Progress bar column */
-	renderer = gaim_gtk_cell_renderer_progress_new();
+	renderer = pidgin_cell_renderer_progress_new();
 	column = gtk_tree_view_column_new_with_attributes(_("Progress"), renderer,
 				"percentage", COLUMN_PROGRESS, NULL);
 	gtk_tree_view_column_set_resizable(GTK_TREE_VIEW_COLUMN(column), TRUE);
@@ -676,7 +676,7 @@
 }
 
 static GtkWidget *
-make_info_table(GaimGtkXferDialog *dialog)
+make_info_table(PidginXferDialog *dialog)
 {
 	GtkWidget *table;
 	GtkWidget *label;
@@ -738,10 +738,10 @@
 	return table;
 }
 
-GaimGtkXferDialog *
-gaim_gtkxfer_dialog_new(void)
+PidginXferDialog *
+pidginxfer_dialog_new(void)
 {
-	GaimGtkXferDialog *dialog;
+	PidginXferDialog *dialog;
 	GtkWidget *window;
 	GtkWidget *vbox1, *vbox2;
 	GtkWidget *bbox;
@@ -751,7 +751,7 @@
 	GtkWidget *table;
 	GtkWidget *checkbox;
 
-	dialog = g_new0(GaimGtkXferDialog, 1);
+	dialog = g_new0(PidginXferDialog, 1);
 	dialog->keep_open =
 		gaim_prefs_get_bool("/gaim/gtk/filetransfer/keep_open");
 	dialog->auto_clear =
@@ -888,7 +888,7 @@
 }
 
 void
-gaim_gtkxfer_dialog_destroy(GaimGtkXferDialog *dialog)
+pidginxfer_dialog_destroy(PidginXferDialog *dialog)
 {
 	g_return_if_fail(dialog != NULL);
 
@@ -900,15 +900,15 @@
 }
 
 void
-gaim_gtkxfer_dialog_show(GaimGtkXferDialog *dialog)
+pidginxfer_dialog_show(PidginXferDialog *dialog)
 {
-	GaimGtkXferDialog *tmp;
+	PidginXferDialog *tmp;
 
 	if (dialog == NULL) {
 		tmp = gaim_get_gtkxfer_dialog();
 
 		if (tmp == NULL) {
-			tmp = gaim_gtkxfer_dialog_new();
+			tmp = pidginxfer_dialog_new();
 			gaim_set_gtkxfer_dialog(tmp);
 		}
 
@@ -919,7 +919,7 @@
 }
 
 void
-gaim_gtkxfer_dialog_hide(GaimGtkXferDialog *dialog)
+pidginxfer_dialog_hide(PidginXferDialog *dialog)
 {
 	g_return_if_fail(dialog != NULL);
 
@@ -929,9 +929,9 @@
 }
 
 void
-gaim_gtkxfer_dialog_add_xfer(GaimGtkXferDialog *dialog, GaimXfer *xfer)
+pidginxfer_dialog_add_xfer(PidginXferDialog *dialog, GaimXfer *xfer)
 {
-	GaimGtkXferUiData *data;
+	PidginXferUiData *data;
 	GaimXferType type;
 	GdkPixbuf *pixbuf;
 	char *size_str, *remaining_str;
@@ -942,10 +942,10 @@
 
 	gaim_xfer_ref(xfer);
 
-	data = GAIM_GTKXFER(xfer);
+	data = PIDGINXFER(xfer);
 	data->in_list = TRUE;
 
-	gaim_gtkxfer_dialog_show(dialog);
+	pidginxfer_dialog_show(dialog);
 
 	data->last_updated_time = 0;
 
@@ -991,15 +991,15 @@
 }
 
 void
-gaim_gtkxfer_dialog_remove_xfer(GaimGtkXferDialog *dialog,
+pidginxfer_dialog_remove_xfer(PidginXferDialog *dialog,
 								GaimXfer *xfer)
 {
-	GaimGtkXferUiData *data;
+	PidginXferUiData *data;
 
 	g_return_if_fail(dialog != NULL);
 	g_return_if_fail(xfer != NULL);
 
-	data = GAIM_GTKXFER(xfer);
+	data = PIDGINXFER(xfer);
 
 	if (data == NULL)
 		return;
@@ -1020,17 +1020,17 @@
 }
 
 void
-gaim_gtkxfer_dialog_cancel_xfer(GaimGtkXferDialog *dialog,
+pidginxfer_dialog_cancel_xfer(PidginXferDialog *dialog,
 								GaimXfer *xfer)
 {
-	GaimGtkXferUiData *data;
+	PidginXferUiData *data;
 	GdkPixbuf *pixbuf;
 	const gchar *status;
 
 	g_return_if_fail(dialog != NULL);
 	g_return_if_fail(xfer != NULL);
 
-	data = GAIM_GTKXFER(xfer);
+	data = PIDGINXFER(xfer);
 
 	if (data == NULL)
 		return;
@@ -1039,11 +1039,11 @@
 		return;
 
 	if ((gaim_xfer_get_status(xfer) == GAIM_XFER_STATUS_CANCEL_LOCAL) && (dialog->auto_clear)) {
-		gaim_gtkxfer_dialog_remove_xfer(dialog, xfer);
+		pidginxfer_dialog_remove_xfer(dialog, xfer);
 		return;
 	}
 
-	data = GAIM_GTKXFER(xfer);
+	data = PIDGINXFER(xfer);
 
 	update_detailed_info(dialog, xfer);
 	update_title_progress(dialog);
@@ -1068,10 +1068,10 @@
 }
 
 void
-gaim_gtkxfer_dialog_update_xfer(GaimGtkXferDialog *dialog,
+pidginxfer_dialog_update_xfer(PidginXferDialog *dialog,
 								GaimXfer *xfer)
 {
-	GaimGtkXferUiData *data;
+	PidginXferUiData *data;
 	char *size_str, *remaining_str;
 	GtkTreeSelection *selection;
 	time_t current_time;
@@ -1081,7 +1081,7 @@
 	g_return_if_fail(dialog != NULL);
 	g_return_if_fail(xfer != NULL);
 
-	if ((data = GAIM_GTKXFER(xfer)) == NULL)
+	if ((data = PIDGINXFER(xfer)) == NULL)
 		return;
 
 	if (data->in_list == FALSE)
@@ -1128,7 +1128,7 @@
 		update_detailed_info(xfer_dialog, xfer);
 
 	if (gaim_xfer_is_completed(xfer) && dialog->auto_clear)
-		gaim_gtkxfer_dialog_remove_xfer(dialog, xfer);
+		pidginxfer_dialog_remove_xfer(dialog, xfer);
 	else
 		update_buttons(dialog, xfer);
 
@@ -1157,28 +1157,28 @@
 	}
 
 	/* If we got to this point then we know everything is finished */
-	gaim_gtkxfer_dialog_hide(dialog);
+	pidginxfer_dialog_hide(dialog);
 }
 
 /**************************************************************************
  * File Transfer UI Ops
  **************************************************************************/
 static void
-gaim_gtkxfer_new_xfer(GaimXfer *xfer)
+pidginxfer_new_xfer(GaimXfer *xfer)
 {
-	GaimGtkXferUiData *data;
+	PidginXferUiData *data;
 
 	/* This is where we're setting xfer->ui_data for the first time. */
-	data = g_new0(GaimGtkXferUiData, 1);
+	data = g_new0(PidginXferUiData, 1);
 	xfer->ui_data = data;
 }
 
 static void
-gaim_gtkxfer_destroy(GaimXfer *xfer)
+pidginxfer_destroy(GaimXfer *xfer)
 {
-	GaimGtkXferUiData *data;
+	PidginXferUiData *data;
 
-	data = GAIM_GTKXFER(xfer);
+	data = PIDGINXFER(xfer);
 	if (data) {
 		g_free(data->name);
 		g_free(data);
@@ -1187,49 +1187,49 @@
 }
 
 static void
-gaim_gtkxfer_add_xfer(GaimXfer *xfer)
+pidginxfer_add_xfer(GaimXfer *xfer)
 {
 	if (xfer_dialog == NULL)
-		xfer_dialog = gaim_gtkxfer_dialog_new();
+		xfer_dialog = pidginxfer_dialog_new();
 
-	gaim_gtkxfer_dialog_add_xfer(xfer_dialog, xfer);
+	pidginxfer_dialog_add_xfer(xfer_dialog, xfer);
 }
 
 static void
-gaim_gtkxfer_update_progress(GaimXfer *xfer, double percent)
+pidginxfer_update_progress(GaimXfer *xfer, double percent)
 {
-	gaim_gtkxfer_dialog_update_xfer(xfer_dialog, xfer);
+	pidginxfer_dialog_update_xfer(xfer_dialog, xfer);
 }
 
 static void
-gaim_gtkxfer_cancel_local(GaimXfer *xfer)
+pidginxfer_cancel_local(GaimXfer *xfer)
 {
 	if (xfer_dialog)
-		gaim_gtkxfer_dialog_cancel_xfer(xfer_dialog, xfer);
+		pidginxfer_dialog_cancel_xfer(xfer_dialog, xfer);
 }
 
 static void
-gaim_gtkxfer_cancel_remote(GaimXfer *xfer)
+pidginxfer_cancel_remote(GaimXfer *xfer)
 {
 	if (xfer_dialog)
-		gaim_gtkxfer_dialog_cancel_xfer(xfer_dialog, xfer);
+		pidginxfer_dialog_cancel_xfer(xfer_dialog, xfer);
 }
 
 static GaimXferUiOps ops =
 {
-	gaim_gtkxfer_new_xfer,
-	gaim_gtkxfer_destroy,
-	gaim_gtkxfer_add_xfer,
-	gaim_gtkxfer_update_progress,
-	gaim_gtkxfer_cancel_local,
-	gaim_gtkxfer_cancel_remote
+	pidginxfer_new_xfer,
+	pidginxfer_destroy,
+	pidginxfer_add_xfer,
+	pidginxfer_update_progress,
+	pidginxfer_cancel_local,
+	pidginxfer_cancel_remote
 };
 
 /**************************************************************************
  * GTK+ File Transfer API
  **************************************************************************/
 void
-gaim_gtk_xfers_init(void)
+pidgin_xfers_init(void)
 {
 	gaim_prefs_add_none("/gaim/gtk/filetransfer");
 	gaim_prefs_add_bool("/gaim/gtk/filetransfer/clear_finished", TRUE);
@@ -1237,26 +1237,26 @@
 }
 
 void
-gaim_gtk_xfers_uninit(void)
+pidgin_xfers_uninit(void)
 {
 	if (xfer_dialog != NULL)
-		gaim_gtkxfer_dialog_destroy(xfer_dialog);
+		pidginxfer_dialog_destroy(xfer_dialog);
 }
 
 void
-gaim_set_gtkxfer_dialog(GaimGtkXferDialog *dialog)
+gaim_set_gtkxfer_dialog(PidginXferDialog *dialog)
 {
 	xfer_dialog = dialog;
 }
 
-GaimGtkXferDialog *
+PidginXferDialog *
 gaim_get_gtkxfer_dialog(void)
 {
 	return xfer_dialog;
 }
 
 GaimXferUiOps *
-gaim_gtk_xfers_get_ui_ops(void)
+pidgin_xfers_get_ui_ops(void)
 {
 	return &ops;
 }
--- a/pidgin/gtkft.h	Sat Feb 03 05:55:41 2007 +0000
+++ b/pidgin/gtkft.h	Sat Feb 03 08:13:34 2007 +0000
@@ -22,8 +22,8 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
-#ifndef _GAIM_GTKFT_H_
-#define _GAIM_GTKFT_H_
+#ifndef _PIDGINFT_H_
+#define _PIDGINFT_H_
 
 #include "ft.h"
 
@@ -33,7 +33,7 @@
  * The structure is opaque, as nobody should be touching anything inside of
  * it.
  */
-typedef struct _GaimGtkXferDialog GaimGtkXferDialog;
+typedef struct _PidginXferDialog PidginXferDialog;
 
 /**************************************************************************/
 /** @name GTK+ File Transfer Dialog API                                   */
@@ -45,14 +45,14 @@
  *
  * @return The new dialog.
  */
-GaimGtkXferDialog *gaim_gtkxfer_dialog_new(void);
+PidginXferDialog *pidginxfer_dialog_new(void);
 
 /**
  * Destroys a file transfer dialog.
  *
  * @param dialog The file transfer dialog.
  */
-void gaim_gtkxfer_dialog_destroy(GaimGtkXferDialog *dialog);
+void pidginxfer_dialog_destroy(PidginXferDialog *dialog);
 
 /**
  * Displays the file transfer dialog given.
@@ -60,14 +60,14 @@
  *
  * @param dialog The file transfer dialog to show.
  */
-void gaim_gtkxfer_dialog_show(GaimGtkXferDialog *dialog);
+void pidginxfer_dialog_show(PidginXferDialog *dialog);
 
 /**
  * Hides the file transfer dialog.
  *
  * @param dialog The file transfer dialog to hide.
  */
-void gaim_gtkxfer_dialog_hide(GaimGtkXferDialog *dialog);
+void pidginxfer_dialog_hide(PidginXferDialog *dialog);
 
 /**
  * Adds a file transfer to the dialog.
@@ -75,7 +75,7 @@
  * @param dialog The file transfer dialog.
  * @param xfer   The file transfer.
  */
-void gaim_gtkxfer_dialog_add_xfer(GaimGtkXferDialog *dialog, GaimXfer *xfer);
+void pidginxfer_dialog_add_xfer(PidginXferDialog *dialog, GaimXfer *xfer);
 
 /**
  * Removes a file transfer from the dialog.
@@ -83,7 +83,7 @@
  * @param dialog The file transfer dialog.
  * @param xfer   The file transfer.
  */
-void gaim_gtkxfer_dialog_remove_xfer(GaimGtkXferDialog *dialog,
+void pidginxfer_dialog_remove_xfer(PidginXferDialog *dialog,
 									 GaimXfer *xfer);
 
 /**
@@ -92,7 +92,7 @@
  * @param dialog The file transfer dialog.
  * @param xfer   The file transfer that was canceled.
  */
-void gaim_gtkxfer_dialog_cancel_xfer(GaimGtkXferDialog *dialog,
+void pidginxfer_dialog_cancel_xfer(PidginXferDialog *dialog,
 									 GaimXfer *xfer);
 
 /**
@@ -101,7 +101,7 @@
  * @param dialog The file transfer dialog.
  * @param xfer   The file transfer.
  */
-void gaim_gtkxfer_dialog_update_xfer(GaimGtkXferDialog *dialog,
+void pidginxfer_dialog_update_xfer(PidginXferDialog *dialog,
 									 GaimXfer *xfer);
 
 /*@}*/
@@ -114,34 +114,34 @@
 /**
  * Initializes the GTK+ file transfer system.
  */
-void gaim_gtk_xfers_init(void);
+void pidgin_xfers_init(void);
 
 /**
  * Uninitializes the GTK+ file transfer system.
  */
-void gaim_gtk_xfers_uninit(void);
+void pidgin_xfers_uninit(void);
 
 /**
  * Sets gaim's main file transfer dialog.
  *
  * @param dialog The main dialog.
  */
-void gaim_set_gtkxfer_dialog(GaimGtkXferDialog *dialog);
+void gaim_set_gtkxfer_dialog(PidginXferDialog *dialog);
 
 /**
  * Returns gaim's main file transfer dialog.
  *
  * @return The main dialog.
  */
-GaimGtkXferDialog *gaim_get_gtkxfer_dialog(void);
+PidginXferDialog *gaim_get_gtkxfer_dialog(void);
 
 /**
  * Returns the UI operations structure for the GTK+ file transfer UI.
  *
  * @return The GTK+ file transfer UI operations structure.
  */
-GaimXferUiOps *gaim_gtk_xfers_get_ui_ops(void);
+GaimXferUiOps *pidgin_xfers_get_ui_ops(void);
 
 /*@}*/
 
-#endif /* _GAIM_GTKFT_H_ */
+#endif /* _PIDGINFT_H_ */
--- a/pidgin/gtkgaim.h	Sat Feb 03 05:55:41 2007 +0000
+++ b/pidgin/gtkgaim.h	Sat Feb 03 08:13:34 2007 +0000
@@ -23,8 +23,8 @@
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 /* #warning ***gtkgaim*** */
-#ifndef _GAIM_GTKGAIM_H_
-#define _GAIM_GTKGAIM_H_
+#ifndef _PIDGINGAIM_H_
+#define _PIDGINGAIM_H_
 
 #ifndef _WIN32
 # include <gdk/gdkx.h>
@@ -39,7 +39,7 @@
 /**
  * Our UI's identifier.
  */
-#define GAIM_GTK_UI "gtk-gaim"
+#define PIDGIN_UI "gtk-gaim"
 
 #ifndef _WIN32
 # define GAIM_ALERT_TITLE ""
@@ -88,5 +88,5 @@
  */
 #define GAIM_INVISIBLE_CHAR (gunichar)0x2022
 
-#endif /* _GAIM_GTKGAIM_H_ */
+#endif /* _PIDGINGAIM_H_ */
 
--- a/pidgin/gtkidle.c	Sat Feb 03 05:55:41 2007 +0000
+++ b/pidgin/gtkidle.c	Sat Feb 03 08:13:34 2007 +0000
@@ -69,7 +69,7 @@
  */
 #if defined(USE_SCREENSAVER) || defined(HAVE_IOKIT)
 static time_t
-gaim_gtk_get_time_idle()
+pidgin_get_time_idle()
 {
 # ifdef HAVE_IOKIT
 	/* Query the IOKit API */
@@ -120,14 +120,14 @@
 static GaimIdleUiOps ui_ops =
 {
 #if defined(USE_SCREENSAVER) || defined(HAVE_IOKIT)
-	gaim_gtk_get_time_idle
+	pidgin_get_time_idle
 #else
 	NULL
 #endif /* USE_SCREENSAVER || HAVE_IOKIT */
 };
 
 GaimIdleUiOps *
-gaim_gtk_idle_get_ui_ops()
+pidgin_idle_get_ui_ops()
 {
 	return &ui_ops;
 }
--- a/pidgin/gtkidle.h	Sat Feb 03 05:55:41 2007 +0000
+++ b/pidgin/gtkidle.h	Sat Feb 03 08:13:34 2007 +0000
@@ -22,8 +22,8 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
-#ifndef _GAIM_GTK_IDLE_H_
-#define _GAIM_GTK_IDLE_H_
+#ifndef _PIDGIN_IDLE_H_
+#define _PIDGIN_IDLE_H_
 
 #include "idle.h"
 
@@ -37,8 +37,8 @@
  *
  * @return The UI operations structure.
  */
-GaimIdleUiOps *gaim_gtk_idle_get_ui_ops(void);
+GaimIdleUiOps *pidgin_idle_get_ui_ops(void);
 
 /*@}*/
 
-#endif /* _GAIM_GTK_IDLE_H_ */
+#endif /* _PIDGIN_IDLE_H_ */
--- a/pidgin/gtkimhtml.h	Sat Feb 03 05:55:41 2007 +0000
+++ b/pidgin/gtkimhtml.h	Sat Feb 03 08:13:34 2007 +0000
@@ -20,8 +20,8 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
-#ifndef _GAIM_GTKIMHTML_H_
-#define _GAIM_GTKIMHTML_H_
+#ifndef _PIDGINIMHTML_H_
+#define _PIDGINIMHTML_H_
 
 #include <gdk/gdk.h>
 #include <gtk/gtktextview.h>
@@ -790,4 +790,4 @@
 }
 #endif
 
-#endif /* _GAIM_GTKIMHTML_H_ */
+#endif /* _PIDGINIMHTML_H_ */
--- a/pidgin/gtkimhtmltoolbar.c	Sat Feb 03 05:55:41 2007 +0000
+++ b/pidgin/gtkimhtmltoolbar.c	Sat Feb 03 08:13:34 2007 +0000
@@ -459,7 +459,7 @@
 	}
 
 #if !GTK_CHECK_VERSION(2,4,0) /* FILECHOOSER */
-	if (gaim_gtk_check_if_dir(filename, GTK_FILE_SELECTION(widget))) {
+	if (pidgin_check_if_dir(filename, GTK_FILE_SELECTION(widget))) {
 		g_free(filename);
 		gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(toolbar->image), FALSE);
 		return;
@@ -653,9 +653,9 @@
 	}
 
 	if (toolbar->sml)
-		smileys = gaim_gtkthemes_get_proto_smileys(toolbar->sml);
+		smileys = pidginthemes_get_proto_smileys(toolbar->sml);
 	else
-		smileys = gaim_gtkthemes_get_proto_smileys(NULL);
+		smileys = pidginthemes_get_proto_smileys(NULL);
 
 	while(smileys) {
 		GtkIMHtmlSmiley *smiley = smileys->data;
--- a/pidgin/gtkimhtmltoolbar.h	Sat Feb 03 05:55:41 2007 +0000
+++ b/pidgin/gtkimhtmltoolbar.h	Sat Feb 03 08:13:34 2007 +0000
@@ -20,8 +20,8 @@
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  *
  */
-#ifndef _GAIM_GTKIMHTMLTOOLBAR_H_
-#define _GAIM_GTKIMHTMLTOOLBAR_H_
+#ifndef _PIDGINIMHTMLTOOLBAR_H_
+#define _PIDGINIMHTMLTOOLBAR_H_
 
 #include <gtk/gtkvbox.h>
 #include "gtkimhtml.h"
@@ -92,4 +92,4 @@
 }
 #endif
 
-#endif /* _GAIM_GTKIMHTMLTOOLBAR_H_ */
+#endif /* _PIDGINIMHTMLTOOLBAR_H_ */
--- a/pidgin/gtklog.c	Sat Feb 03 05:55:41 2007 +0000
+++ b/pidgin/gtklog.c	Sat Feb 03 08:13:34 2007 +0000
@@ -35,8 +35,8 @@
 #include "util.h"
 
 static GHashTable *log_viewers = NULL;
-static void populate_log_tree(GaimGtkLogViewer *lv);
-static GaimGtkLogViewer *syslog_viewer = NULL;
+static void populate_log_tree(PidginLogViewer *lv);
+static PidginLogViewer *syslog_viewer = NULL;
 
 struct log_viewer_hash_t {
 	GaimLogType type;
@@ -83,7 +83,7 @@
 	return ret;
 }
 
-static void select_first_log(GaimGtkLogViewer *lv)
+static void select_first_log(PidginLogViewer *lv)
 {
 	GtkTreeModel *model;
 	GtkTreeIter iter, it;
@@ -114,7 +114,7 @@
 		return gaim_date_format_full(localtime(&log->time));
 }
 
-static void search_cb(GtkWidget *button, GaimGtkLogViewer *lv)
+static void search_cb(GtkWidget *button, PidginLogViewer *lv)
 {
 	const char *search_term = gtk_entry_get_text(GTK_ENTRY(lv->entry));
 	GList *logs;
@@ -137,7 +137,7 @@
 		return;	
 	}
 
-	gaim_gtk_set_cursor(lv->window, GDK_WATCH);
+	pidgin_set_cursor(lv->window, GDK_WATCH);
 
 	g_free(lv->search);
 	lv->search = g_strdup(search_term);
@@ -160,11 +160,11 @@
 	}
 
 	select_first_log(lv);
-	gaim_gtk_clear_cursor(lv->window);
+	pidgin_clear_cursor(lv->window);
 }
 
 static void destroy_cb(GtkWidget *w, gint resp, struct log_viewer_hash_t *ht) {
-	GaimGtkLogViewer *lv = syslog_viewer;
+	PidginLogViewer *lv = syslog_viewer;
 
 #ifdef _WIN32
 	if (resp == GTK_RESPONSE_HELP) {
@@ -193,7 +193,7 @@
 	gtk_widget_destroy(w);
 }
 
-static void log_row_activated_cb(GtkTreeView *tv, GtkTreePath *path, GtkTreeViewColumn *col, GaimGtkLogViewer *viewer) {
+static void log_row_activated_cb(GtkTreeView *tv, GtkTreePath *path, GtkTreeViewColumn *col, PidginLogViewer *viewer) {
 	if (gtk_tree_view_row_expanded(tv, path))
 		gtk_tree_view_collapse_row(tv, path);
 	else
@@ -202,12 +202,12 @@
 
 static gboolean search_find_cb(gpointer data)
 {
-	GaimGtkLogViewer *viewer = data;
+	PidginLogViewer *viewer = data;
 	gtk_imhtml_search_find(GTK_IMHTML(viewer->imhtml), viewer->search);
 	return FALSE;
 }
 
-static void log_select_cb(GtkTreeSelection *sel, GaimGtkLogViewer *viewer) {
+static void log_select_cb(GtkTreeSelection *sel, PidginLogViewer *viewer) {
 	GtkTreeIter iter;
 	GValue val;
 	GtkTreeModel *model = GTK_TREE_MODEL(viewer->treestore);
@@ -226,7 +226,7 @@
 	if (log == NULL)
 		return;
 
-	gaim_gtk_set_cursor(viewer->window, GDK_WATCH);
+	pidgin_set_cursor(viewer->window, GDK_WATCH);
 
 	if (log->type != GAIM_LOG_SYSTEM) {
 		char *title;
@@ -248,7 +248,7 @@
 	gtk_imhtml_set_protocol_name(GTK_IMHTML(viewer->imhtml),
 	                            gaim_account_get_protocol_name(log->account));
 
-	gaim_signal_emit(gaim_gtk_log_get_handle(), "log-displaying", viewer, log);
+	gaim_signal_emit(pidgin_log_get_handle(), "log-displaying", viewer, log);
 
 	gtk_imhtml_append_text(GTK_IMHTML(viewer->imhtml), read,
 			       GTK_IMHTML_NO_COMMENTS | GTK_IMHTML_NO_TITLE | GTK_IMHTML_NO_SCROLL |
@@ -260,7 +260,7 @@
 		g_idle_add(search_find_cb, viewer);
 	}
 
-	gaim_gtk_clear_cursor(viewer->window);
+	pidgin_clear_cursor(viewer->window);
 }
 
 /* I want to make this smarter, but haven't come up with a cool algorithm to do so, yet.
@@ -269,7 +269,7 @@
  *
  * For now, I'll just make it a flat list.
  */
-static void populate_log_tree(GaimGtkLogViewer *lv)
+static void populate_log_tree(PidginLogViewer *lv)
      /* Logs are made from trees in real life.
         This is a tree made from logs */
 {
@@ -304,10 +304,10 @@
 	}
 }
 
-static GaimGtkLogViewer *display_log_viewer(struct log_viewer_hash_t *ht, GList *logs,
+static PidginLogViewer *display_log_viewer(struct log_viewer_hash_t *ht, GList *logs,
 						const char *title, GdkPixbuf *pixbuf, int log_size)
 {
-	GaimGtkLogViewer *lv;
+	PidginLogViewer *lv;
 	GtkWidget *title_box;
 	char *text;
 	GtkWidget *pane;
@@ -343,7 +343,7 @@
 		return NULL;
 	}
 
-	lv = g_new0(GaimGtkLogViewer, 1);
+	lv = g_new0(PidginLogViewer, 1);
 	lv->logs = logs;
 
 	if (ht != NULL)
@@ -434,8 +434,8 @@
 	gtk_paned_add2(GTK_PANED(pane), vbox);
 
 	/* Viewer ************/
-	frame = gaim_gtk_create_imhtml(FALSE, &lv->imhtml, NULL, NULL);
-	gtk_widget_set_name(lv->imhtml, "gaim_gtklog_imhtml");
+	frame = pidgin_create_imhtml(FALSE, &lv->imhtml, NULL, NULL);
+	gtk_widget_set_name(lv->imhtml, "pidginlog_imhtml");
 	gtk_widget_set_size_request(lv->imhtml, 320, 200);
 	gtk_box_pack_start(GTK_BOX(vbox), frame, TRUE, TRUE, 0);
 	gtk_widget_show(frame);
@@ -457,9 +457,9 @@
 	return lv;
 }
 
-void gaim_gtk_log_show(GaimLogType type, const char *screenname, GaimAccount *account) {
+void pidgin_log_show(GaimLogType type, const char *screenname, GaimAccount *account) {
 	struct log_viewer_hash_t *ht;
-	GaimGtkLogViewer *lv = NULL;
+	PidginLogViewer *lv = NULL;
 	const char *name = screenname;
 	char *title;
 
@@ -500,15 +500,15 @@
 	}
 
 	display_log_viewer(ht, gaim_log_get_logs(type, screenname, account),
-			title, gaim_gtk_create_prpl_icon(account, PIDGIN_PRPL_ICON_MEDIUM), 
+			title, pidgin_create_prpl_icon(account, PIDGIN_PRPL_ICON_MEDIUM), 
 			gaim_log_get_total_size(type, screenname, account));
 	g_free(title);
 }
 
-void gaim_gtk_log_show_contact(GaimContact *contact) {
+void pidgin_log_show_contact(GaimContact *contact) {
 	struct log_viewer_hash_t *ht = g_new0(struct log_viewer_hash_t, 1);
 	GaimBlistNode *child;
-	GaimGtkLogViewer *lv = NULL;
+	PidginLogViewer *lv = NULL;
 	GList *logs = NULL;
 	char *filename;
 	GdkPixbuf *pixbuf;
@@ -553,7 +553,7 @@
 	g_free(title);
 }
 
-void gaim_gtk_syslog_show()
+void pidgin_syslog_show()
 {
 	GList *accounts = NULL;
 	GList *logs = NULL;
@@ -581,28 +581,28 @@
  ****************************************************************************/
 
 void *
-gaim_gtk_log_get_handle(void)
+pidgin_log_get_handle(void)
 {
 	static int handle;
 
 	return &handle;
 }
 
-void gaim_gtk_log_init(void)
+void pidgin_log_init(void)
 {
-	void *handle = gaim_gtk_log_get_handle();
+	void *handle = pidgin_log_get_handle();
 
 	gaim_signal_register(handle, "log-displaying",
 	                     gaim_marshal_VOID__POINTER_POINTER,
 	                     NULL, 2,
 	                     gaim_value_new(GAIM_TYPE_BOXED,
-	                                    "GaimGtkLogViewer *"),
+	                                    "PidginLogViewer *"),
 	                     gaim_value_new(GAIM_TYPE_SUBTYPE,
 	                                    GAIM_SUBTYPE_LOG));
 }
 
 void
-gaim_gtk_log_uninit(void)
+pidgin_log_uninit(void)
 {
-	gaim_signals_unregister_by_instance(gaim_gtk_log_get_handle());
+	gaim_signals_unregister_by_instance(pidgin_log_get_handle());
 }
--- a/pidgin/gtklog.h	Sat Feb 03 05:55:41 2007 +0000
+++ b/pidgin/gtklog.h	Sat Feb 03 08:13:34 2007 +0000
@@ -22,20 +22,20 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
-#ifndef _GAIM_GTKLOG_H_
-#define _GAIM_GTKLOG_H_
+#ifndef _PIDGINLOG_H_
+#define _PIDGINLOG_H_
 
 #include "gtkgaim.h"
 #include "log.h"
 
 #include "account.h"
 
-typedef struct _GaimGtkLogViewer GaimGtkLogViewer;
+typedef struct _PidginLogViewer PidginLogViewer;
 
 /**
  * A GTK+ Log Viewer.  You can look at logs with it.
  */
-struct _GaimGtkLogViewer {
+struct _PidginLogViewer {
 	GList *logs;                 /**< The list of logs viewed in this viewer   */
 
 	GtkWidget        *window;    /**< The viewer's window                      */
@@ -51,10 +51,10 @@
 
 
 
-void gaim_gtk_log_show(GaimLogType type, const char *screenname, GaimAccount *account);
-void gaim_gtk_log_show_contact(GaimContact *contact);
+void pidgin_log_show(GaimLogType type, const char *screenname, GaimAccount *account);
+void pidgin_log_show_contact(GaimContact *contact);
 
-void gaim_gtk_syslog_show(void);
+void pidgin_syslog_show(void);
 
 /**************************************************************************/
 /** @name GTK+ Log Subsystem                                              */
@@ -64,19 +64,19 @@
 /**
  * Initializes the GTK+ log subsystem.
  */
-void gaim_gtk_log_init(void);
+void pidgin_log_init(void);
 
 /**
  * Returns the GTK+ log subsystem handle.
  *
  * @return The GTK+ log subsystem handle.
  */
-void *gaim_gtk_log_get_handle(void);
+void *pidgin_log_get_handle(void);
 
 /**
  * Uninitializes the GTK+ log subsystem.
  */
-void gaim_gtk_log_uninit(void);
+void pidgin_log_uninit(void);
 
 /*@}*/
 
--- a/pidgin/gtkmain.c	Sat Feb 03 05:55:41 2007 +0000
+++ b/pidgin/gtkmain.c	Sat Feb 03 08:13:34 2007 +0000
@@ -236,9 +236,9 @@
 	char *icon_path;
 #endif
 
-	gaim_gtkthemes_init();
+	pidginthemes_init();
 
-	gaim_gtk_blist_setup_sort_methods();
+	pidgin_blist_setup_sort_methods();
 
 #ifndef _WIN32
 	/* use the nice PNG icon for all the windows */
@@ -262,60 +262,60 @@
 static void
 debug_init(void)
 {
-	gaim_debug_set_ui_ops(gaim_gtk_debug_get_ui_ops());
-	gaim_gtk_debug_init();
+	gaim_debug_set_ui_ops(pidgin_debug_get_ui_ops());
+	pidgin_debug_init();
 }
 
 static void
-gaim_gtk_ui_init(void)
+pidgin_ui_init(void)
 {
 	/* Set the UI operation structures. */
-	gaim_accounts_set_ui_ops(gaim_gtk_accounts_get_ui_ops());
-	gaim_xfers_set_ui_ops(gaim_gtk_xfers_get_ui_ops());
-	gaim_blist_set_ui_ops(gaim_gtk_blist_get_ui_ops());
-	gaim_notify_set_ui_ops(gaim_gtk_notify_get_ui_ops());
-	gaim_privacy_set_ui_ops(gaim_gtk_privacy_get_ui_ops());
-	gaim_request_set_ui_ops(gaim_gtk_request_get_ui_ops());
-	gaim_sound_set_ui_ops(gaim_gtk_sound_get_ui_ops());
-	gaim_connections_set_ui_ops(gaim_gtk_connections_get_ui_ops());
-	gaim_whiteboard_set_ui_ops(gaim_gtk_whiteboard_get_ui_ops());
+	gaim_accounts_set_ui_ops(pidgin_accounts_get_ui_ops());
+	gaim_xfers_set_ui_ops(pidgin_xfers_get_ui_ops());
+	gaim_blist_set_ui_ops(pidgin_blist_get_ui_ops());
+	gaim_notify_set_ui_ops(pidgin_notify_get_ui_ops());
+	gaim_privacy_set_ui_ops(pidgin_privacy_get_ui_ops());
+	gaim_request_set_ui_ops(pidgin_request_get_ui_ops());
+	gaim_sound_set_ui_ops(pidgin_sound_get_ui_ops());
+	gaim_connections_set_ui_ops(pidgin_connections_get_ui_ops());
+	gaim_whiteboard_set_ui_ops(pidgin_whiteboard_get_ui_ops());
 #ifdef USE_SCREENSAVER
-	gaim_idle_set_ui_ops(gaim_gtk_idle_get_ui_ops());
+	gaim_idle_set_ui_ops(pidgin_idle_get_ui_ops());
 #endif
 
-	gaim_gtk_stock_init();
-	gaim_gtk_account_init();
-	gaim_gtk_connection_init();
-	gaim_gtk_blist_init();
-	gaim_gtk_status_init();
-	gaim_gtk_conversations_init();
-	gaim_gtk_pounces_init();
-	gaim_gtk_privacy_init();
-	gaim_gtk_xfers_init();
-	gaim_gtk_roomlist_init();
-	gaim_gtk_log_init();
+	pidgin_stock_init();
+	pidgin_account_init();
+	pidgin_connection_init();
+	pidgin_blist_init();
+	pidgin_status_init();
+	pidgin_conversations_init();
+	pidgin_pounces_init();
+	pidgin_privacy_init();
+	pidgin_xfers_init();
+	pidgin_roomlist_init();
+	pidgin_log_init();
 }
 
 static void
-gaim_gtk_quit(void)
+pidgin_quit(void)
 {
 #ifdef USE_SM
 	/* unplug */
-	gaim_gtk_session_end();
+	pidgin_session_end();
 #endif
 
 	/* Save the plugins we have loaded for next time. */
-	gaim_gtk_plugins_save();
+	pidgin_plugins_save();
 
 	/* Uninit */
-	gaim_gtk_conversations_uninit();
-	gaim_gtk_status_uninit();
-	gaim_gtk_docklet_uninit();
-	gaim_gtk_blist_uninit();
-	gaim_gtk_connection_uninit();
-	gaim_gtk_account_uninit();
-	gaim_gtk_xfers_uninit();
-	gaim_gtk_debug_uninit();
+	pidgin_conversations_uninit();
+	pidgin_status_uninit();
+	pidgin_docklet_uninit();
+	pidgin_blist_uninit();
+	pidgin_connection_uninit();
+	pidgin_account_uninit();
+	pidgin_xfers_uninit();
+	pidgin_debug_uninit();
 
 	/* and end it all... */
 	gtk_main_quit();
@@ -323,14 +323,14 @@
 
 static GaimCoreUiOps core_ops =
 {
-	gaim_gtk_prefs_init,
+	pidgin_prefs_init,
 	debug_init,
-	gaim_gtk_ui_init,
-	gaim_gtk_quit
+	pidgin_ui_init,
+	pidgin_quit
 };
 
 static GaimCoreUiOps *
-gaim_gtk_core_get_ui_ops(void)
+pidgin_core_get_ui_ops(void)
 {
 	return &core_ops;
 }
@@ -691,8 +691,8 @@
 	gtkwgaim_init(hint);
 #endif
 
-	gaim_core_set_ui_ops(gaim_gtk_core_get_ui_ops());
-	gaim_eventloop_set_ui_ops(gaim_gtk_eventloop_get_ui_ops());
+	gaim_core_set_ui_ops(pidgin_core_get_ui_ops());
+	gaim_eventloop_set_ui_ops(pidgin_eventloop_get_ui_ops());
 
 	/*
 	 * Set plugin search directories. Give priority to the plugins
@@ -703,7 +703,7 @@
 	g_free(search_path);
 	gaim_plugins_add_search_path(LIBDIR);
 
-	if (!gaim_core_init(GAIM_GTK_UI)) {
+	if (!gaim_core_init(PIDGIN_UI)) {
 		fprintf(stderr,
 				"Initialization of the " PIDGIN_NAME " core failed. Dumping core.\n"
 				"Please report this!\n");
@@ -717,11 +717,11 @@
 	/* TODO: Move prefs loading into gaim_prefs_init() */
 	gaim_prefs_load();
 	gaim_prefs_update_old();
-	gaim_gtk_prefs_update_old();
+	pidgin_prefs_update_old();
 
 	/* load plugins we had when we quit */
 	gaim_plugins_load_saved("/gaim/gtk/plugins/loaded");
-	gaim_gtk_docklet_init();
+	pidgin_docklet_init();
 
 	/* TODO: Move pounces loading into gaim_pounces_init() */
 	gaim_pounces_load();
@@ -745,7 +745,7 @@
 	ui_main();
 
 #ifdef USE_SM
-	gaim_gtk_session_init(argv[0], opt_session_arg, opt_config_dir_arg);
+	pidgin_session_init(argv[0], opt_session_arg, opt_config_dir_arg);
 #endif
 	if (opt_session_arg != NULL) {
 		g_free(opt_session_arg);
@@ -763,7 +763,7 @@
 	gaim_blist_show();
 
 	if (gaim_prefs_get_bool("/gaim/gtk/debug/enabled"))
-		gaim_gtk_debug_window_show();
+		pidgin_debug_window_show();
 
 	if (opt_login) {
 		dologin_ret = dologin_named(opt_login_arg);
@@ -799,7 +799,7 @@
 
 	if ((accounts = gaim_accounts_get_all_active()) == NULL)
 	{
-		gaim_gtk_accounts_window_show();
+		pidgin_accounts_window_show();
 	}
 	else
 	{
--- a/pidgin/gtkmenutray.c	Sat Feb 03 05:55:41 2007 +0000
+++ b/pidgin/gtkmenutray.c	Sat Feb 03 08:13:34 2007 +0000
@@ -46,7 +46,7 @@
  * Item Stuff
  *****************************************************************************/
 static void
-gaim_gtk_menu_tray_select(GtkItem *item) {
+pidgin_menu_tray_select(GtkItem *item) {
 	/* this may look like nothing, but it's really overriding the
 	 * GtkMenuItem's select function so that it doesn't get highlighted like
 	 * a normal menu item would.
@@ -54,7 +54,7 @@
 }
 
 static void
-gaim_gtk_menu_tray_deselect(GtkItem *item) {
+pidgin_menu_tray_deselect(GtkItem *item) {
 	/* Probably not necessary, but I'd rather be safe than sorry.  We're
 	 * overridding the select, so it makes sense to override deselect as well.
 	 */
@@ -68,14 +68,14 @@
  * Object Stuff
  *****************************************************************************/
 static void
-gaim_gtk_menu_tray_get_property(GObject *obj, guint param_id, GValue *value,
+pidgin_menu_tray_get_property(GObject *obj, guint param_id, GValue *value,
 								GParamSpec *pspec)
 {
-	GaimGtkMenuTray *menu_tray = GAIM_GTK_MENU_TRAY(obj);
+	PidginMenuTray *menu_tray = PIDGIN_MENU_TRAY(obj);
 
 	switch(param_id) {
 		case PROP_BOX:
-			g_value_set_object(value, gaim_gtk_menu_tray_get_box(menu_tray));
+			g_value_set_object(value, pidgin_menu_tray_get_box(menu_tray));
 			break;
 		default:
 			G_OBJECT_WARN_INVALID_PROPERTY_ID(obj, param_id, pspec);
@@ -84,14 +84,14 @@
 }
 
 static void
-gaim_gtk_menu_tray_finalize(GObject *obj) {
+pidgin_menu_tray_finalize(GObject *obj) {
 #if 0
 	/* This _might_ be leaking, but I have a sneaking suspicion that the widget is
 	 * getting destroyed in GtkContainer's finalize function.  But if were are
 	 * leaking here, be sure to figure out why this causes a crash.
 	 *	-- Gary
 	 */
-	GaimGtkMenuTray *tray = GAIM_GTK_MENU_TRAY(obj);
+	PidginMenuTray *tray = PIDGIN_MENU_TRAY(obj);
 
 	if(GTK_IS_WIDGET(tray->tray))
 		gtk_widget_destroy(GTK_WIDGET(tray->tray));
@@ -101,18 +101,18 @@
 }
 
 static void
-gaim_gtk_menu_tray_class_init(GaimGtkMenuTrayClass *klass) {
+pidgin_menu_tray_class_init(PidginMenuTrayClass *klass) {
 	GObjectClass *object_class = G_OBJECT_CLASS(klass);
 	GtkItemClass *item_class = GTK_ITEM_CLASS(klass);
 	GParamSpec *pspec;
 
 	parent_class = g_type_class_peek_parent(klass);
 
-	object_class->finalize = gaim_gtk_menu_tray_finalize;
-	object_class->get_property = gaim_gtk_menu_tray_get_property;
+	object_class->finalize = pidgin_menu_tray_finalize;
+	object_class->get_property = pidgin_menu_tray_get_property;
 
-	item_class->select = gaim_gtk_menu_tray_select;
-	item_class->deselect = gaim_gtk_menu_tray_deselect;
+	item_class->select = pidgin_menu_tray_select;
+	item_class->deselect = pidgin_menu_tray_deselect;
 
 	pspec = g_param_spec_object("box", "The box",
 								"The box",
@@ -122,7 +122,7 @@
 }
 
 static void
-gaim_gtk_menu_tray_init(GaimGtkMenuTray *menu_tray) {
+pidgin_menu_tray_init(PidginMenuTray *menu_tray) {
 	GtkWidget *widget = GTK_WIDGET(menu_tray);
 #if GTK_CHECK_VERSION(2,2,0)
 	GtkSettings *settings;
@@ -158,25 +158,25 @@
  * API
  *****************************************************************************/
 GType
-gaim_gtk_menu_tray_get_gtype(void) {
+pidgin_menu_tray_get_gtype(void) {
 	static GType type = 0;
 
 	if(type == 0) {
 		static const GTypeInfo info = {
-			sizeof(GaimGtkMenuTrayClass),
+			sizeof(PidginMenuTrayClass),
 			NULL,
 			NULL,
-			(GClassInitFunc)gaim_gtk_menu_tray_class_init,
+			(GClassInitFunc)pidgin_menu_tray_class_init,
 			NULL,
 			NULL,
-			sizeof(GaimGtkMenuTray),
+			sizeof(PidginMenuTray),
 			0,
-			(GInstanceInitFunc)gaim_gtk_menu_tray_init,
+			(GInstanceInitFunc)pidgin_menu_tray_init,
 			NULL
 		};
 
 		type = g_type_register_static(GTK_TYPE_MENU_ITEM,
-									  "GaimGtkMenuTray",
+									  "PidginMenuTray",
 									  &info, 0);
 	}
 
@@ -184,21 +184,21 @@
 }
 
 GtkWidget *
-gaim_gtk_menu_tray_new() {
-	return g_object_new(GAIM_GTK_TYPE_MENU_TRAY, NULL);
+pidgin_menu_tray_new() {
+	return g_object_new(PIDGIN_TYPE_MENU_TRAY, NULL);
 }
 
 GtkWidget *
-gaim_gtk_menu_tray_get_box(GaimGtkMenuTray *menu_tray) {
-	g_return_val_if_fail(GAIM_GTK_IS_MENU_TRAY(menu_tray), NULL);
+pidgin_menu_tray_get_box(PidginMenuTray *menu_tray) {
+	g_return_val_if_fail(PIDGIN_IS_MENU_TRAY(menu_tray), NULL);
 	return menu_tray->tray;
 }
 
 static void
-gaim_gtk_menu_tray_add(GaimGtkMenuTray *menu_tray, GtkWidget *widget,
+pidgin_menu_tray_add(PidginMenuTray *menu_tray, GtkWidget *widget,
 					   const char *tooltip, gboolean prepend)
 {
-	g_return_if_fail(GAIM_GTK_IS_MENU_TRAY(menu_tray));
+	g_return_if_fail(PIDGIN_IS_MENU_TRAY(menu_tray));
 	g_return_if_fail(GTK_IS_WIDGET(widget));
 
 	if (GTK_WIDGET_NO_WINDOW(widget))
@@ -211,7 +211,7 @@
 		widget = event;
 	}
 
-	gaim_gtk_menu_tray_set_tooltip(menu_tray, widget, tooltip);
+	pidgin_menu_tray_set_tooltip(menu_tray, widget, tooltip);
 
 	if (prepend)
 		gtk_box_pack_start(GTK_BOX(menu_tray->tray), widget, FALSE, FALSE, 0);
@@ -220,19 +220,19 @@
 }
 
 void
-gaim_gtk_menu_tray_append(GaimGtkMenuTray *menu_tray, GtkWidget *widget, const char *tooltip)
+pidgin_menu_tray_append(PidginMenuTray *menu_tray, GtkWidget *widget, const char *tooltip)
 {
-	gaim_gtk_menu_tray_add(menu_tray, widget, tooltip, FALSE);
+	pidgin_menu_tray_add(menu_tray, widget, tooltip, FALSE);
 }
 
 void
-gaim_gtk_menu_tray_prepend(GaimGtkMenuTray *menu_tray, GtkWidget *widget, const char *tooltip)
+pidgin_menu_tray_prepend(PidginMenuTray *menu_tray, GtkWidget *widget, const char *tooltip)
 {
-	gaim_gtk_menu_tray_add(menu_tray, widget, tooltip, TRUE);
+	pidgin_menu_tray_add(menu_tray, widget, tooltip, TRUE);
 }
 
 void
-gaim_gtk_menu_tray_set_tooltip(GaimGtkMenuTray *menu_tray, GtkWidget *widget, const char *tooltip)
+pidgin_menu_tray_set_tooltip(PidginMenuTray *menu_tray, GtkWidget *widget, const char *tooltip)
 {
 	if (!menu_tray->tooltips)
 		return;
--- a/pidgin/gtkmenutray.h	Sat Feb 03 05:55:41 2007 +0000
+++ b/pidgin/gtkmenutray.h	Sat Feb 03 08:13:34 2007 +0000
@@ -20,60 +20,60 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
-#ifndef GAIM_GTK_MENU_TRAY_H
-#define GAIM_GTK_MENU_TRAY_H
+#ifndef PIDGIN_MENU_TRAY_H
+#define PIDGIN_MENU_TRAY_H
 
 #include <gtk/gtkhbox.h>
 #include <gtk/gtkmenuitem.h>
 #include <gtk/gtktooltips.h>
 
-#define GAIM_GTK_TYPE_MENU_TRAY				(gaim_gtk_menu_tray_get_gtype())
-#define GAIM_GTK_MENU_TRAY(obj)				(GTK_CHECK_CAST((obj), GAIM_GTK_TYPE_MENU_TRAY, GaimGtkMenuTray))
-#define GAIM_GTK_MENU_TRAY_CLASS(klass)		(GTK_CHECK_CLASS_CAST((klass), GAIM_GTK_TYPE_MENU_TRAY, GaimGtkMenuTrayClass))
-#define GAIM_GTK_IS_MENU_TRAY(obj)			(GTK_CHECK_TYPE((obj), GAIM_GTK_TYPE_MENU_TRAY))
-#define GAIM_GTK_IS_MENU_TRAY_CLASS(klass)	(GTK_CHECK_CLASS_TYPE((klass), GAIM_GTK_TYPE_MENU_TRAY))
-#define GAIM_GTK_MENU_TRAY_GET_CLASS(obj)	(GTK_CHECK_GET_CLASS((obj), GAIM_GTK_TYPE_MENU_TRAY, GaimGtkMenuTrayClass))
+#define PIDGIN_TYPE_MENU_TRAY				(pidgin_menu_tray_get_gtype())
+#define PIDGIN_MENU_TRAY(obj)				(GTK_CHECK_CAST((obj), PIDGIN_TYPE_MENU_TRAY, PidginMenuTray))
+#define PIDGIN_MENU_TRAY_CLASS(klass)		(GTK_CHECK_CLASS_CAST((klass), PIDGIN_TYPE_MENU_TRAY, PidginMenuTrayClass))
+#define PIDGIN_IS_MENU_TRAY(obj)			(GTK_CHECK_TYPE((obj), PIDGIN_TYPE_MENU_TRAY))
+#define PIDGIN_IS_MENU_TRAY_CLASS(klass)	(GTK_CHECK_CLASS_TYPE((klass), PIDGIN_TYPE_MENU_TRAY))
+#define PIDGIN_MENU_TRAY_GET_CLASS(obj)	(GTK_CHECK_GET_CLASS((obj), PIDGIN_TYPE_MENU_TRAY, PidginMenuTrayClass))
 
-typedef struct _GaimGtkMenuTray				GaimGtkMenuTray;
-typedef struct _GaimGtkMenuTrayClass		GaimGtkMenuTrayClass;
+typedef struct _PidginMenuTray				PidginMenuTray;
+typedef struct _PidginMenuTrayClass		PidginMenuTrayClass;
 
-/** A GaimGtkMenuTray */
-struct _GaimGtkMenuTray {
+/** A PidginMenuTray */
+struct _PidginMenuTray {
 	GtkMenuItem gparent;					/**< The parent instance */
 	GtkWidget *tray;						/**< The tray */
 	GtkTooltips *tooltips;					/**< Tooltips */
 };
 
-/** A GaimGtkMenuTrayClass */
-struct _GaimGtkMenuTrayClass {
+/** A PidginMenuTrayClass */
+struct _PidginMenuTrayClass {
 	GtkMenuItemClass gparent;				/**< The parent class */
 };
 
 G_BEGIN_DECLS
 
 /**
- * Registers the GaimGtkMenuTray class if necessary and returns the
+ * Registers the PidginMenuTray class if necessary and returns the
  * type ID assigned to it.
  *
- * @return The GaimGtkMenuTray type ID
+ * @return The PidginMenuTray type ID
  */
-GType gaim_gtk_menu_tray_get_gtype(void);
+GType pidgin_menu_tray_get_gtype(void);
 
 /**
- * Creates a new GaimGtkMenuTray
+ * Creates a new PidginMenuTray
  *
- * @return A new GaimGtkMenuTray
+ * @return A new PidginMenuTray
  */
-GtkWidget *gaim_gtk_menu_tray_new(void);
+GtkWidget *pidgin_menu_tray_new(void);
 
 /**
- * Gets the box for the GaimGtkMenuTray
+ * Gets the box for the PidginMenuTray
  *
- * @param menu_tray The GaimGtkMenuTray
+ * @param menu_tray The PidginMenuTray
  *
  * @return The box that this menu tray is using
  */
-GtkWidget *gaim_gtk_menu_tray_get_box(GaimGtkMenuTray *menu_tray);
+GtkWidget *pidgin_menu_tray_get_box(PidginMenuTray *menu_tray);
 
 /**
  * Appends a widget into the tray
@@ -82,7 +82,7 @@
  * @param widget    The widget
  * @param tooltip   The tooltip for this widget (widget requires its own X-window)
  */
-void gaim_gtk_menu_tray_append(GaimGtkMenuTray *menu_tray, GtkWidget *widget, const char *tooltip);
+void pidgin_menu_tray_append(PidginMenuTray *menu_tray, GtkWidget *widget, const char *tooltip);
 
 /**
  * Prepends a widget into the tray
@@ -91,7 +91,7 @@
  * @param widget    The widget
  * @param tooltip   The tooltip for this widget (widget requires its own X-window)
  */
-void gaim_gtk_menu_tray_prepend(GaimGtkMenuTray *menu_tray, GtkWidget *widget, const char *tooltip);
+void pidgin_menu_tray_prepend(PidginMenuTray *menu_tray, GtkWidget *widget, const char *tooltip);
 
 /**
  * Set the tooltip for a widget
@@ -100,8 +100,8 @@
  * @param widget    The widget
  * @param tooltip   The tooltip to set for the widget (widget requires its own X-window)
  */
-void gaim_gtk_menu_tray_set_tooltip(GaimGtkMenuTray *menu_tray, GtkWidget *widget, const char *tooltip);
+void pidgin_menu_tray_set_tooltip(PidginMenuTray *menu_tray, GtkWidget *widget, const char *tooltip);
 
 G_END_DECLS
 
-#endif /* GAIM_GTK_MENU_TRAY_H */
+#endif /* PIDGIN_MENU_TRAY_H */
--- a/pidgin/gtknickcolors.h	Sat Feb 03 05:55:41 2007 +0000
+++ b/pidgin/gtknickcolors.h	Sat Feb 03 08:13:34 2007 +0000
@@ -21,8 +21,8 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
-#ifndef _GAIM_GTKNICKCOLORS_H_
-#define _GAIM_GTKNICKCOLORS_H_
+#ifndef _PIDGINNICKCOLORS_H_
+#define _PIDGINNICKCOLORS_H_
 
 static GdkColor nick_seed_colors[] = {
     {0, 47616, 46336, 43776},       /* Basic 3D Medium */
--- a/pidgin/gtknotify.c	Sat Feb 03 05:55:41 2007 +0000
+++ b/pidgin/gtknotify.c	Sat Feb 03 08:13:34 2007 +0000
@@ -88,7 +88,7 @@
 
 static GaimMailDialog *mail_dialog = NULL;
 
-static void *gaim_gtk_notify_emails(GaimConnection *gc, size_t count, gboolean detailed,
+static void *pidgin_notify_emails(GaimConnection *gc, size_t count, gboolean detailed,
 									const char **subjects,
 									const char **froms, const char **tos,
 									const char **urls);
@@ -199,7 +199,7 @@
 }
 
 static void *
-gaim_gtk_notify_message(GaimNotifyMsgType type, const char *title,
+pidgin_notify_message(GaimNotifyMsgType type, const char *title,
 						const char *primary, const char *secondary)
 {
 	GtkWidget *dialog;
@@ -297,10 +297,10 @@
 }
 
 static void *
-gaim_gtk_notify_email(GaimConnection *gc, const char *subject, const char *from,
+pidgin_notify_email(GaimConnection *gc, const char *subject, const char *from,
 					  const char *to, const char *url)
 {
-	return gaim_gtk_notify_emails(gc, 1, (subject != NULL),
+	return pidgin_notify_emails(gc, 1, (subject != NULL),
 								  (subject == NULL ? NULL : &subject),
 								  (from    == NULL ? NULL : &from),
 								  (to      == NULL ? NULL : &to),
@@ -308,7 +308,7 @@
 }
 
 static GtkWidget *
-gaim_gtk_get_mail_dialog()
+pidgin_get_mail_dialog()
 {
 	if (mail_dialog == NULL) {
 		GtkWidget *dialog = NULL;
@@ -355,7 +355,7 @@
 		mail_dialog->treeview = gtk_tree_view_new_with_model(GTK_TREE_MODEL(mail_dialog->treemodel));
 		gtk_tree_view_set_search_column(GTK_TREE_VIEW(mail_dialog->treeview), GAIM_MAIL_TEXT);
 		gtk_tree_view_set_search_equal_func(GTK_TREE_VIEW(mail_dialog->treeview),
-			             gaim_gtk_tree_view_search_equal_func, NULL, NULL);
+			             pidgin_tree_view_search_equal_func, NULL, NULL);
 
 		g_signal_connect(G_OBJECT(dialog), "response",
 						 G_CALLBACK(email_response_cb), mail_dialog);
@@ -391,14 +391,14 @@
  * count > 0 mean non-detailed.
  */
 static void *
-gaim_gtk_notify_add_mail(GtkTreeStore *treemodel, GaimAccount *account, char *notification, const char *url, int count)
+pidgin_notify_add_mail(GtkTreeStore *treemodel, GaimAccount *account, char *notification, const char *url, int count)
 {
 	GaimNotifyMailData *data = NULL;
 	GtkTreeIter iter;
 	GdkPixbuf *icon;
 	gboolean new_n = TRUE;
 
-	icon = gaim_gtk_create_prpl_icon(account, PIDGIN_PRPL_ICON_MEDIUM);
+	icon = pidgin_create_prpl_icon(account, PIDGIN_PRPL_ICON_MEDIUM);
 
 	if (count > 0) {
 		/* Allow only one non-detailed email notification for each account */
@@ -441,7 +441,7 @@
 }
 
 static void *
-gaim_gtk_notify_emails(GaimConnection *gc, size_t count, gboolean detailed,
+pidgin_notify_emails(GaimConnection *gc, size_t count, gboolean detailed,
 					   const char **subjects, const char **froms,
 					   const char **tos, const char **urls)
 {
@@ -451,7 +451,7 @@
 	GaimNotifyMailData *data = NULL;
 
 	account = gaim_connection_get_account(gc);
-	dialog = gaim_gtk_get_mail_dialog();  /* This creates mail_dialog if necessary */
+	dialog = pidgin_get_mail_dialog();  /* This creates mail_dialog if necessary */
  
 	mail_dialog->total_count += count;
 	if (detailed) {
@@ -490,7 +490,7 @@
 			g_free(from_text);
 			g_free(subject_text);
 
-			data = gaim_gtk_notify_add_mail(mail_dialog->treemodel, account, notification, urls ? *urls : NULL, 0);
+			data = pidgin_notify_add_mail(mail_dialog->treemodel, account, notification, urls ? *urls : NULL, 0);
 			g_free(notification);
 
 			if (urls != NULL)
@@ -501,7 +501,7 @@
 						   "%s has %d new messages.",
 						   (int)count),
 						   *tos, (int)count);
-		data = gaim_gtk_notify_add_mail(mail_dialog->treemodel, account, notification, urls ? *urls : NULL, count);
+		data = pidgin_notify_add_mail(mail_dialog->treemodel, account, notification, urls ? *urls : NULL, count);
 		g_free(notification);
 	}
 
@@ -514,7 +514,7 @@
 		mail_dialog->in_use = TRUE;     /* So that _set_headline doesn't accidentally
 										   remove the notifications when replacing an
 										   old notification. */
-		gaim_gtk_blist_set_headline(label_text, 
+		pidgin_blist_set_headline(label_text, 
 					    pixbuf, G_CALLBACK(gtk_widget_show_all), dialog,
 					    (GDestroyNotify)reset_mail_dialog);
 		mail_dialog->in_use = FALSE;
@@ -540,7 +540,7 @@
 }
 
 static void *
-gaim_gtk_notify_formatted(const char *title, const char *primary,
+pidgin_notify_formatted(const char *title, const char *primary,
 						  const char *secondary, const char *text)
 {
 	GtkWidget *window;
@@ -586,8 +586,8 @@
 	gtk_widget_show(label);
 
 	/* Add the imhtml */
-	frame = gaim_gtk_create_imhtml(FALSE, &imhtml, NULL, NULL);
-	gtk_widget_set_name(imhtml, "gaim_gtknotify_imhtml");
+	frame = pidgin_create_imhtml(FALSE, &imhtml, NULL, NULL);
+	gtk_widget_set_name(imhtml, "pidginnotify_imhtml");
 	gtk_imhtml_set_format_functions(GTK_IMHTML(imhtml),
 			gtk_imhtml_get_format_functions(GTK_IMHTML(imhtml)) | GTK_IMHTML_IMAGE);
 	gtk_widget_set_size_request(imhtml, 300, 250);
@@ -625,7 +625,7 @@
 }
 
 static void
-gaim_gtk_notify_searchresults_new_rows(GaimConnection *gc, GaimNotifySearchResults *results,
+pidgin_notify_searchresults_new_rows(GaimConnection *gc, GaimNotifySearchResults *results,
 									   void *data_)
 {
 	GaimNotifySearchResultsData *data = data_;
@@ -638,7 +638,7 @@
 
 	gtk_list_store_clear(data->model);
 
-	pixbuf = gaim_gtk_create_prpl_icon(gaim_connection_get_account(gc), 0.5);
+	pixbuf = pidgin_create_prpl_icon(gaim_connection_get_account(gc), 0.5);
 
 	/* +1 is for the automagically created Status column. */
 	col_num = gaim_notify_searchresults_get_columns_count(results) + 1;
@@ -666,7 +666,7 @@
 }
 
 static void *
-gaim_gtk_notify_searchresults(GaimConnection *gc, const char *title,
+pidgin_notify_searchresults(GaimConnection *gc, const char *title,
 							  const char *primary, const char *secondary,
 							  GaimNotifySearchResults *results, gpointer user_data)
 {
@@ -839,7 +839,7 @@
 	data->window = window;
 
 	/* Insert rows. */
-	gaim_gtk_notify_searchresults_new_rows(gc, results, data);
+	pidgin_notify_searchresults_new_rows(gc, results, data);
 
 	/* Show the window */
 	gtk_widget_show(window);
@@ -847,7 +847,7 @@
 }
 
 static void *
-gaim_gtk_notify_userinfo(GaimConnection *gc, const char *who,
+pidgin_notify_userinfo(GaimConnection *gc, const char *who,
 						 GaimNotifyUserInfo *user_info)
 {
 	char *primary, *info;
@@ -855,14 +855,14 @@
 
 	primary = g_strdup_printf(_("Info for %s"), who);
 	info = gaim_notify_user_info_get_text_with_newline(user_info, "<br />");
-	ui_handle = gaim_gtk_notify_formatted(_("Buddy Information"), primary, NULL, info);
+	ui_handle = pidgin_notify_formatted(_("Buddy Information"), primary, NULL, info);
 	g_free(info);
 	g_free(primary);
 	return ui_handle;
 }
 
 static void
-gaim_gtk_close_notify(GaimNotifyType type, void *ui_handle)
+pidgin_close_notify(GaimNotifyType type, void *ui_handle)
 {
 	if (type == GAIM_NOTIFY_EMAIL || type == GAIM_NOTIFY_EMAILS)
 	{
@@ -934,7 +934,7 @@
 #endif /* _WIN32 */
 
 static void *
-gaim_gtk_notify_uri(const char *uri)
+pidgin_notify_uri(const char *uri)
 {
 #ifndef _WIN32
 	char *escaped = g_shell_quote(uri);
@@ -1094,19 +1094,19 @@
 
 static GaimNotifyUiOps ops =
 {
-	gaim_gtk_notify_message,
-	gaim_gtk_notify_email,
-	gaim_gtk_notify_emails,
-	gaim_gtk_notify_formatted,
-	gaim_gtk_notify_searchresults,
-	gaim_gtk_notify_searchresults_new_rows,
-	gaim_gtk_notify_userinfo,
-	gaim_gtk_notify_uri,
-	gaim_gtk_close_notify
+	pidgin_notify_message,
+	pidgin_notify_email,
+	pidgin_notify_emails,
+	pidgin_notify_formatted,
+	pidgin_notify_searchresults,
+	pidgin_notify_searchresults_new_rows,
+	pidgin_notify_userinfo,
+	pidgin_notify_uri,
+	pidgin_close_notify
 };
 
 GaimNotifyUiOps *
-gaim_gtk_notify_get_ui_ops(void)
+pidgin_notify_get_ui_ops(void)
 {
 	return &ops;
 }
--- a/pidgin/gtknotify.h	Sat Feb 03 05:55:41 2007 +0000
+++ b/pidgin/gtknotify.h	Sat Feb 03 08:13:34 2007 +0000
@@ -22,8 +22,8 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
-#ifndef _GAIM_GTKNOTIFY_H_
-#define _GAIM_GTKNOTIFY_H_
+#ifndef _PIDGINNOTIFY_H_
+#define _PIDGINNOTIFY_H_
 
 #include "notify.h"
 
@@ -32,6 +32,6 @@
  *
  * @return The GTK+ UI notify operations structure.
  */
-GaimNotifyUiOps *gaim_gtk_notify_get_ui_ops(void);
+GaimNotifyUiOps *pidgin_notify_get_ui_ops(void);
 
-#endif /* _GAIM_GTKNOTIFY_H_ */
+#endif /* _PIDGINNOTIFY_H_ */
--- a/pidgin/gtkplugin.c	Sat Feb 03 05:55:41 2007 +0000
+++ b/pidgin/gtkplugin.c	Sat Feb 03 08:13:34 2007 +0000
@@ -45,18 +45,18 @@
 static GHashTable *plugin_pref_dialogs = NULL;
 
 GtkWidget *
-gaim_gtk_plugin_get_config_frame(GaimPlugin *plugin)
+pidgin_plugin_get_config_frame(GaimPlugin *plugin)
 {
 	GtkWidget *config = NULL;
 
 	g_return_val_if_fail(plugin != NULL, NULL);
 
 	if (GAIM_IS_GTK_PLUGIN(plugin) && plugin->info->ui_info
-		&& GAIM_GTK_PLUGIN_UI_INFO(plugin)->get_config_frame)
+		&& PIDGIN_PLUGIN_UI_INFO(plugin)->get_config_frame)
 	{
-		GaimGtkPluginUiInfo *ui_info;
+		PidginPluginUiInfo *ui_info;
 
-		ui_info = GAIM_GTK_PLUGIN_UI_INFO(plugin);
+		ui_info = PIDGIN_PLUGIN_UI_INFO(plugin);
 
 		config = ui_info->get_config_frame(plugin);
 
@@ -77,7 +77,7 @@
 
 		frame = plugin->info->prefs_info->get_plugin_pref_frame(plugin);
 
-		config = gaim_gtk_plugin_pref_create_frame(frame);
+		config = pidgin_plugin_pref_create_frame(frame);
 
 		/* XXX According to bug #1407047 this broke saving pluging preferences, I'll look at fixing it correctly later.
 		gaim_plugin_pref_frame_destroy(frame);
@@ -88,7 +88,7 @@
 }
 
 void
-gaim_gtk_plugins_save(void)
+pidgin_plugins_save(void)
 {
 	gaim_plugins_save_loaded("/gaim/gtk/plugins/loaded");
 }
@@ -176,7 +176,7 @@
 					gtk_widget_set_sensitive(pref_button,
 						loaded
 						&& ((GAIM_IS_GTK_PLUGIN(plug) && plug->info->ui_info
-							&& GAIM_GTK_PLUGIN_UI_INFO(plug)->get_config_frame)
+							&& PIDGIN_PLUGIN_UI_INFO(plug)->get_config_frame)
 						 || (plug->info->prefs_info
 							&& plug->info->prefs_info->get_plugin_pref_frame)));
 				}
@@ -246,12 +246,12 @@
 
 	if (!gaim_plugin_is_loaded(plug))
 	{
-		gaim_gtk_set_cursor(plugin_dialog, GDK_WATCH);
+		pidgin_set_cursor(plugin_dialog, GDK_WATCH);
 
 		gaim_plugin_load(plug);
 		plugin_toggled_stage_two(plug, model, iter, FALSE);
 
-		gaim_gtk_clear_cursor(plugin_dialog);
+		pidgin_clear_cursor(plugin_dialog);
 	}
 	else
 	{
@@ -298,17 +298,17 @@
 
 	if (unload)
 	{
-		gaim_gtk_set_cursor(plugin_dialog, GDK_WATCH);
+		pidgin_set_cursor(plugin_dialog, GDK_WATCH);
 
 		gaim_plugin_unload(plug);
 
-		gaim_gtk_clear_cursor(plugin_dialog);
+		pidgin_clear_cursor(plugin_dialog);
 	}
 
 	gtk_widget_set_sensitive(pref_button,
 		gaim_plugin_is_loaded(plug)
 		&& ((GAIM_IS_GTK_PLUGIN(plug) && plug->info->ui_info
-			&& GAIM_GTK_PLUGIN_UI_INFO(plug)->get_config_frame)
+			&& PIDGIN_PLUGIN_UI_INFO(plug)->get_config_frame)
 		 || (plug->info->prefs_info
 			&& plug->info->prefs_info->get_plugin_pref_frame)));
 
@@ -342,7 +342,7 @@
 	                   -1);
 	g_free(iter);
 
-	gaim_gtk_plugins_save();
+	pidgin_plugins_save();
 }
 
 static gboolean ensure_plugin_visible(void *data)
@@ -417,7 +417,7 @@
 	gtk_widget_set_sensitive(pref_button,
 		gaim_plugin_is_loaded(plug)
 		&& ((GAIM_IS_GTK_PLUGIN(plug) && plug->info->ui_info
-			&& GAIM_GTK_PLUGIN_UI_INFO(plug)->get_config_frame)
+			&& PIDGIN_PLUGIN_UI_INFO(plug)->get_config_frame)
 		 || (plug->info->prefs_info
 			&& plug->info->prefs_info->get_plugin_pref_frame)));
 
@@ -466,7 +466,7 @@
 		if (plugin_pref_dialogs != NULL &&
 			g_hash_table_lookup(plugin_pref_dialogs, plug))
 			break;
-		box = gaim_gtk_plugin_get_config_frame(plug);
+		box = pidgin_plugin_get_config_frame(plug);
 		if (box == NULL)
 			break;
 
@@ -511,7 +511,7 @@
 	plugin_dialog_response_cb(dialog, GAIM_RESPONSE_CONFIGURE, sel);
 }
 
-void gaim_gtk_plugin_dialog_show()
+void pidgin_plugin_dialog_show()
 {
 	GtkWidget *sw;
 	GtkWidget *event_view;
@@ -591,7 +591,7 @@
 	gtk_container_add(GTK_CONTAINER(sw), event_view);
 	gtk_tree_view_set_search_column(GTK_TREE_VIEW(event_view), 1);
 	gtk_tree_view_set_search_equal_func(GTK_TREE_VIEW(event_view),
-				gaim_gtk_tree_view_search_equal_func, NULL, NULL);
+				pidgin_tree_view_search_equal_func, NULL, NULL);
 
 	expander = gtk_expander_new(_("<b>Plugin Details</b>"));
 	gtk_expander_set_use_markup(GTK_EXPANDER(expander), TRUE);
--- a/pidgin/gtkplugin.h	Sat Feb 03 05:55:41 2007 +0000
+++ b/pidgin/gtkplugin.h	Sat Feb 03 08:13:34 2007 +0000
@@ -22,32 +22,32 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
-#ifndef _GAIM_GTKPLUGIN_H_
-#define _GAIM_GTKPLUGIN_H_
+#ifndef _PIDGINPLUGIN_H_
+#define _PIDGINPLUGIN_H_
 
 #include "gtkgaim.h"
 #include "plugin.h"
 
-typedef struct _GaimGtkPluginUiInfo GaimGtkPluginUiInfo;
+typedef struct _PidginPluginUiInfo PidginPluginUiInfo;
 
 /**
  * A GTK+ UI structure for plugins.
  */
-struct _GaimGtkPluginUiInfo
+struct _PidginPluginUiInfo
 {
 	GtkWidget *(*get_config_frame)(GaimPlugin *plugin);
 
 	int page_num;                                         /**< Reserved */
 };
 
-#define GAIM_GTK_PLUGIN_TYPE GAIM_GTK_UI
+#define PIDGIN_PLUGIN_TYPE PIDGIN_UI
 
 #define GAIM_IS_GTK_PLUGIN(plugin) \
 	((plugin)->info != NULL && (plugin)->info->ui_info != NULL && \
-	 !strcmp((plugin)->info->ui_requirement, GAIM_GTK_PLUGIN_TYPE))
+	 !strcmp((plugin)->info->ui_requirement, PIDGIN_PLUGIN_TYPE))
 
-#define GAIM_GTK_PLUGIN_UI_INFO(plugin) \
-	((GaimGtkPluginUiInfo *)(plugin)->info->ui_info)
+#define PIDGIN_PLUGIN_UI_INFO(plugin) \
+	((PidginPluginUiInfo *)(plugin)->info->ui_info)
 
 /**
  * Returns the configuration frame widget for a GTK+ plugin, if one
@@ -58,16 +58,16 @@
  * @return The frame, if the plugin is a GTK+ plugin and provides a
  *         configuration frame.
  */
-GtkWidget *gaim_gtk_plugin_get_config_frame(GaimPlugin *plugin);
+GtkWidget *pidgin_plugin_get_config_frame(GaimPlugin *plugin);
 
 /**
  * Saves all loaded plugins.
  */
-void gaim_gtk_plugins_save(void);
+void pidgin_plugins_save(void);
 
 /**
  * Shows the Plugins dialog
  */
-void gaim_gtk_plugin_dialog_show(void);
+void pidgin_plugin_dialog_show(void);
 
-#endif /* _GAIM_GTKPLUGIN_H_ */
+#endif /* _PIDGINPLUGIN_H_ */
--- a/pidgin/gtkpluginpref.c	Sat Feb 03 05:55:41 2007 +0000
+++ b/pidgin/gtkpluginpref.c	Sat Feb 03 08:13:34 2007 +0000
@@ -80,7 +80,7 @@
 
 	switch(gaim_plugin_pref_get_type(pref)) {
 		case GAIM_PLUGIN_PREF_CHOICE:
-			gtk_label = gaim_gtk_prefs_dropdown_from_list(parent, pref_label,
+			gtk_label = pidgin_prefs_dropdown_from_list(parent, pref_label,
 											  GAIM_PREF_STRING, pref_name,
 											  gaim_plugin_pref_get_choices(pref));
 			gtk_misc_set_alignment(GTK_MISC(gtk_label), 0, 0.5);
@@ -142,7 +142,7 @@
 				gtk_box_pack_start(GTK_BOX(hbox), spacer, FALSE, FALSE, 0);
 				gtk_widget_show(spacer);
 
-				frame = gaim_gtk_create_imhtml(TRUE, &imhtml, &toolbar, NULL);
+				frame = pidgin_create_imhtml(TRUE, &imhtml, &toolbar, NULL);
 				if (!(format & GAIM_STRING_FORMAT_TYPE_HTML))
 					gtk_widget_destroy(toolbar);
 
@@ -174,7 +174,7 @@
 
 	switch(gaim_plugin_pref_get_type(pref)) {
 		case GAIM_PLUGIN_PREF_CHOICE:
-			gtk_label = gaim_gtk_prefs_dropdown_from_list(parent, pref_label,
+			gtk_label = pidgin_prefs_dropdown_from_list(parent, pref_label,
 					GAIM_PREF_INT, pref_name, gaim_plugin_pref_get_choices(pref));
 			gtk_misc_set_alignment(GTK_MISC(gtk_label), 0, 0.5);
 
@@ -185,7 +185,7 @@
 		case GAIM_PLUGIN_PREF_NONE:
 		default:
 			gaim_plugin_pref_get_bounds(pref, &min, &max);
-			gaim_gtk_prefs_labeled_spin_button(parent, pref_label,
+			pidgin_prefs_labeled_spin_button(parent, pref_label,
 					pref_name, min, max, sg);
 			break;
 	}
@@ -203,7 +203,7 @@
 
 
 GtkWidget *
-gaim_gtk_plugin_pref_create_frame(GaimPluginPrefFrame *frame) {
+pidgin_plugin_pref_create_frame(GaimPluginPrefFrame *frame) {
 	GtkWidget *ret, *parent;
 	GtkSizeGroup *sg;
 	GList *pp;
@@ -232,7 +232,7 @@
 			if(gaim_plugin_pref_get_type(pref) == GAIM_PLUGIN_PREF_INFO) {
 				make_info_pref(parent, pref);
 			} else {
-				parent = gaim_gtk_make_frame(ret, label);
+				parent = pidgin_make_frame(ret, label);
 				gtk_widget_show(parent);
 			}
 
@@ -241,7 +241,7 @@
 
 		switch(gaim_prefs_get_type(name)) {
 			case GAIM_PREF_BOOLEAN:
-				gaim_gtk_prefs_checkbox(label, name, parent);
+				pidgin_prefs_checkbox(label, name, parent);
 				break;
 			case GAIM_PREF_INT:
 				make_int_pref(parent, pref, sg);
--- a/pidgin/gtkpluginpref.h	Sat Feb 03 05:55:41 2007 +0000
+++ b/pidgin/gtkpluginpref.h	Sat Feb 03 08:13:34 2007 +0000
@@ -23,8 +23,8 @@
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  *
  */
-#ifndef _GAIM_GTKPLUGINPREF_H_
-#define _GAIM_GTKPLUGINPREF_H_
+#ifndef _PIDGINPLUGINPREF_H_
+#define _PIDGINPLUGINPREF_H_
 
 #include "pluginpref.h"
 
@@ -40,10 +40,10 @@
  * @param frame GaimPluginPrefFrame
  * @return The gtk preference frame
  */
-GtkWidget *gaim_gtk_plugin_pref_create_frame(GaimPluginPrefFrame *frame);
+GtkWidget *pidgin_plugin_pref_create_frame(GaimPluginPrefFrame *frame);
 
 #ifdef __cplusplus
 }
 #endif
 
-#endif /* _GAIM_GTKPLUGINPREF_H_ */
+#endif /* _PIDGINPLUGINPREF_H_ */
--- a/pidgin/gtkpounce.c	Sat Feb 03 05:55:41 2007 +0000
+++ b/pidgin/gtkpounce.c	Sat Feb 03 08:13:34 2007 +0000
@@ -104,7 +104,7 @@
 	/* Buttons */
 	GtkWidget *save_button;
 
-} GaimGtkPounceDialog;
+} PidginPounceDialog;
 
 typedef struct
 {
@@ -121,7 +121,7 @@
  * Callbacks
  **************************************************************************/
 static gint
-delete_win_cb(GtkWidget *w, GdkEventAny *e, GaimGtkPounceDialog *dialog)
+delete_win_cb(GtkWidget *w, GdkEventAny *e, PidginPounceDialog *dialog)
 {
 	gtk_widget_destroy(dialog->window);
 	g_free(dialog);
@@ -130,7 +130,7 @@
 }
 
 static void
-cancel_cb(GtkWidget *w, GaimGtkPounceDialog *dialog)
+cancel_cb(GtkWidget *w, PidginPounceDialog *dialog)
 {
 	delete_win_cb(NULL, NULL, dialog);
 }
@@ -186,7 +186,7 @@
 
 	events = gaim_pounce_get_events(pounce);
 
-	pixbuf = gaim_gtk_create_prpl_icon(account, PIDGIN_PRPL_ICON_MEDIUM);
+	pixbuf = pidgin_create_prpl_icon(account, PIDGIN_PRPL_ICON_MEDIUM);
 
 	pouncer = gaim_account_get_username(account);
 	pouncee = gaim_pounce_get_pouncee(pounce);
@@ -236,7 +236,7 @@
 }
 
 static void
-save_pounce_cb(GtkWidget *w, GaimGtkPounceDialog *dialog)
+save_pounce_cb(GtkWidget *w, PidginPounceDialog *dialog)
 {
 	const char *name;
 	const char *message, *command, *sound, *reason;
@@ -300,7 +300,7 @@
 
 	if (dialog->pounce == NULL)
 	{
-		dialog->pounce = gaim_pounce_new(GAIM_GTK_UI, dialog->account,
+		dialog->pounce = gaim_pounce_new(PIDGIN_UI, dialog->account,
 										 name, events, options);
 	}
 	else {
@@ -353,13 +353,13 @@
 
 static void
 pounce_choose_cb(GtkWidget *item, GaimAccount *account,
-				 GaimGtkPounceDialog *dialog)
+				 PidginPounceDialog *dialog)
 {
 	dialog->account = account;
 }
 
 static void
-buddy_changed_cb(GtkEntry *entry, GaimGtkPounceDialog *dialog)
+buddy_changed_cb(GtkEntry *entry, PidginPounceDialog *dialog)
 {
 	if (dialog->save_button == NULL)
 		return;
@@ -382,7 +382,7 @@
 pounce_dnd_recv(GtkWidget *widget, GdkDragContext *dc, gint x, gint y,
 				GtkSelectionData *sd, guint info, guint t, gpointer data)
 {
-	GaimGtkPounceDialog *dialog;
+	PidginPounceDialog *dialog;
 
 	if (sd->target == gdk_atom_intern("GAIM_BLIST_NODE", FALSE))
 	{
@@ -398,11 +398,11 @@
 		else
 			return;
 
-		dialog = (GaimGtkPounceDialog *)data;
+		dialog = (PidginPounceDialog *)data;
 
 		gtk_entry_set_text(GTK_ENTRY(dialog->buddy_entry), buddy->name);
 		dialog->account = buddy->account;
-		gaim_gtk_account_option_menu_set_selected(dialog->account_menu, buddy->account);
+		pidgin_account_option_menu_set_selected(dialog->account_menu, buddy->account);
 
 		gtk_drag_finish(dc, TRUE, (dc->action == GDK_ACTION_MOVE), t);
 	}
@@ -412,7 +412,7 @@
 		char *username = NULL;
 		GaimAccount *account;
 
-		if (gaim_gtk_parse_x_im_contact((const char *)sd->data, FALSE, &account,
+		if (pidgin_parse_x_im_contact((const char *)sd->data, FALSE, &account,
 										&protocol, &username, NULL))
 		{
 			if (account == NULL)
@@ -423,11 +423,11 @@
 			}
 			else
 			{
-				dialog = (GaimGtkPounceDialog *)data;
+				dialog = (PidginPounceDialog *)data;
 
 				gtk_entry_set_text(GTK_ENTRY(dialog->buddy_entry), username);
 				dialog->account = account;
-				gaim_gtk_account_option_menu_set_selected(dialog->account_menu, account);
+				pidgin_account_option_menu_set_selected(dialog->account_menu, account);
 			}
 		}
 
@@ -445,10 +445,10 @@
 };
 
 void
-gaim_gtk_pounce_editor_show(GaimAccount *account, const char *name,
+pidgin_pounce_editor_show(GaimAccount *account, const char *name,
 							GaimPounce *cur_pounce)
 {
-	GaimGtkPounceDialog *dialog;
+	PidginPounceDialog *dialog;
 	GtkWidget *window;
 	GtkWidget *label;
 	GtkWidget *bbox;
@@ -465,7 +465,7 @@
 	                 (account != NULL) ||
 	                 (gaim_accounts_get_all() != NULL));
 
-	dialog = g_new0(GaimGtkPounceDialog, 1);
+	dialog = g_new0(PidginPounceDialog, 1);
 
 	if (cur_pounce != NULL)
 	{
@@ -519,7 +519,7 @@
 	gtk_box_pack_start(GTK_BOX(vbox1), vbox2, TRUE, TRUE, 0);
 
 	/* Create the "Pounce on Whom" frame. */
-	frame = gaim_gtk_make_frame(vbox2, _("Pounce on Whom"));
+	frame = pidgin_make_frame(vbox2, _("Pounce on Whom"));
 
 	/* Account: */
 	hbox = gtk_hbox_new(FALSE, GAIM_HIG_BOX_SPACE);
@@ -533,7 +533,7 @@
 	gtk_size_group_add_widget(sg, label);
 
 	dialog->account_menu =
-		gaim_gtk_account_option_menu_new(dialog->account, TRUE,
+		pidgin_account_option_menu_new(dialog->account, TRUE,
 										 G_CALLBACK(pounce_choose_cb),
 										 NULL, dialog);
 
@@ -554,7 +554,7 @@
 
 	dialog->buddy_entry = gtk_entry_new();
 
-	gaim_gtk_setup_screenname_autocomplete(dialog->buddy_entry, dialog->account_menu, FALSE);
+	pidgin_setup_screenname_autocomplete(dialog->buddy_entry, dialog->account_menu, FALSE);
 
 	gtk_box_pack_start(GTK_BOX(hbox), dialog->buddy_entry, TRUE, TRUE, 0);
 	gtk_widget_show(dialog->buddy_entry);
@@ -572,7 +572,7 @@
 	}
 
 	/* Create the "Pounce When Buddy..." frame. */
-	frame = gaim_gtk_make_frame(vbox2, _("Pounce When Buddy..."));
+	frame = pidgin_make_frame(vbox2, _("Pounce When Buddy..."));
 
 	table = gtk_table_new(5, 2, FALSE);
 	gtk_container_add(GTK_CONTAINER(frame), table);
@@ -633,7 +633,7 @@
 	gtk_widget_show(dialog->message_recv);
 
 	/* Create the "Action" frame. */
-	frame = gaim_gtk_make_frame(vbox2, _("Action"));
+	frame = pidgin_make_frame(vbox2, _("Action"));
 
 	table = gtk_table_new(3, 5, FALSE);
 	gtk_container_add(GTK_CONTAINER(frame), table);
@@ -726,11 +726,11 @@
 					 dialog->send_msg);
 
 	g_signal_connect(G_OBJECT(dialog->send_msg), "clicked",
-					 G_CALLBACK(gaim_gtk_toggle_sensitive),
+					 G_CALLBACK(pidgin_toggle_sensitive),
 					 dialog->send_msg_entry);
 
 	g_signal_connect(G_OBJECT(dialog->popup), "clicked",
-					 G_CALLBACK(gaim_gtk_toggle_sensitive),
+					 G_CALLBACK(pidgin_toggle_sensitive),
 					 dialog->popup_entry);
 
 	exec_widgets = g_ptr_array_new();
@@ -738,7 +738,7 @@
 	g_ptr_array_add(exec_widgets,dialog->exec_cmd_browse);
 
 	g_signal_connect(G_OBJECT(dialog->exec_cmd), "clicked",
-					 G_CALLBACK(gaim_gtk_toggle_sensitive_array),
+					 G_CALLBACK(pidgin_toggle_sensitive_array),
 					 exec_widgets);
 	g_signal_connect(G_OBJECT(dialog->exec_cmd_browse), "clicked",
 					 G_CALLBACK(filesel),
@@ -752,7 +752,7 @@
 	g_ptr_array_add(sound_widgets,dialog->play_sound_test);
 
 	g_signal_connect(G_OBJECT(dialog->play_sound), "clicked",
-					 G_CALLBACK(gaim_gtk_toggle_sensitive_array),
+					 G_CALLBACK(pidgin_toggle_sensitive_array),
 					 sound_widgets);
 	g_signal_connect(G_OBJECT(dialog->play_sound_browse), "clicked",
 					 G_CALLBACK(filesel),
@@ -773,7 +773,7 @@
 					 G_CALLBACK(save_pounce_cb), dialog);
 
 	/* Create the "Options" frame. */
-	frame = gaim_gtk_make_frame(vbox2, _("Options"));
+	frame = pidgin_make_frame(vbox2, _("Options"));
 
 	table = gtk_table_new(2, 1, FALSE);
 	gtk_container_add(GTK_CONTAINER(frame), table);
@@ -1019,7 +1019,7 @@
 	PouncesManager *dialog = user_data;
 
 	dialog->window = NULL;
-	gaim_gtk_pounces_manager_hide();
+	pidgin_pounces_manager_hide();
 
 	return FALSE;
 }
@@ -1042,7 +1042,7 @@
 static void
 pounces_manager_add_cb(GtkButton *button, gpointer user_data)
 {
-	gaim_gtk_pounce_editor_show(NULL, NULL, NULL);
+	pidgin_pounce_editor_show(NULL, NULL, NULL);
 }
 
 static void
@@ -1052,7 +1052,7 @@
 	GaimPounce *pounce;
 
 	gtk_tree_model_get(model, iter, POUNCES_MANAGER_COLUMN_POUNCE, &pounce, -1);
-	gaim_gtk_pounce_editor_show(NULL, NULL, pounce);
+	pidgin_pounce_editor_show(NULL, NULL, pounce);
 }
 
 static void
@@ -1113,7 +1113,7 @@
 static void
 pounces_manager_close_cb(GtkButton *button, gpointer user_data)
 {
-	gaim_gtk_pounces_manager_hide();
+	pidgin_pounces_manager_hide();
 }
 
 static void
@@ -1150,7 +1150,7 @@
 	if ((pounce != NULL) && (event->button == 1) &&
 		(event->type == GDK_2BUTTON_PRESS))
 	{
-		gaim_gtk_pounce_editor_show(NULL, NULL, pounce);
+		pidgin_pounce_editor_show(NULL, NULL, pounce);
 		return TRUE;
 	}
 
@@ -1299,7 +1299,7 @@
 }
 
 void
-gaim_gtk_pounces_manager_show(void)
+pidgin_pounces_manager_show(void)
 {
 	PouncesManager *dialog;
 	GtkWidget *bbox;
@@ -1391,7 +1391,7 @@
 }
 
 void
-gaim_gtk_pounces_manager_hide(void)
+pidgin_pounces_manager_hide(void)
 {
 	if (pounces_manager == NULL)
 		return;
@@ -1629,16 +1629,16 @@
 }
 
 void *
-gaim_gtk_pounces_get_handle() {
+pidgin_pounces_get_handle() {
 	static int handle;
 
 	return &handle;
 }
 
 void
-gaim_gtk_pounces_init(void)
+pidgin_pounces_init(void)
 {
-	gaim_pounces_register_handler(GAIM_GTK_UI, pounce_cb, new_pounce,
+	gaim_pounces_register_handler(PIDGIN_UI, pounce_cb, new_pounce,
 								  free_pounce);
 
 	gaim_prefs_add_none("/gaim/gtk/pounces");
@@ -1658,9 +1658,9 @@
 	gaim_prefs_add_int("/gaim/gtk/pounces/dialog/height", 321);
 
 	gaim_signal_connect(gaim_connections_get_handle(), "signed-on",
-						gaim_gtk_pounces_get_handle(),
+						pidgin_pounces_get_handle(),
 						GAIM_CALLBACK(signed_on_off_cb), NULL);
 	gaim_signal_connect(gaim_connections_get_handle(), "signed-off",
-						gaim_gtk_pounces_get_handle(),
+						pidgin_pounces_get_handle(),
 						GAIM_CALLBACK(signed_on_off_cb), NULL);
 }
--- a/pidgin/gtkpounce.h	Sat Feb 03 05:55:41 2007 +0000
+++ b/pidgin/gtkpounce.h	Sat Feb 03 08:13:34 2007 +0000
@@ -22,8 +22,8 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
-#ifndef _GAIM_GTKPOUNCE_H_
-#define _GAIM_GTKPOUNCE_H_
+#ifndef _PIDGINPOUNCE_H_
+#define _PIDGINPOUNCE_H_
 
 #include "pounce.h"
 
@@ -34,29 +34,29 @@
  * @param name       The optional name to pounce on.
  * @param cur_pounce The current buddy pounce, if editing an existing one.
  */
-void gaim_gtk_pounce_editor_show(GaimAccount *account, const char *name,
+void pidgin_pounce_editor_show(GaimAccount *account, const char *name,
 								GaimPounce *cur_pounce);
 
 /**
  * Shows the pounces manager window.
  */
-void gaim_gtk_pounces_manager_show(void);
+void pidgin_pounces_manager_show(void);
 
 /**
  * Hides the pounces manager window.
  */
-void gaim_gtk_pounces_manager_hide(void);
+void pidgin_pounces_manager_hide(void);
 
 /**
  * Returns the gtkpounces handle
  *
  * @return The handle to the GTK+ pounces system
  */
-void *gaim_gtk_pounces_get_handle(void);
+void *pidgin_pounces_get_handle(void);
 
 /**
  * Initializes the GTK+ pounces subsystem.
  */
-void gaim_gtk_pounces_init(void);
+void pidgin_pounces_init(void);
 
-#endif /* _GAIM_GTKPOUNCE_H_ */
+#endif /* _PIDGINPOUNCE_H_ */
--- a/pidgin/gtkprefs.c	Sat Feb 03 05:55:41 2007 +0000
+++ b/pidgin/gtkprefs.c	Sat Feb 03 08:13:34 2007 +0000
@@ -84,7 +84,7 @@
 }
 
 GtkWidget *
-gaim_gtk_prefs_labeled_spin_button(GtkWidget *box, const gchar *title,
+pidgin_prefs_labeled_spin_button(GtkWidget *box, const gchar *title,
 		const char *key, int min, int max, GtkSizeGroup *sg)
 {
 	GtkWidget *hbox;
@@ -136,7 +136,7 @@
 }
 
 GtkWidget *
-gaim_gtk_prefs_labeled_entry(GtkWidget *page, const gchar *title,
+pidgin_prefs_labeled_entry(GtkWidget *page, const gchar *title,
 							 const char *key, GtkSizeGroup *sg)
 {
 	GtkWidget *hbox, *label, *entry;
@@ -198,7 +198,7 @@
 }
 
 GtkWidget *
-gaim_gtk_prefs_dropdown_from_list(GtkWidget *box, const gchar *title,
+pidgin_prefs_dropdown_from_list(GtkWidget *box, const gchar *title,
 		GaimPrefType type, const char *key, GList *menuitems)
 {
 	GtkWidget  *dropdown, *opt, *menu;
@@ -298,7 +298,7 @@
 }
 
 GtkWidget *
-gaim_gtk_prefs_dropdown(GtkWidget *box, const gchar *title, GaimPrefType type,
+pidgin_prefs_dropdown(GtkWidget *box, const gchar *title, GaimPrefType type,
 			   const char *key, ...)
 {
 	va_list ap;
@@ -331,7 +331,7 @@
 
 	menuitems = g_list_reverse(menuitems);
 
-	dropdown = gaim_gtk_prefs_dropdown_from_list(box, title, type, key,
+	dropdown = pidgin_prefs_dropdown_from_list(box, title, type, key,
 			menuitems);
 
 	g_list_free(menuitems);
@@ -415,7 +415,7 @@
 		gtk_tree_row_reference_free(previous_smiley_row);
 	previous_smiley_row = NULL;
 
-	gaim_gtkthemes_smiley_theme_probe();
+	pidginthemes_smiley_theme_probe();
 
 	if (!(themes = smiley_themes))
 		return NULL;
@@ -813,8 +813,8 @@
 	
 	sg = gtk_size_group_new(GTK_SIZE_GROUP_HORIZONTAL);
 
-	vbox = gaim_gtk_make_frame(ret, _("System Tray Icon"));
-	label = gaim_gtk_prefs_dropdown(vbox, _("_Show system tray icon:"), GAIM_PREF_STRING,
+	vbox = pidgin_make_frame(ret, _("System Tray Icon"));
+	label = pidgin_prefs_dropdown(vbox, _("_Show system tray icon:"), GAIM_PREF_STRING,
 					"/gaim/gtk/docklet/show",
 					_("Always"), "always",
 					_("Never"), "never",
@@ -823,8 +823,8 @@
 	gtk_size_group_add_widget(sg, label);
         gtk_misc_set_alignment(GTK_MISC(label), 0.0, 0.5);
 	
-	vbox = gaim_gtk_make_frame(ret, _("Conversation Window Hiding"));
-	label = gaim_gtk_prefs_dropdown(vbox, _("_Hide new IM conversations:"),
+	vbox = pidgin_make_frame(ret, _("Conversation Window Hiding"));
+	label = pidgin_prefs_dropdown(vbox, _("_Hide new IM conversations:"),
 					GAIM_PREF_STRING, "/gaim/gtk/conversations/im/hide_new",
 					_("Never"), "never",
 					_("When away"), "away",
@@ -835,9 +835,9 @@
 			
 
 	/* All the tab options! */
-	vbox = gaim_gtk_make_frame(ret, _("Tabs"));
+	vbox = pidgin_make_frame(ret, _("Tabs"));
 	
-	gaim_gtk_prefs_checkbox(_("Show IMs and chats in _tabbed windows"),
+	pidgin_prefs_checkbox(_("Show IMs and chats in _tabbed windows"),
 							"/gaim/gtk/conversations/tabs", vbox);
 
 	/*
@@ -851,10 +851,10 @@
 	if (!gaim_prefs_get_bool("/gaim/gtk/conversations/tabs"))
 	  gtk_widget_set_sensitive(vbox2, FALSE);
 
-	gaim_gtk_prefs_checkbox(_("Show close b_utton on tabs"),
+	pidgin_prefs_checkbox(_("Show close b_utton on tabs"),
 				"/gaim/gtk/conversations/close_on_tabs", vbox2);
 
-	label = gaim_gtk_prefs_dropdown(vbox2, _("_Placement:"), GAIM_PREF_INT,
+	label = pidgin_prefs_dropdown(vbox2, _("_Placement:"), GAIM_PREF_INT,
 					"/gaim/gtk/conversations/tab_side",
 					_("Top"), GTK_POS_TOP,
 					_("Bottom"), GTK_POS_BOTTOM,
@@ -868,8 +868,8 @@
 	gtk_size_group_add_widget(sg, label);
         gtk_misc_set_alignment(GTK_MISC(label), 0.0, 0.5);
 		
-	names = gaim_gtkconv_placement_get_options();
-	label = gaim_gtk_prefs_dropdown_from_list(vbox2, _("N_ew conversations:"),
+	names = pidgin_conv_placement_get_options();
+	label = pidgin_prefs_dropdown_from_list(vbox2, _("N_ew conversations:"),
 				GAIM_PREF_STRING, "/gaim/gtk/conversations/placement", names);
 	gtk_misc_set_alignment(GTK_MISC(label), 0.0, 0.5);
 			
@@ -895,37 +895,37 @@
 	ret = gtk_vbox_new(FALSE, GAIM_HIG_CAT_SPACE);
 	gtk_container_set_border_width(GTK_CONTAINER(ret), GAIM_HIG_BORDER);
 
-	vbox = gaim_gtk_make_frame(ret, _("Conversations"));
+	vbox = pidgin_make_frame(ret, _("Conversations"));
 
-	gaim_gtk_prefs_checkbox(_("Show _formatting on incoming messages"),
+	pidgin_prefs_checkbox(_("Show _formatting on incoming messages"),
 				"/gaim/gtk/conversations/show_incoming_formatting", vbox);
 
-	iconpref1 = gaim_gtk_prefs_checkbox(_("Show buddy _icons"),
+	iconpref1 = pidgin_prefs_checkbox(_("Show buddy _icons"),
 			"/gaim/gtk/conversations/im/show_buddy_icons", vbox);
-	iconpref2 = gaim_gtk_prefs_checkbox(_("Enable buddy ic_on animation"),
+	iconpref2 = pidgin_prefs_checkbox(_("Enable buddy ic_on animation"),
 			"/gaim/gtk/conversations/im/animate_buddy_icons", vbox);
 	if (!gaim_prefs_get_bool("/gaim/gtk/conversations/im/show_buddy_icons"))
 		gtk_widget_set_sensitive(iconpref2, FALSE);
 	g_signal_connect(G_OBJECT(iconpref1), "clicked",
-					 G_CALLBACK(gaim_gtk_toggle_sensitive), iconpref2);
+					 G_CALLBACK(pidgin_toggle_sensitive), iconpref2);
 
-	gaim_gtk_prefs_checkbox(_("_Notify buddies that you are typing to them"),
+	pidgin_prefs_checkbox(_("_Notify buddies that you are typing to them"),
 			"/core/conversations/im/send_typing", vbox);
 #ifdef USE_GTKSPELL
-	gaim_gtk_prefs_checkbox(_("Highlight _misspelled words"),
+	pidgin_prefs_checkbox(_("Highlight _misspelled words"),
 			"/gaim/gtk/conversations/spellcheck", vbox);
 #endif
 
-	gaim_gtk_prefs_checkbox(_("Use smooth-scrolling"), "/gaim/gtk/conversations/use_smooth_scrolling", vbox);
+	pidgin_prefs_checkbox(_("Use smooth-scrolling"), "/gaim/gtk/conversations/use_smooth_scrolling", vbox);
 
 #ifdef _WIN32
-	gaim_gtk_prefs_checkbox(_("F_lash window when IMs are received"), "/gaim/gtk/win32/blink_im", vbox);
+	pidgin_prefs_checkbox(_("F_lash window when IMs are received"), "/gaim/gtk/win32/blink_im", vbox);
 #endif
 
-	vbox = gaim_gtk_make_frame(ret, _("Default Formatting"));
+	vbox = pidgin_make_frame(ret, _("Default Formatting"));
 
-	frame = gaim_gtk_create_imhtml(TRUE, &imhtml, &toolbar, NULL);
-	gtk_widget_set_name(imhtml, "gaim_gtkprefs_font_imhtml");
+	frame = pidgin_create_imhtml(TRUE, &imhtml, &toolbar, NULL);
+	gtk_widget_set_name(imhtml, "pidginprefs_font_imhtml");
 	gtk_imhtml_set_whole_buffer_formatting_only(GTK_IMHTML(imhtml), TRUE);
 	gtk_imhtml_set_format_functions(GTK_IMHTML(imhtml),
 									GTK_IMHTML_BOLD |
@@ -1012,9 +1012,9 @@
 	ret = gtk_vbox_new(FALSE, GAIM_HIG_CAT_SPACE);
 	gtk_container_set_border_width (GTK_CONTAINER (ret), GAIM_HIG_BORDER);
 
-	vbox = gaim_gtk_make_frame (ret, _("IP Address"));
+	vbox = pidgin_make_frame (ret, _("IP Address"));
 	sg = gtk_size_group_new(GTK_SIZE_GROUP_HORIZONTAL);
-	gaim_gtk_prefs_labeled_entry(vbox,_("ST_UN server:"),
+	pidgin_prefs_labeled_entry(vbox,_("ST_UN server:"),
 			"/core/network/stun_server", sg);
 
 	hbox = gtk_hbox_new(FALSE, GAIM_HIG_BOX_SPACE);
@@ -1030,7 +1030,7 @@
 	gtk_misc_set_alignment(GTK_MISC(label), 0.0, 0.5);
 	gtk_container_add(GTK_CONTAINER(hbox), label);
 
-	auto_ip_checkbox = gaim_gtk_prefs_checkbox(_("_Autodetect IP address"),
+	auto_ip_checkbox = pidgin_prefs_checkbox(_("_Autodetect IP address"),
 			"/core/network/auto_ip", vbox);
 
 	table = gtk_table_new(2, 2, FALSE);
@@ -1066,32 +1066,32 @@
 	}
 
 	g_signal_connect(G_OBJECT(auto_ip_checkbox), "clicked",
-					 G_CALLBACK(gaim_gtk_toggle_sensitive), table);
+					 G_CALLBACK(pidgin_toggle_sensitive), table);
 
-	vbox = gaim_gtk_make_frame (ret, _("Ports"));
+	vbox = pidgin_make_frame (ret, _("Ports"));
 	sg = gtk_size_group_new(GTK_SIZE_GROUP_HORIZONTAL);
 
-	ports_checkbox = gaim_gtk_prefs_checkbox(_("_Manually specify range of ports to listen on"),
+	ports_checkbox = pidgin_prefs_checkbox(_("_Manually specify range of ports to listen on"),
 			"/core/network/ports_range_use", vbox);
 
-	spin_button = gaim_gtk_prefs_labeled_spin_button(vbox, _("_Start port:"),
+	spin_button = pidgin_prefs_labeled_spin_button(vbox, _("_Start port:"),
 			"/core/network/ports_range_start", 0, 65535, sg);
 	if (!gaim_prefs_get_bool("/core/network/ports_range_use"))
 		gtk_widget_set_sensitive(GTK_WIDGET(spin_button), FALSE);
 	g_signal_connect(G_OBJECT(ports_checkbox), "clicked",
-					 G_CALLBACK(gaim_gtk_toggle_sensitive), spin_button);
+					 G_CALLBACK(pidgin_toggle_sensitive), spin_button);
 
-	spin_button = gaim_gtk_prefs_labeled_spin_button(vbox, _("_End port:"),
+	spin_button = pidgin_prefs_labeled_spin_button(vbox, _("_End port:"),
 			"/core/network/ports_range_end", 0, 65535, sg);
 	if (!gaim_prefs_get_bool("/core/network/ports_range_use"))
 		gtk_widget_set_sensitive(GTK_WIDGET(spin_button), FALSE);
 	g_signal_connect(G_OBJECT(ports_checkbox), "clicked",
-					 G_CALLBACK(gaim_gtk_toggle_sensitive), spin_button);
+					 G_CALLBACK(pidgin_toggle_sensitive), spin_button);
 
 	if (!gaim_running_gnome()) {
-		vbox = gaim_gtk_make_frame(ret, _("Proxy Server"));
+		vbox = pidgin_make_frame(ret, _("Proxy Server"));
 		prefs_proxy_frame = gtk_vbox_new(FALSE, 0);
-		gaim_gtk_prefs_dropdown(vbox, _("Proxy _type:"), GAIM_PREF_STRING,
+		pidgin_prefs_dropdown(vbox, _("Proxy _type:"), GAIM_PREF_STRING,
 					"/core/proxy/type",
 					_("No proxy"), "none",
 					"SOCKS 4", "socks4",
@@ -1284,11 +1284,11 @@
 	gtk_container_set_border_width (GTK_CONTAINER (ret), GAIM_HIG_BORDER);
 
 	sg = gtk_size_group_new(GTK_SIZE_GROUP_HORIZONTAL);
-	vbox = gaim_gtk_make_frame (ret, _("Browser Selection"));
+	vbox = pidgin_make_frame (ret, _("Browser Selection"));
 
 	browsers = get_available_browsers();
 	if (browsers != NULL) {
-		label = gaim_gtk_prefs_dropdown_from_list(vbox,_("_Browser:"), GAIM_PREF_STRING,
+		label = pidgin_prefs_dropdown_from_list(vbox,_("_Browser:"), GAIM_PREF_STRING,
 										 "/gaim/gtk/browsers/browser",
 										 browsers);
 		g_list_free(browsers);
@@ -1296,7 +1296,7 @@
 		gtk_size_group_add_widget(sg, label);
 
 		hbox = gtk_hbox_new(FALSE, 0);
-		label = gaim_gtk_prefs_dropdown(hbox, _("_Open link in:"), GAIM_PREF_INT,
+		label = pidgin_prefs_dropdown(hbox, _("_Open link in:"), GAIM_PREF_INT,
 			"/gaim/gtk/browsers/place",
 			_("Browser default"), GAIM_BROWSER_DEFAULT,
 			_("Existing window"), GAIM_BROWSER_CURRENT,
@@ -1352,19 +1352,19 @@
 	gtk_container_set_border_width (GTK_CONTAINER (ret), GAIM_HIG_BORDER);
 
 
-	vbox = gaim_gtk_make_frame (ret, _("Logging"));
+	vbox = pidgin_make_frame (ret, _("Logging"));
 	names = gaim_log_logger_get_options();
 
-	gaim_gtk_prefs_dropdown_from_list(vbox, _("Log _format:"), GAIM_PREF_STRING,
+	pidgin_prefs_dropdown_from_list(vbox, _("Log _format:"), GAIM_PREF_STRING,
 				 "/core/logging/format", names);
 
 	g_list_free(names);
 
-	gaim_gtk_prefs_checkbox(_("Log all _instant messages"),
+	pidgin_prefs_checkbox(_("Log all _instant messages"),
 				  "/core/logging/log_ims", vbox);
-	gaim_gtk_prefs_checkbox(_("Log all c_hats"),
+	pidgin_prefs_checkbox(_("Log all c_hats"),
 				  "/core/logging/log_chats", vbox);
-	gaim_gtk_prefs_checkbox(_("Log all _status changes to system log"),
+	pidgin_prefs_checkbox(_("Log all _status changes to system log"),
 				  "/core/logging/log_system", vbox);
 
 	gtk_widget_show_all(ret);
@@ -1446,7 +1446,7 @@
 	gboolean temp_value;
 
 	pref = g_strdup_printf("/gaim/gtk/sound/enabled/%s",
-			gaim_gtk_sound_get_event_option(sound_row_sel));
+			pidgin_sound_get_event_option(sound_row_sel));
 
 	temp_value = gaim_prefs_get_bool(pref);
 
@@ -1468,7 +1468,7 @@
 	gchar *pref;
 
 	pref = g_strdup_printf("/gaim/gtk/sound/file/%s",
-						   gaim_gtk_sound_get_event_option(sound_row_sel));
+						   pidgin_sound_get_event_option(sound_row_sel));
 	gaim_prefs_set_path(pref, "");
 	g_free(pref);
 
@@ -1485,7 +1485,7 @@
 
 	/* Set it -- and forget it */
 	pref = g_strdup_printf("/gaim/gtk/sound/file/%s",
-						   gaim_gtk_sound_get_event_option(sound));
+						   pidgin_sound_get_event_option(sound));
 	gaim_prefs_set_path(pref, filename);
 	g_free(pref);
 
@@ -1503,7 +1503,7 @@
 	const char *filename;
 
 	pref = g_strdup_printf("/gaim/gtk/sound/file/%s",
-						   gaim_gtk_sound_get_event_option(sound_row_sel));
+						   pidgin_sound_get_event_option(sound_row_sel));
 	filename = gaim_prefs_get_path(pref);
 	g_free(pref);
 
@@ -1555,7 +1555,7 @@
 	sound_row_sel = g_value_get_uint(&val);
 
 	pref = g_strdup_printf("/gaim/gtk/sound/file/%s",
-			gaim_gtk_sound_get_event_option(sound_row_sel));
+			pidgin_sound_get_event_option(sound_row_sel));
 	file = gaim_prefs_get_path(pref);
 	g_free(pref);
 	if (sound_entry)
@@ -1593,8 +1593,8 @@
 	sg = gtk_size_group_new(GTK_SIZE_GROUP_HORIZONTAL);
 
 #ifndef _WIN32
-	vbox = gaim_gtk_make_frame (ret, _("Sound Method"));
-	dd = gaim_gtk_prefs_dropdown(vbox, _("_Method:"), GAIM_PREF_STRING,
+	vbox = pidgin_make_frame (ret, _("Sound Method"));
+	dd = pidgin_prefs_dropdown(vbox, _("_Method:"), GAIM_PREF_STRING,
 			"/gaim/gtk/sound/method",
 			_("Console beep"), "beep",
 #ifdef USE_GSTREAMER
@@ -1636,10 +1636,10 @@
 	gaim_set_accessible_label (entry, label);
 #endif /* _WIN32 */
 
-	vbox = gaim_gtk_make_frame (ret, _("Sound Options"));
-	gaim_gtk_prefs_checkbox(_("Sounds when conversation has _focus"),
+	vbox = pidgin_make_frame (ret, _("Sound Options"));
+	pidgin_prefs_checkbox(_("Sounds when conversation has _focus"),
 				   "/gaim/gtk/sound/conv_focus", vbox);
-	gaim_gtk_prefs_dropdown(vbox, _("Enable sounds:"),
+	pidgin_prefs_dropdown(vbox, _("Enable sounds:"),
 				 GAIM_PREF_INT, "/core/sound/while_status",
 				_("Only when available"), 1,
 				_("Only when not available"), 2,
@@ -1678,7 +1678,7 @@
 								sound_changed2_cb, vbox);
 #endif
 
-	vbox = gaim_gtk_make_frame(ret, _("Sound Events"));
+	vbox = pidgin_make_frame(ret, _("Sound Events"));
 
 	/* The following is an ugly hack to make the frame expand so the
 	 * sound events list is big enough to be usable */
@@ -1698,8 +1698,8 @@
 
 	for (j=0; j < GAIM_NUM_SOUNDS; j++) {
 		char *pref = g_strdup_printf("/gaim/gtk/sound/enabled/%s",
-					     gaim_gtk_sound_get_event_option(j));
-		const char *label = gaim_gtk_sound_get_event_label(j);
+					     pidgin_sound_get_event_option(j));
+		const char *label = pidgin_sound_get_event_label(j);
 
 		if (label == NULL) {
 			g_free(pref);
@@ -1748,7 +1748,7 @@
 	gtk_box_pack_start(GTK_BOX(vbox), hbox, FALSE, FALSE, 0);
 	sound_entry = gtk_entry_new();
 	pref = g_strdup_printf("/gaim/gtk/sound/file/%s",
-			       gaim_gtk_sound_get_event_option(0));
+			       pidgin_sound_get_event_option(0));
 	file = gaim_prefs_get_path(pref);
 	g_free(pref);
 	gtk_entry_set_text(GTK_ENTRY(sound_entry), (file && *file != '\0') ? file : "(default)");
@@ -1804,9 +1804,9 @@
 	sg = gtk_size_group_new(GTK_SIZE_GROUP_HORIZONTAL);
 
 	/* Idle stuff */
-	vbox = gaim_gtk_make_frame(ret, _("Idle"));
+	vbox = pidgin_make_frame(ret, _("Idle"));
 
-	dd = gaim_gtk_prefs_dropdown(vbox, _("_Report idle time:"),
+	dd = pidgin_prefs_dropdown(vbox, _("_Report idle time:"),
 		GAIM_PREF_STRING, "/core/away/idle_reporting",
 		_("Never"), "none",
 		_("From last sent message"), "gaim",
@@ -1818,9 +1818,9 @@
 	gtk_misc_set_alignment(GTK_MISC(dd), 0, 0.5);
 
 	/* Away stuff */
-	vbox = gaim_gtk_make_frame(ret, _("Away"));
+	vbox = pidgin_make_frame(ret, _("Away"));
 
-	dd = gaim_gtk_prefs_dropdown(vbox, _("_Auto-reply:"),
+	dd = pidgin_prefs_dropdown(vbox, _("_Auto-reply:"),
 		GAIM_PREF_STRING, "/core/away/auto_reply",
 		_("Never"), "never",
 		_("When away"), "away",
@@ -1830,16 +1830,16 @@
 	gtk_misc_set_alignment(GTK_MISC(dd), 0, 0.5);
 
 	/* Auto-away stuff */
-	vbox = gaim_gtk_make_frame(ret, _("Auto-away"));
+	vbox = pidgin_make_frame(ret, _("Auto-away"));
 
-	button = gaim_gtk_prefs_checkbox(_("Change status when _idle"),
+	button = pidgin_prefs_checkbox(_("Change status when _idle"),
 						   "/core/away/away_when_idle", vbox);
 
-	select = gaim_gtk_prefs_labeled_spin_button(vbox,
+	select = pidgin_prefs_labeled_spin_button(vbox,
 			_("_Minutes before changing status:"), "/core/away/mins_before_away",
 			1, 24 * 60, sg);
 	g_signal_connect(G_OBJECT(button), "clicked",
-					 G_CALLBACK(gaim_gtk_toggle_sensitive), select);
+					 G_CALLBACK(pidgin_toggle_sensitive), select);
 
 	hbox = gtk_hbox_new(FALSE, 0);
 	gtk_container_add(GTK_CONTAINER(vbox), hbox);
@@ -1848,14 +1848,14 @@
 	gtk_size_group_add_widget(sg, label);
 	gtk_misc_set_alignment(GTK_MISC(label), 0, 0.5);
 	g_signal_connect(G_OBJECT(button), "clicked",
-					 G_CALLBACK(gaim_gtk_toggle_sensitive), label);
+					 G_CALLBACK(pidgin_toggle_sensitive), label);
 	gtk_box_pack_start(GTK_BOX(hbox), label, FALSE, FALSE, 0);
 
 	/* TODO: Show something useful if we don't have any saved statuses. */
-	menu = gaim_gtk_status_menu(gaim_savedstatus_get_idleaway(), G_CALLBACK(set_idle_away));
+	menu = pidgin_status_menu(gaim_savedstatus_get_idleaway(), G_CALLBACK(set_idle_away));
 	gtk_box_pack_start(GTK_BOX(hbox), menu, FALSE, FALSE, 0);
 	g_signal_connect(G_OBJECT(button), "clicked",
-			 G_CALLBACK(gaim_gtk_toggle_sensitive), menu);
+			 G_CALLBACK(pidgin_toggle_sensitive), menu);
 	gtk_label_set_mnemonic_widget(GTK_LABEL(label), menu);
 
 	if (!gaim_prefs_get_bool("/core/away/away_when_idle")) {
@@ -1865,9 +1865,9 @@
 	}
 
 	/* Signon status stuff */
-	vbox = gaim_gtk_make_frame(ret, _("Status at Startup"));
+	vbox = pidgin_make_frame(ret, _("Status at Startup"));
 
-	button = gaim_gtk_prefs_checkbox(_("Use status from last _exit at startup"),
+	button = pidgin_prefs_checkbox(_("Use status from last _exit at startup"),
 		"/core/savedstatus/startup_current_status", vbox);
 
 	hbox = gtk_hbox_new(FALSE, 0);
@@ -1877,14 +1877,14 @@
 	gtk_size_group_add_widget(sg, label);
 	gtk_misc_set_alignment(GTK_MISC(label), 0, 0.5);
 	g_signal_connect(G_OBJECT(button), "clicked",
-					 G_CALLBACK(gaim_gtk_toggle_sensitive), label);
+					 G_CALLBACK(pidgin_toggle_sensitive), label);
 	gtk_box_pack_start(GTK_BOX(hbox), label, FALSE, FALSE, 0);
 
 	/* TODO: Show something useful if we don't have any saved statuses. */
-	menu = gaim_gtk_status_menu(gaim_savedstatus_get_startup(), G_CALLBACK(set_startupstatus));
+	menu = pidgin_status_menu(gaim_savedstatus_get_startup(), G_CALLBACK(set_startupstatus));
 	gtk_box_pack_start(GTK_BOX(hbox), menu, FALSE, FALSE, 0);
 	g_signal_connect(G_OBJECT(button), "clicked",
-			 G_CALLBACK(gaim_gtk_toggle_sensitive), menu);
+			 G_CALLBACK(pidgin_toggle_sensitive), menu);
 	gtk_label_set_mnemonic_widget(GTK_LABEL(label), menu);
 
 	if (gaim_prefs_get_bool("/core/savedstatus/startup_current_status")) {
@@ -1927,7 +1927,7 @@
 	prefs_notebook_add_page(_("Status / Idle"), away_page(), notebook_page++);
 }
 
-void gaim_gtk_prefs_show(void)
+void pidgin_prefs_show(void)
 {
 	GtkWidget *vbox;
 	GtkWidget *bbox;
@@ -1990,7 +1990,7 @@
 }
 
 GtkWidget *
-gaim_gtk_prefs_checkbox(const char *text, const char *key, GtkWidget *page)
+pidgin_prefs_checkbox(const char *text, const char *key, GtkWidget *page)
 {
 	GtkWidget *button;
 
@@ -2018,14 +2018,14 @@
 	for (themes = smiley_themes; themes; themes = themes->next) {
 		struct smiley_theme *smile = themes->data;
 		if (smile->name && strcmp(themename, smile->name) == 0) {
-			gaim_gtkthemes_load_smiley_theme(smile->path, TRUE);
+			pidginthemes_load_smiley_theme(smile->path, TRUE);
 			break;
 		}
 	}
 }
 
 void
-gaim_gtk_prefs_init(void)
+pidgin_prefs_init(void)
 {
 	gaim_prefs_add_none("/gaim");
 	gaim_prefs_add_none("/gaim/gtk");
@@ -2058,7 +2058,7 @@
 								smiley_theme_pref_cb, NULL);
 }
 
-void gaim_gtk_prefs_update_old() {
+void pidgin_prefs_update_old() {
 	/* Rename some old prefs */
 	gaim_prefs_rename("/gaim/gtk/logging/log_ims", "/core/logging/log_ims");
 	gaim_prefs_rename("/gaim/gtk/logging/log_chats", "/core/logging/log_chats");
--- a/pidgin/gtkprefs.h	Sat Feb 03 05:55:41 2007 +0000
+++ b/pidgin/gtkprefs.h	Sat Feb 03 08:13:34 2007 +0000
@@ -23,20 +23,20 @@
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  *
  */
-#ifndef _GAIM_GTKPREFS_H_
-#define _GAIM_GTKPREFS_H_
+#ifndef _PIDGINPREFS_H_
+#define _PIDGINPREFS_H_
 
 #include "prefs.h"
 
 /**
  * Initializes all UI-specific preferences.
  */
-void gaim_gtk_prefs_init(void);
+void pidgin_prefs_init(void);
 
 /**
  * Shows the preferences dialog.
  */
-void gaim_gtk_prefs_show(void);
+void pidgin_prefs_show(void);
 
 /**
  * Add a new checkbox for a boolean preference
@@ -45,7 +45,7 @@
  * @param key   The key of the gaim bool pref that will be represented by the checkbox
  * @param page  The page to which the new checkbox will be added
  */
-GtkWidget *gaim_gtk_prefs_checkbox(const char *title, const char *key,
+GtkWidget *pidgin_prefs_checkbox(const char *title, const char *key,
 		GtkWidget *page);
 
 /**
@@ -61,7 +61,7 @@
  *              used to set the widgets to sensitive or insensitive based on the 
  *              value of a checkbox.
  */
-GtkWidget *gaim_gtk_prefs_labeled_spin_button(GtkWidget *page,
+GtkWidget *pidgin_prefs_labeled_spin_button(GtkWidget *page,
 		const gchar *title, const char *key, int min, int max, GtkSizeGroup *sg);
 
 /**
@@ -76,7 +76,7 @@
  *               the widgets to sensitive or insensitive based on the value of a
  *               checkbox.
  */
-GtkWidget *gaim_gtk_prefs_labeled_entry(GtkWidget *page, const gchar *title,
+GtkWidget *pidgin_prefs_labeled_entry(GtkWidget *page, const gchar *title,
 										const char *key, GtkSizeGroup *sg);
 
 /**
@@ -89,7 +89,7 @@
  * @param ...   The choices to be added to the dropdown, choices should be
  *              paired as label/value
  */
-GtkWidget *gaim_gtk_prefs_dropdown(GtkWidget *page, const gchar *title,
+GtkWidget *pidgin_prefs_dropdown(GtkWidget *page, const gchar *title,
 		GaimPrefType type, const char *key, ...);
 
 /**
@@ -102,13 +102,13 @@
  * @param menuitems The choices to be added to the dropdown, choices should
  *                  be paired as label/value
  */
-GtkWidget *gaim_gtk_prefs_dropdown_from_list(GtkWidget *page,
+GtkWidget *pidgin_prefs_dropdown_from_list(GtkWidget *page,
 		const gchar * title, GaimPrefType type, const char *key,
 		GList *menuitems);
 
 /**
  * Rename legacy prefs and delete some that no longer exist.
  */
-void gaim_gtk_prefs_update_old(void);
+void pidgin_prefs_update_old(void);
 
-#endif /* _GAIM_GTKPREFS_H_ */
+#endif /* _PIDGINPREFS_H_ */
--- a/pidgin/gtkprivacy.c	Sat Feb 03 05:55:41 2007 +0000
+++ b/pidgin/gtkprivacy.c	Sat Feb 03 08:13:34 2007 +0000
@@ -59,7 +59,7 @@
 
 	GaimAccount *account;
 
-} GaimGtkPrivacyDialog;
+} PidginPrivacyDialog;
 
 typedef struct
 {
@@ -67,7 +67,7 @@
 	char *name;
 	gboolean block;
 
-} GaimGtkPrivacyRequestData;
+} PidginPrivacyRequestData;
 
 static struct
 {
@@ -85,10 +85,10 @@
 
 static size_t menu_entry_count = sizeof(menu_entries) / sizeof(*menu_entries);
 
-static GaimGtkPrivacyDialog *privacy_dialog = NULL;
+static PidginPrivacyDialog *privacy_dialog = NULL;
 
 static void
-rebuild_allow_list(GaimGtkPrivacyDialog *dialog)
+rebuild_allow_list(PidginPrivacyDialog *dialog)
 {
 	GSList *l;
 	GtkTreeIter iter;
@@ -102,7 +102,7 @@
 }
 
 static void
-rebuild_block_list(GaimGtkPrivacyDialog *dialog)
+rebuild_block_list(PidginPrivacyDialog *dialog)
 {
 	GSList *l;
 	GtkTreeIter iter;
@@ -133,13 +133,13 @@
 }
 
 static void
-user_selected_cb(GtkTreeSelection *sel, GaimGtkPrivacyDialog *dialog)
+user_selected_cb(GtkTreeSelection *sel, PidginPrivacyDialog *dialog)
 {
 	gtk_widget_set_sensitive(dialog->remove_button, TRUE);
 }
 
 static GtkWidget *
-build_list(GaimGtkPrivacyDialog *dialog, GtkListStore *model,
+build_list(PidginPrivacyDialog *dialog, GtkListStore *model,
 		   GtkWidget **ret_treeview)
 {
 	GtkWidget *sw;
@@ -180,7 +180,7 @@
 }
 
 static GtkWidget *
-build_allow_list(GaimGtkPrivacyDialog *dialog)
+build_allow_list(PidginPrivacyDialog *dialog)
 {
 	GtkWidget *widget;
 	GtkWidget *list;
@@ -199,7 +199,7 @@
 }
 
 static GtkWidget *
-build_block_list(GaimGtkPrivacyDialog *dialog)
+build_block_list(PidginPrivacyDialog *dialog)
 {
 	GtkWidget *widget;
 	GtkWidget *list;
@@ -218,16 +218,16 @@
 }
 
 static gint
-destroy_cb(GtkWidget *w, GdkEvent *event, GaimGtkPrivacyDialog *dialog)
+destroy_cb(GtkWidget *w, GdkEvent *event, PidginPrivacyDialog *dialog)
 {
-	gaim_gtk_privacy_dialog_hide();
+	pidgin_privacy_dialog_hide();
 
 	return 0;
 }
 
 static void
 select_account_cb(GtkWidget *dropdown, GaimAccount *account,
-				  GaimGtkPrivacyDialog *dialog)
+				  PidginPrivacyDialog *dialog)
 {
 	int i;
 
@@ -249,7 +249,7 @@
  *       Even better: the privacy API needs to not suck.
  */
 static void
-type_changed_cb(GtkOptionMenu *optmenu, GaimGtkPrivacyDialog *dialog)
+type_changed_cb(GtkOptionMenu *optmenu, PidginPrivacyDialog *dialog)
 {
 	int new_type = menu_entries[gtk_option_menu_get_history(optmenu)].num;
 
@@ -272,20 +272,20 @@
 	}
 
 	gaim_blist_schedule_save();
-	gaim_gtk_blist_refresh(gaim_get_blist());
+	pidgin_blist_refresh(gaim_get_blist());
 }
 
 static void
-add_cb(GtkWidget *button, GaimGtkPrivacyDialog *dialog)
+add_cb(GtkWidget *button, PidginPrivacyDialog *dialog)
 {
 	if (dialog->in_allow_list)
-		gaim_gtk_request_add_permit(dialog->account, NULL);
+		pidgin_request_add_permit(dialog->account, NULL);
 	else
-		gaim_gtk_request_add_block(dialog->account, NULL);
+		pidgin_request_add_block(dialog->account, NULL);
 }
 
 static void
-remove_cb(GtkWidget *button, GaimGtkPrivacyDialog *dialog)
+remove_cb(GtkWidget *button, PidginPrivacyDialog *dialog)
 {
 	GtkTreeIter iter;
 	GtkTreeModel *model;
@@ -324,7 +324,7 @@
 }
 
 static void
-clear_cb(GtkWidget *button, GaimGtkPrivacyDialog *dialog)
+clear_cb(GtkWidget *button, PidginPrivacyDialog *dialog)
 {
 	GSList *l;
 	if (dialog->in_allow_list)
@@ -343,17 +343,17 @@
 }
 
 static void
-close_cb(GtkWidget *button, GaimGtkPrivacyDialog *dialog)
+close_cb(GtkWidget *button, PidginPrivacyDialog *dialog)
 {
 	gtk_widget_destroy(dialog->win);
 
-	gaim_gtk_privacy_dialog_hide();
+	pidgin_privacy_dialog_hide();
 }
 
-static GaimGtkPrivacyDialog *
+static PidginPrivacyDialog *
 privacy_dialog_new(void)
 {
-	GaimGtkPrivacyDialog *dialog;
+	PidginPrivacyDialog *dialog;
 	GtkWidget *bbox;
 	GtkWidget *hbox;
 	GtkWidget *vbox;
@@ -364,7 +364,7 @@
 	int selected = 0;
 	int i;
 
-	dialog = g_new0(GaimGtkPrivacyDialog, 1);
+	dialog = g_new0(PidginPrivacyDialog, 1);
 
 	dialog->win = gtk_window_new(GTK_WINDOW_TOPLEVEL);
 	gtk_window_set_resizable(GTK_WINDOW(dialog->win), FALSE);
@@ -399,12 +399,12 @@
 	gtk_widget_show(label);
 
 	/* Accounts drop-down */
-	dropdown = gaim_gtk_account_option_menu_new(NULL, FALSE,
+	dropdown = pidgin_account_option_menu_new(NULL, FALSE,
 												G_CALLBACK(select_account_cb), NULL, dialog);
 	gtk_box_pack_start(GTK_BOX(hbox), dropdown, FALSE, FALSE, 0);
 	gtk_widget_show(dropdown);
 	gaim_set_accessible_label (dropdown, label);
-	dialog->account = gaim_gtk_account_option_menu_get_selected(dropdown);
+	dialog->account = pidgin_account_option_menu_get_selected(dropdown);
 
 	/* Add the drop-down list with the allow/block types. */
 	dialog->type_menu = gtk_option_menu_new();
@@ -497,7 +497,7 @@
 }
 
 void
-gaim_gtk_privacy_dialog_show(void)
+pidgin_privacy_dialog_show(void)
 {
 	g_return_if_fail(gaim_connections_get_all() != NULL);
 
@@ -509,7 +509,7 @@
 }
 
 void
-gaim_gtk_privacy_dialog_hide(void)
+pidgin_privacy_dialog_hide(void)
 {
 	if (privacy_dialog == NULL)
 		return;
@@ -519,14 +519,14 @@
 }
 
 static void
-destroy_request_data(GaimGtkPrivacyRequestData *data)
+destroy_request_data(PidginPrivacyRequestData *data)
 {
 	g_free(data->name);
 	g_free(data);
 }
 
 static void
-confirm_permit_block_cb(GaimGtkPrivacyRequestData *data, int option)
+confirm_permit_block_cb(PidginPrivacyRequestData *data, int option)
 {
 	if (data->block)
 		gaim_privacy_deny(data->account, data->name, FALSE, FALSE);
@@ -537,7 +537,7 @@
 }
 
 static void
-add_permit_block_cb(GaimGtkPrivacyRequestData *data, const char *name)
+add_permit_block_cb(PidginPrivacyRequestData *data, const char *name)
 {
 	data->name = g_strdup(name);
 
@@ -545,13 +545,13 @@
 }
 
 void
-gaim_gtk_request_add_permit(GaimAccount *account, const char *name)
+pidgin_request_add_permit(GaimAccount *account, const char *name)
 {
-	GaimGtkPrivacyRequestData *data;
+	PidginPrivacyRequestData *data;
 
 	g_return_if_fail(account != NULL);
 
-	data = g_new0(GaimGtkPrivacyRequestData, 1);
+	data = g_new0(PidginPrivacyRequestData, 1);
 	data->account = account;
 	data->name    = g_strdup(name);
 	data->block   = FALSE;
@@ -584,13 +584,13 @@
 }
 
 void
-gaim_gtk_request_add_block(GaimAccount *account, const char *name)
+pidgin_request_add_block(GaimAccount *account, const char *name)
 {
-	GaimGtkPrivacyRequestData *data;
+	PidginPrivacyRequestData *data;
 
 	g_return_if_fail(account != NULL);
 
-	data = g_new0(GaimGtkPrivacyRequestData, 1);
+	data = g_new0(PidginPrivacyRequestData, 1);
 	data->account = account;
 	data->name    = g_strdup(name);
 	data->block   = TRUE;
@@ -620,14 +620,14 @@
 }
 
 static void
-gaim_gtk_permit_added_removed(GaimAccount *account, const char *name)
+pidgin_permit_added_removed(GaimAccount *account, const char *name)
 {
 	if (privacy_dialog != NULL)
 		rebuild_allow_list(privacy_dialog);
 }
 
 static void
-gaim_gtk_deny_added_removed(GaimAccount *account, const char *name)
+pidgin_deny_added_removed(GaimAccount *account, const char *name)
 {
 	if (privacy_dialog != NULL)
 		rebuild_block_list(privacy_dialog);
@@ -635,19 +635,19 @@
 
 static GaimPrivacyUiOps privacy_ops =
 {
-	gaim_gtk_permit_added_removed,
-	gaim_gtk_permit_added_removed,
-	gaim_gtk_deny_added_removed,
-	gaim_gtk_deny_added_removed
+	pidgin_permit_added_removed,
+	pidgin_permit_added_removed,
+	pidgin_deny_added_removed,
+	pidgin_deny_added_removed
 };
 
 GaimPrivacyUiOps *
-gaim_gtk_privacy_get_ui_ops(void)
+pidgin_privacy_get_ui_ops(void)
 {
 	return &privacy_ops;
 }
 
 void
-gaim_gtk_privacy_init(void)
+pidgin_privacy_init(void)
 {
 }
--- a/pidgin/gtkprivacy.h	Sat Feb 03 05:55:41 2007 +0000
+++ b/pidgin/gtkprivacy.h	Sat Feb 03 08:13:34 2007 +0000
@@ -22,25 +22,25 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
-#ifndef _GAIM_GTKPRIVACY_H_
-#define _GAIM_GTKPRIVACY_H_
+#ifndef _PIDGINPRIVACY_H_
+#define _PIDGINPRIVACY_H_
 
 #include "privacy.h"
 
 /**
  * Initializes the GTK+ privacy subsystem.
  */
-void gaim_gtk_privacy_init(void);
+void pidgin_privacy_init(void);
 
 /**
  * Shows the privacy dialog.
  */
-void gaim_gtk_privacy_dialog_show(void);
+void pidgin_privacy_dialog_show(void);
 
 /**
  * Hides the privacy dialog.
  */
-void gaim_gtk_privacy_dialog_hide(void);
+void pidgin_privacy_dialog_hide(void);
 
 /**
  * Requests confirmation to add a user to the allow list for an account,
@@ -51,7 +51,7 @@
  * @param account The account.
  * @param name    The name of the user to add.
  */
-void gaim_gtk_request_add_permit(GaimAccount *account, const char *name);
+void pidgin_request_add_permit(GaimAccount *account, const char *name);
 
 /**
  * Requests confirmation to add a user to the block list for an account,
@@ -62,13 +62,13 @@
  * @param account The account.
  * @param name    The name of the user to add.
  */
-void gaim_gtk_request_add_block(GaimAccount *account, const char *name);
+void pidgin_request_add_block(GaimAccount *account, const char *name);
 
 /**
  * Returns the UI operations structure for the GTK+ privacy subsystem.
  *
  * @return The GTK+ UI privacy operations structure.
  */
-GaimPrivacyUiOps *gaim_gtk_privacy_get_ui_ops(void);
+GaimPrivacyUiOps *pidgin_privacy_get_ui_ops(void);
 
-#endif /* _GAIM_GTKPRIVACY_H_ */
+#endif /* _PIDGINPRIVACY_H_ */
--- a/pidgin/gtkrequest.c	Sat Feb 03 05:55:41 2007 +0000
+++ b/pidgin/gtkrequest.c	Sat Feb 03 08:13:34 2007 +0000
@@ -76,19 +76,19 @@
 
 	} u;
 
-} GaimGtkRequestData;
+} PidginRequestData;
 
 static void
-generic_response_start(GaimGtkRequestData *data)
+generic_response_start(PidginRequestData *data)
 {
 	g_return_if_fail(data != NULL);
 
 	/* Tell the user we're doing something. */
-	gaim_gtk_set_cursor(GTK_WIDGET(data->dialog), GDK_WATCH);
+	pidgin_set_cursor(GTK_WIDGET(data->dialog), GDK_WATCH);
 }
 
 static void
-input_response_cb(GtkDialog *dialog, gint id, GaimGtkRequestData *data)
+input_response_cb(GtkDialog *dialog, gint id, PidginRequestData *data)
 {
 	const char *value;
 	char *multiline_value = NULL;
@@ -126,7 +126,7 @@
 }
 
 static void
-action_response_cb(GtkDialog *dialog, gint id, GaimGtkRequestData *data)
+action_response_cb(GtkDialog *dialog, gint id, PidginRequestData *data)
 {
 	generic_response_start(data);
 
@@ -138,7 +138,7 @@
 
 
 static void
-choice_response_cb(GtkDialog *dialog, gint id, GaimGtkRequestData *data)
+choice_response_cb(GtkDialog *dialog, gint id, PidginRequestData *data)
 {
 	GtkWidget *radio = g_object_get_data(G_OBJECT(dialog), "radio");
 	GSList *group = gtk_radio_button_get_group(GTK_RADIO_BUTTON(radio));
@@ -223,7 +223,7 @@
 }
 
 static void
-multifield_ok_cb(GtkWidget *button, GaimGtkRequestData *data)
+multifield_ok_cb(GtkWidget *button, PidginRequestData *data)
 {
 	generic_response_start(data);
 
@@ -238,7 +238,7 @@
 }
 
 static void
-multifield_cancel_cb(GtkWidget *button, GaimGtkRequestData *data)
+multifield_cancel_cb(GtkWidget *button, PidginRequestData *data)
 {
 	generic_response_start(data);
 
@@ -251,7 +251,7 @@
 
 static void
 destroy_multifield_cb(GtkWidget *dialog, GdkEvent *event,
-					  GaimGtkRequestData *data)
+					  PidginRequestData *data)
 {
 	multifield_cancel_cb(NULL, data);
 }
@@ -280,14 +280,14 @@
 }
 
 static void *
-gaim_gtk_request_input(const char *title, const char *primary,
+pidgin_request_input(const char *title, const char *primary,
 					   const char *secondary, const char *default_value,
 					   gboolean multiline, gboolean masked, gchar *hint,
 					   const char *ok_text, GCallback ok_cb,
 					   const char *cancel_text, GCallback cancel_cb,
 					   void *user_data)
 {
-	GaimGtkRequestData *data;
+	PidginRequestData *data;
 	GtkWidget *dialog;
 	GtkWidget *vbox;
 	GtkWidget *hbox;
@@ -298,7 +298,7 @@
 	char *label_text;
 	char *primary_esc, *secondary_esc;
 
-	data            = g_new0(GaimGtkRequestData, 1);
+	data            = g_new0(PidginRequestData, 1);
 	data->type      = GAIM_REQUEST_INPUT;
 	data->user_data = user_data;
 
@@ -370,9 +370,9 @@
 		GtkWidget *frame;
 
 		/* imhtml */
-		frame = gaim_gtk_create_imhtml(TRUE, &entry, &toolbar, NULL);
+		frame = pidgin_create_imhtml(TRUE, &entry, &toolbar, NULL);
 		gtk_widget_set_size_request(entry, 320, 130);
-		gtk_widget_set_name(entry, "gaim_gtkrequest_imhtml");
+		gtk_widget_set_name(entry, "pidginrequest_imhtml");
 		if (default_value != NULL)
 			gtk_imhtml_append_text(GTK_IMHTML(entry), default_value, GTK_IMHTML_NO_SCROLL);
 		gtk_box_pack_start(GTK_BOX(vbox), frame, TRUE, TRUE, 0);
@@ -406,7 +406,7 @@
 			gtk_box_pack_start(GTK_BOX(vbox), sw, TRUE, TRUE, 0);
 
 			if (gaim_prefs_get_bool("/gaim/gtk/conversations/spellcheck"))
-				gaim_gtk_setup_gtkspell(GTK_TEXT_VIEW(entry));
+				pidgin_setup_gtkspell(GTK_TEXT_VIEW(entry));
 
 			gtk_container_add(GTK_CONTAINER(sw), entry);
 		}
@@ -439,13 +439,13 @@
 }
 
 static void *
-gaim_gtk_request_choice(const char *title, const char *primary,
+pidgin_request_choice(const char *title, const char *primary,
 			const char *secondary, unsigned int default_value,
 			const char *ok_text, GCallback ok_cb,
 			const char *cancel_text, GCallback cancel_cb,
 			void *user_data, va_list args)
 {
-	GaimGtkRequestData *data;
+	PidginRequestData *data;
 	GtkWidget *dialog;
 	GtkWidget *vbox, *vbox2;
 	GtkWidget *hbox;
@@ -456,7 +456,7 @@
 	char *radio_text;
 	char *primary_esc, *secondary_esc;
 
-	data            = g_new0(GaimGtkRequestData, 1);
+	data            = g_new0(PidginRequestData, 1);
 	data->type      = GAIM_REQUEST_ACTION;
 	data->user_data = user_data;
 
@@ -542,11 +542,11 @@
 }
 
 static void *
-gaim_gtk_request_action(const char *title, const char *primary,
+pidgin_request_action(const char *title, const char *primary,
 						const char *secondary, unsigned int default_action,
 						void *user_data, size_t action_count, va_list actions)
 {
-	GaimGtkRequestData *data;
+	PidginRequestData *data;
 	GtkWidget *dialog;
 	GtkWidget *vbox;
 	GtkWidget *hbox;
@@ -557,7 +557,7 @@
 	char *primary_esc, *secondary_esc;
 	int i;
 
-	data            = g_new0(GaimGtkRequestData, 1);
+	data            = g_new0(PidginRequestData, 1);
 	data->type      = GAIM_REQUEST_ACTION;
 	data->user_data = user_data;
 
@@ -650,12 +650,12 @@
 static void
 req_entry_field_changed_cb(GtkWidget *entry, GaimRequestField *field)
 {
-	GaimGtkRequestData *req_data;
+	PidginRequestData *req_data;
 	const char *text = gtk_entry_get_text(GTK_ENTRY(entry));
 
 	gaim_request_field_string_set_value(field, (*text == '\0' ? NULL : text));
 
-	req_data = (GaimGtkRequestData *)field->group->fields_list->ui_data;
+	req_data = (PidginRequestData *)field->group->fields_list->ui_data;
 
 	gtk_widget_set_sensitive(req_data->ok_button,
 		gaim_request_fields_all_required_filled(field->group->fields_list));
@@ -697,7 +697,7 @@
 					}
 				}
 			}
-			gaim_gtk_setup_screenname_autocomplete(entry, optmenu, !strcmp(type_hint, "screenname-all"));
+			pidgin_setup_screenname_autocomplete(entry, optmenu, !strcmp(type_hint, "screenname-all"));
 		}
 	}
 }
@@ -727,7 +727,7 @@
 									GTK_WRAP_WORD_CHAR);
 
 		if (gaim_prefs_get_bool("/gaim/gtk/conversations/spellcheck"))
-			gaim_gtk_setup_gtkspell(GTK_TEXT_VIEW(textview));
+			pidgin_setup_gtkspell(GTK_TEXT_VIEW(textview));
 
 		gtk_container_add(GTK_CONTAINER(widget), textview);
 		gtk_widget_show(textview);
@@ -924,7 +924,7 @@
 {
 	GtkWidget *widget;
 
-	widget = gaim_gtk_account_option_menu_new(
+	widget = pidgin_account_option_menu_new(
 		gaim_request_field_account_get_default_value(field),
 		gaim_request_field_account_get_show_all(field),
 		G_CALLBACK(field_account_cb),
@@ -1021,13 +1021,13 @@
 }
 
 static void *
-gaim_gtk_request_fields(const char *title, const char *primary,
+pidgin_request_fields(const char *title, const char *primary,
 						const char *secondary, GaimRequestFields *fields,
 						const char *ok_text, GCallback ok_cb,
 						const char *cancel_text, GCallback cancel_cb,
 						void *user_data)
 {
-	GaimGtkRequestData *data;
+	PidginRequestData *data;
 	GtkWidget *win;
 	GtkWidget *vbox;
 	GtkWidget *vbox2;
@@ -1047,7 +1047,7 @@
 	char *primary_esc, *secondary_esc;
 	int total_fields = 0;
 
-	data            = g_new0(GaimGtkRequestData, 1);
+	data            = g_new0(PidginRequestData, 1);
 	data->type      = GAIM_REQUEST_FIELDS;
 	data->user_data = user_data;
 	data->u.multifield.fields = fields;
@@ -1154,7 +1154,7 @@
 
 		if (gaim_request_field_group_get_title(group) != NULL)
 		{
-			frame = gaim_gtk_make_frame(vbox2,
+			frame = pidgin_make_frame(vbox2,
 				gaim_request_field_group_get_title(group));
 		}
 		else
@@ -1382,7 +1382,7 @@
 }
 
 static void
-file_yes_no_cb(GaimGtkRequestData *data, gint id)
+file_yes_no_cb(PidginRequestData *data, gint id)
 {
 	/* Only call the callback if yes was selected, otherwise the request
 	 * (eg. file transfer) will be cancelled, then when a new filename is chosen
@@ -1392,13 +1392,13 @@
 			((GaimRequestFileCb)data->cbs[1])(data->user_data, data->u.file.name);
 		gaim_request_close(data->type, data);
 	} else {
-		gaim_gtk_clear_cursor(GTK_WIDGET(data->dialog));
+		pidgin_clear_cursor(GTK_WIDGET(data->dialog));
 	}
 }
 
 #if GTK_CHECK_VERSION(2,4,0) /* FILECHOOSER */
 static void
-file_ok_check_if_exists_cb(GtkWidget *widget, gint response, GaimGtkRequestData *data)
+file_ok_check_if_exists_cb(GtkWidget *widget, gint response, PidginRequestData *data)
 {
 	gchar *current_folder;
 
@@ -1425,7 +1425,7 @@
 #else /* FILECHOOSER */
 
 static void
-file_ok_check_if_exists_cb(GtkWidget *button, GaimGtkRequestData *data)
+file_ok_check_if_exists_cb(GtkWidget *button, PidginRequestData *data)
 {
 	const gchar *name;
 	gchar *current_folder;
@@ -1436,7 +1436,7 @@
 
 	/* If name is a directory then change directories */
 	if (data->type == GAIM_REQUEST_FILE) {
-		if (gaim_gtk_check_if_dir(name, GTK_FILE_SELECTION(data->dialog)))
+		if (pidgin_check_if_dir(name, GTK_FILE_SELECTION(data->dialog)))
 			return;
 	}
 
@@ -1476,7 +1476,7 @@
 
 #if !GTK_CHECK_VERSION(2,4,0) /* FILECHOOSER */
 static void
-file_cancel_cb(GaimGtkRequestData *data)
+file_cancel_cb(PidginRequestData *data)
 {
 	generic_response_start(data);
 
@@ -1488,19 +1488,19 @@
 #endif /* FILECHOOSER */
 
 static void *
-gaim_gtk_request_file(const char *title, const char *filename,
+pidgin_request_file(const char *title, const char *filename,
 					  gboolean savedialog,
 					  GCallback ok_cb, GCallback cancel_cb,
 					  void *user_data)
 {
-	GaimGtkRequestData *data;
+	PidginRequestData *data;
 	GtkWidget *filesel;
 	const gchar *current_folder;
 #if GTK_CHECK_VERSION(2,4,0)
 	gboolean folder_set = FALSE;
 #endif
 
-	data = g_new0(GaimGtkRequestData, 1);
+	data = g_new0(PidginRequestData, 1);
 	data->type = GAIM_REQUEST_FILE;
 	data->user_data = user_data;
 	data->cb_count = 2;
@@ -1586,14 +1586,14 @@
 }
 
 static void *
-gaim_gtk_request_folder(const char *title, const char *dirname,
+pidgin_request_folder(const char *title, const char *dirname,
 					  GCallback ok_cb, GCallback cancel_cb,
 					  void *user_data)
 {
-	GaimGtkRequestData *data;
+	PidginRequestData *data;
 	GtkWidget *dirsel;
 
-	data = g_new0(GaimGtkRequestData, 1);
+	data = g_new0(PidginRequestData, 1);
 	data->type = GAIM_REQUEST_FOLDER;
 	data->user_data = user_data;
 	data->cb_count = 2;
@@ -1635,9 +1635,9 @@
 }
 
 static void
-gaim_gtk_close_request(GaimRequestType type, void *ui_handle)
+pidgin_close_request(GaimRequestType type, void *ui_handle)
 {
-	GaimGtkRequestData *data = (GaimGtkRequestData *)ui_handle;
+	PidginRequestData *data = (PidginRequestData *)ui_handle;
 
 	g_free(data->cbs);
 
@@ -1653,17 +1653,17 @@
 
 static GaimRequestUiOps ops =
 {
-	gaim_gtk_request_input,
-	gaim_gtk_request_choice,
-	gaim_gtk_request_action,
-	gaim_gtk_request_fields,
-	gaim_gtk_request_file,
-	gaim_gtk_close_request,
-	gaim_gtk_request_folder
+	pidgin_request_input,
+	pidgin_request_choice,
+	pidgin_request_action,
+	pidgin_request_fields,
+	pidgin_request_file,
+	pidgin_close_request,
+	pidgin_request_folder
 };
 
 GaimRequestUiOps *
-gaim_gtk_request_get_ui_ops(void)
+pidgin_request_get_ui_ops(void)
 {
 	return &ops;
 }
--- a/pidgin/gtkrequest.h	Sat Feb 03 05:55:41 2007 +0000
+++ b/pidgin/gtkrequest.h	Sat Feb 03 08:13:34 2007 +0000
@@ -22,8 +22,8 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
-#ifndef _GAIM_GTKREQUEST_H_
-#define _GAIM_GTKREQUEST_H_
+#ifndef _PIDGINREQUEST_H_
+#define _PIDGINREQUEST_H_
 
 #include "request.h"
 
@@ -32,6 +32,6 @@
  *
  * @return The GTK+ UI request operations structure.
  */
-GaimRequestUiOps *gaim_gtk_request_get_ui_ops(void);
+GaimRequestUiOps *pidgin_request_get_ui_ops(void);
 
-#endif /* _GAIM_GTKREQUEST_H_ */
+#endif /* _PIDGINREQUEST_H_ */
--- a/pidgin/gtkroomlist.c	Sat Feb 03 05:55:41 2007 +0000
+++ b/pidgin/gtkroomlist.c	Sat Feb 03 08:13:34 2007 +0000
@@ -34,7 +34,7 @@
 
 #include "gtkroomlist.h"
 
-typedef struct _GaimGtkRoomlistDialog {
+typedef struct _PidginRoomlistDialog {
 	GtkWidget *window;
 	GtkWidget *account_widget;
 	GtkWidget *progress;
@@ -52,15 +52,15 @@
 	gboolean pg_needs_pulse;
 	gboolean pg_to_active;
 	guint pg_update_to;
-} GaimGtkRoomlistDialog;
+} PidginRoomlistDialog;
 
-typedef struct _GaimGtkRoomlist {
-	GaimGtkRoomlistDialog *dialog;
+typedef struct _PidginRoomlist {
+	PidginRoomlistDialog *dialog;
 	GtkTreeStore *model;
 	GtkWidget *tree;
 	GHashTable *cats; /**< Meow. */
 	gint num_rooms, total_rooms;
-} GaimGtkRoomlist;
+} PidginRoomlist;
 
 enum {
 	NAME_COLUMN = 0,
@@ -72,9 +72,9 @@
 
 static gint delete_win_cb(GtkWidget *w, GdkEventAny *e, gpointer d)
 {
-	GaimGtkRoomlistDialog *dialog;
+	PidginRoomlistDialog *dialog;
 
-	dialog = (GaimGtkRoomlistDialog *) d;
+	dialog = (PidginRoomlistDialog *) d;
 
 	if (dialog->roomlist && gaim_roomlist_get_in_progress(dialog->roomlist))
 		gaim_roomlist_cancel_get_list(dialog->roomlist);
@@ -97,15 +97,15 @@
 }
 
 static void dialog_select_account_cb(GObject *w, GaimAccount *account,
-                                     GaimGtkRoomlistDialog *dialog)
+                                     PidginRoomlistDialog *dialog)
 {
 	dialog->account = account;
 }
 
-static void list_button_cb(GtkButton *button, GaimGtkRoomlistDialog *dialog)
+static void list_button_cb(GtkButton *button, PidginRoomlistDialog *dialog)
 {
 	GaimConnection *gc;
-	GaimGtkRoomlist *rl;
+	PidginRoomlist *rl;
 
 	gc = gaim_account_get_connection(dialog->account);
 	if (!gc)
@@ -142,7 +142,7 @@
 	gtk_widget_set_sensitive(dialog->join_button, FALSE);
 }
 
-static void stop_button_cb(GtkButton *button, GaimGtkRoomlistDialog *dialog)
+static void stop_button_cb(GtkButton *button, PidginRoomlistDialog *dialog)
 {
 	gaim_roomlist_cancel_get_list(dialog->roomlist);
 
@@ -155,7 +155,7 @@
 	gtk_widget_set_sensitive(dialog->join_button, FALSE);
 }
 
-static void close_button_cb(GtkButton *button, GaimGtkRoomlistDialog *dialog)
+static void close_button_cb(GtkButton *button, PidginRoomlistDialog *dialog)
 {
 	GtkWidget *window = dialog->window;
 
@@ -169,12 +169,12 @@
 };
 
 static void
-selection_changed_cb(GtkTreeSelection *selection, GaimGtkRoomlist *grl) {
+selection_changed_cb(GtkTreeSelection *selection, PidginRoomlist *grl) {
 	GtkTreeIter iter;
 	GValue val;
 	GaimRoomlistRoom *room;
 	static struct _menu_cb_info *info;
-	GaimGtkRoomlistDialog *dialog;
+	PidginRoomlistDialog *dialog;
 
 	dialog = grl->dialog;
 
@@ -223,10 +223,10 @@
 	g_free(name);
 }
 
-static void add_room_to_blist_cb(GtkButton *button, GaimGtkRoomlistDialog *dialog)
+static void add_room_to_blist_cb(GtkButton *button, PidginRoomlistDialog *dialog)
 {
 	GaimRoomlist *rl = dialog->roomlist;
-	GaimGtkRoomlist *grl = rl->ui_data;
+	PidginRoomlist *grl = rl->ui_data;
 	struct _menu_cb_info *info;
 
 	info = (struct _menu_cb_info*)g_object_get_data(G_OBJECT(button), "room-info");
@@ -240,10 +240,10 @@
 	gaim_roomlist_room_join(info->list, info->room);
 }
 
-static void join_button_cb(GtkButton *button, GaimGtkRoomlistDialog *dialog)
+static void join_button_cb(GtkButton *button, PidginRoomlistDialog *dialog)
 {
 	GaimRoomlist *rl = dialog->roomlist;
-	GaimGtkRoomlist *grl = rl->ui_data;
+	PidginRoomlist *grl = rl->ui_data;
 	struct _menu_cb_info *info;
 
 	info = (struct _menu_cb_info*)g_object_get_data(G_OBJECT(button), "room-info");
@@ -255,7 +255,7 @@
 static void row_activated_cb(GtkTreeView *tv, GtkTreePath *path, GtkTreeViewColumn *arg2,
                       GaimRoomlist *list)
 {
-	GaimGtkRoomlist *grl = list->ui_data;
+	PidginRoomlist *grl = list->ui_data;
 	GtkTreeIter iter;
 	GaimRoomlistRoom *room;
 	GValue val;
@@ -277,7 +277,7 @@
 static gboolean room_click_cb(GtkWidget *tv, GdkEventButton *event, GaimRoomlist *list)
 {
 	GtkTreePath *path;
-	GaimGtkRoomlist *grl = list->ui_data;
+	PidginRoomlist *grl = list->ui_data;
 	GValue val;
 	GaimRoomlistRoom *room;
 	GtkTreeIter iter;
@@ -341,7 +341,7 @@
 }
 
 gboolean
-gaim_gtk_roomlist_is_showable()
+pidgin_roomlist_is_showable()
 {
 	GList *c;
 	GaimConnection *gc;
@@ -356,10 +356,10 @@
 	return FALSE;
 }
 
-static GaimGtkRoomlistDialog *
-gaim_gtk_roomlist_dialog_new_with_account(GaimAccount *account)
+static PidginRoomlistDialog *
+pidgin_roomlist_dialog_new_with_account(GaimAccount *account)
 {
-	GaimGtkRoomlistDialog *dialog;
+	PidginRoomlistDialog *dialog;
 	GtkWidget *window;
 	GtkWidget *vbox;
 	GtkWidget *vbox2;
@@ -367,7 +367,7 @@
 	GtkWidget *bbox;
 	GtkWidget *label;
 
-	dialog = g_new0(GaimGtkRoomlistDialog, 1);
+	dialog = g_new0(PidginRoomlistDialog, 1);
 	dialog->account = account;
 
 	/* Create the window. */
@@ -400,11 +400,11 @@
 	gtk_misc_set_alignment(GTK_MISC(label), 0, 0.5);
 	gtk_widget_show(label);
 
-	dialog->account_widget = gaim_gtk_account_option_menu_new(dialog->account, FALSE,
+	dialog->account_widget = pidgin_account_option_menu_new(dialog->account, FALSE,
 	                         G_CALLBACK(dialog_select_account_cb), account_filter_func, dialog);
 
 	if (!dialog->account) /* this is normally null, and we normally don't care what the first selected item is */
-		dialog->account = gaim_gtk_account_option_menu_get_selected(dialog->account_widget);
+		dialog->account = pidgin_account_option_menu_get_selected(dialog->account_widget);
 
 	gtk_box_pack_start(GTK_BOX(account_hbox), dialog->account_widget, TRUE, TRUE, 0);
 	gtk_label_set_mnemonic_widget(GTK_LABEL(label), GTK_WIDGET(dialog->account_widget));
@@ -481,27 +481,27 @@
 	return dialog;
 }
 
-void gaim_gtk_roomlist_dialog_show_with_account(GaimAccount *account)
+void pidgin_roomlist_dialog_show_with_account(GaimAccount *account)
 {
-	GaimGtkRoomlistDialog *dialog;
+	PidginRoomlistDialog *dialog;
 
-	dialog = gaim_gtk_roomlist_dialog_new_with_account(account);
+	dialog = pidgin_roomlist_dialog_new_with_account(account);
 	if (!dialog)
 		return;
 
 	list_button_cb(GTK_BUTTON(dialog->list_button), dialog);
 }
 
-void gaim_gtk_roomlist_dialog_show(void)
+void pidgin_roomlist_dialog_show(void)
 {
-	gaim_gtk_roomlist_dialog_new_with_account(NULL);
+	pidgin_roomlist_dialog_new_with_account(NULL);
 }
 
-static void gaim_gtk_roomlist_new(GaimRoomlist *list)
+static void pidgin_roomlist_new(GaimRoomlist *list)
 {
-	GaimGtkRoomlist *rl;
+	PidginRoomlist *rl;
 
-	rl = g_new0(GaimGtkRoomlist, 1);
+	rl = g_new0(PidginRoomlist, 1);
 
 	list->ui_data = rl;
 
@@ -564,9 +564,9 @@
 	return result;
 }
 
-static void gaim_gtk_roomlist_set_fields(GaimRoomlist *list, GList *fields)
+static void pidgin_roomlist_set_fields(GaimRoomlist *list, GList *fields)
 {
-	GaimGtkRoomlist *grl = list->ui_data;
+	PidginRoomlist *grl = list->ui_data;
 	gint columns = NUM_OF_COLUMNS;
 	int j;
 	GtkTreeStore *model;
@@ -660,10 +660,10 @@
 
 }
 
-static gboolean gaim_gtk_progress_bar_pulse(gpointer data)
+static gboolean pidgin_progress_bar_pulse(gpointer data)
 {
 	GaimRoomlist *list = data;
-	GaimGtkRoomlist *rl = list->ui_data;
+	PidginRoomlist *rl = list->ui_data;
 
 	if (!rl || !rl->dialog || !rl->dialog->pg_needs_pulse) {
 		if (rl && rl->dialog)
@@ -677,9 +677,9 @@
 	return TRUE;
 }
 
-static void gaim_gtk_roomlist_add_room(GaimRoomlist *list, GaimRoomlistRoom *room)
+static void pidgin_roomlist_add_room(GaimRoomlist *list, GaimRoomlistRoom *room)
 {
-	GaimGtkRoomlist *rl = list->ui_data;
+	PidginRoomlist *rl = list->ui_data;
 	GtkTreeRowReference *rr, *parentrr = NULL;
 	GtkTreePath *path;
 	GtkTreeIter iter, parent, child;
@@ -695,7 +695,7 @@
 		if (!rl->dialog->pg_to_active) {
 			rl->dialog->pg_to_active = TRUE;
 			gaim_roomlist_ref(list);
-			rl->dialog->pg_update_to = g_timeout_add(100, gaim_gtk_progress_bar_pulse, list);
+			rl->dialog->pg_update_to = g_timeout_add(100, pidgin_progress_bar_pulse, list);
 			gtk_progress_bar_pulse(GTK_PROGRESS_BAR(rl->dialog->progress));
 		} else {
 			rl->dialog->pg_needs_pulse = TRUE;
@@ -746,9 +746,9 @@
 	}
 }
 
-static void gaim_gtk_roomlist_in_progress(GaimRoomlist *list, gboolean flag)
+static void pidgin_roomlist_in_progress(GaimRoomlist *list, gboolean flag)
 {
-	GaimGtkRoomlist *rl = list->ui_data;
+	PidginRoomlist *rl = list->ui_data;
 
 	if (!rl || !rl->dialog)
 		return;
@@ -768,9 +768,9 @@
 	}
 }
 
-static void gaim_gtk_roomlist_destroy(GaimRoomlist *list)
+static void pidgin_roomlist_destroy(GaimRoomlist *list)
 {
-	GaimGtkRoomlist *rl;
+	PidginRoomlist *rl;
 
 	roomlists = g_list_remove(roomlists, list);
 
@@ -784,16 +784,16 @@
 }
 
 static GaimRoomlistUiOps ops = {
-	gaim_gtk_roomlist_dialog_show_with_account,
-	gaim_gtk_roomlist_new,
-	gaim_gtk_roomlist_set_fields,
-	gaim_gtk_roomlist_add_room,
-	gaim_gtk_roomlist_in_progress,
-	gaim_gtk_roomlist_destroy
+	pidgin_roomlist_dialog_show_with_account,
+	pidgin_roomlist_new,
+	pidgin_roomlist_set_fields,
+	pidgin_roomlist_add_room,
+	pidgin_roomlist_in_progress,
+	pidgin_roomlist_destroy
 };
 
 
-void gaim_gtk_roomlist_init(void)
+void pidgin_roomlist_init(void)
 {
 	gaim_roomlist_set_ui_ops(&ops);
 }
--- a/pidgin/gtkroomlist.h	Sat Feb 03 05:55:41 2007 +0000
+++ b/pidgin/gtkroomlist.h	Sat Feb 03 08:13:34 2007 +0000
@@ -22,15 +22,15 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
-#ifndef _GAIM_GTKROOMLIST_H_
-#define _GAIM_GTKROOMLIST_H_
+#ifndef _PIDGINROOMLIST_H_
+#define _PIDGINROOMLIST_H_
 
 #include "roomlist.h"
 
 /**
  * Initializes the room list subsystem.
  */
-void gaim_gtk_roomlist_init(void);
+void pidgin_roomlist_init(void);
 
 /**
  * Determines if showing the room list dialog is a valid action.
@@ -38,18 +38,18 @@
  * @return TRUE if there are accounts online that support listing
  *         chat rooms.  Otherwise return FALSE.
  */
-gboolean gaim_gtk_roomlist_is_showable(void);
+gboolean pidgin_roomlist_is_showable(void);
 
 /**
  * Shows a new roomlist dialog.
  */
-void gaim_gtk_roomlist_dialog_show(void);
+void pidgin_roomlist_dialog_show(void);
 
 /**
  * Shows a new room list dialog and fetches the list for the specified account.
  *
  * @param account The account to use.
  */
-void gaim_gtk_roomlist_dialog_show_with_account(GaimAccount *account);
+void pidgin_roomlist_dialog_show_with_account(GaimAccount *account);
 
-#endif /* _GAIM_GTKROOMLIST_H_ */
+#endif /* _PIDGINROOMLIST_H_ */
--- a/pidgin/gtksavedstatuses.c	Sat Feb 03 05:55:41 2007 +0000
+++ b/pidgin/gtksavedstatuses.c	Sat Feb 03 08:13:34 2007 +0000
@@ -171,7 +171,7 @@
 	StatusWindow *dialog = user_data;
 
 	dialog->window = NULL;
-	gaim_gtk_status_window_hide();
+	pidgin_status_window_hide();
 
 	return FALSE;
 }
@@ -241,7 +241,7 @@
 static void
 status_window_add_cb(GtkButton *button, gpointer user_data)
 {
-	gaim_gtk_status_editor_show(FALSE, NULL);
+	pidgin_status_editor_show(FALSE, NULL);
 }
 
 static void
@@ -254,7 +254,7 @@
 	gtk_tree_model_get(model, iter, STATUS_WINDOW_COLUMN_TITLE, &title, -1);
 	saved_status = gaim_savedstatus_find(title);
 	g_free(title);
-	gaim_gtk_status_editor_show(TRUE, saved_status);
+	pidgin_status_editor_show(TRUE, saved_status);
 }
 
 static void
@@ -341,7 +341,7 @@
 static void
 status_window_close_cb(GtkButton *button, gpointer user_data)
 {
-	gaim_gtk_status_window_hide();
+	pidgin_status_window_hide();
 }
 
 static void
@@ -529,7 +529,7 @@
 }
 
 void
-gaim_gtk_status_window_show(void)
+pidgin_status_window_show(void)
 {
 	StatusWindow *dialog;
 	GtkWidget *bbox;
@@ -621,7 +621,7 @@
 }
 
 void
-gaim_gtk_status_window_hide(void)
+pidgin_status_window_hide(void)
 {
 	if (status_window == NULL)
 		return;
@@ -969,7 +969,7 @@
 	GdkPixbuf *pixbuf;
 	const char *id = NULL, *name = NULL, *message = NULL;
 
-	pixbuf = gaim_gtk_create_prpl_icon(account, PIDGIN_PRPL_ICON_MEDIUM);
+	pixbuf = pidgin_create_prpl_icon(account, PIDGIN_PRPL_ICON_MEDIUM);
 	if ((pixbuf != NULL) && !gaim_account_is_connected(account))
 	{
 		gdk_pixbuf_saturate_and_pixelate(pixbuf, pixbuf, 0.0, FALSE);
@@ -1033,7 +1033,7 @@
 }
 
 void
-gaim_gtk_status_editor_show(gboolean edit, GaimSavedStatus *saved_status)
+pidgin_status_editor_show(gboolean edit, GaimSavedStatus *saved_status)
 {
 	GtkTreeIter iter;
 	StatusEditor *dialog;
@@ -1143,7 +1143,7 @@
 	gtk_box_pack_start(GTK_BOX(hbox), label, FALSE, FALSE, 0);
 	gtk_size_group_add_widget(sg, label);
 
-	frame = gaim_gtk_create_imhtml(TRUE, &text, &toolbar, NULL);
+	frame = pidgin_create_imhtml(TRUE, &text, &toolbar, NULL);
 	dialog->message = GTK_IMHTML(text);
 	gtk_box_pack_start(GTK_BOX(hbox), frame, TRUE, TRUE, 0);
 	focus_chain = g_list_prepend(focus_chain, dialog->message);
@@ -1479,7 +1479,7 @@
 	gtk_box_pack_start(GTK_BOX(hbox), label, FALSE, FALSE, 0);
 	gtk_size_group_add_widget(sg, label);
 
-	frame = gaim_gtk_create_imhtml(TRUE, &text, &toolbar, NULL);
+	frame = pidgin_create_imhtml(TRUE, &text, &toolbar, NULL);
 	dialog->message = GTK_IMHTML(text);
 	dialog->toolbar = GTK_IMHTMLTOOLBAR(toolbar);
 	gtk_box_pack_start(GTK_BOX(hbox), frame, TRUE, TRUE, 0);
@@ -1538,7 +1538,7 @@
 			continue;
 
 		id = gaim_status_type_get_id(status_type);
-		pixbuf = gaim_gtk_create_prpl_icon_with_status(account, status_type, PIDGIN_PRPL_ICON_MEDIUM);
+		pixbuf = pidgin_create_prpl_icon_with_status(account, status_type, PIDGIN_PRPL_ICON_MEDIUM);
 		name = gaim_status_type_get_name(status_type);
 
 		gtk_list_store_append(dialog->model, &iter);
@@ -1633,12 +1633,12 @@
 				  gaim_savedstatus_get_title(saved_status_b));
 }
 
-static gboolean gaim_gtk_status_menu_add_primitive(GtkListStore *model, GaimStatusPrimitive primitive,
+static gboolean pidgin_status_menu_add_primitive(GtkListStore *model, GaimStatusPrimitive primitive,
 	GaimSavedStatus *current_status)
 {
 	GtkTreeIter iter;
 	gboolean currently_selected = FALSE;
-	GdkPixbuf *pixbuf = gaim_gtk_create_gaim_icon_with_status(primitive, 0.5);
+	GdkPixbuf *pixbuf = pidgin_create_gaim_icon_with_status(primitive, 0.5);
 
 	gtk_list_store_append(model, &iter);
 	gtk_list_store_set(model, &iter,
@@ -1656,7 +1656,7 @@
 	return currently_selected;
 }
 
-GtkWidget *gaim_gtk_status_menu(GaimSavedStatus *current_status, GCallback callback)
+GtkWidget *pidgin_status_menu(GaimSavedStatus *current_status, GCallback callback)
 {
 	GtkWidget *combobox;
 	GtkListStore *model;
@@ -1672,19 +1672,19 @@
 
 	combobox = gtk_combo_box_new();
 
-	if (gaim_gtk_status_menu_add_primitive(model, GAIM_STATUS_AVAILABLE, current_status))
+	if (pidgin_status_menu_add_primitive(model, GAIM_STATUS_AVAILABLE, current_status))
 		index = i;
 	i++;
 
-	if (gaim_gtk_status_menu_add_primitive(model, GAIM_STATUS_AWAY, current_status))
+	if (pidgin_status_menu_add_primitive(model, GAIM_STATUS_AWAY, current_status))
 		index = i;
 	i++;
 
-	if (gaim_gtk_status_menu_add_primitive(model, GAIM_STATUS_INVISIBLE, current_status))
+	if (pidgin_status_menu_add_primitive(model, GAIM_STATUS_INVISIBLE, current_status))
 		index = i;
 	i++;
 
-	if (gaim_gtk_status_menu_add_primitive(model, GAIM_STATUS_OFFLINE, current_status))
+	if (pidgin_status_menu_add_primitive(model, GAIM_STATUS_OFFLINE, current_status))
 		index = i;
 	i++;
 
@@ -1696,7 +1696,7 @@
 		if (!gaim_savedstatus_is_transient(status))
 		{
 			/* Get an appropriate status icon */
-			pixbuf = gaim_gtk_create_gaim_icon_with_status(
+			pixbuf = pidgin_create_gaim_icon_with_status(
 					gaim_savedstatus_get_type(status), 0.5);
 
 			/* Overlay a disk in the bottom left corner */
@@ -1749,7 +1749,7 @@
 **************************************************************************/
 
 void *
-gaim_gtk_status_get_handle(void)
+pidgin_status_get_handle(void)
 {
 	static int handle;
 
@@ -1757,7 +1757,7 @@
 }
 
 void
-gaim_gtk_status_init(void)
+pidgin_status_init(void)
 {
 	gaim_prefs_add_none("/gaim/gtk/status");
 	gaim_prefs_add_none("/gaim/gtk/status/dialog");
@@ -1766,7 +1766,7 @@
 }
 
 void
-gaim_gtk_status_uninit(void)
+pidgin_status_uninit(void)
 {
-	gaim_gtk_status_window_hide();
+	pidgin_status_window_hide();
 }
--- a/pidgin/gtksavedstatuses.h	Sat Feb 03 05:55:41 2007 +0000
+++ b/pidgin/gtksavedstatuses.h	Sat Feb 03 08:13:34 2007 +0000
@@ -22,8 +22,8 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
-#ifndef _GAIM_GTKSAVEDSTATUSES_H_
-#define _GAIM_GTKSAVEDSTATUSES_H_
+#ifndef _PIDGINSAVEDSTATUSES_H_
+#define _PIDGINSAVEDSTATUSES_H_
 
 #include "savedstatuses.h"
 #include "status.h"
@@ -31,12 +31,12 @@
 /**
  * Shows the status window.
  */
-void gaim_gtk_status_window_show(void);
+void pidgin_status_window_show(void);
 
 /**
  * Hides the status window.
  */
-void gaim_gtk_status_window_hide(void);
+void pidgin_status_window_hide(void);
 
 /**
  * Shows a status editor (used for adding a new saved status or
@@ -55,7 +55,7 @@
  *               or you can pass in a saved status to
  *               seed the initial values of the new status.
  */
-void gaim_gtk_status_editor_show(gboolean edit, GaimSavedStatus *status);
+void pidgin_status_editor_show(gboolean edit, GaimSavedStatus *status);
 
 /**
  * Creates a dropdown menu of saved statuses and calls a callback
@@ -65,23 +65,23 @@
  * @param callback The callback to call when the selection changes
  * @return         The menu widget
  */
-GtkWidget *gaim_gtk_status_menu(GaimSavedStatus *status, GCallback callback);
+GtkWidget *pidgin_status_menu(GaimSavedStatus *status, GCallback callback);
 
 /**
  * Returns the GTK+ status handle.
  *
  * @return The handle to the GTK+ status system.
  */
-void *gaim_gtk_status_get_handle(void);
+void *pidgin_status_get_handle(void);
 
 /**
  * Initializes the GTK+ status system.
  */
-void gaim_gtk_status_init(void);
+void pidgin_status_init(void);
 
 /**
  * Uninitializes the GTK+ status system.
  */
-void gaim_gtk_status_uninit(void);
+void pidgin_status_uninit(void);
 
-#endif /* _GAIM_GTKSAVEDSTATUSES_H_ */
+#endif /* _PIDGINSAVEDSTATUSES_H_ */
--- a/pidgin/gtksession.c	Sat Feb 03 05:55:41 2007 +0000
+++ b/pidgin/gtksession.c	Sat Feb 03 08:13:34 2007 +0000
@@ -279,7 +279,7 @@
 /* setup functions */
 
 void
-gaim_gtk_session_init(gchar *argv0, gchar *previous_id, gchar *config_dir)
+pidgin_session_init(gchar *argv0, gchar *previous_id, gchar *config_dir)
 {
 #ifdef USE_SM
 	SmcCallbacks callbacks;
@@ -291,7 +291,7 @@
 	if (session != NULL) {
 		/* session is already established, what the hell is going on? */
 		gaim_debug(GAIM_DEBUG_WARNING, "Session Management",
-				   "Duplicated call to gaim_gtk_session_init!\n");
+				   "Duplicated call to pidgin_session_init!\n");
 		return;
 	}
 
@@ -386,7 +386,7 @@
 }
 
 void
-gaim_gtk_session_end()
+pidgin_session_end()
 {
 #ifdef USE_SM
 	if (session == NULL) /* no session to close */
--- a/pidgin/gtksession.h	Sat Feb 03 05:55:41 2007 +0000
+++ b/pidgin/gtksession.h	Sat Feb 03 08:13:34 2007 +0000
@@ -22,8 +22,8 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
-#ifndef _GAIM_GTKSESSION_H_
-#define _GAIM_GTKSESSION_H_
+#ifndef _PIDGINSESSION_H_
+#define _PIDGINSESSION_H_
 
 /**************************************************************************/
 /** @name X Windows session subsystem                                     */
@@ -40,14 +40,14 @@
  * @param config_dir  The path to the configuration directory used by
  *                    this instance of this program, e.g. '/home/user/.gaim'
  */
-void gaim_gtk_session_init(gchar *argv0, gchar *previous_id, gchar *config_dir);
+void pidgin_session_init(gchar *argv0, gchar *previous_id, gchar *config_dir);
 
 /**
  * Unregister this instance of Gaim with the user's current session
  * manager.
  */
-void gaim_gtk_session_end(void);
+void pidgin_session_end(void);
 
 /*@}*/
 
-#endif /* _GAIM_GTKSESSION_H_ */
+#endif /* _PIDGINSESSION_H_ */
--- a/pidgin/gtksound.c	Sat Feb 03 05:55:41 2007 +0000
+++ b/pidgin/gtksound.c	Sat Feb 03 08:13:34 2007 +0000
@@ -116,11 +116,11 @@
 	/* If we should not play the sound for some reason, then exit early */
 	if (conv != NULL)
 	{
-		GaimGtkConversation *gtkconv;
-		GaimGtkWindow *win;
+		PidginConversation *gtkconv;
+		PidginWindow *win;
 		gboolean has_focus;
 
-		gtkconv = GAIM_GTK_CONVERSATION(conv);
+		gtkconv = PIDGIN_CONVERSATION(conv);
 		win = gtkconv->win;
 
 		has_focus = gaim_conversation_has_focus(conv);
@@ -234,7 +234,7 @@
 }
 
 const char *
-gaim_gtk_sound_get_event_option(GaimSoundEventID event)
+pidgin_sound_get_event_option(GaimSoundEventID event)
 {
 	if(event >= GAIM_NUM_SOUNDS)
 		return 0;
@@ -243,7 +243,7 @@
 }
 
 const char *
-gaim_gtk_sound_get_event_label(GaimSoundEventID event)
+pidgin_sound_get_event_label(GaimSoundEventID event)
 {
 	if(event >= GAIM_NUM_SOUNDS)
 		return NULL;
@@ -252,7 +252,7 @@
 }
 
 void *
-gaim_gtk_sound_get_handle()
+pidgin_sound_get_handle()
 {
 	static int handle;
 
@@ -260,9 +260,9 @@
 }
 
 static void
-gaim_gtk_sound_init(void)
+pidgin_sound_init(void)
 {
-	void *gtk_sound_handle = gaim_gtk_sound_get_handle();
+	void *gtk_sound_handle = pidgin_sound_get_handle();
 	void *blist_handle = gaim_blist_get_handle();
 	void *conv_handle = gaim_conversations_get_handle();
 #ifdef USE_GSTREAMER
@@ -344,14 +344,14 @@
 }
 
 static void
-gaim_gtk_sound_uninit(void)
+pidgin_sound_uninit(void)
 {
 #ifdef USE_GSTREAMER
 	if (!gst_init_failed)
 		gst_deinit();
 #endif
 
-	gaim_signals_disconnect_by_handle(gaim_gtk_sound_get_handle());
+	gaim_signals_disconnect_by_handle(pidgin_sound_get_handle());
 }
 
 #ifdef USE_GSTREAMER
@@ -386,7 +386,7 @@
 #endif
 
 static void
-gaim_gtk_sound_play_file(const char *filename)
+pidgin_sound_play_file(const char *filename)
 {
 	const char *method;
 #ifdef USE_GSTREAMER
@@ -508,7 +508,7 @@
 }
 
 static void
-gaim_gtk_sound_play_event(GaimSoundEventID event)
+pidgin_sound_play_event(GaimSoundEventID event)
 {
 	char *enable_pref;
 	char *file_pref;
@@ -543,14 +543,14 @@
 
 static GaimSoundUiOps sound_ui_ops =
 {
-	gaim_gtk_sound_init,
-	gaim_gtk_sound_uninit,
-	gaim_gtk_sound_play_file,
-	gaim_gtk_sound_play_event
+	pidgin_sound_init,
+	pidgin_sound_uninit,
+	pidgin_sound_play_file,
+	pidgin_sound_play_event
 };
 
 GaimSoundUiOps *
-gaim_gtk_sound_get_ui_ops(void)
+pidgin_sound_get_ui_ops(void)
 {
 	return &sound_ui_ops;
 }
--- a/pidgin/gtksound.h	Sat Feb 03 05:55:41 2007 +0000
+++ b/pidgin/gtksound.h	Sat Feb 03 08:13:34 2007 +0000
@@ -22,8 +22,8 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
-#ifndef _GAIM_GTKSOUND_H_
-#define _GAIM_GTKSOUND_H_
+#ifndef _PIDGINSOUND_H_
+#define _PIDGINSOUND_H_
 
 #include "sound.h"
 
@@ -38,7 +38,7 @@
  * @param event The event.
  * @return The option.
  */
-const char *gaim_gtk_sound_get_event_option(GaimSoundEventID event);
+const char *pidgin_sound_get_event_option(GaimSoundEventID event);
 
 /**
  * Get the label for an event.
@@ -46,22 +46,22 @@
  * @param event The event.
  * @return The label.
  */
-const char *gaim_gtk_sound_get_event_label(GaimSoundEventID event);
+const char *pidgin_sound_get_event_label(GaimSoundEventID event);
 
 /**
  * Gets GTK+ sound UI ops.
  *
  * @return The UI operations structure.
  */
-GaimSoundUiOps *gaim_gtk_sound_get_ui_ops(void);
+GaimSoundUiOps *pidgin_sound_get_ui_ops(void);
 
 /**
  * Get the handle for the GTK+ sound system.
  *
  * @return The handle to the sound system
  */
-void *gaim_gtk_sound_get_handle(void);
+void *pidgin_sound_get_handle(void);
 
 /*@}*/
 
-#endif /* _GAIM_GTKSOUND_H_ */
+#endif /* _PIDGINSOUND_H_ */
--- a/pidgin/gtksourceiter.h	Sat Feb 03 05:55:41 2007 +0000
+++ b/pidgin/gtksourceiter.h	Sat Feb 03 08:13:34 2007 +0000
@@ -25,8 +25,8 @@
  *  Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
  */
 
-#ifndef _GAIM_GTKSOURCEITER_H_
-#define _GAIM_GTKSOURCEITER_H_
+#ifndef _PIDGINSOURCEITER_H_
+#define _PIDGINSOURCEITER_H_
 
 #include <gtk/gtktextiter.h>
 
@@ -58,4 +58,4 @@
 
 G_END_DECLS
 
-#endif /* _GAIM_GTKSOURCEITER_H_ */
+#endif /* _PIDGINSOURCEITER_H_ */
--- a/pidgin/gtkstatusbox.c	Sat Feb 03 05:55:41 2007 +0000
+++ b/pidgin/gtkstatusbox.c	Sat Feb 03 08:13:34 2007 +0000
@@ -79,8 +79,8 @@
 static gboolean gtk_gaim_status_box_expose_event (GtkWidget *widget, GdkEventExpose *event);
 static void gtk_gaim_status_box_redisplay_buddy_icon(GtkGaimStatusBox *status_box);
 static void gtk_gaim_status_box_forall (GtkContainer *container, gboolean include_internals, GtkCallback callback, gpointer callback_data);
-static void gaim_gtk_status_box_popup(GtkGaimStatusBox *box);
-static void gaim_gtk_status_box_popdown(GtkGaimStatusBox *box);
+static void pidgin_status_box_popup(GtkGaimStatusBox *box);
+static void pidgin_status_box_popdown(GtkGaimStatusBox *box);
 
 static void do_colorshift (GdkPixbuf *dest, GdkPixbuf *src, int shift);
 static void icon_choose_cb(const char *filename, gpointer data);
@@ -260,7 +260,7 @@
 			return FALSE;
 		}
 
-		box->buddy_icon_sel = gaim_gtk_buddy_icon_chooser_new(NULL, icon_choose_cb, box);
+		box->buddy_icon_sel = pidgin_buddy_icon_chooser_new(NULL, icon_choose_cb, box);
 		gtk_widget_show_all(box->buddy_icon_sel);
 	}
 	return FALSE;
@@ -621,11 +621,11 @@
 					         icon_size, "PidginStatusBox");
 #if 0
 		if (account_status)
-			pixbuf = gaim_gtk_create_prpl_icon_with_status(acct,
+			pixbuf = pidgin_create_prpl_icon_with_status(acct,
 						gaim_status_get_type(gaim_account_get_active_status(acct)),
 						0.5);
 		else
-			pixbuf = gaim_gtk_create_gaim_icon_with_status(
+			pixbuf = pidgin_create_gaim_icon_with_status(
 						gaim_savedstatus_get_type(saved_status),
 						0.5);
 
@@ -1044,7 +1044,7 @@
 			                                  icon_size, "PidginStatusBox");
 			pixbuf3 = gtk_widget_render_icon (GTK_WIDGET(status_box->vbox), PIDGIN_STOCK_STATUS_OFFLINE,
 			                                  icon_size, "PidginStatusBox");
-			pixbuf4 = gtk_widget_render_icon (GTK_WIDGET(status_box->vbox), PIDGIN_STOCK_STATUS_INVISIBLE,
+			pixbuf4 = gtk_widget_render_icon (GTK_WIDGET(status_box->vbox), PIDGIN_STOCK_STATUS_AVAILABLE_I,
 			                                  icon_size, "PidginStatusBox");
 
 			gtk_gaim_status_box_add(GTK_GAIM_STATUS_BOX(status_box), GTK_GAIM_STATUS_BOX_TYPE_PRIMITIVE, pixbuf, _("Available"), NULL, GINT_TO_POINTER(GAIM_STATUS_AVAILABLE));
@@ -1078,7 +1078,7 @@
 
 static gboolean combo_box_scroll_event_cb(GtkWidget *w, GdkEventScroll *event, GtkIMHtml *imhtml)
 {
-  	gaim_gtk_status_box_popup(GTK_GAIM_STATUS_BOX(w));
+  	pidgin_status_box_popup(GTK_GAIM_STATUS_BOX(w));
 	return TRUE;
 }
 
@@ -1217,7 +1217,7 @@
 	GtkGaimStatusBox *status_box = (GtkGaimStatusBox *)data;
 
 	if (value)
-		gaim_gtk_setup_gtkspell(GTK_TEXT_VIEW(status_box->imhtml));
+		pidgin_setup_gtkspell(GTK_TEXT_VIEW(status_box->imhtml));
 	else
 	{
 		GtkSpell *spell;
@@ -1351,7 +1351,7 @@
 
 
 static void
-gaim_gtk_status_box_popup(GtkGaimStatusBox *box)
+pidgin_status_box_popup(GtkGaimStatusBox *box)
 {
 	int width, height, x, y;
 	gtk_gaim_status_box_list_position (box, &x, &y, &width, &height);
@@ -1378,7 +1378,7 @@
 }
 
 static void
-gaim_gtk_status_box_popdown(GtkGaimStatusBox *box) {
+pidgin_status_box_popdown(GtkGaimStatusBox *box) {
 	gtk_widget_hide(box->popup_window);
 	box->popup_in_progress = FALSE;
 	gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (box->toggle_button),
@@ -1392,9 +1392,9 @@
 {
 	if (gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (widget)))  {
 		if (!box->popup_in_progress) 
-			gaim_gtk_status_box_popup (box);
+			pidgin_status_box_popup (box);
 	}  else {
-		gaim_gtk_status_box_popdown(box);
+		pidgin_status_box_popdown(box);
 	}
 }
 
@@ -1409,9 +1409,9 @@
 			if (prplinfo && prplinfo->icon_spec.format) {
 				char *icon = NULL;
 				if (filename)
-					icon = gaim_gtk_convert_buddy_icon(plug, filename);
+					icon = pidgin_convert_buddy_icon(plug, filename);
 				gaim_account_set_bool(box->account, "use-global-buddyicon", (filename != NULL));
-				gaim_account_set_ui_string(box->account, GAIM_GTK_UI, "non-global-buddyicon-cached-path", icon);
+				gaim_account_set_ui_string(box->account, PIDGIN_UI, "non-global-buddyicon-cached-path", icon);
 				gaim_account_set_buddy_icon_path(box->account, filename);
 				gaim_account_set_buddy_icon(box->account, icon);
 				g_free(icon);
@@ -1429,7 +1429,7 @@
 				    prplinfo->icon_spec.format) {
 					char *icon = NULL;
 					if (filename)
-						icon = gaim_gtk_convert_buddy_icon(plug, filename);
+						icon = pidgin_convert_buddy_icon(plug, filename);
 					gaim_account_set_buddy_icon_path(account, filename);
 					gaim_account_set_buddy_icon(account, icon);
 					g_free(icon);
@@ -1483,7 +1483,7 @@
 	
 	status_box->active_row = gtk_tree_row_reference_new(GTK_TREE_MODEL(status_box->dropdown_store), path);
 	
-	gaim_gtk_status_box_popdown (status_box);
+	pidgin_status_box_popdown (status_box);
 	gtk_gaim_status_box_changed(status_box);
 }
 
@@ -1498,14 +1498,14 @@
 		if (ewidget == status_box->toggle_button && 
 		    status_box->popup_in_progress &&
 		    gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (status_box->toggle_button))) {
-			gaim_gtk_status_box_popdown (status_box);
+			pidgin_status_box_popdown (status_box);
 			return TRUE;
 		}
 		
 		/* released outside treeview */
 		if (ewidget != status_box->toggle_button) 
 			{
-				gaim_gtk_status_box_popdown (status_box);
+				pidgin_status_box_popdown (status_box);
 				return TRUE;
 			}
 		
@@ -1532,7 +1532,7 @@
 {
 	if (box->popup_in_progress) {
 		if (event->keyval == GDK_Escape) {
-			gaim_gtk_status_box_popdown(box);
+			pidgin_status_box_popdown(box);
 			return TRUE;
 		} else if (event->keyval == GDK_Return) {
 			GtkTreeSelection *sel = gtk_tree_view_get_selection(GTK_TREE_VIEW(box->tree_view));
@@ -1644,7 +1644,7 @@
 	gtk_widget_show(status_box->tree_view);
 	gtk_tree_view_set_search_column(GTK_TREE_VIEW(status_box->tree_view), TEXT_COLUMN);
 	gtk_tree_view_set_search_equal_func(GTK_TREE_VIEW(status_box->tree_view),
-				gaim_gtk_tree_view_search_equal_func, NULL, NULL);
+				pidgin_tree_view_search_equal_func, NULL, NULL);
 	  
 #if GTK_CHECK_VERSION(2, 6, 0)
 	g_object_set(text_rend, "ellipsize", PANGO_ELLIPSIZE_END, NULL);
@@ -1661,7 +1661,7 @@
 #endif
 
 	status_box->vbox = gtk_vbox_new(0, FALSE);
-	status_box->sw = gaim_gtk_create_imhtml(FALSE, &status_box->imhtml, NULL, NULL);
+	status_box->sw = pidgin_create_imhtml(FALSE, &status_box->imhtml, NULL, NULL);
 	gtk_imhtml_set_editable(GTK_IMHTML(status_box->imhtml), TRUE);
 
 	buffer = gtk_text_view_get_buffer(GTK_TEXT_VIEW(status_box->imhtml));
@@ -1682,7 +1682,7 @@
 	gtk_imhtml_set_editable(GTK_IMHTML(status_box->imhtml), TRUE);
 #ifdef USE_GTKSPELL
 	if (gaim_prefs_get_bool("/gaim/gtk/conversations/spellcheck"))
-		gaim_gtk_setup_gtkspell(GTK_TEXT_VIEW(status_box->imhtml));
+		pidgin_setup_gtkspell(GTK_TEXT_VIEW(status_box->imhtml));
 #endif
 	gtk_widget_set_parent(status_box->vbox, GTK_WIDGET(status_box));
 	gtk_widget_show_all(status_box->vbox);
@@ -2362,7 +2362,7 @@
 		{
 			GaimSavedStatus *saved_status;
 			saved_status = gaim_savedstatus_get_current();
-			gaim_gtk_status_editor_show(FALSE,
+			pidgin_status_editor_show(FALSE,
 				gaim_savedstatus_is_transient(saved_status)
 					? saved_status : NULL);
 			status_menu_refresh_iter(status_box);
@@ -2371,7 +2371,7 @@
 
 		if (type == GTK_GAIM_STATUS_BOX_TYPE_SAVED)
 		{
-			gaim_gtk_status_window_show();
+			pidgin_status_window_show();
 			status_menu_refresh_iter(status_box);
 			return;
 		}
--- a/pidgin/gtkstatusbox.h	Sat Feb 03 05:55:41 2007 +0000
+++ b/pidgin/gtkstatusbox.h	Sat Feb 03 08:13:34 2007 +0000
@@ -184,4 +184,4 @@
 
 G_END_DECLS
 
-#endif /* __GTK_GAIM_GTK_STATUS_COMBO_BOX_H__ */
+#endif /* __GTK_PIDGIN_STATUS_COMBO_BOX_H__ */
--- a/pidgin/gtkthemes.c	Sat Feb 03 05:55:41 2007 +0000
+++ b/pidgin/gtkthemes.c	Sat Feb 03 08:13:34 2007 +0000
@@ -36,7 +36,7 @@
 GSList *smiley_themes = NULL;
 struct smiley_theme *current_smiley_theme;
 
-gboolean gaim_gtkthemes_smileys_disabled()
+gboolean pidginthemes_smileys_disabled()
 {
 	if (!current_smiley_theme)
 		return 1;
@@ -44,7 +44,7 @@
 	return strcmp(current_smiley_theme->name, "none") == 0;
 }
 
-void gaim_gtkthemes_smiley_themeize(GtkWidget *imhtml)
+void pidginthemes_smiley_themeize(GtkWidget *imhtml)
 {
 	struct smiley_list *list;
 	if (!current_smiley_theme)
@@ -63,7 +63,7 @@
 	}
 }
 
-void gaim_gtkthemes_load_smiley_theme(const char *file, gboolean load)
+void pidginthemes_load_smiley_theme(const char *file, gboolean load)
 {
 	FILE *f = g_fopen(file, "r");
 	char buf[256];
@@ -249,14 +249,14 @@
 			GaimConversation *conv = cnv->data;
 
 			if (GAIM_IS_GTK_CONVERSATION(conv)) {
-				gaim_gtkthemes_smiley_themeize(GAIM_GTK_CONVERSATION(conv)->imhtml);
-				gaim_gtkthemes_smiley_themeize(GAIM_GTK_CONVERSATION(conv)->entry);
+				pidginthemes_smiley_themeize(PIDGIN_CONVERSATION(conv)->imhtml);
+				pidginthemes_smiley_themeize(PIDGIN_CONVERSATION(conv)->entry);
 			}
 		}
 	}
 }
 
-void gaim_gtkthemes_smiley_theme_probe()
+void pidginthemes_smiley_theme_probe()
 {
 	GDir *dir;
 	const gchar *file;
@@ -277,7 +277,7 @@
 				 * We set the second argument to FALSE so that it doesn't load
 				 * the theme yet.
 				 */
-				gaim_gtkthemes_load_smiley_theme(path, FALSE);
+				pidginthemes_load_smiley_theme(path, FALSE);
 				g_free(path);
 			}
 			g_dir_close(dir);
@@ -288,7 +288,7 @@
 	}
 }
 
-GSList *gaim_gtkthemes_get_proto_smileys(const char *id) {
+GSList *pidginthemes_get_proto_smileys(const char *id) {
 	GaimPlugin *proto;
 	struct smiley_list *list, *def;
 
@@ -314,18 +314,18 @@
 	return list ? list->smileys : def->smileys;
 }
 
-void gaim_gtkthemes_init()
+void pidginthemes_init()
 {
 	GSList *l;
 	const char *current_theme =
 		gaim_prefs_get_string("/gaim/gtk/smileys/theme");
 
-	gaim_gtkthemes_smiley_theme_probe();
+	pidginthemes_smiley_theme_probe();
 
 	for (l = smiley_themes; l; l = l->next) {
 		struct smiley_theme *smile = l->data;
 		if (smile->name && strcmp(current_theme, smile->name) == 0) {
-			gaim_gtkthemes_load_smiley_theme(smile->path, TRUE);
+			pidginthemes_load_smiley_theme(smile->path, TRUE);
 			break;
 		}
 	}
@@ -333,7 +333,7 @@
 	/* If we still don't have a smiley theme, choose the first one */
 	if (!current_smiley_theme && smiley_themes) {
 		struct smiley_theme *smile = smiley_themes->data;
-		gaim_gtkthemes_load_smiley_theme(smile->path, TRUE);
+		pidginthemes_load_smiley_theme(smile->path, TRUE);
 	}
 
 }
--- a/pidgin/gtkthemes.h	Sat Feb 03 05:55:41 2007 +0000
+++ b/pidgin/gtkthemes.h	Sat Feb 03 08:13:34 2007 +0000
@@ -22,8 +22,8 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
-#ifndef _GAIM_GTKTHEMES_H_
-#define _GAIM_GTKTHEMES_H_
+#ifndef _PIDGINTHEMES_H_
+#define _PIDGINTHEMES_H_
 
 struct smiley_list {
 	char *sml;
@@ -44,10 +44,10 @@
 extern struct smiley_theme *current_smiley_theme;
 extern GSList *smiley_themes;
 
-void gaim_gtkthemes_init(void);
-gboolean gaim_gtkthemes_smileys_disabled(void);
-void gaim_gtkthemes_smiley_themeize(GtkWidget *);
-void gaim_gtkthemes_smiley_theme_probe(void);
-void gaim_gtkthemes_load_smiley_theme(const char *file, gboolean load);
-GSList *gaim_gtkthemes_get_proto_smileys(const char *id);
-#endif /* _GAIM_GTKDIALOGS_H_ */
+void pidginthemes_init(void);
+gboolean pidginthemes_smileys_disabled(void);
+void pidginthemes_smiley_themeize(GtkWidget *);
+void pidginthemes_smiley_theme_probe(void);
+void pidginthemes_load_smiley_theme(const char *file, gboolean load);
+GSList *pidginthemes_get_proto_smileys(const char *id);
+#endif /* _PIDGINDIALOGS_H_ */
--- a/pidgin/gtkutils.c	Sat Feb 03 05:55:41 2007 +0000
+++ b/pidgin/gtkutils.c	Sat Feb 03 08:13:34 2007 +0000
@@ -95,7 +95,7 @@
 	g_signal_connect(G_OBJECT(imhtml), "url_clicked",
 					 G_CALLBACK(url_clicked_cb), NULL);
 
-	gaim_gtkthemes_smiley_themeize(imhtml);
+	pidginthemes_smiley_themeize(imhtml);
 
 	gtk_imhtml_set_funcs(GTK_IMHTML(imhtml), &gtkimhtml_cbs);
 
@@ -122,7 +122,7 @@
 }
 
 GtkWidget *
-gaim_gtk_create_imhtml(gboolean editable, GtkWidget **imhtml_ret, GtkWidget **toolbar_ret, GtkWidget **sw_ret)
+pidgin_create_imhtml(gboolean editable, GtkWidget **imhtml_ret, GtkWidget **toolbar_ret, GtkWidget **sw_ret)
 {
 	GtkWidget *frame;
 	GtkWidget *imhtml;
@@ -162,7 +162,7 @@
 	gtk_text_view_set_wrap_mode(GTK_TEXT_VIEW(imhtml), GTK_WRAP_WORD_CHAR);
 #ifdef USE_GTKSPELL
 	if (editable && gaim_prefs_get_bool("/gaim/gtk/conversations/spellcheck"))
-		gaim_gtk_setup_gtkspell(GTK_TEXT_VIEW(imhtml));
+		pidgin_setup_gtkspell(GTK_TEXT_VIEW(imhtml));
 #endif
 	gtk_widget_show(imhtml);
 
@@ -187,7 +187,7 @@
 }
 
 void
-gaim_gtk_set_sensitive_if_input(GtkWidget *entry, GtkWidget *dialog)
+pidgin_set_sensitive_if_input(GtkWidget *entry, GtkWidget *dialog)
 {
 	const char *text = gtk_entry_get_text(GTK_ENTRY(entry));
 	gtk_dialog_set_response_sensitive(GTK_DIALOG(dialog), GTK_RESPONSE_OK,
@@ -195,7 +195,7 @@
 }
 
 void
-gaim_gtk_toggle_sensitive(GtkWidget *widget, GtkWidget *to_toggle)
+pidgin_toggle_sensitive(GtkWidget *widget, GtkWidget *to_toggle)
 {
 	gboolean sensitivity;
 
@@ -208,7 +208,7 @@
 }
 
 void
-gaim_gtk_toggle_sensitive_array(GtkWidget *w, GPtrArray *data)
+pidgin_toggle_sensitive_array(GtkWidget *w, GPtrArray *data)
 {
 	gboolean sensitivity;
 	gpointer element;
@@ -226,7 +226,7 @@
 }
 
 void
-gaim_gtk_toggle_showhide(GtkWidget *widget, GtkWidget *to_toggle)
+pidgin_toggle_showhide(GtkWidget *widget, GtkWidget *to_toggle)
 {
 	if (to_toggle == NULL)
 		return;
@@ -395,7 +395,7 @@
 }
 
 GtkWidget *
-gaim_gtk_make_frame(GtkWidget *parent, const char *title)
+pidgin_make_frame(GtkWidget *parent, const char *title)
 {
 	GtkWidget *vbox, *label, *hbox;
 	char *labeltitle;
@@ -450,7 +450,7 @@
 }
 
 GtkWidget *
-gaim_gtk_protocol_option_menu_new(const char *id, GCallback cb,
+pidgin_protocol_option_menu_new(const char *id, GCallback cb,
 								  gpointer user_data)
 {
 	GaimPluginProtocolInfo *prpl_info;
@@ -547,7 +547,7 @@
 }
 
 GaimAccount *
-gaim_gtk_account_option_menu_get_selected(GtkWidget *optmenu)
+pidgin_account_option_menu_get_selected(GtkWidget *optmenu)
 {
 	GtkWidget *menu = gtk_option_menu_get_menu(GTK_OPTION_MENU(optmenu));
 	GtkWidget *item = gtk_menu_get_active(GTK_MENU(menu));
@@ -745,7 +745,7 @@
 }
 
 void
-gaim_gtk_account_option_menu_set_selected(GtkWidget *optmenu, GaimAccount *account)
+pidgin_account_option_menu_set_selected(GtkWidget *optmenu, GaimAccount *account)
 {
 	GtkWidget *menu;
 	GtkWidget *item;
@@ -772,7 +772,7 @@
 }
 
 GtkWidget *
-gaim_gtk_account_option_menu_new(GaimAccount *default_account,
+pidgin_account_option_menu_new(GaimAccount *default_account,
 								 gboolean show_all, GCallback cb,
 								 GaimFilterAccountFunc filter_func,
 								 gpointer user_data)
@@ -817,7 +817,7 @@
 }
 
 gboolean
-gaim_gtk_check_if_dir(const char *path, GtkFileSelection *filesel)
+pidgin_check_if_dir(const char *path, GtkFileSelection *filesel)
 {
 	char *dirname;
 
@@ -837,7 +837,7 @@
 }
 
 void
-gaim_gtk_setup_gtkspell(GtkTextView *textview)
+pidgin_setup_gtkspell(GtkTextView *textview)
 {
 #ifdef USE_GTKSPELL
 	GError *error = NULL;
@@ -856,7 +856,7 @@
 }
 
 void
-gaim_gtk_save_accels_cb(GtkAccelGroup *accel_group, guint arg1,
+pidgin_save_accels_cb(GtkAccelGroup *accel_group, guint arg1,
                          GdkModifierType arg2, GClosure *arg3,
                          gpointer data)
 {
@@ -864,12 +864,12 @@
 	           "accel changed, scheduling save.\n");
 
 	if (!accels_save_timer)
-		accels_save_timer = g_timeout_add(5000, gaim_gtk_save_accels,
+		accels_save_timer = g_timeout_add(5000, pidgin_save_accels,
 		                                  NULL);
 }
 
 gboolean
-gaim_gtk_save_accels(gpointer data)
+pidgin_save_accels(gpointer data)
 {
 	char *filename = NULL;
 
@@ -884,7 +884,7 @@
 }
 
 void
-gaim_gtk_load_accels()
+pidgin_load_accels()
 {
 	char *filename = NULL;
 
@@ -895,7 +895,7 @@
 }
 
 gboolean
-gaim_gtk_parse_x_im_contact(const char *msg, gboolean all_accounts,
+pidgin_parse_x_im_contact(const char *msg, gboolean all_accounts,
 							GaimAccount **ret_account, char **ret_protocol,
 							char **ret_username, char **ret_alias)
 {
@@ -1115,7 +1115,7 @@
 
 #if GTK_CHECK_VERSION(2,2,0)
 static void
-gaim_gtk_menu_position_func(GtkMenu *menu,
+pidgin_menu_position_func(GtkMenu *menu,
 							gint *x,
 							gint *y,
 							gboolean *push_in,
@@ -1266,7 +1266,7 @@
 #endif
 
 void
-gaim_gtk_treeview_popup_menu_position_func(GtkMenu *menu,
+pidgin_treeview_popup_menu_position_func(GtkMenu *menu,
 										   gint *x,
 										   gint *y,
 										   gboolean *push_in,
@@ -1286,7 +1286,7 @@
 	*x += rect.x+rect.width;
 	*y += rect.y+rect.height+ythickness;
 #if GTK_CHECK_VERSION(2,2,0)
-	gaim_gtk_menu_position_func (menu, x, y, push_in, data);
+	pidgin_menu_position_func (menu, x, y, push_in, data);
 #endif
 }
 
@@ -1309,7 +1309,7 @@
 	struct stat st;
 	GError *err = NULL;
 	GaimConversation *conv;
-	GaimGtkConversation *gtkconv;
+	PidginConversation *gtkconv;
 	GtkTextIter iter;
 	int id;
 	switch (choice) {
@@ -1327,14 +1327,14 @@
 			return;
 		}
 
-		gaim_gtk_set_custom_buddy_icon(data->account, data->who, data->filename);
+		pidgin_set_custom_buddy_icon(data->account, data->who, data->filename);
 		break;
 	case DND_FILE_TRANSFER:
 		serv_send_file(gaim_account_get_connection(data->account), data->who, data->filename);
 		break;
 	case DND_IM_IMAGE:
 		conv = gaim_conversation_new(GAIM_CONV_TYPE_IM, data->account, data->who);
-		gtkconv = GAIM_GTK_CONVERSATION(conv);
+		gtkconv = PIDGIN_CONVERSATION(conv);
 
 		if (!g_file_get_contents(data->filename, &filedata, &size,
 					 &err)) {
@@ -1503,11 +1503,11 @@
 			dtype = gaim_desktop_item_get_entry_type(item);
 			switch (dtype) {
 				GaimConversation *conv;
-				GaimGtkConversation *gtkconv;
+				PidginConversation *gtkconv;
 
 			case GAIM_DESKTOP_ITEM_TYPE_LINK:
 				conv = gaim_conversation_new(GAIM_CONV_TYPE_IM, account, who);
-				gtkconv =  GAIM_GTK_CONVERSATION(conv);
+				gtkconv =  PIDGIN_CONVERSATION(conv);
 				gtk_imhtml_insert_link(GTK_IMHTML(gtkconv->entry),
 						       gtk_text_buffer_get_insert(GTK_IMHTML(gtkconv->entry)->text_buffer),
 						       gaim_desktop_item_get_string(item, "URL"), itemname);
@@ -1535,7 +1535,7 @@
 	g_list_free(files);
 }
 
-void gaim_gtk_buddy_icon_get_scale_size(GdkPixbuf *buf, GaimBuddyIconSpec *spec, GaimIconScaleRules rules, int *width, int *height)
+void pidgin_buddy_icon_get_scale_size(GdkPixbuf *buf, GaimBuddyIconSpec *spec, GaimIconScaleRules rules, int *width, int *height)
 {
 	*width = gdk_pixbuf_get_width(buf);
 	*height = gdk_pixbuf_get_height(buf);
@@ -1553,7 +1553,7 @@
 }
 
 GdkPixbuf *
-gaim_gtk_create_prpl_icon(GaimAccount *account, PidginPrplIconSize size)
+pidgin_create_prpl_icon(GaimAccount *account, PidginPrplIconSize size)
 {
 	GaimPlugin *prpl;
 	GaimPluginProtocolInfo *prpl_info;
@@ -1644,11 +1644,11 @@
 }
 
 GdkPixbuf *
-gaim_gtk_create_prpl_icon_with_status(GaimAccount *account, GaimStatusType *status_type, double scale_factor)
+pidgin_create_prpl_icon_with_status(GaimAccount *account, GaimStatusType *status_type, double scale_factor)
 {
 	GdkPixbuf *pixbuf;
 
-	pixbuf = gaim_gtk_create_prpl_icon(account, scale_factor);
+	pixbuf = pidgin_create_prpl_icon(account, scale_factor);
 	if (pixbuf == NULL)
 		return NULL;
 
@@ -1662,7 +1662,7 @@
 }
 
 GdkPixbuf *
-gaim_gtk_create_gaim_icon_with_status(GaimStatusPrimitive primitive, double scale_factor)
+pidgin_create_gaim_icon_with_status(GaimStatusPrimitive primitive, double scale_factor)
 {
 	gchar *filename;
 	GdkPixbuf *orig, *pixbuf;
@@ -1694,7 +1694,7 @@
 }
 
 void
-gaim_gtk_append_menu_action(GtkWidget *menu, GaimMenuAction *act,
+pidgin_append_menu_action(GtkWidget *menu, GaimMenuAction *act,
                             gpointer object)
 {
 	if (act == NULL) {
@@ -1742,7 +1742,7 @@
 			for (l = act->children; l; l = l->next) {
 				GaimMenuAction *act = (GaimMenuAction *)l->data;
 
-				gaim_gtk_append_menu_action(submenu, act, object);
+				pidgin_append_menu_action(submenu, act, object);
 			}
 			g_list_free(act->children);
 			act->children = NULL;
@@ -1763,13 +1763,13 @@
 	gboolean completion_started;
 	gboolean all;
 
-} GaimGtkCompletionData;
+} PidginCompletionData;
 #endif
 
 #ifndef NEW_STYLE_COMPLETION
 static gboolean
 completion_entry_event(GtkEditable *entry, GdkEventKey *event,
-					   GaimGtkCompletionData *data)
+					   PidginCompletionData *data)
 {
 	int pos, end_pos;
 
@@ -1838,7 +1838,7 @@
 }
 
 static void
-destroy_completion_data(GtkWidget *w, GaimGtkCompletionData *data)
+destroy_completion_data(GtkWidget *w, PidginCompletionData *data)
 {
 	g_list_foreach(data->completion->items, (GFunc)g_free, NULL);
 	g_completion_free(data->completion);
@@ -1903,7 +1903,7 @@
 	if (optmenu != NULL) {
 		GList *items;
 		guint index = 0;
-		gaim_gtk_account_option_menu_set_selected(optmenu, account);
+		pidgin_account_option_menu_set_selected(optmenu, account);
 		items = GTK_MENU_SHELL(gtk_option_menu_get_menu(GTK_OPTION_MENU(optmenu)))->children;
 
 		do {
@@ -2061,7 +2061,7 @@
 }
 #else
 static void
-add_completion_list(GaimGtkCompletionData *data)
+add_completion_list(PidginCompletionData *data)
 {
 	GaimBlistNode *gnode, *cnode, *bnode;
 	GCompletion *completion;
@@ -2122,7 +2122,7 @@
 }
 
 void
-gaim_gtk_setup_screenname_autocomplete(GtkWidget *entry, GtkWidget *accountopt, gboolean all)
+pidgin_setup_screenname_autocomplete(GtkWidget *entry, GtkWidget *accountopt, gboolean all)
 {
 	gpointer cb_data = NULL;
 
@@ -2161,9 +2161,9 @@
 	gtk_entry_completion_set_text_column(completion, 0);
 
 #else /* !NEW_STYLE_COMPLETION */
-	GaimGtkCompletionData *data;
-
-	data = g_new0(GaimGtkCompletionData, 1);
+	PidginCompletionData *data;
+
+	data = g_new0(PidginCompletionData, 1);
 
 	data->completion = g_completion_new(NULL);
 	data->all = all;
@@ -2196,7 +2196,7 @@
 	g_signal_connect(G_OBJECT(entry), "destroy", G_CALLBACK(screenname_autocomplete_destroyed_cb), NULL);
 }
 
-void gaim_gtk_set_cursor(GtkWidget *widget, GdkCursorType cursor_type)
+void pidgin_set_cursor(GtkWidget *widget, GdkCursorType cursor_type)
 {
 	GdkCursor *cursor;
 
@@ -2215,7 +2215,7 @@
 #endif
 }
 
-void gaim_gtk_clear_cursor(GtkWidget *widget)
+void pidgin_clear_cursor(GtkWidget *widget)
 {
 	g_return_if_fail(widget != NULL);
 	if (widget->window == NULL)
@@ -2283,7 +2283,7 @@
 				GTK_FILE_SELECTION(dialog->icon_filesel)));
 
 	/* If they typed in a directory, change there */
-	if (gaim_gtk_check_if_dir(filename,
+	if (pidgin_check_if_dir(filename,
 				GTK_FILE_SELECTION(dialog->icon_filesel)))
 	{
 		g_free(filename);
@@ -2371,7 +2371,7 @@
 }
 
 
-GtkWidget *gaim_gtk_buddy_icon_chooser_new(GtkWindow *parent, void(*callback)(const char *, gpointer), gpointer data) {
+GtkWidget *pidgin_buddy_icon_chooser_new(GtkWindow *parent, void(*callback)(const char *, gpointer), gpointer data) {
 	struct _icon_chooser *dialog = g_new0(struct _icon_chooser, 1);
 
 #if !GTK_CHECK_VERSION(2,4,0) /* FILECHOOSER */
@@ -2467,7 +2467,7 @@
 #endif
 
 char *
-gaim_gtk_convert_buddy_icon(GaimPlugin *plugin, const char *path)
+pidgin_convert_buddy_icon(GaimPlugin *plugin, const char *path)
 {
 	GaimPluginProtocolInfo *prpl_info;
 #if GTK_CHECK_VERSION(2,2,0)
@@ -2825,7 +2825,7 @@
 }
 #endif /* ! Gtk 2.6.0 */
 
-void gaim_gtk_set_custom_buddy_icon(GaimAccount *account, const char *who, const char *filename)
+void pidgin_set_custom_buddy_icon(GaimAccount *account, const char *who, const char *filename)
 {
 	GaimConversation *conv;
 	GaimBuddy *buddy;
@@ -2850,7 +2850,7 @@
 	if (filename) {
 		char *newfile;
 
-		newfile = gaim_gtk_convert_buddy_icon(gaim_find_prpl(gaim_account_get_protocol_id(account)),
+		newfile = pidgin_convert_buddy_icon(gaim_find_prpl(gaim_account_get_protocol_id(account)),
 						filename);
 		path = gaim_buddy_icons_get_full_path(newfile);
 		g_free(newfile);
@@ -2869,7 +2869,7 @@
 		gaim_blist_update_buddy_icon(buddy);
 }
 
-char *gaim_gtk_make_pretty_arrows(const char *str)
+char *pidgin_make_pretty_arrows(const char *str)
 {
 	char *ret;
 	char **split = g_strsplit(str, "->", -1);
@@ -2884,7 +2884,7 @@
 	return ret;
 }
 
-void gaim_gtk_set_urgent(GtkWindow *window, gboolean urgent)
+void pidgin_set_urgent(GtkWindow *window, gboolean urgent)
 {
 #if GTK_CHECK_VERSION(2,8,0)
 	gtk_window_set_urgency_hint(window, urgent);
@@ -2918,7 +2918,7 @@
 GSList *minidialogs = NULL;
 
 static void *
-gaim_gtk_utils_get_handle()
+pidgin_utils_get_handle()
 {
 	static int handle;
 
@@ -2940,7 +2940,7 @@
 	minidialogs = g_slist_remove(minidialogs, widget);
 }
 
-void *gaim_gtk_make_mini_dialog(GaimConnection *gc, const char *icon_name,
+void *pidgin_make_mini_dialog(GaimConnection *gc, const char *icon_name,
 				const char *primary, const char *secondary,
 				void *user_data,  ...)
 {
@@ -2971,7 +2971,7 @@
 	if (first_call) {
 		first_call = FALSE;
 		gaim_signal_connect(gaim_connections_get_handle(), "signed-off",
-				    gaim_gtk_utils_get_handle(),
+				    pidgin_utils_get_handle(),
 				    GAIM_CALLBACK(connection_signed_off_cb), NULL);
 	}
 
@@ -3039,7 +3039,7 @@
  * is to add an extra column to the GtkTreeModel.  And this function is
  * used rarely, so it shouldn't matter TOO much.
  */
-gboolean gaim_gtk_tree_view_search_equal_func(GtkTreeModel *model, gint column,
+gboolean pidgin_tree_view_search_equal_func(GtkTreeModel *model, gint column,
 			const gchar *key, GtkTreeIter *iter, gpointer data)
 {
 	gchar *enteredstring;
--- a/pidgin/gtkutils.h	Sat Feb 03 05:55:41 2007 +0000
+++ b/pidgin/gtkutils.h	Sat Feb 03 08:13:34 2007 +0000
@@ -22,8 +22,8 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
-#ifndef _GAIM_GTKUTILS_H_
-#define _GAIM_GTKUTILS_H_
+#ifndef _PIDGINUTILS_H_
+#define _PIDGINUTILS_H_
 
 #include "gtkconv.h"
 #include "gtkgaim.h"
@@ -90,7 +90,7 @@
  *        widget which contains the imhtml.
  * @return The GtkFrame containing the toolbar and imhtml.
  */
-GtkWidget *gaim_gtk_create_imhtml(gboolean editable, GtkWidget **imhtml_ret, GtkWidget **toolbar_ret, GtkWidget **sw_ret);
+GtkWidget *pidgin_create_imhtml(gboolean editable, GtkWidget **imhtml_ret, GtkWidget **toolbar_ret, GtkWidget **sw_ret);
 
 /**
  * Toggles the sensitivity of a widget.
@@ -98,7 +98,7 @@
  * @param widget    @c NULL. Used for signal handlers.
  * @param to_toggle The widget to toggle.
  */
-void gaim_gtk_toggle_sensitive(GtkWidget *widget, GtkWidget *to_toggle);
+void pidgin_toggle_sensitive(GtkWidget *widget, GtkWidget *to_toggle);
 
 /**
  * Checks if text has been entered into a GtkTextEntry widget.  If 
@@ -108,7 +108,7 @@
  * @param entry  The text entry widget.
  * @param dialog The dialog containing the text entry widget.
  */
-void gaim_gtk_set_sensitive_if_input(GtkWidget *entry, GtkWidget *dialog);
+void pidgin_set_sensitive_if_input(GtkWidget *entry, GtkWidget *dialog);
 
 /**
  * Toggles the sensitivity of all widgets in a pointer array.
@@ -116,7 +116,7 @@
  * @param w    @c NULL. Used for signal handlers.
  * @param data The array containing the widgets to toggle.
  */
-void gaim_gtk_toggle_sensitive_array(GtkWidget *w, GPtrArray *data);
+void pidgin_toggle_sensitive_array(GtkWidget *w, GPtrArray *data);
 
 /**
  * Toggles the visibility of a widget.
@@ -124,7 +124,7 @@
  * @param widget    @c NULL. Used for signal handlers.
  * @param to_toggle The widget to toggle.
  */
-void gaim_gtk_toggle_showhide(GtkWidget *widget, GtkWidget *to_toggle);
+void pidgin_toggle_showhide(GtkWidget *widget, GtkWidget *to_toggle);
 
 /**
  * Adds a separator to a menu.
@@ -206,7 +206,7 @@
  *
  * @return The vbox to put things into.
  */
-GtkWidget *gaim_gtk_make_frame(GtkWidget *parent, const char *title);
+GtkWidget *pidgin_make_frame(GtkWidget *parent, const char *title);
 
 /**
  * Creates a drop-down option menu filled with protocols.
@@ -217,7 +217,7 @@
  *
  * @return The drop-down option menu.
  */
-GtkWidget *gaim_gtk_protocol_option_menu_new(const char *id,
+GtkWidget *pidgin_protocol_option_menu_new(const char *id,
 											 GCallback cb,
 											 gpointer user_data);
 
@@ -234,7 +234,7 @@
  *
  * @return The drop-down option menu.
  */
-GtkWidget *gaim_gtk_account_option_menu_new(GaimAccount *default_account,
+GtkWidget *pidgin_account_option_menu_new(GaimAccount *default_account,
 		gboolean show_all, GCallback cb,
 		GaimFilterAccountFunc filter_func, gpointer user_data);
 
@@ -242,30 +242,30 @@
  * Gets the currently selected account from an account drop down box.
  *
  * @param optmenu The GtkOptionMenu created by
- *        gaim_gtk_account_option_menu_new.
+ *        pidgin_account_option_menu_new.
  * @return Returns the GaimAccount that is currently selected.
  */
-GaimAccount *gaim_gtk_account_option_menu_get_selected(GtkWidget *optmenu);
+GaimAccount *pidgin_account_option_menu_get_selected(GtkWidget *optmenu);
 
 /**
  * Sets the currently selected account for an account drop down box.
  *
  * @param optmenu The GtkOptionMenu created by
- *        gaim_gtk_account_option_menu_new.
+ *        pidgin_account_option_menu_new.
  * @param account The GaimAccount to select.
  */
-void gaim_gtk_account_option_menu_set_selected(GtkWidget *optmenu, GaimAccount *account);
+void pidgin_account_option_menu_set_selected(GtkWidget *optmenu, GaimAccount *account);
 
 /**
  * Add autocompletion of screenames to an entry.
  *
  * @param entry     The GtkEntry on which to setup autocomplete.
- * @param optmenu   A menu for accounts, returned by gaim_gtk_account_option_menu_new().
+ * @param optmenu   A menu for accounts, returned by pidgin_account_option_menu_new().
  *                  If @a optmenu is not @c NULL, it'll be updated when a screenname is chosen
  *                  from the autocomplete list.
  * @param all       Whether to include screennames from disconnected accounts.
  */
-void gaim_gtk_setup_screenname_autocomplete(GtkWidget *entry, GtkWidget *optmenu, gboolean all);
+void pidgin_setup_screenname_autocomplete(GtkWidget *entry, GtkWidget *optmenu, gboolean all);
 
 /**
  * Check if the given path is a directory or not.  If it is, then modify
@@ -277,7 +277,7 @@
  *
  * @return TRUE if given path is a directory, FALSE otherwise.
  */
-gboolean gaim_gtk_check_if_dir(const char *path, GtkFileSelection *filesel);
+gboolean pidgin_check_if_dir(const char *path, GtkFileSelection *filesel);
 
 /**
  * Sets up GtkSpell for the given GtkTextView, reporting errors
@@ -287,24 +287,24 @@
  *
  * @param textview The textview widget to setup spellchecking for.
  */
-void gaim_gtk_setup_gtkspell(GtkTextView *textview);
+void pidgin_setup_gtkspell(GtkTextView *textview);
 
 /**
  * Save menu accelerators callback
  */
-void gaim_gtk_save_accels_cb(GtkAccelGroup *accel_group, guint arg1,
+void pidgin_save_accels_cb(GtkAccelGroup *accel_group, guint arg1,
 							 GdkModifierType arg2, GClosure *arg3,
 							 gpointer data);
 
 /**
  * Save menu accelerators
  */
-gboolean gaim_gtk_save_accels(gpointer data);
+gboolean pidgin_save_accels(gpointer data);
 
 /**
  * Load menu accelerators
  */
-void gaim_gtk_load_accels(void);
+void pidgin_load_accels(void);
 
 /**
  * Parses an application/x-im-contact MIME message and returns the
@@ -322,7 +322,7 @@
  * @return TRUE if the message was parsed for the minimum necessary data.
  *         FALSE otherwise.
  */
-gboolean gaim_gtk_parse_x_im_contact(const char *msg, gboolean all_accounts,
+gboolean pidgin_parse_x_im_contact(const char *msg, gboolean all_accounts,
 									 GaimAccount **ret_account,
 									 char **ret_protocol, char **ret_username,
 									 char **ret_alias);
@@ -351,7 +351,7 @@
  * @param push_in This is an output parameter?
  * @param user_data Not used by this particular position function.
  */
-void gaim_gtk_treeview_popup_menu_position_func(GtkMenu *menu,
+void pidgin_treeview_popup_menu_position_func(GtkMenu *menu,
 												gint *x,
 												gint *y,
 												gboolean *push_in,
@@ -369,7 +369,7 @@
 /**
  * Convenience wrapper for gaim_buddy_icon_get_scale_size
  */
-void gaim_gtk_buddy_icon_get_scale_size(GdkPixbuf *buf, GaimBuddyIconSpec *spec, GaimIconScaleRules rules, int *width, int *height);
+void pidgin_buddy_icon_get_scale_size(GdkPixbuf *buf, GaimBuddyIconSpec *spec, GaimIconScaleRules rules, int *width, int *height);
 
 /**
  * Returns the base image to represent the account, based on
@@ -385,7 +385,7 @@
  *         to allocate the image buffer, or the image file
  *         contained invalid data.
  */
-GdkPixbuf *gaim_gtk_create_prpl_icon(GaimAccount *account, PidginPrplIconSize size);
+GdkPixbuf *pidgin_create_prpl_icon(GaimAccount *account, PidginPrplIconSize size);
 
 /**
  * Create a protocol icon with the status emblem overlayed in
@@ -406,7 +406,7 @@
  *         to allocate the image buffer, or the image file
  *         contained invalid data.
  */
-GdkPixbuf *gaim_gtk_create_prpl_icon_with_status(GaimAccount *account, GaimStatusType *status_type, double scale_factor);
+GdkPixbuf *pidgin_create_prpl_icon_with_status(GaimAccount *account, GaimStatusType *status_type, double scale_factor);
 
 /**
  * Create a Gaim running-man icon with the status emblem overlayed
@@ -426,7 +426,7 @@
  *         allocate the image buffer, or the image file contained
  *         invalid data.
  */
-GdkPixbuf *gaim_gtk_create_gaim_icon_with_status(GaimStatusPrimitive primitive, double scale_factor);
+GdkPixbuf *pidgin_create_gaim_icon_with_status(GaimStatusPrimitive primitive, double scale_factor);
 
 
 /**
@@ -436,7 +436,7 @@
  * @param act     The GaimMenuAction to append.
  * @param gobject The object to be passed to the action callback.
  */
-void gaim_gtk_append_menu_action(GtkWidget *menu, GaimMenuAction *act,
+void pidgin_append_menu_action(GtkWidget *menu, GaimMenuAction *act,
                                  gpointer gobject);
 
 /**
@@ -450,7 +450,7 @@
  * @param widget      The widget for which to set the mouse pointer
  * @param cursor_type The type of cursor to set
  */
-void gaim_gtk_set_cursor(GtkWidget *widget, GdkCursorType cursor_type);
+void pidgin_set_cursor(GtkWidget *widget, GdkCursorType cursor_type);
 
 /**
  * Sets the mouse point for a GtkWidget back to that of its parent window.
@@ -461,7 +461,7 @@
  *
  * @note The display is not flushed from this function.
  */
-void gaim_gtk_clear_cursor(GtkWidget *widget);
+void pidgin_clear_cursor(GtkWidget *widget);
 
 /**
  * Creates a File Selection widget for choosing a buddy icon
@@ -471,7 +471,7 @@
  * @param data        Data to pass to @callback
  * @return            The file dialog 
  */
-GtkWidget *gaim_gtk_buddy_icon_chooser_new(GtkWindow *parent, void(*callback)(const char*,gpointer), gpointer data);
+GtkWidget *pidgin_buddy_icon_chooser_new(GtkWindow *parent, void(*callback)(const char*,gpointer), gpointer data);
 
 /**
  * Converts a buddy icon to the required size and format
@@ -480,7 +480,7 @@
  * @param path       The path of a buddy icon to convert
  * @return           The name of a new buddy icon
  */
-char* gaim_gtk_convert_buddy_icon(GaimPlugin *plugin, const char *path);
+char* pidgin_convert_buddy_icon(GaimPlugin *plugin, const char *path);
 
 #if !GTK_CHECK_VERSION(2,6,0)
 /**
@@ -501,7 +501,7 @@
  * @param filename  The path of the custom icon. If this is @c NULL, then any
  *                  previously set custom buddy icon for the user is removed.
  */
-void gaim_gtk_set_custom_buddy_icon(GaimAccount *account, const char *who, const char *filename);
+void pidgin_set_custom_buddy_icon(GaimAccount *account, const char *who, const char *filename);
 
 /**
  * Converts "->" and "<-" in strings to Unicode arrow characters, for use in referencing
@@ -510,7 +510,7 @@
  * @param str      The text to convert
  * @return         A newly allocated string with unicode arrow characters
  */
-char *gaim_gtk_make_pretty_arrows(const char *str);
+char *pidgin_make_pretty_arrows(const char *str);
 
 /**
  * Creates a "mini-dialog" suitable for embedding in the buddy list scrollbook
@@ -521,7 +521,7 @@
  * @param user_data      Data to pass to the callbacks
  * @param ...            a NULL-terminated list of button labels and callbacks
  */
-void *gaim_gtk_make_mini_dialog(GaimConnection *handle, const char* stock_id, 
+void *pidgin_make_mini_dialog(GaimConnection *handle, const char* stock_id, 
 				const char *primary, const char *secondary,
 				void *user_data,  ...);
 
@@ -529,11 +529,11 @@
  * This is a callback function to be used for Ctrl+F searching in treeviews.
  * Sample Use:
  * 		gtk_tree_view_set_search_equal_func(treeview,
- * 				gaim_gtk_tree_view_search_equal_func,
+ * 				pidgin_tree_view_search_equal_func,
  * 				search_data, search_data_destroy_cb);
  *
  */
-gboolean gaim_gtk_tree_view_search_equal_func(GtkTreeModel *model, gint column,
+gboolean pidgin_tree_view_search_equal_func(GtkTreeModel *model, gint column,
 			const gchar *key, GtkTreeIter *iter, gpointer data);
 
 /**
@@ -543,7 +543,7 @@
  * @param window  The window to draw attention to
  * @param urgent  Whether to set the urgent hint or not
  */
-void gaim_gtk_set_urgent(GtkWindow *window, gboolean urgent);
+void pidgin_set_urgent(GtkWindow *window, gboolean urgent);
 
 /**
  * Returns TRUE if the GdkPixbuf is opaque, as determined by no
@@ -569,5 +569,5 @@
 GtkTreePath *gtk_tree_path_new_from_indices (gint first_index, ...);
 #endif
 
-#endif /* _GAIM_GTKUTILS_H_ */
+#endif /* _PIDGINUTILS_H_ */
 
--- a/pidgin/gtkwhiteboard.c	Sat Feb 03 05:55:41 2007 +0000
+++ b/pidgin/gtkwhiteboard.c	Sat Feb 03 08:13:34 2007 +0000
@@ -32,37 +32,37 @@
 /******************************************************************************
  * Prototypes
  *****************************************************************************/
-static void gaim_gtk_whiteboard_create(GaimWhiteboard *wb);
+static void pidgin_whiteboard_create(GaimWhiteboard *wb);
 
-static void gaim_gtk_whiteboard_destroy(GaimWhiteboard *wb);
-static gboolean whiteboard_close_cb(GtkWidget *widget, GdkEvent *event, GaimGtkWhiteboard *gtkwb);
+static void pidgin_whiteboard_destroy(GaimWhiteboard *wb);
+static gboolean whiteboard_close_cb(GtkWidget *widget, GdkEvent *event, PidginWhiteboard *gtkwb);
 
-/*static void gaim_gtkwhiteboard_button_start_press(GtkButton *button, gpointer data); */
+/*static void pidginwhiteboard_button_start_press(GtkButton *button, gpointer data); */
 
-static gboolean gaim_gtk_whiteboard_configure_event(GtkWidget *widget, GdkEventConfigure *event, gpointer data);
-static gboolean gaim_gtk_whiteboard_expose_event(GtkWidget *widget, GdkEventExpose *event, gpointer data);
+static gboolean pidgin_whiteboard_configure_event(GtkWidget *widget, GdkEventConfigure *event, gpointer data);
+static gboolean pidgin_whiteboard_expose_event(GtkWidget *widget, GdkEventExpose *event, gpointer data);
 
-static gboolean gaim_gtk_whiteboard_brush_down(GtkWidget *widget, GdkEventButton *event, gpointer data);
-static gboolean gaim_gtk_whiteboard_brush_motion(GtkWidget *widget, GdkEventMotion *event, gpointer data);
-static gboolean gaim_gtk_whiteboard_brush_up(GtkWidget *widget, GdkEventButton *event, gpointer data);
+static gboolean pidgin_whiteboard_brush_down(GtkWidget *widget, GdkEventButton *event, gpointer data);
+static gboolean pidgin_whiteboard_brush_motion(GtkWidget *widget, GdkEventMotion *event, gpointer data);
+static gboolean pidgin_whiteboard_brush_up(GtkWidget *widget, GdkEventButton *event, gpointer data);
 
-static void gaim_gtk_whiteboard_draw_brush_point(GaimWhiteboard *wb,
+static void pidgin_whiteboard_draw_brush_point(GaimWhiteboard *wb,
 												  int x, int y, int color, int size);
-static void gaim_gtk_whiteboard_draw_brush_line(GaimWhiteboard *wb, int x0, int y0,
+static void pidgin_whiteboard_draw_brush_line(GaimWhiteboard *wb, int x0, int y0,
 												int x1, int y1, int color, int size);
 
-static void gaim_gtk_whiteboard_set_dimensions(GaimWhiteboard *wb, int width, int height);
-static void gaim_gtk_whiteboard_set_brush(GaimWhiteboard *wb, int size, int color);
-static void gaim_gtk_whiteboard_clear(GaimWhiteboard *wb);
+static void pidgin_whiteboard_set_dimensions(GaimWhiteboard *wb, int width, int height);
+static void pidgin_whiteboard_set_brush(GaimWhiteboard *wb, int size, int color);
+static void pidgin_whiteboard_clear(GaimWhiteboard *wb);
 
-static void gaim_gtk_whiteboard_button_clear_press(GtkWidget *widget, gpointer data);
-static void gaim_gtk_whiteboard_button_save_press(GtkWidget *widget, gpointer data);
+static void pidgin_whiteboard_button_clear_press(GtkWidget *widget, gpointer data);
+static void pidgin_whiteboard_button_save_press(GtkWidget *widget, gpointer data);
 
-static void gaim_gtk_whiteboard_set_canvas_as_icon(GaimGtkWhiteboard *gtkwb);
+static void pidgin_whiteboard_set_canvas_as_icon(PidginWhiteboard *gtkwb);
 
-static void gaim_gtk_whiteboard_rgb24_to_rgb48(int color_rgb, GdkColor *color);
+static void pidgin_whiteboard_rgb24_to_rgb48(int color_rgb, GdkColor *color);
 
-static void color_select_dialog(GtkWidget *widget, GaimGtkWhiteboard *gtkwb);
+static void color_select_dialog(GtkWidget *widget, PidginWhiteboard *gtkwb);
 
 /******************************************************************************
  * Globals
@@ -79,24 +79,24 @@
 
 static GaimWhiteboardUiOps ui_ops =
 {
-	gaim_gtk_whiteboard_create,
-	gaim_gtk_whiteboard_destroy,
-	gaim_gtk_whiteboard_set_dimensions,
-	gaim_gtk_whiteboard_set_brush,
-	gaim_gtk_whiteboard_draw_brush_point,
-	gaim_gtk_whiteboard_draw_brush_line,
-	gaim_gtk_whiteboard_clear
+	pidgin_whiteboard_create,
+	pidgin_whiteboard_destroy,
+	pidgin_whiteboard_set_dimensions,
+	pidgin_whiteboard_set_brush,
+	pidgin_whiteboard_draw_brush_point,
+	pidgin_whiteboard_draw_brush_line,
+	pidgin_whiteboard_clear
 };
 
 /******************************************************************************
  * API
  *****************************************************************************/
-GaimWhiteboardUiOps *gaim_gtk_whiteboard_get_ui_ops(void)
+GaimWhiteboardUiOps *pidgin_whiteboard_get_ui_ops(void)
 {
 	return &ui_ops;
 }
 
-static void gaim_gtk_whiteboard_create(GaimWhiteboard *wb)
+static void pidgin_whiteboard_create(GaimWhiteboard *wb)
 {
 	GaimBuddy *buddy;
 	GtkWidget *window;
@@ -119,7 +119,7 @@
 	GtkWidget *save_button;
 	GtkWidget *color_button;
 
-	GaimGtkWhiteboard *gtkwb = g_new0(GaimGtkWhiteboard, 1);
+	PidginWhiteboard *gtkwb = g_new0(PidginWhiteboard, 1);
 
 	gtkwb->wb = wb;
 	wb->ui_data = gtkwb;
@@ -208,20 +208,20 @@
 
 	/* Signals used to handle backing pixmap */
 	g_signal_connect(G_OBJECT(drawing_area), "expose_event",
-					 G_CALLBACK(gaim_gtk_whiteboard_expose_event), gtkwb);
+					 G_CALLBACK(pidgin_whiteboard_expose_event), gtkwb);
 
 	g_signal_connect(G_OBJECT(drawing_area), "configure_event",
-					 G_CALLBACK(gaim_gtk_whiteboard_configure_event), gtkwb);
+					 G_CALLBACK(pidgin_whiteboard_configure_event), gtkwb);
 
 	/* Event signals */
 	g_signal_connect(G_OBJECT(drawing_area), "button_press_event",
-					 G_CALLBACK(gaim_gtk_whiteboard_brush_down), gtkwb);
+					 G_CALLBACK(pidgin_whiteboard_brush_down), gtkwb);
 
 	g_signal_connect(G_OBJECT(drawing_area), "motion_notify_event",
-					 G_CALLBACK(gaim_gtk_whiteboard_brush_motion), gtkwb);
+					 G_CALLBACK(pidgin_whiteboard_brush_motion), gtkwb);
 
 	g_signal_connect(G_OBJECT(drawing_area), "button_release_event",
-					 G_CALLBACK(gaim_gtk_whiteboard_brush_up), gtkwb);
+					 G_CALLBACK(pidgin_whiteboard_brush_up), gtkwb);
 
 	gtk_widget_set_events(drawing_area,
 						  GDK_EXPOSURE_MASK |
@@ -242,7 +242,7 @@
 	gtk_box_pack_start(GTK_BOX(vbox_controls), clear_button, FALSE, FALSE, GAIM_HIG_BOX_SPACE);
 	gtk_widget_show(clear_button);
 	g_signal_connect(G_OBJECT(clear_button), "clicked",
-					 G_CALLBACK(gaim_gtk_whiteboard_button_clear_press), gtkwb);
+					 G_CALLBACK(pidgin_whiteboard_button_clear_press), gtkwb);
 
 	/* Add a save button */
 	save_button = gtk_button_new_from_stock(GTK_STOCK_SAVE);
@@ -250,7 +250,7 @@
 	gtk_widget_show(save_button);
 
 	g_signal_connect(G_OBJECT(save_button), "clicked",
-					 G_CALLBACK(gaim_gtk_whiteboard_button_save_press), gtkwb);
+					 G_CALLBACK(pidgin_whiteboard_button_save_press), gtkwb);
 
 	/* Add a color selector */
 	color_button = gtk_button_new_from_stock(GTK_STOCK_SELECT_COLOR);
@@ -262,7 +262,7 @@
 	/* Make all this (window) visible */
 	gtk_widget_show(window);
 
-	gaim_gtk_whiteboard_set_canvas_as_icon(gtkwb);
+	pidgin_whiteboard_set_canvas_as_icon(gtkwb);
 
 	/* TODO Specific protocol/whiteboard assignment here? Needs a UI Op? */
 	/* Set default brush size and color */
@@ -272,9 +272,9 @@
 	*/
 }
 
-static void gaim_gtk_whiteboard_destroy(GaimWhiteboard *wb)
+static void pidgin_whiteboard_destroy(GaimWhiteboard *wb)
 {
-	GaimGtkWhiteboard *gtkwb;
+	PidginWhiteboard *gtkwb;
 
 	g_return_if_fail(wb != NULL);
 	gtkwb = wb->ui_data;
@@ -298,7 +298,7 @@
 	wb->ui_data = NULL;
 }
 
-static gboolean whiteboard_close_cb(GtkWidget *widget, GdkEvent *event, GaimGtkWhiteboard *gtkwb)
+static gboolean whiteboard_close_cb(GtkWidget *widget, GdkEvent *event, PidginWhiteboard *gtkwb)
 {
 	GaimWhiteboard *wb;
 
@@ -316,7 +316,7 @@
  * and use new prpl_info member?)
  */
 #if 0
-static void gaim_gtkwhiteboard_button_start_press(GtkButton *button, gpointer data)
+static void pidginwhiteboard_button_start_press(GtkButton *button, gpointer data)
 {
 	GaimConversation *conv = data;
 	GaimAccount *account = gaim_conversation_get_account(conv);
@@ -347,9 +347,9 @@
 }
 #endif
 
-static gboolean gaim_gtk_whiteboard_configure_event(GtkWidget *widget, GdkEventConfigure *event, gpointer data)
+static gboolean pidgin_whiteboard_configure_event(GtkWidget *widget, GdkEventConfigure *event, gpointer data)
 {
-	GaimGtkWhiteboard *gtkwb = (GaimGtkWhiteboard*)data;
+	PidginWhiteboard *gtkwb = (PidginWhiteboard*)data;
 
 	GdkPixmap *pixmap = gtkwb->pixmap;
 
@@ -373,9 +373,9 @@
 	return TRUE;
 }
 
-static gboolean gaim_gtk_whiteboard_expose_event(GtkWidget *widget, GdkEventExpose *event, gpointer data)
+static gboolean pidgin_whiteboard_expose_event(GtkWidget *widget, GdkEventExpose *event, gpointer data)
 {
-	GaimGtkWhiteboard *gtkwb = (GaimGtkWhiteboard*)(data);
+	PidginWhiteboard *gtkwb = (PidginWhiteboard*)(data);
 	GdkPixmap *pixmap = gtkwb->pixmap;
 
 	gdk_draw_drawable(widget->window,
@@ -388,9 +388,9 @@
 	return FALSE;
 }
 
-static gboolean gaim_gtk_whiteboard_brush_down(GtkWidget *widget, GdkEventButton *event, gpointer data)
+static gboolean pidgin_whiteboard_brush_down(GtkWidget *widget, GdkEventButton *event, gpointer data)
 {
-	GaimGtkWhiteboard *gtkwb = (GaimGtkWhiteboard*)data;
+	PidginWhiteboard *gtkwb = (PidginWhiteboard*)data;
 	GdkPixmap *pixmap = gtkwb->pixmap;
 
 	GaimWhiteboard *wb = gtkwb->wb;
@@ -424,7 +424,7 @@
 		draw_list = g_list_append(draw_list, GINT_TO_POINTER(LastX));
 		draw_list = g_list_append(draw_list, GINT_TO_POINTER(LastY));
 
-		gaim_gtk_whiteboard_draw_brush_point(gtkwb->wb,
+		pidgin_whiteboard_draw_brush_point(gtkwb->wb,
 											 event->x, event->y,
 											 gtkwb->brush_color, gtkwb->brush_size);
 	}
@@ -434,7 +434,7 @@
 	return TRUE;
 }
 
-static gboolean gaim_gtk_whiteboard_brush_motion(GtkWidget *widget, GdkEventMotion *event, gpointer data)
+static gboolean pidgin_whiteboard_brush_motion(GtkWidget *widget, GdkEventMotion *event, gpointer data)
 {
 	int x;
 	int y;
@@ -443,7 +443,7 @@
 
 	GdkModifierType state;
 
-	GaimGtkWhiteboard *gtkwb = (GaimGtkWhiteboard*)data;
+	PidginWhiteboard *gtkwb = (PidginWhiteboard*)data;
 	GdkPixmap *pixmap = gtkwb->pixmap;
 
 	GaimWhiteboard *wb = gtkwb->wb;
@@ -506,7 +506,7 @@
 		draw_list = g_list_append(draw_list, GINT_TO_POINTER(dx));
 		draw_list = g_list_append(draw_list, GINT_TO_POINTER(dy));
 
-		gaim_gtk_whiteboard_draw_brush_line(gtkwb->wb,
+		pidgin_whiteboard_draw_brush_line(gtkwb->wb,
 											LastX, LastY,
 											x, y,
 											gtkwb->brush_color, gtkwb->brush_size);
@@ -521,9 +521,9 @@
 	return TRUE;
 }
 
-static gboolean gaim_gtk_whiteboard_brush_up(GtkWidget *widget, GdkEventButton *event, gpointer data)
+static gboolean pidgin_whiteboard_brush_up(GtkWidget *widget, GdkEventButton *event, gpointer data)
 {
-	GaimGtkWhiteboard *gtkwb = (GaimGtkWhiteboard*)data;
+	PidginWhiteboard *gtkwb = (PidginWhiteboard*)data;
 	GdkPixmap *pixmap = gtkwb->pixmap;
 
 	GaimWhiteboard *wb = gtkwb->wb;
@@ -565,7 +565,7 @@
 		/* Send draw list to prpl draw_list handler */
 		gaim_whiteboard_send_draw_list(gtkwb->wb, draw_list);
 
-		gaim_gtk_whiteboard_set_canvas_as_icon(gtkwb);
+		pidgin_whiteboard_set_canvas_as_icon(gtkwb);
 
 		/* The brush stroke is finished, clear the list for another one */
 		if(draw_list)
@@ -577,9 +577,9 @@
 	return TRUE;
 }
 
-static void gaim_gtk_whiteboard_draw_brush_point(GaimWhiteboard *wb, int x, int y, int color, int size)
+static void pidgin_whiteboard_draw_brush_point(GaimWhiteboard *wb, int x, int y, int color, int size)
 {
-	GaimGtkWhiteboard *gtkwb = wb->ui_data;
+	PidginWhiteboard *gtkwb = wb->ui_data;
 	GtkWidget *widget = gtkwb->drawing_area;
 	GdkPixmap *pixmap = gtkwb->pixmap;
 
@@ -594,7 +594,7 @@
 	update_rect.height = size;
 
 	/* Interpret and convert color */
-	gaim_gtk_whiteboard_rgb24_to_rgb48(color, &col);
+	pidgin_whiteboard_rgb24_to_rgb48(color, &col);
 
 	gdk_gc_set_rgb_fg_color(gfx_con, &col);
 	/* gdk_gc_set_rgb_bg_color(gfx_con, &col); */
@@ -630,7 +630,7 @@
 }
 
 /* Uses Bresenham's algorithm (as provided by Wikipedia) */
-static void gaim_gtk_whiteboard_draw_brush_line(GaimWhiteboard *wb, int x0, int y0, int x1, int y1, int color, int size)
+static void pidgin_whiteboard_draw_brush_line(GaimWhiteboard *wb, int x0, int y0, int x1, int y1, int color, int size)
 {
 	int temp;
 
@@ -674,9 +674,9 @@
 		ystep = -1;
 
 	if(steep)
-		gaim_gtk_whiteboard_draw_brush_point(wb, y, x, color, size);
+		pidgin_whiteboard_draw_brush_point(wb, y, x, color, size);
 	else
-		gaim_gtk_whiteboard_draw_brush_point(wb, x, y, color, size);
+		pidgin_whiteboard_draw_brush_point(wb, x, y, color, size);
 
 	while(x != x1)
 	{
@@ -690,31 +690,31 @@
 		}
 
 		if(steep)
-			gaim_gtk_whiteboard_draw_brush_point(wb, y, x, color, size);
+			pidgin_whiteboard_draw_brush_point(wb, y, x, color, size);
 		else
-			gaim_gtk_whiteboard_draw_brush_point(wb, x, y, color, size);
+			pidgin_whiteboard_draw_brush_point(wb, x, y, color, size);
 	}
 }
 
-static void gaim_gtk_whiteboard_set_dimensions(GaimWhiteboard *wb, int width, int height)
+static void pidgin_whiteboard_set_dimensions(GaimWhiteboard *wb, int width, int height)
 {
-	GaimGtkWhiteboard *gtkwb = wb->ui_data;
+	PidginWhiteboard *gtkwb = wb->ui_data;
 
 	gtkwb->width = width;
 	gtkwb->height = height;
 }
 
-static void gaim_gtk_whiteboard_set_brush(GaimWhiteboard *wb, int size, int color)
+static void pidgin_whiteboard_set_brush(GaimWhiteboard *wb, int size, int color)
 {
-	GaimGtkWhiteboard *gtkwb = wb->ui_data;
+	PidginWhiteboard *gtkwb = wb->ui_data;
 
 	gtkwb->brush_size = size;
 	gtkwb->brush_color = color;
 }
 
-static void gaim_gtk_whiteboard_clear(GaimWhiteboard *wb)
+static void pidgin_whiteboard_clear(GaimWhiteboard *wb)
 {
-	GaimGtkWhiteboard *gtkwb = wb->ui_data;
+	PidginWhiteboard *gtkwb = wb->ui_data;
 	GdkPixmap *pixmap = gtkwb->pixmap;
 	GtkWidget *drawing_area = gtkwb->drawing_area;
 
@@ -731,21 +731,21 @@
 							   drawing_area->allocation.height);
 }
 
-static void gaim_gtk_whiteboard_button_clear_press(GtkWidget *widget, gpointer data)
+static void pidgin_whiteboard_button_clear_press(GtkWidget *widget, gpointer data)
 {
-	GaimGtkWhiteboard *gtkwb = (GaimGtkWhiteboard*)(data);
+	PidginWhiteboard *gtkwb = (PidginWhiteboard*)(data);
 
-	gaim_gtk_whiteboard_clear(gtkwb->wb);
+	pidgin_whiteboard_clear(gtkwb->wb);
 
-	gaim_gtk_whiteboard_set_canvas_as_icon(gtkwb);
+	pidgin_whiteboard_set_canvas_as_icon(gtkwb);
 
 	/* Do protocol specific clearing procedures */
 	gaim_whiteboard_send_clear(gtkwb->wb);
 }
 
-static void gaim_gtk_whiteboard_button_save_press(GtkWidget *widget, gpointer data)
+static void pidgin_whiteboard_button_save_press(GtkWidget *widget, gpointer data)
 {
-	GaimGtkWhiteboard *gtkwb = (GaimGtkWhiteboard*)(data);
+	PidginWhiteboard *gtkwb = (PidginWhiteboard*)(data);
 	GdkPixbuf *pixbuf;
 
 	GtkWidget *dialog;
@@ -810,7 +810,7 @@
 	}
 }
 
-static void gaim_gtk_whiteboard_set_canvas_as_icon(GaimGtkWhiteboard *gtkwb)
+static void pidgin_whiteboard_set_canvas_as_icon(PidginWhiteboard *gtkwb)
 {
 	GdkPixbuf *pixbuf;
 
@@ -825,7 +825,7 @@
 	gtk_window_set_icon((GtkWindow*)(gtkwb->window), pixbuf);
 }
 
-static void gaim_gtk_whiteboard_rgb24_to_rgb48(int color_rgb, GdkColor *color)
+static void pidgin_whiteboard_rgb24_to_rgb48(int color_rgb, GdkColor *color)
 {
 	color->red   = (color_rgb >> 8) | 0xFF;
 	color->green = (color_rgb & 0xFF00) | 0xFF;
@@ -833,7 +833,7 @@
 }
 
 static void
-change_color_cb(GtkColorSelection *selection, GaimGtkWhiteboard *gtkwb)
+change_color_cb(GtkColorSelection *selection, PidginWhiteboard *gtkwb)
 {
 	GdkColor color;
 	int old_size = 5;
@@ -855,7 +855,7 @@
 	gtk_widget_destroy(destroy);
 }
 
-static void color_select_dialog(GtkWidget *widget, GaimGtkWhiteboard *gtkwb)
+static void color_select_dialog(GtkWidget *widget, PidginWhiteboard *gtkwb)
 {
 	GdkColor color;
 	GtkColorSelectionDialog *dialog;
@@ -873,7 +873,7 @@
 
 	gtk_color_selection_set_has_palette(GTK_COLOR_SELECTION(dialog->colorsel), TRUE);
 
-	gaim_gtk_whiteboard_rgb24_to_rgb48(gtkwb->brush_color, &color);
+	pidgin_whiteboard_rgb24_to_rgb48(gtkwb->brush_color, &color);
 	gtk_color_selection_set_current_color(GTK_COLOR_SELECTION(dialog->colorsel), &color);
 
 	gtk_widget_show_all(GTK_WIDGET(dialog));
--- a/pidgin/gtkwhiteboard.h	Sat Feb 03 05:55:41 2007 +0000
+++ b/pidgin/gtkwhiteboard.h	Sat Feb 03 08:13:34 2007 +0000
@@ -22,8 +22,8 @@
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
-#ifndef _GAIM_GTKWHITEBOARD_H_
-#define _GAIM_GTKWHITEBOARD_H_
+#ifndef _PIDGINWHITEBOARD_H_
+#define _PIDGINWHITEBOARD_H_
 
 #include "gtkgaim.h"
 
@@ -41,9 +41,9 @@
 #define PALETTE_NUM_COLORS  7
 
 /**
- * A GaimGtkWhiteboard
+ * A PidginWhiteboard
  */
-typedef struct _GaimGtkWhiteboard
+typedef struct _PidginWhiteboard
 {
 	GaimWhiteboard *wb;      /**< backend data for this whiteboard */
 
@@ -56,14 +56,14 @@
 	int  height;             /**< Canvas height */
 	int brush_color;         /**< Foreground color */
 	int brush_size;          /**< Brush size */
-} GaimGtkWhiteboard;
+} PidginWhiteboard;
 
 #ifdef __cplusplus
 extern "C" {
 #endif /* __cplusplus */
 
 /*****************************************************************************/
-/** @name GaimGtkWhiteboard API                                              */
+/** @name PidginWhiteboard API                                              */
 /*****************************************************************************/
 /*@{*/
 
@@ -72,7 +72,7 @@
  *
  * @return The GtkWhiteboard UI Operations.
  */
-GaimWhiteboardUiOps *gaim_gtk_whiteboard_get_ui_ops( void );
+GaimWhiteboardUiOps *pidgin_whiteboard_get_ui_ops( void );
 
 /*@}*/
 
@@ -80,4 +80,4 @@
 }
 #endif /* __cplusplus */
 
-#endif /* _GAIM_GTKWHITEBOARD_H_ */
+#endif /* _PIDGINWHITEBOARD_H_ */
--- a/pidgin/pixmaps/emblems/16/Makefile.am	Sat Feb 03 05:55:41 2007 +0000
+++ b/pidgin/pixmaps/emblems/16/Makefile.am	Sat Feb 03 08:13:34 2007 +0000
@@ -8,7 +8,6 @@
 		free-for-chat.png \
 		game.png \
 		male.png \
-		message-pending.png \
 		mobile.png \
 		not-authorized.png \
 		qq-member.png \
Binary file pidgin/pixmaps/emblems/16/message-pending.png has changed
--- a/pidgin/pixmaps/emblems/16/scalable/Makefile.am	Sat Feb 03 05:55:41 2007 +0000
+++ b/pidgin/pixmaps/emblems/16/scalable/Makefile.am	Sat Feb 03 08:13:34 2007 +0000
@@ -6,7 +6,6 @@
 		free-for-chat.svg \
 		game.svg \
 		male.svg \
-		message-pending.svg \
 		mobile.svg \
 		not-authorized.svg \
 		qq-member.svg \
--- a/pidgin/pixmaps/emblems/16/scalable/message-pending.svg	Sat Feb 03 05:55:41 2007 +0000
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,365 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!-- Created with Inkscape (http://www.inkscape.org/) -->
-<svg
-   xmlns:dc="http://purl.org/dc/elements/1.1/"
-   xmlns:cc="http://web.resource.org/cc/"
-   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-   xmlns:svg="http://www.w3.org/2000/svg"
-   xmlns="http://www.w3.org/2000/svg"
-   xmlns:xlink="http://www.w3.org/1999/xlink"
-   xmlns:sodipodi="http://inkscape.sourceforge.net/DTD/s odipodi-0.dtd"
-   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   width="16"
-   height="16"
-   id="svg2"
-   sodipodi:version="0.32"
-   inkscape:version="0.43"
-   version="1.0"
-   sodipodi:docbase="/home/hbons/Desktop/Gaim Refresh/emblems"
-   sodipodi:docname="message-pending.svg"
-   inkscape:export-filename="/home/hbons/Desktop/Gaim Refresh/emblems/message-pending.png"
-   inkscape:export-xdpi="90"
-   inkscape:export-ydpi="90">
-  <defs
-     id="defs4">
-    <linearGradient
-       id="linearGradient2804">
-      <stop
-         style="stop-color:black;stop-opacity:0;"
-         offset="0"
-         id="stop2806" />
-      <stop
-         id="stop2812"
-         offset="0.5"
-         style="stop-color:black;stop-opacity:1;" />
-      <stop
-         style="stop-color:black;stop-opacity:0;"
-         offset="1"
-         id="stop2808" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient2804"
-       id="linearGradient2831"
-       gradientUnits="userSpaceOnUse"
-       x1="21.875"
-       y1="48.000977"
-       x2="21.875"
-       y2="40" />
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient2781"
-       id="radialGradient2829"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(2,0,0,0.8,36,8.8)"
-       cx="1"
-       cy="44"
-       fx="1"
-       fy="44"
-       r="5" />
-    <linearGradient
-       inkscape:collect="always"
-       id="linearGradient2781">
-      <stop
-         style="stop-color:black;stop-opacity:1;"
-         offset="0"
-         id="stop2783" />
-      <stop
-         style="stop-color:black;stop-opacity:0;"
-         offset="1"
-         id="stop2785" />
-    </linearGradient>
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient2781"
-       id="radialGradient2827"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(2,0,0,0.8,-13,-79.2)"
-       cx="1"
-       cy="44"
-       fx="1"
-       fy="44"
-       r="5" />
-    <linearGradient
-       inkscape:collect="always"
-       id="linearGradient2422">
-      <stop
-         style="stop-color:#dfe2dc;stop-opacity:1;"
-         offset="0"
-         id="stop2424" />
-      <stop
-         style="stop-color:#dfe2dc;stop-opacity:0;"
-         offset="1"
-         id="stop2426" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       id="linearGradient2260">
-      <stop
-         style="stop-color:#555753;stop-opacity:1;"
-         offset="0"
-         id="stop2262" />
-      <stop
-         style="stop-color:#555753;stop-opacity:0;"
-         offset="1"
-         id="stop2264" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       id="linearGradient3816">
-      <stop
-         style="stop-color:#000000;stop-opacity:1;"
-         offset="0"
-         id="stop3818" />
-      <stop
-         style="stop-color:#000000;stop-opacity:0;"
-         offset="1"
-         id="stop3820" />
-    </linearGradient>
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3816"
-       id="radialGradient3822"
-       cx="31.112698"
-       cy="19.008621"
-       fx="31.112698"
-       fy="19.008621"
-       r="8.6620579"
-       gradientUnits="userSpaceOnUse" />
-    <linearGradient
-       inkscape:collect="always"
-       id="linearGradient2200">
-      <stop
-         style="stop-color:#d3d7cf;stop-opacity:1;"
-         offset="0"
-         id="stop2202" />
-      <stop
-         style="stop-color:#d3d7cf;stop-opacity:0;"
-         offset="1"
-         id="stop2204" />
-    </linearGradient>
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient2200"
-       id="radialGradient2216"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(-2.522332,-1.518129e-16,-1.517788e-16,2.521765,40.1904,-21.83521)"
-       cx="9.9988937"
-       cy="8.963316"
-       fx="9.9988937"
-       fy="8.963316"
-       r="7.003407" />
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient2260"
-       id="radialGradient2266"
-       cx="11.756953"
-       cy="17.588654"
-       fx="11.756953"
-       fy="17.588654"
-       r="6.3436799"
-       gradientTransform="matrix(1,0,0,0.626667,1.8722e-15,6.566431)"
-       gradientUnits="userSpaceOnUse" />
-    <linearGradient
-       id="linearGradient3150"
-       inkscape:collect="always">
-      <stop
-         id="stop3152"
-         offset="0"
-         style="stop-color:#2e3436;stop-opacity:1;" />
-      <stop
-         id="stop3154"
-         offset="1"
-         style="stop-color:#2e3436;stop-opacity:0;" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient4130"
-       inkscape:collect="always">
-      <stop
-         id="stop4132"
-         offset="0"
-         style="stop-color:#babdb6;stop-opacity:1;" />
-      <stop
-         id="stop4134"
-         offset="1"
-         style="stop-color:#babdb6;stop-opacity:0;" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient4138"
-       inkscape:collect="always">
-      <stop
-         id="stop4140"
-         offset="0"
-         style="stop-color:#babdb6;stop-opacity:1;" />
-      <stop
-         id="stop4142"
-         offset="1"
-         style="stop-color:#babdb6;stop-opacity:0;" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient4146"
-       inkscape:collect="always">
-      <stop
-         id="stop4148"
-         offset="0"
-         style="stop-color:#ffffff;stop-opacity:1;" />
-      <stop
-         id="stop4150"
-         offset="1"
-         style="stop-color:#ffffff;stop-opacity:0;" />
-    </linearGradient>
-    <radialGradient
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1.257382,-2.683712e-16,1.506476e-16,0.665505,-3.088585,4.013937)"
-       r="8.96875"
-       fy="12"
-       fx="12"
-       cy="12"
-       cx="12"
-       id="radialGradient1484"
-       xlink:href="#linearGradient4146"
-       inkscape:collect="always" />
-    <linearGradient
-       gradientUnits="userSpaceOnUse"
-       y2="17.151861"
-       x2="12.015625"
-       y1="13.368965"
-       x1="12.015625"
-       id="linearGradient1482"
-       xlink:href="#linearGradient4138"
-       inkscape:collect="always" />
-    <linearGradient
-       gradientUnits="userSpaceOnUse"
-       y2="20.157516"
-       x2="12.015625"
-       y1="12.904307"
-       x1="12.015625"
-       id="linearGradient1480"
-       xlink:href="#linearGradient4130"
-       inkscape:collect="always" />
-    <radialGradient
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(-0.842757,5.698892e-16,-4.565819e-9,-0.35721,19.80716,14.19321)"
-       r="6.6449099"
-       fy="10.457643"
-       fx="10.748654"
-       cy="10.457643"
-       cx="10.748654"
-       id="radialGradient1478"
-       xlink:href="#linearGradient3150"
-       inkscape:collect="always" />
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3150"
-       id="radialGradient1518"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(-0.842757,5.698892e-16,-4.565819e-9,-0.35721,19.80716,14.19321)"
-       cx="10.748654"
-       cy="10.457643"
-       fx="10.748654"
-       fy="10.457643"
-       r="6.6449099" />
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient4146"
-       id="radialGradient1537"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1.257382,-2.683712e-16,1.506476e-16,0.665505,-3.088585,4.013937)"
-       cx="12"
-       cy="12"
-       fx="12"
-       fy="12"
-       r="8.96875" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient2422"
-       id="linearGradient2432"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.92783,0,0,1.001064,-0.823593,-7.013831)"
-       x1="9.5028229"
-       y1="12.832533"
-       x2="10.30435"
-       y2="12.031006" />
-  </defs>
-  <sodipodi:namedview
-     id="base"
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="1.0"
-     inkscape:pageopacity="0.0"
-     inkscape:pageshadow="2"
-     inkscape:zoom="29.556977"
-     inkscape:cx="14.103447"
-     inkscape:cy="8.3465311"
-     inkscape:document-units="px"
-     inkscape:current-layer="layer1"
-     showgrid="true"
-     fill="#d3d7cf"
-     inkscape:window-width="1268"
-     inkscape:window-height="971"
-     inkscape:window-x="6"
-     inkscape:window-y="21" />
-  <metadata
-     id="metadata7">
-    <rdf:RDF>
-      <cc:Work
-         rdf:about="">
-        <dc:format>image/svg+xml</dc:format>
-        <dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-      </cc:Work>
-    </rdf:RDF>
-  </metadata>
-  <g
-     inkscape:label="Layer 1"
-     inkscape:groupmode="layer"
-     id="layer1">
-    <rect
-       style="fill:#dfe2dc;fill-opacity:1;stroke:#888a85;stroke-width:1.00000072;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-       id="rect3198"
-       width="13.000139"
-       height="10.992994"
-       x="1.4998647"
-       y="2.5055699"
-       rx="1.3258357"
-       ry="1.3258338" />
-    <path
-       sodipodi:type="inkscape:offset"
-       inkscape:radius="-1.0251163"
-       inkscape:original="M 2.8125 2.5 C 2.077987 2.5 1.5 3.1092381 1.5 3.84375 L 1.5 12.1875 C 1.5 12.922012 2.0779871 13.5 2.8125 13.5 L 13.1875 13.5 C 13.922013 13.5 14.5 12.922012 14.5 12.1875 L 14.5 3.84375 C 14.5 3.1092381 13.922013 2.5 13.1875 2.5 L 2.8125 2.5 z "
-       xlink:href="#rect3198"
-       style="opacity:0.4;fill:none;fill-opacity:1;stroke:url(#radialGradient1537);stroke-width:1.00000036;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-       id="path4119"
-       inkscape:href="#rect3198"
-       d="M 2.8125,5.625 C 2.6448378,5.625 2.53125,5.7407625 2.53125,5.9375 L 2.53125,14.15625 C 2.53125,14.352987 2.6157624,14.4375 2.8125,14.4375 L 13.1875,14.4375 C 13.384238,14.4375 13.46875,14.352988 13.46875,14.15625 L 13.46875,5.9375 C 13.46875,5.7407629 13.355162,5.625 13.1875,5.625 L 2.8125,5.625 z "
-       transform="translate(-2.49527e-7,3.000449)" />
-    <path
-       style="fill:#dfe2dc;fill-opacity:1;stroke:#888a85;stroke-width:0.99999994;stroke-miterlimit:4;stroke-opacity:1"
-       d="M 13.592215,13.500304 L 2.4076597,13.500304 C 1.9049198,13.500304 1.5001876,12.987314 1.5001876,12.350102 L 7.9870143,6.4978147 L 14.499686,12.350102 C 14.499686,12.987314 14.094954,13.500304 13.592215,13.500304 z "
-       id="path4113"
-       sodipodi:nodetypes="cccccc" />
-    <path
-       sodipodi:type="inkscape:offset"
-       inkscape:radius="-1.0369591"
-       inkscape:original="M 8 6.5 L 1.5 12.34375 C 1.5 12.980962 1.90351 13.5 2.40625 13.5 L 13.59375 13.5 C 14.096489 13.5 14.5 12.980962 14.5 12.34375 L 8 6.5 z "
-       xlink:href="#path4113"
-       style="opacity:0.4;fill:none;fill-opacity:1;stroke:#ffffff;stroke-width:0.9999997;stroke-miterlimit:4;stroke-opacity:1"
-       id="path2434"
-       inkscape:href="#path4113"
-       d="M 7.96875,9.875 L 2.90625,14.4375 L 13.09375,14.4375 L 7.96875,9.875 z " />
-    <path
-       style="fill:url(#linearGradient2432);fill-opacity:1;stroke:#888a85;stroke-width:1.00000095;stroke-miterlimit:4;stroke-opacity:1"
-       d="M 13.583704,2.5043194 L 2.4031327,2.5043194 C 1.9005721,2.5043194 1.4959838,3.0164966 1.4959838,3.6526958 L 7.9805003,9.4956802 L 14.490853,3.6526958 C 14.490853,3.0164966 14.086265,2.5043194 13.583704,2.5043194 z "
-       id="path4122"
-       sodipodi:nodetypes="cccccc" />
-    <path
-       sodipodi:type="inkscape:offset"
-       inkscape:radius="-1.0758224"
-       inkscape:original="M 2.40625 2.5 C 1.9036894 2.5 1.5 3.0200508 1.5 3.65625 L 7.96875 9.5 L 14.5 3.65625 C 14.5 3.0200507 14.096311 2.5 13.59375 2.5 L 2.40625 2.5 z "
-       xlink:href="#path4122"
-       style="opacity:0.4;fill:none;fill-opacity:1;stroke:#ffffff;stroke-width:1.0000006;stroke-miterlimit:4;stroke-opacity:1"
-       id="path2430"
-       inkscape:href="#path4122"
-       d="M 3.03125,5.625 L 7.96875,10.0625 L 12.96875,5.625 L 3.03125,5.625 z " />
-  </g>
-</svg>
--- a/pidgin/pixmaps/emotes/default/22/Makefile.am	Sat Feb 03 05:55:41 2007 +0000
+++ b/pidgin/pixmaps/emotes/default/22/Makefile.am	Sat Feb 03 08:13:34 2007 +0000
@@ -125,6 +125,7 @@
 		shame.png \
 		sheep.png \
 		shock.png \
+		shout.png \
 		shut-mouth.png \
 		sick.png \
 		sigarette.png \
--- a/pidgin/pixmaps/emotes/default/22/scalable/Makefile.am	Sat Feb 03 05:55:41 2007 +0000
+++ b/pidgin/pixmaps/emotes/default/22/scalable/Makefile.am	Sat Feb 03 08:13:34 2007 +0000
@@ -118,6 +118,7 @@
 		shame.svg \
 		sheep.svg \
 		shock.svg \
+		shout.svg \
 		shut-mouth.svg \
 		sick.svg \
 		sigarette.svg \
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/pidgin/pixmaps/emotes/default/22/scalable/shout.svg	Sat Feb 03 08:13:34 2007 +0000
@@ -0,0 +1,170 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://web.resource.org/cc/"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:xlink="http://www.w3.org/1999/xlink"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   width="24"
+   height="24"
+   id="svg2"
+   sodipodi:version="0.32"
+   inkscape:version="0.44.1"
+   version="1.0"
+   sodipodi:docbase="/home/hbons/Desktop"
+   sodipodi:docname="shout.svg"
+   inkscape:export-filename="/home/hbons/Desktop/shout.png"
+   inkscape:export-xdpi="90"
+   inkscape:export-ydpi="90">
+  <defs
+     id="defs4">
+    <linearGradient
+       inkscape:collect="always"
+       id="linearGradient3150">
+      <stop
+         style="stop-color:#2e3436;stop-opacity:1;"
+         offset="0"
+         id="stop3152" />
+      <stop
+         style="stop-color:#2e3436;stop-opacity:0;"
+         offset="1"
+         id="stop3154" />
+    </linearGradient>
+    <linearGradient
+       inkscape:collect="always"
+       id="linearGradient3104">
+      <stop
+         style="stop-color:#eeeeec;stop-opacity:1;"
+         offset="0"
+         id="stop3106" />
+      <stop
+         style="stop-color:#eeeeec;stop-opacity:0;"
+         offset="1"
+         id="stop3108" />
+    </linearGradient>
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3104"
+       id="radialGradient3114"
+       cx="8.3343515"
+       cy="14.186539"
+       fx="8.3343515"
+       fy="14.186539"
+       r="9.975256"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(-0.9327,0.932656,-0.947494,-0.947449,33.02126,11.96667)" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3150"
+       id="radialGradient3156"
+       cx="10.748654"
+       cy="10.457643"
+       fx="10.748654"
+       fy="10.457643"
+       r="6.6449099"
+       gradientTransform="matrix(-0.842757,5.698892e-16,-4.565819e-9,-0.35721,19.80716,14.19321)"
+       gradientUnits="userSpaceOnUse" />
+  </defs>
+  <sodipodi:namedview
+     id="base"
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     inkscape:pageopacity="0.0"
+     inkscape:pageshadow="2"
+     inkscape:zoom="25.730843"
+     inkscape:cx="22.602397"
+     inkscape:cy="13.317176"
+     inkscape:document-units="px"
+     inkscape:current-layer="layer1"
+     showgrid="true"
+     fill="#babdb6"
+     inkscape:window-width="1268"
+     inkscape:window-height="971"
+     inkscape:window-x="6"
+     inkscape:window-y="23"
+     showguides="true"
+     inkscape:guide-bbox="true" />
+  <metadata
+     id="metadata7">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <g
+     inkscape:label="Layer 1"
+     inkscape:groupmode="layer"
+     id="layer1">
+    <path
+       sodipodi:type="arc"
+       style="opacity:0.6;fill:url(#radialGradient3156);fill-opacity:1.0;stroke:none;stroke-width:1;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       id="path3140"
+       sodipodi:cx="10.748654"
+       sodipodi:cy="10.457643"
+       sodipodi:rx="6.6449099"
+       sodipodi:ry="2.3675451"
+       d="M 17.393564 10.457643 A 6.6449099 2.3675451 0 1 1  4.1037445,10.457643 A 6.6449099 2.3675451 0 1 1  17.393564 10.457643 z"
+       transform="matrix(1.504911,0,0,1.300982,-4.175772,6.474929)" />
+    <path
+       sodipodi:type="arc"
+       style="opacity:1;fill:#edd400;fill-opacity:1;stroke:#f57900;stroke-width:1.05276573;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       id="path1307"
+       sodipodi:cx="11.806158"
+       sodipodi:cy="10.983024"
+       sodipodi:rx="9.975256"
+       sodipodi:ry="9.975256"
+       d="M 21.781414 10.983024 A 9.975256 9.975256 0 1 1  1.8309021,10.983024 A 9.975256 9.975256 0 1 1  21.781414 10.983024 z"
+       transform="matrix(0.952236,0,0,0.952236,0.757713,1.541608)" />
+    <path
+       sodipodi:type="arc"
+       style="opacity:0.79545455;fill:url(#radialGradient3114);fill-opacity:1.0;stroke:none;stroke-width:1.05274069;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       id="path3102"
+       sodipodi:cx="11.806158"
+       sodipodi:cy="10.983024"
+       sodipodi:rx="9.975256"
+       sodipodi:ry="9.975256"
+       d="M 21.781414 10.983024 A 9.975256 9.975256 0 1 1  1.8309021,10.983024 A 9.975256 9.975256 0 1 1  21.781414 10.983024 z"
+       transform="matrix(0.8019,0,0,0.801938,2.532654,3.191833)" />
+    <path
+       sodipodi:type="arc"
+       style="opacity:0.5;fill:none;fill-opacity:1.0;stroke:#ffffff;stroke-width:1.17343897;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       id="path2184"
+       sodipodi:cx="11.806158"
+       sodipodi:cy="10.983024"
+       sodipodi:rx="9.975256"
+       sodipodi:ry="9.975256"
+       d="M 21.781414 10.983024 A 9.975256 9.975256 0 1 1  1.8309021,10.983024 A 9.975256 9.975256 0 1 1  21.781414 10.983024 z"
+       transform="matrix(0.852176,0,0,0.852216,1.93909,2.639626)" />
+    <path
+       style="fill:#2e3436;fill-opacity:1;stroke:none;stroke-width:1;stroke-miterlimit:4;stroke-opacity:1"
+       d="M 11.000001,9.9999999 C 11.000001,11.104 10.552001,12 10.000001,12 C 9.4480002,12 9,11.104 9,9.9999999 C 9,8.8959999 9.0000003,8.6363117 9.0000003,8 C 10.214913,8.726047 11.000001,8.8959999 11.000001,9.9999999 z "
+       id="path2224"
+       sodipodi:nodetypes="csscc"
+       transform="translate(0,-1)" />
+    <path
+       style="fill:#2e3436;fill-opacity:1;stroke:none;stroke-width:1;stroke-miterlimit:4;stroke-opacity:1"
+       d="M 13,10 C 13,11.104 13.448001,12 14.000001,12 C 14.552001,12 15.000002,11.104 15.000002,10 C 15.000002,8.8959999 15.000001,8.6363117 15.000001,8 C 13.785089,8.726047 13,8.8959999 13,10 z "
+       id="path2228"
+       sodipodi:nodetypes="csscc"
+       transform="translate(0,-1)" />
+    <path
+       sodipodi:type="arc"
+       style="opacity:1;fill:#2e3436;fill-opacity:1;stroke:none;stroke-width:1;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       id="path2251"
+       sodipodi:cx="9.3754778"
+       sodipodi:cy="13.4881"
+       sodipodi:rx="6.1556172"
+       sodipodi:ry="6.1556172"
+       d="M 15.531095 13.4881 A 6.1556172 6.1556172 0 1 1  3.2198606,13.4881 A 6.1556172 6.1556172 0 1 1  15.531095 13.4881 z"
+       transform="matrix(0.48736,0,0,0.568587,7.430769,7.830849)" />
+  </g>
+</svg>
Binary file pidgin/pixmaps/emotes/default/22/shout.png has changed
--- a/pidgin/pixmaps/emotes/default/22/theme	Sat Feb 03 05:55:41 2007 +0000
+++ b/pidgin/pixmaps/emotes/default/22/theme	Sat Feb 03 08:13:34 2007 +0000
@@ -19,6 +19,7 @@
 shut-mouth.png :-X
 moneymouth.png :-$
 foot-in-mouth.png :-!
+shout.png >:o >:O
 
 [MSN]
 smile.png :)
--- a/pidgin/pixmaps/status/16/Makefile.am	Sat Feb 03 05:55:41 2007 +0000
+++ b/pidgin/pixmaps/status/16/Makefile.am	Sat Feb 03 08:13:34 2007 +0000
@@ -1,14 +1,18 @@
 SUBDIRS = scalable
 
 EXTRA_DIST = 	available.png \
+		available_i.png \
 		away.png \
+		away_i.png \
 		busy.png \
+		busy_i.png \
 		chat.png \
 		extended-away.png \
+		extended-away_i.png \
 		half-operator.png \
-		invisible.png \
 		log-in.png \
 		log-out.png \
+		message-pending.png \
 		offline.png \
 		operator.png \
 		person.png
Binary file pidgin/pixmaps/status/16/available_i.png has changed
Binary file pidgin/pixmaps/status/16/away_i.png has changed
Binary file pidgin/pixmaps/status/16/busy_i.png has changed
Binary file pidgin/pixmaps/status/16/extended-away_i.png has changed
Binary file pidgin/pixmaps/status/16/invisible.png has changed
Binary file pidgin/pixmaps/status/16/message-pending.png has changed
--- a/pidgin/pixmaps/status/16/scalable/Makefile.am	Sat Feb 03 05:55:41 2007 +0000
+++ b/pidgin/pixmaps/status/16/scalable/Makefile.am	Sat Feb 03 08:13:34 2007 +0000
@@ -5,6 +5,7 @@
 		extended-away.svg \
 		log-in.svg \
 		log-out.svg \
+		message-pending.svg \
 		offline.svg \
 		person.svg
 
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/pidgin/pixmaps/status/16/scalable/message-pending.svg	Sat Feb 03 08:13:34 2007 +0000
@@ -0,0 +1,365 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://web.resource.org/cc/"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:xlink="http://www.w3.org/1999/xlink"
+   xmlns:sodipodi="http://inkscape.sourceforge.net/DTD/s odipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   width="16"
+   height="16"
+   id="svg2"
+   sodipodi:version="0.32"
+   inkscape:version="0.43"
+   version="1.0"
+   sodipodi:docbase="/home/hbons/Desktop/Gaim Refresh/emblems"
+   sodipodi:docname="message-pending.svg"
+   inkscape:export-filename="/home/hbons/Desktop/Gaim Refresh/emblems/message-pending.png"
+   inkscape:export-xdpi="90"
+   inkscape:export-ydpi="90">
+  <defs
+     id="defs4">
+    <linearGradient
+       id="linearGradient2804">
+      <stop
+         style="stop-color:black;stop-opacity:0;"
+         offset="0"
+         id="stop2806" />
+      <stop
+         id="stop2812"
+         offset="0.5"
+         style="stop-color:black;stop-opacity:1;" />
+      <stop
+         style="stop-color:black;stop-opacity:0;"
+         offset="1"
+         id="stop2808" />
+    </linearGradient>
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient2804"
+       id="linearGradient2831"
+       gradientUnits="userSpaceOnUse"
+       x1="21.875"
+       y1="48.000977"
+       x2="21.875"
+       y2="40" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient2781"
+       id="radialGradient2829"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(2,0,0,0.8,36,8.8)"
+       cx="1"
+       cy="44"
+       fx="1"
+       fy="44"
+       r="5" />
+    <linearGradient
+       inkscape:collect="always"
+       id="linearGradient2781">
+      <stop
+         style="stop-color:black;stop-opacity:1;"
+         offset="0"
+         id="stop2783" />
+      <stop
+         style="stop-color:black;stop-opacity:0;"
+         offset="1"
+         id="stop2785" />
+    </linearGradient>
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient2781"
+       id="radialGradient2827"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(2,0,0,0.8,-13,-79.2)"
+       cx="1"
+       cy="44"
+       fx="1"
+       fy="44"
+       r="5" />
+    <linearGradient
+       inkscape:collect="always"
+       id="linearGradient2422">
+      <stop
+         style="stop-color:#dfe2dc;stop-opacity:1;"
+         offset="0"
+         id="stop2424" />
+      <stop
+         style="stop-color:#dfe2dc;stop-opacity:0;"
+         offset="1"
+         id="stop2426" />
+    </linearGradient>
+    <linearGradient
+       inkscape:collect="always"
+       id="linearGradient2260">
+      <stop
+         style="stop-color:#555753;stop-opacity:1;"
+         offset="0"
+         id="stop2262" />
+      <stop
+         style="stop-color:#555753;stop-opacity:0;"
+         offset="1"
+         id="stop2264" />
+    </linearGradient>
+    <linearGradient
+       inkscape:collect="always"
+       id="linearGradient3816">
+      <stop
+         style="stop-color:#000000;stop-opacity:1;"
+         offset="0"
+         id="stop3818" />
+      <stop
+         style="stop-color:#000000;stop-opacity:0;"
+         offset="1"
+         id="stop3820" />
+    </linearGradient>
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3816"
+       id="radialGradient3822"
+       cx="31.112698"
+       cy="19.008621"
+       fx="31.112698"
+       fy="19.008621"
+       r="8.6620579"
+       gradientUnits="userSpaceOnUse" />
+    <linearGradient
+       inkscape:collect="always"
+       id="linearGradient2200">
+      <stop
+         style="stop-color:#d3d7cf;stop-opacity:1;"
+         offset="0"
+         id="stop2202" />
+      <stop
+         style="stop-color:#d3d7cf;stop-opacity:0;"
+         offset="1"
+         id="stop2204" />
+    </linearGradient>
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient2200"
+       id="radialGradient2216"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(-2.522332,-1.518129e-16,-1.517788e-16,2.521765,40.1904,-21.83521)"
+       cx="9.9988937"
+       cy="8.963316"
+       fx="9.9988937"
+       fy="8.963316"
+       r="7.003407" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient2260"
+       id="radialGradient2266"
+       cx="11.756953"
+       cy="17.588654"
+       fx="11.756953"
+       fy="17.588654"
+       r="6.3436799"
+       gradientTransform="matrix(1,0,0,0.626667,1.8722e-15,6.566431)"
+       gradientUnits="userSpaceOnUse" />
+    <linearGradient
+       id="linearGradient3150"
+       inkscape:collect="always">
+      <stop
+         id="stop3152"
+         offset="0"
+         style="stop-color:#2e3436;stop-opacity:1;" />
+      <stop
+         id="stop3154"
+         offset="1"
+         style="stop-color:#2e3436;stop-opacity:0;" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient4130"
+       inkscape:collect="always">
+      <stop
+         id="stop4132"
+         offset="0"
+         style="stop-color:#babdb6;stop-opacity:1;" />
+      <stop
+         id="stop4134"
+         offset="1"
+         style="stop-color:#babdb6;stop-opacity:0;" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient4138"
+       inkscape:collect="always">
+      <stop
+         id="stop4140"
+         offset="0"
+         style="stop-color:#babdb6;stop-opacity:1;" />
+      <stop
+         id="stop4142"
+         offset="1"
+         style="stop-color:#babdb6;stop-opacity:0;" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient4146"
+       inkscape:collect="always">
+      <stop
+         id="stop4148"
+         offset="0"
+         style="stop-color:#ffffff;stop-opacity:1;" />
+      <stop
+         id="stop4150"
+         offset="1"
+         style="stop-color:#ffffff;stop-opacity:0;" />
+    </linearGradient>
+    <radialGradient
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1.257382,-2.683712e-16,1.506476e-16,0.665505,-3.088585,4.013937)"
+       r="8.96875"
+       fy="12"
+       fx="12"
+       cy="12"
+       cx="12"
+       id="radialGradient1484"
+       xlink:href="#linearGradient4146"
+       inkscape:collect="always" />
+    <linearGradient
+       gradientUnits="userSpaceOnUse"
+       y2="17.151861"
+       x2="12.015625"
+       y1="13.368965"
+       x1="12.015625"
+       id="linearGradient1482"
+       xlink:href="#linearGradient4138"
+       inkscape:collect="always" />
+    <linearGradient
+       gradientUnits="userSpaceOnUse"
+       y2="20.157516"
+       x2="12.015625"
+       y1="12.904307"
+       x1="12.015625"
+       id="linearGradient1480"
+       xlink:href="#linearGradient4130"
+       inkscape:collect="always" />
+    <radialGradient
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(-0.842757,5.698892e-16,-4.565819e-9,-0.35721,19.80716,14.19321)"
+       r="6.6449099"
+       fy="10.457643"
+       fx="10.748654"
+       cy="10.457643"
+       cx="10.748654"
+       id="radialGradient1478"
+       xlink:href="#linearGradient3150"
+       inkscape:collect="always" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3150"
+       id="radialGradient1518"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(-0.842757,5.698892e-16,-4.565819e-9,-0.35721,19.80716,14.19321)"
+       cx="10.748654"
+       cy="10.457643"
+       fx="10.748654"
+       fy="10.457643"
+       r="6.6449099" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient4146"
+       id="radialGradient1537"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1.257382,-2.683712e-16,1.506476e-16,0.665505,-3.088585,4.013937)"
+       cx="12"
+       cy="12"
+       fx="12"
+       fy="12"
+       r="8.96875" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient2422"
+       id="linearGradient2432"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0.92783,0,0,1.001064,-0.823593,-7.013831)"
+       x1="9.5028229"
+       y1="12.832533"
+       x2="10.30435"
+       y2="12.031006" />
+  </defs>
+  <sodipodi:namedview
+     id="base"
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     inkscape:pageopacity="0.0"
+     inkscape:pageshadow="2"
+     inkscape:zoom="29.556977"
+     inkscape:cx="14.103447"
+     inkscape:cy="8.3465311"
+     inkscape:document-units="px"
+     inkscape:current-layer="layer1"
+     showgrid="true"
+     fill="#d3d7cf"
+     inkscape:window-width="1268"
+     inkscape:window-height="971"
+     inkscape:window-x="6"
+     inkscape:window-y="21" />
+  <metadata
+     id="metadata7">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <g
+     inkscape:label="Layer 1"
+     inkscape:groupmode="layer"
+     id="layer1">
+    <rect
+       style="fill:#dfe2dc;fill-opacity:1;stroke:#888a85;stroke-width:1.00000072;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       id="rect3198"
+       width="13.000139"
+       height="10.992994"
+       x="1.4998647"
+       y="2.5055699"
+       rx="1.3258357"
+       ry="1.3258338" />
+    <path
+       sodipodi:type="inkscape:offset"
+       inkscape:radius="-1.0251163"
+       inkscape:original="M 2.8125 2.5 C 2.077987 2.5 1.5 3.1092381 1.5 3.84375 L 1.5 12.1875 C 1.5 12.922012 2.0779871 13.5 2.8125 13.5 L 13.1875 13.5 C 13.922013 13.5 14.5 12.922012 14.5 12.1875 L 14.5 3.84375 C 14.5 3.1092381 13.922013 2.5 13.1875 2.5 L 2.8125 2.5 z "
+       xlink:href="#rect3198"
+       style="opacity:0.4;fill:none;fill-opacity:1;stroke:url(#radialGradient1537);stroke-width:1.00000036;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       id="path4119"
+       inkscape:href="#rect3198"
+       d="M 2.8125,5.625 C 2.6448378,5.625 2.53125,5.7407625 2.53125,5.9375 L 2.53125,14.15625 C 2.53125,14.352987 2.6157624,14.4375 2.8125,14.4375 L 13.1875,14.4375 C 13.384238,14.4375 13.46875,14.352988 13.46875,14.15625 L 13.46875,5.9375 C 13.46875,5.7407629 13.355162,5.625 13.1875,5.625 L 2.8125,5.625 z "
+       transform="translate(-2.49527e-7,3.000449)" />
+    <path
+       style="fill:#dfe2dc;fill-opacity:1;stroke:#888a85;stroke-width:0.99999994;stroke-miterlimit:4;stroke-opacity:1"
+       d="M 13.592215,13.500304 L 2.4076597,13.500304 C 1.9049198,13.500304 1.5001876,12.987314 1.5001876,12.350102 L 7.9870143,6.4978147 L 14.499686,12.350102 C 14.499686,12.987314 14.094954,13.500304 13.592215,13.500304 z "
+       id="path4113"
+       sodipodi:nodetypes="cccccc" />
+    <path
+       sodipodi:type="inkscape:offset"
+       inkscape:radius="-1.0369591"
+       inkscape:original="M 8 6.5 L 1.5 12.34375 C 1.5 12.980962 1.90351 13.5 2.40625 13.5 L 13.59375 13.5 C 14.096489 13.5 14.5 12.980962 14.5 12.34375 L 8 6.5 z "
+       xlink:href="#path4113"
+       style="opacity:0.4;fill:none;fill-opacity:1;stroke:#ffffff;stroke-width:0.9999997;stroke-miterlimit:4;stroke-opacity:1"
+       id="path2434"
+       inkscape:href="#path4113"
+       d="M 7.96875,9.875 L 2.90625,14.4375 L 13.09375,14.4375 L 7.96875,9.875 z " />
+    <path
+       style="fill:url(#linearGradient2432);fill-opacity:1;stroke:#888a85;stroke-width:1.00000095;stroke-miterlimit:4;stroke-opacity:1"
+       d="M 13.583704,2.5043194 L 2.4031327,2.5043194 C 1.9005721,2.5043194 1.4959838,3.0164966 1.4959838,3.6526958 L 7.9805003,9.4956802 L 14.490853,3.6526958 C 14.490853,3.0164966 14.086265,2.5043194 13.583704,2.5043194 z "
+       id="path4122"
+       sodipodi:nodetypes="cccccc" />
+    <path
+       sodipodi:type="inkscape:offset"
+       inkscape:radius="-1.0758224"
+       inkscape:original="M 2.40625 2.5 C 1.9036894 2.5 1.5 3.0200508 1.5 3.65625 L 7.96875 9.5 L 14.5 3.65625 C 14.5 3.0200507 14.096311 2.5 13.59375 2.5 L 2.40625 2.5 z "
+       xlink:href="#path4122"
+       style="opacity:0.4;fill:none;fill-opacity:1;stroke:#ffffff;stroke-width:1.0000006;stroke-miterlimit:4;stroke-opacity:1"
+       id="path2430"
+       inkscape:href="#path4122"
+       d="M 3.03125,5.625 L 7.96875,10.0625 L 12.96875,5.625 L 3.03125,5.625 z " />
+  </g>
+</svg>
--- a/pidgin/plugins/cap/cap.c	Sat Feb 03 05:55:41 2007 +0000
+++ b/pidgin/plugins/cap/cap.c	Sat Feb 03 08:13:34 2007 +0000
@@ -714,7 +714,7 @@
 	/*gaim_signal_connect(gaim_blist_get_handle(), "blist-node-extended-menu", plugin,
 			GAIM_CALLBACK(blist_node_extended_menu), NULL);*/
 
-	gaim_signal_connect(gaim_gtk_blist_get_handle(), "drawing-tooltip", plugin,
+	gaim_signal_connect(pidgin_blist_get_handle(), "drawing-tooltip", plugin,
 			GAIM_CALLBACK(drawing_tooltip), NULL);
 
 	gaim_signal_connect(gaim_connections_get_handle(), "signed-on", plugin,
@@ -765,7 +765,7 @@
 	/*gaim_signal_disconnect(gaim_blist_get_handle(), "blist-node-extended-menu", plugin,
 			GAIM_CALLBACK(blist_node_extended_menu));*/
 
-	gaim_signal_disconnect(gaim_gtk_blist_get_handle(), "drawing-tooltip", plugin,
+	gaim_signal_disconnect(pidgin_blist_get_handle(), "drawing-tooltip", plugin,
 			GAIM_CALLBACK(drawing_tooltip));
 
 	gaim_signal_disconnect(gaim_connections_get_handle(), "signed-on", plugin,
@@ -807,7 +807,7 @@
 
 	ui->ret = gtk_vbox_new(FALSE, 18);
 	gtk_container_set_border_width(GTK_CONTAINER(ui->ret), 10);
-	ui->cap_vbox = gaim_gtk_make_frame(ui->ret, _("Statistics Configuration"));
+	ui->cap_vbox = pidgin_make_frame(ui->ret, _("Statistics Configuration"));
 
 	/* msg_difference spinner */
 	ui->msg_difference_label = gtk_label_new(_("Maximum response timeout:"));
@@ -916,7 +916,7 @@
 	gaim_prefs_set_int(user_data, gtk_spin_button_get_value_as_int(spinbutton));
 }
 
-static GaimGtkPluginUiInfo ui_info = {
+static PidginPluginUiInfo ui_info = {
 	get_config_frame,
 	0 /* page_num (reserved) */
 };
@@ -926,7 +926,7 @@
 	GAIM_MAJOR_VERSION,
 	GAIM_MINOR_VERSION,
 	GAIM_PLUGIN_STANDARD,							/**< type		*/
-	GAIM_GTK_PLUGIN_TYPE,							/**< ui_requirement */
+	PIDGIN_PLUGIN_TYPE,							/**< ui_requirement */
 	0,												/**< flags		*/
 	NULL,											/**< dependencies   */
 	GAIM_PRIORITY_DEFAULT,							/**< priority		*/
--- a/pidgin/plugins/contact_priority.c	Sat Feb 03 05:55:41 2007 +0000
+++ b/pidgin/plugins/contact_priority.c	Sat Feb 03 08:13:34 2007 +0000
@@ -87,7 +87,7 @@
 	ret = gtk_vbox_new(FALSE, 18);
 	gtk_container_set_border_width(GTK_CONTAINER(ret), 12);
 
-	frame = gaim_gtk_make_frame(ret, _("Point values to use when..."));
+	frame = pidgin_make_frame(ret, _("Point values to use when..."));
 
 	vbox = gtk_vbox_new(FALSE, 5);
 	gtk_container_add(GTK_CONTAINER(frame), vbox);
@@ -127,7 +127,7 @@
 	g_signal_connect(G_OBJECT(check), "toggled", G_CALLBACK(pref_update), "/core/contact/last_match");
 	gtk_box_pack_start(GTK_BOX(hbox), check, FALSE, FALSE, 0);
 
-	frame = gaim_gtk_make_frame(ret, _("Point values to use for account..."));
+	frame = pidgin_make_frame(ret, _("Point values to use for account..."));
 
 	vbox = gtk_vbox_new(FALSE, 5);
 	gtk_container_add(GTK_CONTAINER(frame), vbox);
@@ -141,7 +141,7 @@
 	adj = gtk_adjustment_new(0, -500, 500, 1, 1, 1);
 	spin = gtk_spin_button_new((GtkAdjustment *)adj, 1, 0);
 
-	optmenu = gaim_gtk_account_option_menu_new(NULL, TRUE,
+	optmenu = pidgin_account_option_menu_new(NULL, TRUE,
 																						 G_CALLBACK(select_account),
 																						 NULL, spin);
 	gtk_box_pack_start(GTK_BOX(hbox), optmenu, FALSE, FALSE, 0);
@@ -161,7 +161,7 @@
 	return ret;
 }
 
-static GaimGtkPluginUiInfo ui_info =
+static PidginPluginUiInfo ui_info =
 {
 	get_config_frame,
 	0 /* page_num (Reserved) */
@@ -173,7 +173,7 @@
 	GAIM_MAJOR_VERSION,
 	GAIM_MINOR_VERSION,
 	GAIM_PLUGIN_STANDARD,                             /**< type           */
-	GAIM_GTK_PLUGIN_TYPE,                             /**< ui_requirement */
+	PIDGIN_PLUGIN_TYPE,                             /**< ui_requirement */
 	0,                                                /**< flags          */
 	NULL,                                             /**< dependencies   */
 	GAIM_PRIORITY_DEFAULT,                            /**< priority       */
--- a/pidgin/plugins/convcolors.c	Sat Feb 03 05:55:41 2007 +0000
+++ b/pidgin/plugins/convcolors.c	Sat Feb 03 08:13:34 2007 +0000
@@ -160,10 +160,10 @@
 static gboolean
 plugin_load(GaimPlugin *plugin)
 {
-	gaim_signal_connect(gaim_gtk_conversations_get_handle(),
+	gaim_signal_connect(pidgin_conversations_get_handle(),
 					"displaying-im-msg", plugin,
 					GAIM_CALLBACK(displaying_msg), NULL);
-	gaim_signal_connect(gaim_gtk_conversations_get_handle(),
+	gaim_signal_connect(pidgin_conversations_get_handle(),
 					"displaying-chat-msg", plugin,
 					GAIM_CALLBACK(displaying_msg), NULL);
 	return TRUE;
@@ -271,7 +271,7 @@
 		g_snprintf(tmp, sizeof(tmp), "%s/format", formats[i].prefix);
 		f = gaim_prefs_get_int(tmp);
 
-		frame = gaim_gtk_make_frame(ret, _(formats[i].text));
+		frame = pidgin_make_frame(ret, _(formats[i].text));
 		vbox = gtk_vbox_new(FALSE, GAIM_HIG_BOX_SPACE);
 		gtk_box_pack_start(GTK_BOX(frame), vbox, FALSE, FALSE, 0);
 
@@ -306,16 +306,16 @@
 				G_CALLBACK(toggle_underline), formats[i].prefix);
 	}
 
-	frame = gaim_gtk_make_frame(ret, _("General"));
-	gaim_gtk_prefs_checkbox(_("Ignore incoming format"), PREF_IGNORE, frame);
-	gaim_gtk_prefs_checkbox(_("Apply in Chats"), PREF_CHATS, frame);
-	gaim_gtk_prefs_checkbox(_("Apply in IMs"), PREF_IMS, frame);
+	frame = pidgin_make_frame(ret, _("General"));
+	pidgin_prefs_checkbox(_("Ignore incoming format"), PREF_IGNORE, frame);
+	pidgin_prefs_checkbox(_("Apply in Chats"), PREF_CHATS, frame);
+	pidgin_prefs_checkbox(_("Apply in IMs"), PREF_IMS, frame);
 
 	gtk_widget_show_all(ret);
 	return ret;
 }
 
-static GaimGtkPluginUiInfo ui_info = 
+static PidginPluginUiInfo ui_info = 
 {
 	get_config_frame,
 	0,
@@ -327,7 +327,7 @@
 	GAIM_MAJOR_VERSION,           /* Gaim Major Version */
 	GAIM_MINOR_VERSION,           /* Gaim Minor Version */
 	GAIM_PLUGIN_STANDARD,         /* plugin type        */
-	GAIM_GTK_PLUGIN_TYPE,         /* ui requirement     */
+	PIDGIN_PLUGIN_TYPE,         /* ui requirement     */
 	0,                            /* flags              */
 	NULL,                         /* dependencies       */
 	GAIM_PRIORITY_DEFAULT,        /* priority           */
--- a/pidgin/plugins/crazychat/cc_gaim_plugin.c	Sat Feb 03 05:55:41 2007 +0000
+++ b/pidgin/plugins/crazychat/cc_gaim_plugin.c	Sat Feb 03 08:13:34 2007 +0000
@@ -130,14 +130,14 @@
 
 #define CRAZYCHAT_PLUGIN_ID "gtk-crazychat"
 
-static GaimGtkPluginUiInfo ui_info = {
+static PidginPluginUiInfo ui_info = {
 	get_config_frame				/**< get_config_frame */
 };
 
 static GaimPluginInfo info = {
 	2,						  /**< api_version    */
 	GAIM_PLUGIN_STANDARD,				  /**< type           */
-	GAIM_GTK_PLUGIN_TYPE,				  /**< ui_requirement */
+	PIDGIN_PLUGIN_TYPE,				  /**< ui_requirement */
 	0,						  /**< flags          */
 	NULL,						  /**< dependencies   */
 	GAIM_PRIORITY_DEFAULT,				  /**< priority       */
@@ -292,7 +292,7 @@
 	gtk_container_set_border_width(GTK_CONTAINER(ret), 12);
 
 	/* make the network configuration frame */
-	frame = gaim_gtk_make_frame(ret, _("Network Configuration"));
+	frame = pidgin_make_frame(ret, _("Network Configuration"));
 	gtk_widget_show(frame);
 
 	/* add boxes for packing purposes */
@@ -326,7 +326,7 @@
 	gtk_widget_show(spinner);
 
 	/* make the feature configuration frame */
-	frame = gaim_gtk_make_frame(ret, _("Feature Calibration"));
+	frame = pidgin_make_frame(ret, _("Feature Calibration"));
 	gtk_widget_show(frame);
 
 	/* add hbox for packing purposes */
@@ -412,7 +412,7 @@
 	gaim_signal_disconnect
 	    (gaim_connections_get_handle(), "signed-on",
 	     plugin, GAIM_CALLBACK(cc_signed_on));
-	gaim_signal_connect(GAIM_GTK_BLIST
+	gaim_signal_connect(PIDGIN_BLIST
 			    (gaim_get_blist()),
 			    "drawing-menu", plugin,
 			    GAIM_CALLBACK(cc_buddy_menu), NULL);
@@ -435,7 +435,7 @@
 	cc_init(&cc_info);
 	buddy_list = gaim_get_blist();
 	if (buddy_list) {
-		gaim_signal_connect(GAIM_GTK_BLIST
+		gaim_signal_connect(PIDGIN_BLIST
 				    (buddy_list),
 				    "drawing-menu", plugin,
 				    GAIM_CALLBACK(cc_buddy_menu), NULL);
@@ -463,7 +463,7 @@
 	extra = (struct crazychat*) plugin->info->extra_info;
 	cc_destroy(extra);
 	conv_handle = gaim_conversations_get_handle();
-	gaim_signal_disconnect(GAIM_GTK_BLIST
+	gaim_signal_disconnect(PIDGIN_BLIST
 			       (gaim_get_blist()),
 			       "drawing-menu", plugin,
 			       GAIM_CALLBACK(cc_buddy_menu));
--- a/pidgin/plugins/extplacement.c	Sat Feb 03 05:55:41 2007 +0000
+++ b/pidgin/plugins/extplacement.c	Sat Feb 03 08:13:34 2007 +0000
@@ -29,47 +29,47 @@
 #include "gtkconvwin.h"
 
 static void
-conv_placement_by_number(GaimGtkConversation *conv)
+conv_placement_by_number(PidginConversation *conv)
 {
-	GaimGtkWindow *win = NULL;
+	PidginWindow *win = NULL;
 	GList *wins = NULL;
 
 	if (gaim_prefs_get_bool("/plugins/gtk/extplacement/placement_number_separate"))
-		win = gaim_gtk_conv_window_last_with_type(gaim_conversation_get_type(conv->active_conv));
-	else if ((wins = gaim_gtk_conv_windows_get_list()) != NULL)
+		win = pidgin_conv_window_last_with_type(gaim_conversation_get_type(conv->active_conv));
+	else if ((wins = pidgin_conv_windows_get_list()) != NULL)
 		win = g_list_last(wins)->data;
 
 	if (win == NULL) {
-		win = gaim_gtk_conv_window_new();
+		win = pidgin_conv_window_new();
 
-		gaim_gtk_conv_window_add_gtkconv(win, conv);
-		gaim_gtk_conv_window_show(win);
+		pidgin_conv_window_add_gtkconv(win, conv);
+		pidgin_conv_window_show(win);
 	} else {
 		int max_count = gaim_prefs_get_int("/plugins/gtk/extplacement/placement_number");
-		int count = gaim_gtk_conv_window_get_gtkconv_count(win);
+		int count = pidgin_conv_window_get_gtkconv_count(win);
 
 		if (count < max_count)
-			gaim_gtk_conv_window_add_gtkconv(win, conv);
+			pidgin_conv_window_add_gtkconv(win, conv);
 		else {
 			GList *l = NULL;
 
-			for (l = gaim_gtk_conv_windows_get_list(); l != NULL; l = l->next) {
+			for (l = pidgin_conv_windows_get_list(); l != NULL; l = l->next) {
 				win = l->data;
 
 				if (gaim_prefs_get_bool("/plugins/gtk/extplacement/placement_number_separate") &&
-					gaim_conversation_get_type(gaim_gtk_conv_window_get_active_conversation(win)) != gaim_conversation_get_type(conv->active_conv))
+					gaim_conversation_get_type(pidgin_conv_window_get_active_conversation(win)) != gaim_conversation_get_type(conv->active_conv))
 					continue;
 
-				count = gaim_gtk_conv_window_get_gtkconv_count(win);
+				count = pidgin_conv_window_get_gtkconv_count(win);
 				if (count < max_count) {
-					gaim_gtk_conv_window_add_gtkconv(win, conv);
+					pidgin_conv_window_add_gtkconv(win, conv);
 					return;
 				}
 			}
-			win = gaim_gtk_conv_window_new();
+			win = pidgin_conv_window_new();
 
-			gaim_gtk_conv_window_add_gtkconv(win, conv);
-			gaim_gtk_conv_window_show(win);
+			pidgin_conv_window_add_gtkconv(win, conv);
+			pidgin_conv_window_show(win);
 		}
 	}
 }
@@ -77,7 +77,7 @@
 static gboolean
 plugin_load(GaimPlugin *plugin)
 {
-	gaim_gtkconv_placement_add_fnc("number", _("By conversation count"),
+	pidgin_conv_placement_add_fnc("number", _("By conversation count"),
 							   &conv_placement_by_number);
 	gaim_prefs_trigger_callback("/gaim/gtk/conversations/placement");
 	return TRUE;
@@ -86,7 +86,7 @@
 static gboolean
 plugin_unload(GaimPlugin *plugin)
 {
-	gaim_gtkconv_placement_remove_fnc("number");
+	pidgin_conv_placement_remove_fnc("number");
 	gaim_prefs_trigger_callback("/gaim/gtk/conversations/placement");
 	return TRUE;
 }
@@ -127,7 +127,7 @@
 	GAIM_MAJOR_VERSION,
 	GAIM_MINOR_VERSION,
 	GAIM_PLUGIN_STANDARD,							/**< type			*/
-	GAIM_GTK_PLUGIN_TYPE,							/**< ui_requirement	*/
+	PIDGIN_PLUGIN_TYPE,							/**< ui_requirement	*/
 	0,												/**< flags			*/
 	NULL,											/**< dependencies	*/
 	GAIM_PRIORITY_DEFAULT,							/**< priority		*/
--- a/pidgin/plugins/gaiminc.c	Sat Feb 03 05:55:41 2007 +0000
+++ b/pidgin/plugins/gaiminc.c	Sat Feb 03 08:13:34 2007 +0000
@@ -6,7 +6,7 @@
 #include "conversation.h"
 #include "version.h"
 
-/* include UI for gaim_gtkdialogs_about() */
+/* include UI for pidgindialogs_about() */
 #include "gtkplugin.h"
 #include "gtkdialogs.h"
 
@@ -16,7 +16,7 @@
 echo_hi(GaimConnection *gc)
 {
 	/* this doesn't do much, just lets you know who we are :) */
-	gaim_gtkdialogs_about();
+	pidgindialogs_about();
 }
 
 static gboolean
--- a/pidgin/plugins/gaimrc.c	Sat Feb 03 05:55:41 2007 +0000
+++ b/pidgin/plugins/gaimrc.c	Sat Feb 03 08:13:34 2007 +0000
@@ -59,18 +59,18 @@
 static GtkWidget *widget_size_widgets[G_N_ELEMENTS(widget_size_prefs)];
 
 static const char *font_prefs[] = {
-	"/plugins/gtk/gaimrc/font/*gaim_gtkconv_entry",
-	"/plugins/gtk/gaimrc/font/*gaim_gtkconv_imhtml",
-	"/plugins/gtk/gaimrc/font/*gaim_gtklog_imhtml",
-	"/plugins/gtk/gaimrc/font/*gaim_gtkrequest_imhtml",
-	"/plugins/gtk/gaimrc/font/*gaim_gtknotify_imhtml",
+	"/plugins/gtk/gaimrc/font/*pidgin_conv_entry",
+	"/plugins/gtk/gaimrc/font/*pidgin_conv_imhtml",
+	"/plugins/gtk/gaimrc/font/*pidginlog_imhtml",
+	"/plugins/gtk/gaimrc/font/*pidginrequest_imhtml",
+	"/plugins/gtk/gaimrc/font/*pidginnotify_imhtml",
 };
 static const char *font_prefs_set[] = {
-	"/plugins/gtk/gaimrc/set/font/*gaim_gtkconv_entry",
-	"/plugins/gtk/gaimrc/set/font/*gaim_gtkconv_imhtml",
-	"/plugins/gtk/gaimrc/set/font/*gaim_gtklog_imhtml",
-	"/plugins/gtk/gaimrc/set/font/*gaim_gtkrequest_imhtml",
-	"/plugins/gtk/gaimrc/set/font/*gaim_gtknotify_imhtml",
+	"/plugins/gtk/gaimrc/set/font/*pidgin_conv_entry",
+	"/plugins/gtk/gaimrc/set/font/*pidgin_conv_imhtml",
+	"/plugins/gtk/gaimrc/set/font/*pidginlog_imhtml",
+	"/plugins/gtk/gaimrc/set/font/*pidginrequest_imhtml",
+	"/plugins/gtk/gaimrc/set/font/*pidginnotify_imhtml",
 };
 static const char *font_names[] = {
 	N_("Conversation Entry"),
@@ -431,7 +431,7 @@
 gaimrc_get_config_frame(GaimPlugin *plugin)
 {
 	/* Note: Intentionally not using the size group argument to the
-	 * gaim_gtk_prefs_labeled_* functions they only add the text label to
+	 * pidgin_prefs_labeled_* functions they only add the text label to
 	 * the size group not the whole thing, which isn't what I want. */
 	int i;
 	char *tmp;
@@ -445,12 +445,12 @@
 	labelsg  = gtk_size_group_new(GTK_SIZE_GROUP_HORIZONTAL);
 	widgetsg = gtk_size_group_new(GTK_SIZE_GROUP_HORIZONTAL);
 
-	frame = gaim_gtk_make_frame(ret, _("General"));
+	frame = pidgin_make_frame(ret, _("General"));
 	/* interface font */
 	hbox = gtk_hbox_new(FALSE, GAIM_HIG_CAT_SPACE);
 	gtk_box_pack_start(GTK_BOX(frame), hbox, FALSE, FALSE, 0);
 
-	check = gaim_gtk_prefs_checkbox(_("GTK+ Interface Font"),
+	check = pidgin_prefs_checkbox(_("GTK+ Interface Font"),
 	                                "/plugins/gtk/gaimrc/set/gtk-font-name",
 	                                hbox);
 	gtk_size_group_add_widget(labelsg, check);
@@ -462,7 +462,7 @@
 	gtk_widget_set_sensitive(widget,
 	                         gaim_prefs_get_bool("/plugins/gtk/gaimrc/set/gtk-font-name"));
 	g_signal_connect(G_OBJECT(check), "toggled",
-	                 G_CALLBACK(gaim_gtk_toggle_sensitive), widget);
+	                 G_CALLBACK(pidgin_toggle_sensitive), widget);
 	g_signal_connect(G_OBJECT(widget), "clicked",
 	                 G_CALLBACK(gaimrc_set_font_special), NULL);
 
@@ -470,12 +470,12 @@
 	hbox = gtk_hbox_new(FALSE, GAIM_HIG_CAT_SPACE);
 	gtk_box_pack_start(GTK_BOX(frame), hbox, FALSE, FALSE, 0);
 
-	check = gaim_gtk_prefs_checkbox(_("GTK+ Text Shortcut Theme"),
+	check = pidgin_prefs_checkbox(_("GTK+ Text Shortcut Theme"),
 	                                "/plugins/gtk/gaimrc/set/gtk-key-theme-name",
 	                                hbox);
 	gtk_size_group_add_widget(labelsg, check);
 
-	widget = gaim_gtk_prefs_labeled_entry(hbox, "",
+	widget = pidgin_prefs_labeled_entry(hbox, "",
 	                                      "/plugins/gtk/gaimrc/gtk-key-theme-name",
 	                                      NULL);
 	/*
@@ -484,34 +484,34 @@
 	gtk_widget_set_sensitive(widget,
 	                         gaim_prefs_get_bool("/plugins/gtk/gaimrc/set/gtk-key-theme-name"));
 	g_signal_connect(G_OBJECT(check), "toggled",
-	                 G_CALLBACK(gaim_gtk_toggle_sensitive), widget);
+	                 G_CALLBACK(pidgin_toggle_sensitive), widget);
 
 	for (i = 0; i < G_N_ELEMENTS(widget_bool_prefs); i++) {
 		hbox = gtk_hbox_new(FALSE, GAIM_HIG_CAT_SPACE);
 		gtk_box_pack_start(GTK_BOX(frame), hbox, FALSE, FALSE, 0);
 
-		check = gaim_gtk_prefs_checkbox(_(widget_bool_names[i]),
+		check = pidgin_prefs_checkbox(_(widget_bool_names[i]),
 		                                widget_bool_prefs_set[i], hbox);
 		gtk_size_group_add_widget(labelsg, check);
 
-		widget_bool_widgets[i] = gaim_gtk_prefs_checkbox("", widget_bool_prefs[i], hbox);
+		widget_bool_widgets[i] = pidgin_prefs_checkbox("", widget_bool_prefs[i], hbox);
 		/*
 		gtk_size_group_add_widget(widgetsb, widget_bool_widgets[i]);
 		*/
 		gtk_widget_set_sensitive(widget_bool_widgets[i],
 		                         gaim_prefs_get_bool(widget_bool_prefs_set[i]));
 		g_signal_connect(G_OBJECT(check), "toggled",
-		                 G_CALLBACK(gaim_gtk_toggle_sensitive),
+		                 G_CALLBACK(pidgin_toggle_sensitive),
 		                 widget_bool_widgets[i]);
 	}
 
-	frame = gaim_gtk_make_frame(ret, _("Interface colors"));
+	frame = pidgin_make_frame(ret, _("Interface colors"));
 	/* imhtml stuff */
 	for (i = 0; i < G_N_ELEMENTS(color_prefs); i++) {
 		hbox = gtk_hbox_new(FALSE, GAIM_HIG_CAT_SPACE);
 		gtk_box_pack_start(GTK_BOX(frame), hbox, FALSE, FALSE, 0);
 
-		check = gaim_gtk_prefs_checkbox(_(color_names[i]),
+		check = pidgin_prefs_checkbox(_(color_names[i]),
 		                                color_prefs_set[i], hbox);
 		gtk_size_group_add_widget(labelsg, check);
 
@@ -522,41 +522,41 @@
 		gtk_widget_set_sensitive(color_widgets[i],
 		                         gaim_prefs_get_bool(color_prefs_set[i]));
 		g_signal_connect(G_OBJECT(check), "toggled",
-		                 G_CALLBACK(gaim_gtk_toggle_sensitive),
+		                 G_CALLBACK(pidgin_toggle_sensitive),
 		                 color_widgets[i]);
 		g_signal_connect(G_OBJECT(color_widgets[i]), "clicked",
 		                 G_CALLBACK(gaimrc_set_color),
 		                 GINT_TO_POINTER(i));
 	}
 
-	frame = gaim_gtk_make_frame(ret, _("Widget Sizes"));
+	frame = pidgin_make_frame(ret, _("Widget Sizes"));
 	/* widget size stuff */
 	for (i = 0; i < G_N_ELEMENTS(widget_size_prefs); i++) {
 		hbox = gtk_hbox_new(FALSE, GAIM_HIG_CAT_SPACE);
 		gtk_box_pack_start(GTK_BOX(frame), hbox, FALSE, FALSE, 0);
 
-		check = gaim_gtk_prefs_checkbox(_(widget_size_names[i]),
+		check = pidgin_prefs_checkbox(_(widget_size_names[i]),
 		                                widget_size_prefs_set[i], hbox);
 		gtk_size_group_add_widget(labelsg, check);
 
-		widget_size_widgets[i] = gaim_gtk_prefs_labeled_spin_button(hbox, "", widget_size_prefs[i], 0, 50, NULL);
+		widget_size_widgets[i] = pidgin_prefs_labeled_spin_button(hbox, "", widget_size_prefs[i], 0, 50, NULL);
 		/*
 		gtk_size_group_add_widget(widgetsg, widget_size_widgets[i]);
 		*/
 		gtk_widget_set_sensitive(widget_size_widgets[i],
 		                         gaim_prefs_get_bool(widget_size_prefs_set[i]));
 		g_signal_connect(G_OBJECT(check), "toggled",
-		                 G_CALLBACK(gaim_gtk_toggle_sensitive),
+		                 G_CALLBACK(pidgin_toggle_sensitive),
 		                 widget_size_widgets[i]);
 	}
 
-	frame = gaim_gtk_make_frame(ret, _("Fonts"));
+	frame = pidgin_make_frame(ret, _("Fonts"));
 	/* imhtml font stuff */
 	for (i = 0; i < G_N_ELEMENTS(font_prefs); i++) {
 		hbox = gtk_hbox_new(FALSE, GAIM_HIG_CAT_SPACE);
 		gtk_box_pack_start(GTK_BOX(frame), hbox, FALSE, FALSE, 0);
 
-		check = gaim_gtk_prefs_checkbox(_(font_names[i]),
+		check = pidgin_prefs_checkbox(_(font_names[i]),
 		                                font_prefs_set[i], hbox);
 		gtk_size_group_add_widget(labelsg, check);
 
@@ -567,13 +567,13 @@
 		gtk_widget_set_sensitive(font_widgets[i],
 		                         gaim_prefs_get_bool(font_prefs_set[i]));
 		g_signal_connect(G_OBJECT(check), "toggled",
-		                 G_CALLBACK(gaim_gtk_toggle_sensitive),
+		                 G_CALLBACK(pidgin_toggle_sensitive),
 		                 font_widgets[i]);
 		g_signal_connect(G_OBJECT(font_widgets[i]), "clicked",
 		                 G_CALLBACK(gaimrc_set_font), GINT_TO_POINTER(i));
 	}
 
-	frame = gaim_gtk_make_frame(ret, _("Tools"));
+	frame = pidgin_make_frame(ret, _("Tools"));
 
 	vbox = gtk_vbox_new(FALSE, GAIM_HIG_CAT_SPACE);
 	gtk_box_pack_start(GTK_BOX(frame), vbox, FALSE, FALSE, 0);
@@ -596,7 +596,7 @@
 	return ret;
 }
 
-static GaimGtkPluginUiInfo gaimrc_ui_info =
+static PidginPluginUiInfo gaimrc_ui_info =
 {
 	gaimrc_get_config_frame,
 	0 /* page_num (Reserved) */
@@ -608,7 +608,7 @@
 	GAIM_MAJOR_VERSION,
 	GAIM_MINOR_VERSION,
 	GAIM_PLUGIN_STANDARD,
-	GAIM_GTK_PLUGIN_TYPE,
+	PIDGIN_PLUGIN_TYPE,
 	0,
 	NULL,
 	GAIM_PRIORITY_DEFAULT,
--- a/pidgin/plugins/gestures/gestures.c	Sat Feb 03 05:55:41 2007 +0000
+++ b/pidgin/plugins/gestures/gestures.c	Sat Feb 03 08:13:34 2007 +0000
@@ -38,7 +38,7 @@
 stroke_close(GtkWidget *widget, void *data)
 {
 	GaimConversation *conv;
-	GaimGtkConversation *gtkconv;
+	PidginConversation *gtkconv;
 
 	conv = (GaimConversation *)data;
 
@@ -46,14 +46,14 @@
 	if (!GAIM_IS_GTK_CONVERSATION(conv))
 		return;
 
-	gtkconv = GAIM_GTK_CONVERSATION(conv);
+	gtkconv = PIDGIN_CONVERSATION(conv);
 
 	gstroke_cleanup(gtkconv->imhtml);
 	gaim_conversation_destroy(conv);
 }
 
 static void
-switch_page(GaimGtkWindow *win, GtkDirectionType dir)
+switch_page(PidginWindow *win, GtkDirectionType dir)
 {
 	int count, current;
 
@@ -81,11 +81,11 @@
 stroke_prev_tab(GtkWidget *widget, void *data)
 {
 	GaimConversation *conv;
-	GaimGtkConversation *gtkconv;
-	GaimGtkWindow *win;
+	PidginConversation *gtkconv;
+	PidginWindow *win;
 
 	conv  = (GaimConversation *)data;
-	gtkconv = GAIM_GTK_CONVERSATION(conv);
+	gtkconv = PIDGIN_CONVERSATION(conv);
 	win   = gtkconv->win;
 
 	switch_page(win, GTK_DIR_LEFT);
@@ -95,10 +95,10 @@
 stroke_next_tab(GtkWidget *widget, void *data)
 {
 	GaimConversation *conv;
-	GaimGtkWindow *win;
+	PidginWindow *win;
 
 	conv  = (GaimConversation *)data;
-	win   = GAIM_GTK_CONVERSATION(conv)->win;
+	win   = PIDGIN_CONVERSATION(conv)->win;
 
 	switch_page(win, GTK_DIR_RIGHT);
 }
@@ -106,29 +106,29 @@
 static void
 stroke_new_win(GtkWidget *widget, void *data)
 {
-	GaimGtkWindow *new_win, *old_win;
+	PidginWindow *new_win, *old_win;
 	GaimConversation *conv;
 
 	conv    = (GaimConversation *)data;
-	old_win = GAIM_GTK_CONVERSATION(conv)->win;
+	old_win = PIDGIN_CONVERSATION(conv)->win;
 
-	if (gaim_gtk_conv_window_get_gtkconv_count(old_win) <= 1)
+	if (pidgin_conv_window_get_gtkconv_count(old_win) <= 1)
 		return;
 
-	new_win = gaim_gtk_conv_window_new();
+	new_win = pidgin_conv_window_new();
 
-	gaim_gtk_conv_window_remove_gtkconv(old_win, GAIM_GTK_CONVERSATION(conv));
-	gaim_gtk_conv_window_add_gtkconv(new_win, GAIM_GTK_CONVERSATION(conv));
+	pidgin_conv_window_remove_gtkconv(old_win, PIDGIN_CONVERSATION(conv));
+	pidgin_conv_window_add_gtkconv(new_win, PIDGIN_CONVERSATION(conv));
 
-	gaim_gtk_conv_window_show(new_win);
+	pidgin_conv_window_show(new_win);
 }
 
 static void
 attach_signals(GaimConversation *conv)
 {
-	GaimGtkConversation *gtkconv;
+	PidginConversation *gtkconv;
 
-	gtkconv = GAIM_GTK_CONVERSATION(conv);
+	gtkconv = PIDGIN_CONVERSATION(conv);
 
 	gstroke_enable(gtkconv->imhtml);
 	gstroke_signal_connect(gtkconv->imhtml, "14789",  stroke_close,    conv);
@@ -198,7 +198,7 @@
 plugin_unload(GaimPlugin *plugin)
 {
 	GaimConversation *conv;
-	GaimGtkConversation *gtkconv;
+	PidginConversation *gtkconv;
 	GList *l;
 
 	for (l = gaim_get_conversations(); l != NULL; l = l->next) {
@@ -207,7 +207,7 @@
 		if (!GAIM_IS_GTK_CONVERSATION(conv))
 			continue;
 
-		gtkconv = GAIM_GTK_CONVERSATION(conv);
+		gtkconv = PIDGIN_CONVERSATION(conv);
 
 		gstroke_cleanup(gtkconv->imhtml);
 		gstroke_disable(gtkconv->imhtml);
@@ -232,7 +232,7 @@
 	gtk_container_set_border_width(GTK_CONTAINER(ret), 12);
 
 	/* Configuration frame */
-	vbox = gaim_gtk_make_frame(ret, _("Mouse Gestures Configuration"));
+	vbox = pidgin_make_frame(ret, _("Mouse Gestures Configuration"));
 
 #if 0
 	/* Mouse button drop-down menu */
@@ -268,7 +268,7 @@
 	return ret;
 }
 
-static GaimGtkPluginUiInfo ui_info =
+static PidginPluginUiInfo ui_info =
 {
 	get_config_frame,
 	0 /* page_num (Reserved) */
@@ -280,7 +280,7 @@
 	GAIM_MAJOR_VERSION,
 	GAIM_MINOR_VERSION,
 	GAIM_PLUGIN_STANDARD,                             /**< type           */
-	GAIM_GTK_PLUGIN_TYPE,                             /**< ui_requirement */
+	PIDGIN_PLUGIN_TYPE,                             /**< ui_requirement */
 	0,                                                /**< flags          */
 	NULL,                                             /**< dependencies   */
 	GAIM_PRIORITY_DEFAULT,                            /**< priority       */
--- a/pidgin/plugins/gevolution/add_buddy_dialog.c	Sat Feb 03 05:55:41 2007 +0000
+++ b/pidgin/plugins/gevolution/add_buddy_dialog.c	Sat Feb 03 08:13:34 2007 +0000
@@ -184,7 +184,7 @@
 	if (account == NULL)
 		return;
 
-	pixbuf = gaim_gtk_create_prpl_icon(account, 0.5);
+	pixbuf = pidgin_create_prpl_icon(account, 0.5);
 
 	for (l = list; l != NULL; l = l->next)
 	{
@@ -616,7 +616,7 @@
 	GdkPixbuf *pixbuf;
 	GtkTreeIter iter;
 
-	pixbuf = gaim_gtk_create_prpl_icon(account, 0.5);
+	pixbuf = pidgin_create_prpl_icon(account, 0.5);
 
 	gtk_list_store_append(dialog->model, &iter);
 
--- a/pidgin/plugins/gevolution/gevolution.c	Sat Feb 03 05:55:41 2007 +0000
+++ b/pidgin/plugins/gevolution/gevolution.c	Sat Feb 03 08:13:34 2007 +0000
@@ -408,7 +408,7 @@
 	gtk_container_set_border_width(GTK_CONTAINER(ret), 12);
 
 	/* Configuration frame */
-	vbox = gaim_gtk_make_frame(ret, _("Evolution Integration Configuration"));
+	vbox = pidgin_make_frame(ret, _("Evolution Integration Configuration"));
 
 	/* Label */
 	label = gtk_label_new(_("Select all accounts that buddies should be "
@@ -477,7 +477,7 @@
 
 		gtk_list_store_append(model, &iter);
 
-		pixbuf = gaim_gtk_create_prpl_icon(account, 0.5);
+		pixbuf = pidgin_create_prpl_icon(account, 0.5);
 		if ((pixbuf != NULL) && (!gaim_account_is_connected(account)))
 			gdk_pixbuf_saturate_and_pixelate(pixbuf, pixbuf, 0.0, FALSE);
 
@@ -500,7 +500,7 @@
 	return ret;
 }
 
-static GaimGtkPluginUiInfo ui_info =
+static PidginPluginUiInfo ui_info =
 {
 	get_config_frame,	/**< get_config_frame */
 	0			/**< page_num */
@@ -512,7 +512,7 @@
 	GAIM_MAJOR_VERSION,
 	GAIM_MINOR_VERSION,
 	GAIM_PLUGIN_STANDARD,                             /**< type           */
-	GAIM_GTK_PLUGIN_TYPE,                             /**< ui_requirement */
+	PIDGIN_PLUGIN_TYPE,                             /**< ui_requirement */
 	0,                                                /**< flags          */
 	NULL,                                             /**< dependencies   */
 	GAIM_PRIORITY_DEFAULT,                            /**< priority       */
--- a/pidgin/plugins/gevolution/new_person_dialog.c	Sat Feb 03 05:55:41 2007 +0000
+++ b/pidgin/plugins/gevolution/new_person_dialog.c	Sat Feb 03 08:13:34 2007 +0000
@@ -285,7 +285,7 @@
 	{
 		/* Add the account type stuff. */
 		dialog->accounts_menu =
-			gaim_gtk_account_option_menu_new(account, FALSE,
+			pidgin_account_option_menu_new(account, FALSE,
 											 G_CALLBACK(select_account_cb),
 											 NULL, dialog);
 		add_pref_box(sg, vbox, _("Account type:"), dialog->accounts_menu);
--- a/pidgin/plugins/gtk-signals-test.c	Sat Feb 03 05:55:41 2007 +0000
+++ b/pidgin/plugins/gtk-signals-test.c	Sat Feb 03 08:13:34 2007 +0000
@@ -56,7 +56,7 @@
  * Conversation subsystem signal callbacks
  **************************************************************************/
 static void
-conversation_dragging_cb(GaimGtkWindow *source, GaimGtkWindow *destination) {
+conversation_dragging_cb(PidginWindow *source, PidginWindow *destination) {
 	gaim_debug_info("gtk-signal-test", "conversation dragging cb\n");
 }
 
@@ -109,9 +109,9 @@
 static gboolean
 plugin_load(GaimPlugin *plugin)
 {
-	void *accounts_handle = gaim_gtk_account_get_handle();
-	void *blist_handle = gaim_gtk_blist_get_handle();
-	void *conv_handle = gaim_gtk_conversations_get_handle();
+	void *accounts_handle = pidgin_account_get_handle();
+	void *blist_handle = pidgin_blist_get_handle();
+	void *conv_handle = pidgin_conversations_get_handle();
 
 	/* Accounts subsystem signals */
 	gaim_signal_connect(accounts_handle, "account-modified",
@@ -151,7 +151,7 @@
 	GAIM_MAJOR_VERSION,
 	GAIM_MINOR_VERSION,
 	GAIM_PLUGIN_STANDARD,                             /**< type           */
-	GAIM_GTK_PLUGIN_TYPE,                             /**< ui_requirement */
+	PIDGIN_PLUGIN_TYPE,                             /**< ui_requirement */
 	0,                                                /**< flags          */
 	NULL,                                             /**< dependencies   */
 	GAIM_PRIORITY_DEFAULT,                            /**< priority       */
--- a/pidgin/plugins/history.c	Sat Feb 03 05:55:41 2007 +0000
+++ b/pidgin/plugins/history.c	Sat Feb 03 08:13:34 2007 +0000
@@ -38,13 +38,13 @@
 	const char *alias = name;
 	guint flags;
 	char *history;
-	GaimGtkConversation *gtkconv;
+	PidginConversation *gtkconv;
 	GtkIMHtmlOptions options = GTK_IMHTML_NO_COLOURS;
 	char *header;
 	char *protocol;
 
 	convtype = gaim_conversation_get_type(c);
-	gtkconv = GAIM_GTK_CONVERSATION(c);
+	gtkconv = PIDGIN_CONVERSATION(c);
 	if (convtype == GAIM_CONV_TYPE_IM && g_list_length(gtkconv->convs) < 2)
 	{
 		GSList *buddies;
@@ -106,7 +106,7 @@
 		return;
 
 	history = gaim_log_read((GaimLog*)logs->data, &flags);
-	gtkconv = GAIM_GTK_CONVERSATION(c);
+	gtkconv = PIDGIN_CONVERSATION(c);
 	if (flags & GAIM_LOG_READ_NO_NEWLINE)
 		options |= GTK_IMHTML_NO_NEWLINE;
 
@@ -180,7 +180,7 @@
 	GAIM_MAJOR_VERSION,
 	GAIM_MINOR_VERSION,
 	GAIM_PLUGIN_STANDARD,
-	GAIM_GTK_PLUGIN_TYPE,
+	PIDGIN_PLUGIN_TYPE,
 	0,
 	NULL,
 	GAIM_PRIORITY_DEFAULT,
--- a/pidgin/plugins/iconaway.c	Sat Feb 03 05:55:41 2007 +0000
+++ b/pidgin/plugins/iconaway.c	Sat Feb 03 08:13:34 2007 +0000
@@ -34,7 +34,7 @@
 iconify_windows(GaimAccount *account, GaimStatus *old, GaimStatus *newstatus)
 {
 	GaimPresence *presence;
-	GaimGtkWindow *win;
+	PidginWindow *win;
 	GList *windows;
 
 	presence = gaim_status_get_presence(newstatus);
@@ -44,11 +44,11 @@
 
 	gaim_blist_set_visible(FALSE);
 
-	for (windows = gaim_gtk_conv_windows_get_list();
+	for (windows = pidgin_conv_windows_get_list();
 		 windows != NULL;
 		 windows = windows->next) {
 
-		win = (GaimGtkWindow *)windows->data;
+		win = (PidginWindow *)windows->data;
 
 		gtk_window_iconify(GTK_WINDOW(win->window));
 	}
@@ -73,7 +73,7 @@
 	GAIM_MAJOR_VERSION,
 	GAIM_MINOR_VERSION,
 	GAIM_PLUGIN_STANDARD,                             /**< type           */
-	GAIM_GTK_PLUGIN_TYPE,                             /**< ui_requirement */
+	PIDGIN_PLUGIN_TYPE,                             /**< ui_requirement */
 	0,                                                /**< flags          */
 	NULL,                                             /**< dependencies   */
 	GAIM_PRIORITY_DEFAULT,                            /**< priority       */
--- a/pidgin/plugins/mailchk.c	Sat Feb 03 05:55:41 2007 +0000
+++ b/pidgin/plugins/mailchk.c	Sat Feb 03 08:13:34 2007 +0000
@@ -60,12 +60,12 @@
 	if (count == -1)
 		return FALSE;
 
-	if (!list || !GAIM_IS_GTK_BLIST(list) || !(GAIM_GTK_BLIST(list)->vbox))
+	if (!list || !GAIM_IS_GTK_BLIST(list) || !(PIDGIN_BLIST(list)->vbox))
 		return TRUE;
 
 	if (!mail) {
 		/* guess we better build it then :P */
-		GtkWidget *vbox = GAIM_GTK_BLIST(list)->vbox;
+		GtkWidget *vbox = PIDGIN_BLIST(list)->vbox;
 
 		mail = gtk_label_new("No mail messages.");
 		gtk_box_pack_start(GTK_BOX(vbox), mail, FALSE, FALSE, 0);
@@ -101,7 +101,7 @@
 signoff_cb(GaimConnection *gc)
 {
 	GaimBuddyList *list = gaim_get_blist();
-	if ((!list || !GAIM_IS_GTK_BLIST(list) || !GAIM_GTK_BLIST(list)->vbox) && timer) {
+	if ((!list || !GAIM_IS_GTK_BLIST(list) || !PIDGIN_BLIST(list)->vbox) && timer) {
 		g_source_remove(timer);
 		timer = 0;
 	}
@@ -122,7 +122,7 @@
 		return FALSE;
 	}
 
-	if (list && GAIM_IS_GTK_BLIST(list) && GAIM_GTK_BLIST(list)->vbox)
+	if (list && GAIM_IS_GTK_BLIST(list) && PIDGIN_BLIST(list)->vbox)
 		timer = g_timeout_add(2000, check_timeout, NULL);
 
 	gaim_signal_connect(conn_handle, "signed-on",
@@ -152,7 +152,7 @@
 	GAIM_MAJOR_VERSION,
 	GAIM_MINOR_VERSION,
 	GAIM_PLUGIN_STANDARD,
-	GAIM_GTK_PLUGIN_TYPE,
+	PIDGIN_PLUGIN_TYPE,
 	0,
 	NULL,
 	GAIM_PRIORITY_DEFAULT,
--- a/pidgin/plugins/markerline.c	Sat Feb 03 05:55:41 2007 +0000
+++ b/pidgin/plugins/markerline.c	Sat Feb 03 08:13:34 2007 +0000
@@ -42,7 +42,7 @@
 #define PREF_CHATS      PREF_PREFIX "/chats"
 
 static int
-imhtml_expose_cb(GtkWidget *widget, GdkEventExpose *event, GaimGtkConversation *gtkconv)
+imhtml_expose_cb(GtkWidget *widget, GdkEventExpose *event, PidginConversation *gtkconv)
 {
 	int y, last_y, offset;
 	GdkRectangle visible_rect;
@@ -90,7 +90,7 @@
 }
 
 static void
-update_marker_for_gtkconv(GaimGtkConversation *gtkconv)
+update_marker_for_gtkconv(PidginConversation *gtkconv)
 {
 	GtkTextIter iter;
 	GtkTextBuffer *buffer;
@@ -109,15 +109,15 @@
 }
 
 static gboolean
-focus_removed(GtkWidget *widget, GdkEventVisibility *event, GaimGtkWindow *win)
+focus_removed(GtkWidget *widget, GdkEventVisibility *event, PidginWindow *win)
 {
 	GaimConversation *conv;
-	GaimGtkConversation *gtkconv;
+	PidginConversation *gtkconv;
 
-	conv = gaim_gtk_conv_window_get_active_conversation(win);
+	conv = pidgin_conv_window_get_active_conversation(win);
 	g_return_val_if_fail(conv != NULL, FALSE);
 
-	gtkconv = GAIM_GTK_CONVERSATION(conv);
+	gtkconv = PIDGIN_CONVERSATION(conv);
 	update_marker_for_gtkconv(gtkconv);
 
 	return FALSE;
@@ -125,11 +125,11 @@
 
 #if 0
 static gboolean
-window_resized(GtkWidget *w, GdkEventConfigure *event, GaimGtkWindow *win)
+window_resized(GtkWidget *w, GdkEventConfigure *event, PidginWindow *win)
 {
 	GList *list;
 
-	list = gaim_gtk_conv_window_get_gtkconvs(win);
+	list = pidgin_conv_window_get_gtkconvs(win);
 	
 	for (; list; list = list->next)
 		update_marker_for_gtkconv(list->data);
@@ -138,7 +138,7 @@
 }
 
 static gboolean
-imhtml_resize_cb(GtkWidget *w, GtkAllocation *allocation, GaimGtkConversation *gtkconv)
+imhtml_resize_cb(GtkWidget *w, GtkAllocation *allocation, PidginConversation *gtkconv)
 {
 	gtk_widget_queue_draw(w);
 	return FALSE;
@@ -146,21 +146,21 @@
 #endif
 
 static void
-page_switched(GtkWidget *widget, GtkWidget *page, gint num, GaimGtkWindow *win)
+page_switched(GtkWidget *widget, GtkWidget *page, gint num, PidginWindow *win)
 {
 	focus_removed(NULL, NULL, win);
 }
 
 static void
-detach_from_gtkconv(GaimGtkConversation *gtkconv, gpointer null)
+detach_from_gtkconv(PidginConversation *gtkconv, gpointer null)
 {
 	g_signal_handlers_disconnect_by_func(G_OBJECT(gtkconv->imhtml), imhtml_expose_cb, gtkconv);
 }
 
 static void
-detach_from_gaim_gtk_window(GaimGtkWindow *win, gpointer null)
+detach_from_pidgin_window(PidginWindow *win, gpointer null)
 {
-	g_list_foreach(gaim_gtk_conv_window_get_gtkconvs(win), (GFunc)detach_from_gtkconv, NULL);
+	g_list_foreach(pidgin_conv_window_get_gtkconvs(win), (GFunc)detach_from_gtkconv, NULL);
 	g_signal_handlers_disconnect_by_func(G_OBJECT(win->notebook), page_switched, win);
 	g_signal_handlers_disconnect_by_func(G_OBJECT(win->window), focus_removed, win);
 
@@ -168,7 +168,7 @@
 }
 
 static void
-attach_to_gtkconv(GaimGtkConversation *gtkconv, gpointer null)
+attach_to_gtkconv(PidginConversation *gtkconv, gpointer null)
 {
 	detach_from_gtkconv(gtkconv, NULL);
 	g_signal_connect(G_OBJECT(gtkconv->imhtml), "expose_event",
@@ -176,9 +176,9 @@
 }
 
 static void
-attach_to_gaim_gtk_window(GaimGtkWindow *win, gpointer null)
+attach_to_pidgin_window(PidginWindow *win, gpointer null)
 {
-	g_list_foreach(gaim_gtk_conv_window_get_gtkconvs(win), (GFunc)attach_to_gtkconv, NULL);
+	g_list_foreach(pidgin_conv_window_get_gtkconvs(win), (GFunc)attach_to_gtkconv, NULL);
 
 	g_signal_connect(G_OBJECT(win->window), "focus_out_event",
 					 G_CALLBACK(focus_removed), win);
@@ -192,28 +192,28 @@
 static void
 detach_from_all_windows()
 {
-	g_list_foreach(gaim_gtk_conv_windows_get_list(), (GFunc)detach_from_gaim_gtk_window, NULL);
+	g_list_foreach(pidgin_conv_windows_get_list(), (GFunc)detach_from_pidgin_window, NULL);
 }
 
 static void
 attach_to_all_windows()
 {
-	g_list_foreach(gaim_gtk_conv_windows_get_list(), (GFunc)attach_to_gaim_gtk_window, NULL);
+	g_list_foreach(pidgin_conv_windows_get_list(), (GFunc)attach_to_pidgin_window, NULL);
 }
 
 static void
 conv_created(GaimConversation *conv, gpointer null)
 {
-	GaimGtkConversation *gtkconv = GAIM_GTK_CONVERSATION(conv);
-	GaimGtkWindow *win;
+	PidginConversation *gtkconv = PIDGIN_CONVERSATION(conv);
+	PidginWindow *win;
 
 	if (!gtkconv)
 		return;
 
-	win = gaim_gtkconv_get_window(gtkconv);
+	win = pidgin_conv_get_window(gtkconv);
 
-	detach_from_gaim_gtk_window(win, NULL);
-	attach_to_gaim_gtk_window(win, NULL);
+	detach_from_pidgin_window(win, NULL);
+	attach_to_pidgin_window(win, NULL);
 }
 
 static gboolean
@@ -268,7 +268,7 @@
 	GAIM_MAJOR_VERSION,			/* Gaim Major Version	*/
 	GAIM_MINOR_VERSION,			/* Gaim Minor Version	*/
 	GAIM_PLUGIN_STANDARD,		/* plugin type			*/
-	GAIM_GTK_PLUGIN_TYPE,		/* ui requirement		*/
+	PIDGIN_PLUGIN_TYPE,		/* ui requirement		*/
 	0,							/* flags				*/
 	NULL,						/* dependencies			*/
 	GAIM_PRIORITY_DEFAULT,		/* priority				*/
--- a/pidgin/plugins/musicmessaging/musicmessaging.c	Sat Feb 03 05:55:41 2007 +0000
+++ b/pidgin/plugins/musicmessaging/musicmessaging.c	Sat Feb 03 08:13:34 2007 +0000
@@ -597,8 +597,8 @@
 	gtk_widget_show(image);
 	gtk_widget_show(button);
 	
-	gtk_box_pack_start(GTK_BOX(GAIM_GTK_CONVERSATION(conv)->toolbar), sep, FALSE, FALSE, 0);
-	gtk_box_pack_start(GTK_BOX(GAIM_GTK_CONVERSATION(conv)->toolbar), button, FALSE, FALSE, 0);
+	gtk_box_pack_start(GTK_BOX(PIDGIN_CONVERSATION(conv)->toolbar), sep, FALSE, FALSE, 0);
+	gtk_box_pack_start(GTK_BOX(PIDGIN_CONVERSATION(conv)->toolbar), button, FALSE, FALSE, 0);
 }
 
 static void remove_widget (GtkWidget *button)
@@ -622,7 +622,7 @@
 	gtk_container_set_border_width(GTK_CONTAINER(ret), 10);
 
 	/* Configuration frame */
-	vbox = gaim_gtk_make_frame(ret, _("Music Messaging Configuration"));
+	vbox = pidgin_make_frame(ret, _("Music Messaging Configuration"));
 	
 	/* Path to the score editor */
 	editor_path = gtk_entry_new();
@@ -643,7 +643,7 @@
 	return ret;
 }
 
-static GaimGtkPluginUiInfo ui_info =
+static PidginPluginUiInfo ui_info =
 {
 	get_config_frame,
 	0 /* page_num (reserved) */
@@ -654,7 +654,7 @@
     GAIM_MAJOR_VERSION,
     GAIM_MINOR_VERSION,
     GAIM_PLUGIN_STANDARD,                                /**< type           */
-    GAIM_GTK_PLUGIN_TYPE,                                /**< ui_requirement */
+    PIDGIN_PLUGIN_TYPE,                                /**< ui_requirement */
     0,                                                   /**< flags          */
     NULL,                                                /**< dependencies   */
     GAIM_PRIORITY_DEFAULT,                               /**< priority       */
--- a/pidgin/plugins/notify.c	Sat Feb 03 05:55:41 2007 +0000
+++ b/pidgin/plugins/notify.c	Sat Feb 03 08:13:34 2007 +0000
@@ -112,7 +112,7 @@
 
 /* notification set/unset */
 static int notify(GaimConversation *conv, gboolean increment);
-static void notify_win(GaimGtkWindow *gaimwin);
+static void notify_win(PidginWindow *gaimwin);
 static void unnotify(GaimConversation *conv, gboolean reset);
 static int unnotify_cb(GtkWidget *widget, gpointer data,
                        GaimConversation *conv);
@@ -127,31 +127,31 @@
 static void apply_notify(void);
 
 /* string function */
-static void handle_string(GaimGtkWindow *gaimwin);
+static void handle_string(PidginWindow *gaimwin);
 
 /* count_title function */
-static void handle_count_title(GaimGtkWindow *gaimwin);
+static void handle_count_title(PidginWindow *gaimwin);
 
 /* count_xprop function */
-static void handle_count_xprop(GaimGtkWindow *gaimwin);
+static void handle_count_xprop(PidginWindow *gaimwin);
 
 /* urgent function */
-static void handle_urgent(GaimGtkWindow *gaimwin, gboolean set);
+static void handle_urgent(PidginWindow *gaimwin, gboolean set);
 
 /* raise function */
-static void handle_raise(GaimGtkWindow *gaimwin);
+static void handle_raise(PidginWindow *gaimwin);
 
 /****************************************/
 /* Begin doing stuff below this line... */
 /****************************************/
 static guint
-count_messages(GaimGtkWindow *gaimwin)
+count_messages(PidginWindow *gaimwin)
 {
 	guint count = 0;
 	GList *convs = NULL, *l;
 
 	for (convs = gaimwin->gtkconvs; convs != NULL; convs = convs->next) {
-		GaimGtkConversation *conv = convs->data;
+		PidginConversation *conv = convs->data;
 		for (l = conv->convs; l != NULL; l = l->next) {
 			count += GPOINTER_TO_INT(gaim_conversation_get_data(l->data, "notify-message-count"));
 		}
@@ -165,7 +165,7 @@
 {
 	gint count;
 	gboolean has_focus;
-	GaimGtkWindow *gaimwin = NULL;
+	PidginWindow *gaimwin = NULL;
 
 	if (conv == NULL)
 		return 0;
@@ -173,7 +173,7 @@
 	/* We want to remove the notifications, but not reset the counter */
 	unnotify(conv, FALSE);
 
-	gaimwin = GAIM_GTK_CONVERSATION(conv)->win;
+	gaimwin = PIDGIN_CONVERSATION(conv)->win;
 
 	/* If we aren't doing notifications for this type of conversation, return */
 	if (((gaim_conversation_get_type(conv) == GAIM_CONV_TYPE_IM) &&
@@ -200,7 +200,7 @@
 }
 
 static void
-notify_win(GaimGtkWindow *gaimwin)
+notify_win(PidginWindow *gaimwin)
 {
 	if (count_messages(gaimwin) <= 0)
 		return;
@@ -221,12 +221,12 @@
 unnotify(GaimConversation *conv, gboolean reset)
 {
 	GaimConversation *active_conv = NULL;
-	GaimGtkWindow *gaimwin = NULL;
+	PidginWindow *gaimwin = NULL;
 
 	g_return_if_fail(conv != NULL);
 
-	gaimwin = GAIM_GTK_CONVERSATION(conv)->win;
-	active_conv = gaim_gtk_conv_window_get_active_conversation(gaimwin);
+	gaimwin = PIDGIN_CONVERSATION(conv)->win;
+	active_conv = pidgin_conv_window_get_active_conversation(gaimwin);
 
 	/* reset the conversation window title */
 	gaim_conversation_autoset_title(active_conv);
@@ -295,12 +295,12 @@
 static int
 attach_signals(GaimConversation *conv)
 {
-	GaimGtkConversation *gtkconv = NULL;
-	GaimGtkWindow *gtkwin = NULL;
+	PidginConversation *gtkconv = NULL;
+	PidginWindow *gtkwin = NULL;
 	GSList *imhtml_ids = NULL, *entry_ids = NULL;
 	guint id;
 
-	gtkconv = GAIM_GTK_CONVERSATION(conv);
+	gtkconv = PIDGIN_CONVERSATION(conv);
 	if (!gtkconv) {
 		gaim_debug_misc("notify", "Failed to find gtkconv\n");
 		return 0;
@@ -350,11 +350,11 @@
 static void
 detach_signals(GaimConversation *conv)
 {
-	GaimGtkConversation *gtkconv = NULL;
-	GaimGtkWindow *gtkwin = NULL;
+	PidginConversation *gtkconv = NULL;
+	PidginWindow *gtkwin = NULL;
 	GSList *ids = NULL, *l;
 
-	gtkconv = GAIM_GTK_CONVERSATION(conv);
+	gtkconv = PIDGIN_CONVERSATION(conv);
 	if (!gtkconv)
 		return;
 	gtkwin  = gtkconv->win;
@@ -390,7 +390,7 @@
 conv_switched(GaimConversation *conv)
 {
 #if 0
-	GaimGtkWindow *gaimwin = gaim_conversation_get_window(new_conv);
+	PidginWindow *gaimwin = gaim_conversation_get_window(new_conv);
 #endif
 
 	/*
@@ -416,11 +416,11 @@
 static void
 deleting_conv(GaimConversation *conv)
 {
-	GaimGtkWindow *gaimwin = NULL;
+	PidginWindow *gaimwin = NULL;
 
 	detach_signals(conv);
 
-	gaimwin = GAIM_GTK_CONVERSATION(conv)->win;
+	gaimwin = PIDGIN_CONVERSATION(conv)->win;
 
 	handle_urgent(gaimwin, FALSE);
 	gaim_conversation_set_data(conv, "notify-message-count", GINT_TO_POINTER(0));
@@ -437,8 +437,8 @@
 #if 0
 static void
 conversation_dragging(GaimConversation *active_conv,
-                        GaimGtkWindow *old_gaimwin,
-                        GaimGtkWindow *new_gaimwin)
+                        PidginWindow *old_gaimwin,
+                        PidginWindow *new_gaimwin)
 {
 	if (old_gaimwin != new_gaimwin) {
 		if (old_gaimwin == NULL) {
@@ -484,7 +484,7 @@
 #endif
 
 static void
-handle_string(GaimGtkWindow *gaimwin)
+handle_string(PidginWindow *gaimwin)
 {
 	GtkWindow *window = NULL;
 	gchar newtitle[256];
@@ -501,7 +501,7 @@
 }
 
 static void
-handle_count_title(GaimGtkWindow *gaimwin)
+handle_count_title(PidginWindow *gaimwin)
 {
 	GtkWindow *window;
 	char newtitle[256];
@@ -517,7 +517,7 @@
 }
 
 static void
-handle_count_xprop(GaimGtkWindow *gaimwin)
+handle_count_xprop(PidginWindow *gaimwin)
 {
 #ifndef _WIN32
 	guint count;
@@ -544,17 +544,17 @@
 }
 
 static void
-handle_urgent(GaimGtkWindow *win, gboolean set)
+handle_urgent(PidginWindow *win, gboolean set)
 {
 #ifndef _WIN32
-	gaim_gtk_set_urgent(GTK_WINDOW(win->window), set);
+	pidgin_set_urgent(GTK_WINDOW(win->window), set);
 #endif
 }
 
 static void
-handle_raise(GaimGtkWindow *gaimwin)
+handle_raise(PidginWindow *gaimwin)
 {
-	gaim_gtk_conv_window_raise(gaimwin);
+	pidgin_conv_window_raise(gaimwin);
 }
 
 static void
@@ -625,7 +625,7 @@
 apply_method()
 {
 	GList *convs;
-	GaimGtkWindow *gaimwin = NULL;
+	PidginWindow *gaimwin = NULL;
 
 	for (convs = gaim_get_conversations(); convs != NULL;
 	     convs = convs->next) {
@@ -634,7 +634,7 @@
 		/* remove notifications */
 		unnotify(conv, FALSE);
 
-		gaimwin = GAIM_GTK_CONVERSATION(conv)->win;
+		gaimwin = PIDGIN_CONVERSATION(conv)->win;
 		if (GPOINTER_TO_INT(gaim_conversation_get_data(conv, "notify-message-count")) != 0)
 			/* reattach appropriate notifications */
 			notify(conv, FALSE);
@@ -669,7 +669,7 @@
 	gtk_container_set_border_width(GTK_CONTAINER (ret), 12);
 
 	/*---------- "Notify For" ----------*/
-	frame = gaim_gtk_make_frame(ret, _("Notify For"));
+	frame = pidgin_make_frame(ret, _("Notify For"));
 	vbox = gtk_vbox_new(FALSE, 5);
 	gtk_container_add(GTK_CONTAINER(frame), vbox);
 
@@ -696,7 +696,7 @@
 	                 G_CALLBACK(type_toggle_cb), "type_chat_nick");
 	gtk_widget_set_sensitive(toggle, gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(ref)));
 	g_signal_connect(G_OBJECT(ref), "toggled",
-	                 G_CALLBACK(gaim_gtk_toggle_sensitive), toggle);
+	                 G_CALLBACK(pidgin_toggle_sensitive), toggle);
 
 	toggle = gtk_check_button_new_with_mnemonic(_("_Focused windows"));
 	gtk_box_pack_start(GTK_BOX(vbox), toggle, FALSE, FALSE, 0);
@@ -706,7 +706,7 @@
 	                 G_CALLBACK(type_toggle_cb), "type_focused");
 
 	/*---------- "Notification Methods" ----------*/
-	frame = gaim_gtk_make_frame(ret, _("Notification Methods"));
+	frame = pidgin_make_frame(ret, _("Notification Methods"));
 	vbox = gtk_vbox_new(FALSE, 5);
 	gtk_container_add(GTK_CONTAINER(frame), vbox);
 
@@ -766,7 +766,7 @@
 	                 G_CALLBACK(method_toggle_cb), "method_raise");
 
 	/*---------- "Notification Removals" ----------*/
-	frame = gaim_gtk_make_frame(ret, _("Notification Removal"));
+	frame = pidgin_make_frame(ret, _("Notification Removal"));
 	vbox = gtk_vbox_new(FALSE, 5);
 	gtk_container_add(GTK_CONTAINER(frame), vbox);
 
@@ -820,7 +820,7 @@
 {
 	GList *convs = gaim_get_conversations();
 	void *conv_handle = gaim_conversations_get_handle();
-	void *gtk_conv_handle = gaim_gtk_conversations_get_handle();
+	void *gtk_conv_handle = pidgin_conversations_get_handle();
 
 	my_plugin = plugin;
 
@@ -874,7 +874,7 @@
 	return TRUE;
 }
 
-static GaimGtkPluginUiInfo ui_info =
+static PidginPluginUiInfo ui_info =
 {
 	get_config_frame,
 	0 /* page_num (Reserved) */
@@ -886,7 +886,7 @@
 	GAIM_MAJOR_VERSION,
 	GAIM_MINOR_VERSION,
 	GAIM_PLUGIN_STANDARD,                             /**< type           */
-	GAIM_GTK_PLUGIN_TYPE,                             /**< ui_requirement */
+	PIDGIN_PLUGIN_TYPE,                             /**< ui_requirement */
 	0,                                                /**< flags          */
 	NULL,                                             /**< dependencies   */
 	GAIM_PRIORITY_DEFAULT,                            /**< priority       */
--- a/pidgin/plugins/perl/common/gtkmodule.h	Sat Feb 03 05:55:41 2007 +0000
+++ b/pidgin/plugins/perl/common/gtkmodule.h	Sat Feb 03 08:13:34 2007 +0000
@@ -41,22 +41,22 @@
 #include "gtkutils.h"
 
 /* gtkaccount.h */
-typedef GaimGtkAccountDialogType			Gaim__GtkUI__Account__Dialog__Type;
+typedef PidginAccountDialogType			Gaim__GtkUI__Account__Dialog__Type;
 
 /* gtkblist.h */
-typedef GaimGtkBuddyList *				Gaim__GtkUI__BuddyList;
-typedef gaim_gtk_blist_sort_function			Gaim__GtkUI__BuddyList__SortFunction;
+typedef PidginBuddyList *				Gaim__GtkUI__BuddyList;
+typedef pidgin_blist_sort_function			Gaim__GtkUI__BuddyList__SortFunction;
 
 /* gtkconv.h */
-typedef GaimGtkConversation *				Gaim__GtkUI__Conversation;
+typedef PidginConversation *				Gaim__GtkUI__Conversation;
 typedef GaimUnseenState					Gaim__UnseenState;
 
 /* gtkconvwin.h */
-typedef GaimGtkWindow *					Gaim__GtkUI__Conversation__Window;
+typedef PidginWindow *					Gaim__GtkUI__Conversation__Window;
 typedef GaimConvPlacementFunc				Gaim__Conversation__PlacementFunc;
 
 /* gtkft.h */
-typedef GaimGtkXferDialog *				Gaim__GtkUI__Xfer__Dialog;
+typedef PidginXferDialog *				Gaim__GtkUI__Xfer__Dialog;
 
 /* gtkimhtml.h */
 typedef GtkIMHtml *					Gaim__GtkUI__IMHtml;
@@ -70,7 +70,7 @@
 typedef GtkIMHtmlToolbar *				Gaim__GtkUI__IMHtmlToolbar;
 
 /* gtkmenutray.h */
-typedef GaimGtkMenuTray *				Gaim__GtkUI__MenuTray;
+typedef PidginMenuTray *				Gaim__GtkUI__MenuTray;
 
 /* gtkstatusbox.h */
 typedef GtkGaimStatusBox *				Gaim__GtkUI__StatusBox;
--- a/pidgin/plugins/raw.c	Sat Feb 03 05:55:41 2007 +0000
+++ b/pidgin/plugins/raw.c	Sat Feb 03 08:13:34 2007 +0000
@@ -130,7 +130,7 @@
 	gtk_container_add(GTK_CONTAINER(window), hbox);
 
 	/* Account drop-down menu. */
-	dropdown = gaim_gtk_account_option_menu_new(NULL, FALSE,
+	dropdown = pidgin_account_option_menu_new(NULL, FALSE,
 			G_CALLBACK(account_changed_cb), NULL, NULL);
 
 	if (gaim_connections_get_all())
@@ -167,7 +167,7 @@
 	GAIM_MAJOR_VERSION,
 	GAIM_MINOR_VERSION,
 	GAIM_PLUGIN_STANDARD,
-	GAIM_GTK_PLUGIN_TYPE,
+	PIDGIN_PLUGIN_TYPE,
 	0,
 	NULL,
 	GAIM_PRIORITY_DEFAULT,
--- a/pidgin/plugins/spellchk.c	Sat Feb 03 05:55:41 2007 +0000
+++ b/pidgin/plugins/spellchk.c	Sat Feb 03 08:13:34 2007 +0000
@@ -625,10 +625,10 @@
 	spellchk *spell;
 	GtkTextBuffer *buffer;
 	GtkTextIter start, end;
-	GaimGtkConversation *gtkconv;
+	PidginConversation *gtkconv;
 	GtkTextView *view;
 
-	gtkconv = GAIM_GTK_CONVERSATION(conv);
+	gtkconv = PIDGIN_CONVERSATION(conv);
 
 	view = GTK_TEXT_VIEW(gtkconv->entry);
 
@@ -2142,7 +2142,7 @@
 	/* Detach from existing conversations */
 	for (convs = gaim_get_conversations(); convs != NULL; convs = convs->next)
 	{
-		GaimGtkConversation *gtkconv = GAIM_GTK_CONVERSATION((GaimConversation *)convs->data);
+		PidginConversation *gtkconv = PIDGIN_CONVERSATION((GaimConversation *)convs->data);
 		spellchk *spell = g_object_get_data(G_OBJECT(gtkconv->entry), SPELLCHK_OBJECT_KEY);
 
 		g_signal_handlers_disconnect_by_func(gtkconv->entry, message_send_cb, spell);
@@ -2177,7 +2177,7 @@
 	ret = gtk_vbox_new(FALSE, GAIM_HIG_CAT_SPACE);
 	gtk_container_set_border_width (GTK_CONTAINER(ret), GAIM_HIG_BORDER);
 
-	vbox = gaim_gtk_make_frame(ret, _("Text Replacements"));
+	vbox = pidgin_make_frame(ret, _("Text Replacements"));
 	gtk_container_set_border_width(GTK_CONTAINER(vbox), 4);
 	gtk_widget_show(vbox);
 
@@ -2266,7 +2266,7 @@
 
 	gtk_widget_show(button);
 
-	vbox = gaim_gtk_make_frame(ret, _("Add a new text replacement"));
+	vbox = pidgin_make_frame(ret, _("Add a new text replacement"));
 
 	hbox = gtk_hbox_new(FALSE, GAIM_HIG_BOX_SPACE);
 	gtk_box_pack_start(GTK_BOX(vbox), hbox, TRUE, TRUE, 0);
@@ -2338,8 +2338,8 @@
 	gtk_widget_show(button);
 
 #if 0
-	vbox = gaim_gtk_make_frame(ret, _("General Text Replacement Options"));
-	gaim_gtk_prefs_checkbox(_("Enable replacement of last word on send"),
+	vbox = pidgin_make_frame(ret, _("General Text Replacement Options"));
+	pidgin_prefs_checkbox(_("Enable replacement of last word on send"),
 	                        "/plugins/gtk/spellchk/last_word_replace", vbox);
 #endif
 
@@ -2347,7 +2347,7 @@
 	return ret;
 }
 
-static GaimGtkPluginUiInfo ui_info =
+static PidginPluginUiInfo ui_info =
 {
 	get_config_frame,
 	0 /* page_num (Reserved) */
@@ -2359,7 +2359,7 @@
 	GAIM_MAJOR_VERSION,
 	GAIM_MINOR_VERSION,
 	GAIM_PLUGIN_STANDARD,
-	GAIM_GTK_PLUGIN_TYPE,
+	PIDGIN_PLUGIN_TYPE,
 	0,
 	NULL,
 	GAIM_PRIORITY_DEFAULT,
--- a/pidgin/plugins/ticker/ticker.c	Sat Feb 03 05:55:41 2007 +0000
+++ b/pidgin/plugins/ticker/ticker.c	Sat Feb 03 08:13:34 2007 +0000
@@ -116,7 +116,7 @@
 	if(!td->icon)
 		td->icon = gtk_image_new();
 
-	pixbuf = gaim_gtk_blist_get_status_icon((GaimBlistNode*)c,
+	pixbuf = pidgin_blist_get_status_icon((GaimBlistNode*)c,
 			GAIM_STATUS_ICON_SMALL);
 	gtk_image_set_from_pixbuf(GTK_IMAGE(td->icon), pixbuf);
 	g_object_unref(G_OBJECT(pixbuf));
@@ -346,7 +346,7 @@
 	GAIM_MAJOR_VERSION,
 	GAIM_MINOR_VERSION,
 	GAIM_PLUGIN_STANDARD,                             /**< type           */
-	GAIM_GTK_PLUGIN_TYPE,                             /**< ui_requirement */
+	PIDGIN_PLUGIN_TYPE,                             /**< ui_requirement */
 	0,                                                /**< flags          */
 	NULL,                                             /**< dependencies   */
 	GAIM_PRIORITY_DEFAULT,                            /**< priority       */
--- a/pidgin/plugins/timestamp.c	Sat Feb 03 05:55:41 2007 +0000
+++ b/pidgin/plugins/timestamp.c	Sat Feb 03 08:13:34 2007 +0000
@@ -41,7 +41,7 @@
 static void
 timestamp_display(GaimConversation *conv, time_t then, time_t now)
 {
-	GaimGtkConversation *gtk_conv = GAIM_GTK_CONVERSATION(conv);
+	PidginConversation *gtk_conv = PIDGIN_CONVERSATION(conv);
 	GtkWidget *imhtml = gtk_conv->imhtml;
 	GtkTextBuffer *buffer = gtk_text_view_get_buffer(GTK_TEXT_VIEW(imhtml));
 	GtkTextIter iter;
@@ -94,7 +94,7 @@
 static void
 timestamp_new_convo(GaimConversation *conv)
 {
-	GaimGtkConversation *gtk_conv = GAIM_GTK_CONVERSATION(conv);
+	PidginConversation *gtk_conv = PIDGIN_CONVERSATION(conv);
 	GtkTextBuffer *buffer;
 
 	if (!g_list_find(gaim_get_conversations(), conv))
@@ -133,7 +133,7 @@
 	ret = gtk_vbox_new(FALSE, 18);
 	gtk_container_set_border_width (GTK_CONTAINER (ret), 12);
 
-	frame = gaim_gtk_make_frame(ret, _("Display Timestamps Every"));
+	frame = pidgin_make_frame(ret, _("Display Timestamps Every"));
 	vbox = gtk_vbox_new(FALSE, 5);
 	gtk_container_add(GTK_CONTAINER(frame), vbox);
 
@@ -157,7 +157,7 @@
 plugin_load(GaimPlugin *plugin)
 {
 	void *conv_handle = gaim_conversations_get_handle();
-	void *gtkconv_handle = gaim_gtk_conversations_get_handle();
+	void *gtkconv_handle = pidgin_conversations_get_handle();
 
 	/* lower priority to display initial timestamp after logged messages */
 	gaim_signal_connect_priority(conv_handle, "conversation-created",
@@ -174,7 +174,7 @@
 	return TRUE;
 }
 
-static GaimGtkPluginUiInfo ui_info =
+static PidginPluginUiInfo ui_info =
 {
 	get_config_frame,
 	0 /* page_num (Reserved) */
@@ -186,7 +186,7 @@
 	GAIM_MAJOR_VERSION,
 	GAIM_MINOR_VERSION,
 	GAIM_PLUGIN_STANDARD,                             /**< type           */
-	GAIM_GTK_PLUGIN_TYPE,                             /**< ui_requirement */
+	PIDGIN_PLUGIN_TYPE,                             /**< ui_requirement */
 	0,                                                /**< flags          */
 	NULL,                                             /**< dependencies   */
 	GAIM_PRIORITY_DEFAULT,                            /**< priority       */
--- a/pidgin/plugins/timestamp_format.c	Sat Feb 03 05:55:41 2007 +0000
+++ b/pidgin/plugins/timestamp_format.c	Sat Feb 03 08:13:34 2007 +0000
@@ -115,7 +115,7 @@
 static gboolean
 plugin_load(GaimPlugin *plugin)
 {
-	gaim_signal_connect(gaim_gtk_conversations_get_handle(), "conversation-timestamp",
+	gaim_signal_connect(pidgin_conversations_get_handle(), "conversation-timestamp",
 	                    plugin, GAIM_CALLBACK(conversation_timestamp_cb), NULL);
 	gaim_signal_connect(gaim_log_get_handle(), "log-timestamp",
 	                    plugin, GAIM_CALLBACK(log_timestamp_cb), NULL);
@@ -140,7 +140,7 @@
 	GAIM_MAJOR_VERSION,
 	GAIM_MINOR_VERSION,
 	GAIM_PLUGIN_STANDARD,                             /**< type           */
-	GAIM_GTK_PLUGIN_TYPE,                             /**< ui_requirement */
+	PIDGIN_PLUGIN_TYPE,                             /**< ui_requirement */
 	0,                                                /**< flags          */
 	NULL,                                             /**< dependencies   */
 	GAIM_PRIORITY_DEFAULT,                            /**< priority       */
--- a/pidgin/plugins/win32/transparency/win2ktrans.c	Sat Feb 03 05:55:41 2007 +0000
+++ b/pidgin/plugins/win32/transparency/win2ktrans.c	Sat Feb 03 08:13:34 2007 +0000
@@ -44,8 +44,8 @@
 #define WINTRANS_PLUGIN_ID	"gtk-win-trans"
 
 #define blist	(gaim_get_blist() \
-		? (GAIM_GTK_BLIST(gaim_get_blist()) \
-			? ((GAIM_GTK_BLIST(gaim_get_blist()))->window) \
+		? (PIDGIN_BLIST(gaim_get_blist()) \
+			? ((PIDGIN_BLIST(gaim_get_blist()))->window) \
 			: NULL) \
 		: NULL)
 
@@ -215,7 +215,7 @@
 }
 
 /* Clean up transparency stuff for the conv window */
-static void cleanup_conv_window(GaimGtkWindow *win) {
+static void cleanup_conv_window(PidginWindow *win) {
 	GtkWidget *window = win->window;
 	slider_win *slidwin = NULL;
 
@@ -234,9 +234,9 @@
 }
 
 static void gaim_conversation_delete(GaimConversation *conv) {
-	GaimGtkWindow *win = gaim_gtkconv_get_window(GAIM_GTK_CONVERSATION(conv));
+	PidginWindow *win = pidgin_conv_get_window(PIDGIN_CONVERSATION(conv));
 	/* If it is the last conversation in the window, cleanup */
-	if (gaim_gtk_conv_window_get_gtkconv_count(win) == 1)
+	if (pidgin_conv_window_get_gtkconv_count(win) == 1)
 		cleanup_conv_window(win);
 }
 
@@ -327,8 +327,8 @@
 static void remove_convs_wintrans(gboolean remove_signal) {
 	GList *wins;
 
-	for (wins = gaim_gtk_conv_windows_get_list(); wins; wins = wins->next) {
-		GaimGtkWindow *win = wins->data;
+	for (wins = pidgin_conv_windows_get_list(); wins; wins = wins->next) {
+		PidginWindow *win = wins->data;
 		GtkWidget *window = win->window;
 
 		if (gaim_prefs_get_bool(OPT_WINTRANS_IM_ENABLED))
@@ -343,7 +343,7 @@
 	remove_sliders();
 }
 
-static void set_conv_window_trans(GaimGtkWindow *oldwin, GaimGtkWindow *newwin) {
+static void set_conv_window_trans(PidginWindow *oldwin, PidginWindow *newwin) {
 	GtkWidget *win = newwin->window;
 
 	/* check prefs to see if we want trans */
@@ -359,7 +359,7 @@
 	/* If we're moving from one window to another,
 	 * add the focus listeners to the new window if not already there */
 	if (oldwin != NULL && oldwin != newwin) {
-		if (gaim_gtk_conv_window_get_gtkconv_count(newwin) == 0) {
+		if (pidgin_conv_window_get_gtkconv_count(newwin) == 0) {
 			g_signal_connect(G_OBJECT(win), "focus_in_event",
 				G_CALLBACK(focus_conv_win_cb), win);
 			g_signal_connect(G_OBJECT(win), "focus_out_event",
@@ -367,7 +367,7 @@
 		}
 
 		/* If we've moved the last conversation, cleanup the window */
-		if (gaim_gtk_conv_window_get_gtkconv_count(oldwin) == 1)
+		if (pidgin_conv_window_get_gtkconv_count(oldwin) == 1)
 			cleanup_conv_window(oldwin);
 	}
 }
@@ -379,8 +379,8 @@
 	if (gaim_prefs_get_bool(OPT_WINTRANS_IM_ENABLED)) {
 		GList *wins;
 
-		for (wins = gaim_gtk_conv_windows_get_list(); wins; wins = wins->next) {
-			GaimGtkWindow *win = wins->data;
+		for (wins = pidgin_conv_windows_get_list(); wins; wins = wins->next) {
+			PidginWindow *win = wins->data;
 			set_conv_window_trans(NULL, win);
 		}
 
@@ -392,11 +392,11 @@
 }
 
 static void gaim_new_conversation(GaimConversation *conv) {
-	GaimGtkWindow *win = gaim_gtkconv_get_window(GAIM_GTK_CONVERSATION(conv));
+	PidginWindow *win = pidgin_conv_get_window(PIDGIN_CONVERSATION(conv));
 
 	/* If it is the first conversation in the window,
 	 * add the sliders, and set transparency */
-	if (gaim_gtk_conv_window_get_gtkconv_count(win) == 1) {
+	if (pidgin_conv_window_get_gtkconv_count(win) == 1) {
 		GtkWidget *window = win->window;
 
 		set_conv_window_trans(NULL, win);
@@ -428,8 +428,8 @@
 	GList *wins;
 	int imalpha = gtk_range_get_value(GTK_RANGE(w));
 
-	for (wins = gaim_gtk_conv_windows_get_list(); wins; wins = wins->next) {
-		GaimGtkWindow *win = wins->data;
+	for (wins = pidgin_conv_windows_get_list(); wins; wins = wins->next) {
+		PidginWindow *win = wins->data;
 		set_wintrans(win->window, imalpha, TRUE,
 			gaim_prefs_get_bool(OPT_WINTRANS_IM_ONTOP));
 	}
@@ -449,8 +449,8 @@
 static void update_existing_convs() {
 	GList *wins;
 
-	for (wins = gaim_gtk_conv_windows_get_list(); wins; wins = wins->next) {
-		GaimGtkWindow *win = wins->data;
+	for (wins = pidgin_conv_windows_get_list(); wins; wins = wins->next) {
+		PidginWindow *win = wins->data;
 		GtkWidget *window = win->window;
 
 		set_conv_window_trans(NULL, win);
@@ -484,7 +484,7 @@
 		"deleting-conversation", plugin,
 		GAIM_CALLBACK(gaim_conversation_delete), NULL);
 
-	gaim_signal_connect(gaim_gtk_conversations_get_handle(),
+	gaim_signal_connect(pidgin_conversations_get_handle(),
 		"conversation-dragging", plugin,
 		GAIM_CALLBACK(set_conv_window_trans), NULL);
 
@@ -493,7 +493,7 @@
 	if (blist)
 		blist_created_cb(NULL, NULL);
 	else
-		gaim_signal_connect(gaim_gtk_blist_get_handle(),
+		gaim_signal_connect(pidgin_blist_get_handle(),
 			"gtkblist-created", plugin,
 			GAIM_CALLBACK(blist_created_cb), NULL);
 
@@ -530,7 +530,7 @@
 	gtk_container_set_border_width(GTK_CONTAINER (ret), 12);
 
 	/* IM Convo trans options */
-	imtransbox = gaim_gtk_make_frame(ret, _("IM Conversation Windows"));
+	imtransbox = pidgin_make_frame(ret, _("IM Conversation Windows"));
 	button = wgaim_button(_("_IM window transparency"),
 		OPT_WINTRANS_IM_ENABLED, imtransbox);
 	g_signal_connect(GTK_OBJECT(button), "clicked",
@@ -543,7 +543,7 @@
 	gtk_widget_show(trans_box);
 
 	g_signal_connect(GTK_OBJECT(button), "clicked",
-		GTK_SIGNAL_FUNC(gaim_gtk_toggle_sensitive), trans_box);
+		GTK_SIGNAL_FUNC(pidgin_toggle_sensitive), trans_box);
 
 	button = wgaim_button(_("_Show slider bar in IM window"),
 		OPT_WINTRANS_IM_SLIDER, trans_box);
@@ -551,7 +551,7 @@
 		GTK_SIGNAL_FUNC(update_convs_wintrans),
 		(gpointer) OPT_WINTRANS_IM_SLIDER);
 
-	button = gaim_gtk_prefs_checkbox(
+	button = pidgin_prefs_checkbox(
 		_("Remove IM window transparency on focus"),
 		OPT_WINTRANS_IM_ONFOCUS, trans_box);
 
@@ -587,7 +587,7 @@
 	gtk_box_pack_start(GTK_BOX(trans_box), hbox, FALSE, FALSE, 5);
 
 	/* Buddy List trans options */
-	bltransbox = gaim_gtk_make_frame (ret, _("Buddy List Window"));
+	bltransbox = pidgin_make_frame (ret, _("Buddy List Window"));
 	button = wgaim_button(_("_Buddy List window transparency"),
 		OPT_WINTRANS_BL_ENABLED, bltransbox);
 	g_signal_connect(GTK_OBJECT(button), "clicked",
@@ -599,8 +599,8 @@
 		gtk_widget_set_sensitive(GTK_WIDGET(trans_box), FALSE);
 	gtk_widget_show(trans_box);
 	g_signal_connect(GTK_OBJECT(button), "clicked",
-		GTK_SIGNAL_FUNC(gaim_gtk_toggle_sensitive), trans_box);
-	button = gaim_gtk_prefs_checkbox(
+		GTK_SIGNAL_FUNC(pidgin_toggle_sensitive), trans_box);
+	button = pidgin_prefs_checkbox(
 		_("Remove Buddy List window transparency on focus"),
 		OPT_WINTRANS_BL_ONFOCUS, trans_box);
 	button = wgaim_button(_("Always on top"), OPT_WINTRANS_BL_ONTOP,
@@ -638,7 +638,7 @@
 	return ret;
 }
 
-static GaimGtkPluginUiInfo ui_info =
+static PidginPluginUiInfo ui_info =
 {
 	get_config_frame,
 	0 /* page_num (Reserved) */
@@ -650,7 +650,7 @@
 	GAIM_MAJOR_VERSION,
 	GAIM_MINOR_VERSION,
 	GAIM_PLUGIN_STANDARD,		/**< type           */
-	GAIM_GTK_PLUGIN_TYPE,		/**< ui_requirement */
+	PIDGIN_PLUGIN_TYPE,		/**< ui_requirement */
 	0,				/**< flags          */
 	NULL,				/**< dependencies   */
 	GAIM_PRIORITY_DEFAULT,		/**< priority       */
--- a/pidgin/plugins/win32/winprefs/winprefs.c	Sat Feb 03 05:55:41 2007 +0000
+++ b/pidgin/plugins/win32/winprefs/winprefs.c	Sat Feb 03 08:13:34 2007 +0000
@@ -173,7 +173,7 @@
 static void blist_create_cb(GaimBuddyList *gaim_blist, void *data) {
 	gaim_debug_info(WINPREFS_PLUGIN_ID, "buddy list created\n");
 
-	blist = GAIM_GTK_BLIST(gaim_blist)->window;
+	blist = PIDGIN_BLIST(gaim_blist)->window;
 
 	if(gaim_prefs_get_bool(PREF_DBLIST_DOCKABLE)) {
 		blist_set_dockable(TRUE);
@@ -252,17 +252,17 @@
 	handle = plugin;
 
 	/* blist docking init */
-	if(gaim_get_blist() && GAIM_GTK_BLIST(gaim_get_blist())
-			&& GAIM_GTK_BLIST(gaim_get_blist())->window) {
+	if(gaim_get_blist() && PIDGIN_BLIST(gaim_get_blist())
+			&& PIDGIN_BLIST(gaim_get_blist())->window) {
 		blist_create_cb(gaim_get_blist(), NULL);
 	}
 
 	/* This really shouldn't happen anymore generally, but if for some strange
 	   reason, the blist is recreated, we need to set it up again. */
-	gaim_signal_connect(gaim_gtk_blist_get_handle(), "gtkblist-created",
+	gaim_signal_connect(pidgin_blist_get_handle(), "gtkblist-created",
 		plugin, GAIM_CALLBACK(blist_create_cb), NULL);
 
-	gaim_signal_connect(gaim_gtk_conversations_get_handle(),
+	gaim_signal_connect(pidgin_conversations_get_handle(),
 		"displaying-chat-msg", plugin, GAIM_CALLBACK(gtkwgaim_conv_chat_blink),
 		NULL);
 
@@ -303,7 +303,7 @@
 	/* Display Installed GTK+ Runtime Version */
 	if(gtk_version) {
 		GtkWidget *label;
-		vbox = gaim_gtk_make_frame(ret, _("GTK+ Runtime Version"));
+		vbox = pidgin_make_frame(ret, _("GTK+ Runtime Version"));
 		label = gtk_label_new(gtk_version);
 		gtk_box_pack_start(GTK_BOX(vbox), label, FALSE, FALSE, 0);
 		gtk_widget_show(label);
@@ -311,7 +311,7 @@
 	}
 
 	/* Autostart */
-	vbox = gaim_gtk_make_frame(ret, _("Startup"));
+	vbox = pidgin_make_frame(ret, _("Startup"));
 	button = gtk_check_button_new_with_mnemonic(_("_Start " PIDGIN_NAME " on Windows startup"));
 	gtk_box_pack_start(GTK_BOX(vbox), button, FALSE, FALSE, 0);
 
@@ -324,12 +324,12 @@
 	gtk_widget_show(button);
 
 	/* Buddy List */
-	vbox = gaim_gtk_make_frame(ret, _("Buddy List"));
-	gaim_gtk_prefs_checkbox(_("_Dockable Buddy List"),
+	vbox = pidgin_make_frame(ret, _("Buddy List"));
+	pidgin_prefs_checkbox(_("_Dockable Buddy List"),
 							PREF_DBLIST_DOCKABLE, vbox);
 
 	/* Blist On Top */
-	gaim_gtk_prefs_dropdown(vbox, _("_Keep Buddy List window on top:"),
+	pidgin_prefs_dropdown(vbox, _("_Keep Buddy List window on top:"),
 		GAIM_PREF_INT, PREF_BLIST_ON_TOP,
 		_("Never"), BLIST_TOP_NEVER,
 		_("Always"), BLIST_TOP_ALWAYS,
@@ -338,15 +338,15 @@
 		NULL);
 
 	/* Conversations */
-	vbox = gaim_gtk_make_frame(ret, _("Conversations"));
-	gaim_gtk_prefs_checkbox(_("_Flash window when chat messages are received"),
+	vbox = pidgin_make_frame(ret, _("Conversations"));
+	pidgin_prefs_checkbox(_("_Flash window when chat messages are received"),
 							PREF_CHAT_BLINK, vbox);
 
 	gtk_widget_show_all(ret);
 	return ret;
 }
 
-static GaimGtkPluginUiInfo ui_info =
+static PidginPluginUiInfo ui_info =
 {
 	get_config_frame,
 	0
@@ -358,7 +358,7 @@
 	GAIM_MAJOR_VERSION,
 	GAIM_MINOR_VERSION,
 	GAIM_PLUGIN_STANDARD,
-	GAIM_GTK_PLUGIN_TYPE,
+	PIDGIN_PLUGIN_TYPE,
 	0,
 	NULL,
 	GAIM_PRIORITY_DEFAULT,
--- a/pidgin/plugins/xmppconsole.c	Sat Feb 03 05:55:41 2007 +0000
+++ b/pidgin/plugins/xmppconsole.c	Sat Feb 03 08:13:34 2007 +0000
@@ -851,7 +851,7 @@
 	GAIM_MAJOR_VERSION,
 	GAIM_MINOR_VERSION,
 	GAIM_PLUGIN_STANDARD,                             /**< type           */
-	GAIM_GTK_PLUGIN_TYPE,                             /**< ui_requirement */
+	PIDGIN_PLUGIN_TYPE,                             /**< ui_requirement */
 	0,                                                /**< flags          */
 	NULL,                                             /**< dependencies   */
 	GAIM_PRIORITY_DEFAULT,                            /**< priority       */
--- a/pidgin/win32/gtkdocklet-win32.c	Sat Feb 03 05:55:41 2007 +0000
+++ b/pidgin/win32/gtkdocklet-win32.c	Sat Feb 03 08:13:34 2007 +0000
@@ -84,7 +84,7 @@
 		else
 			break;
 
-		gaim_gtk_docklet_clicked(type);
+		pidgin_docklet_clicked(type);
 		break;
 	}
 	default:
@@ -136,7 +136,7 @@
 	wgaim_nid.hIcon = icon;
 	lstrcpy(wgaim_nid.szTip, PIDGIN_NAME);
 	Shell_NotifyIcon(NIM_ADD, &wgaim_nid);
-	gaim_gtk_docklet_embedded();
+	pidgin_docklet_embedded();
 }
 
 static void systray_change_icon(HICON icon) {
@@ -186,11 +186,11 @@
 	Shell_NotifyIcon(NIM_MODIFY, &wgaim_nid);
 }
 
-static void wgaim_tray_minimize(GaimGtkBuddyList *gtkblist) {
+static void wgaim_tray_minimize(PidginBuddyList *gtkblist) {
 	MinimizeWndToTray(GDK_WINDOW_HWND(gtkblist->window->window));
 }
 
-static void wgaim_tray_maximize(GaimGtkBuddyList *gtkblist) {
+static void wgaim_tray_maximize(PidginBuddyList *gtkblist) {
 	RestoreWndFromTray(GDK_WINDOW_HWND(gtkblist->window->window));
 }
 
@@ -228,10 +228,10 @@
 	/* Create icon in systray */
 	systray_init_icon(systray_hwnd, sysicon_disconn);
 
-	gaim_signal_connect(gaim_gtk_blist_get_handle(), "gtkblist-hiding",
-			gaim_gtk_docklet_get_handle(), GAIM_CALLBACK(wgaim_tray_minimize), NULL);
-	gaim_signal_connect(gaim_gtk_blist_get_handle(), "gtkblist-unhiding",
-			gaim_gtk_docklet_get_handle(), GAIM_CALLBACK(wgaim_tray_maximize), NULL);
+	gaim_signal_connect(pidgin_blist_get_handle(), "gtkblist-hiding",
+			pidgin_docklet_get_handle(), GAIM_CALLBACK(wgaim_tray_minimize), NULL);
+	gaim_signal_connect(pidgin_blist_get_handle(), "gtkblist-unhiding",
+			pidgin_docklet_get_handle(), GAIM_CALLBACK(wgaim_tray_maximize), NULL);
 
 	gaim_debug(GAIM_DEBUG_INFO, "docklet", "created\n");
 }
@@ -239,7 +239,7 @@
 static void wgaim_tray_destroy() {
 	systray_remove_nid();
 	DestroyWindow(systray_hwnd);
-	gaim_gtk_docklet_remove();
+	pidgin_docklet_remove();
 }
 
 static struct docklet_ui_ops wgaim_tray_ops =
@@ -254,5 +254,5 @@
 
 /* Used by docklet's plugin load func */
 void docklet_ui_init() {
-	gaim_gtk_docklet_set_ui_ops(&wgaim_tray_ops);
+	pidgin_docklet_set_ui_ops(&wgaim_tray_ops);
 }
--- a/pidgin/win32/gtkwin32dep.c	Sat Feb 03 05:55:41 2007 +0000
+++ b/pidgin/win32/gtkwin32dep.c	Sat Feb 03 08:13:34 2007 +0000
@@ -279,7 +279,7 @@
 
 void
 gtkwgaim_conv_blink(GaimConversation *conv, GaimMessageFlags flags) {
-	GaimGtkWindow *win;
+	PidginWindow *win;
 	GtkWindow *window;
 
 	/* Don't flash for our own messages or system messages */
@@ -291,7 +291,7 @@
 		return;
 	}
 
-	win = gaim_gtkconv_get_window(GAIM_GTK_CONVERSATION(conv));
+	win = pidgin_conv_get_window(PIDGIN_CONVERSATION(conv));
 	if(win == NULL) {
 		gaim_debug_info("gtkwgaim", "No conversation windows found to blink.\n");
 		return;
@@ -323,7 +323,7 @@
 	if(!wgaim_set_idlehooks())
 		gaim_debug_error("gtkwgaim", "Failed to initialize idle tracker\n");
 
-	wgaim_gtkspell_init();
+	wpidginspell_init();
 	gaim_debug_info("gtkwgaim", "GTK+ :%u.%u.%u\n",
 		gtk_major_version, gtk_minor_version, gtk_micro_version);
 
@@ -339,7 +339,7 @@
 	gaim_prefs_add_none("/gaim/gtk/win32");
 	gaim_prefs_add_bool("/gaim/gtk/win32/blink_im", TRUE);
 
-	gaim_signal_connect(gaim_gtk_conversations_get_handle(),
+	gaim_signal_connect(pidgin_conversations_get_handle(),
 		"displaying-im-msg", &gtkwin32_handle, GAIM_CALLBACK(gtkwgaim_conv_im_blink),
 		NULL);
 
--- a/pidgin/win32/wspell.c	Sat Feb 03 05:55:41 2007 +0000
+++ b/pidgin/win32/wspell.c	Sat Feb 03 08:13:34 2007 +0000
@@ -43,26 +43,26 @@
 void      wgtkspell_recheck_all(GtkSpell *spell) {}
 
 /* GTKSPELL PROTOS */
-GtkSpell*         (*wgaim_gtkspell_new_attach)              (GtkTextView *,
+GtkSpell*         (*wpidginspell_new_attach)              (GtkTextView *,
 							     const gchar *,
 							     GError **) = wgtkspell_new_attach;
 
-GtkSpell*         (*wgaim_gtkspell_get_from_text_view)      (GtkTextView*) = wgtkspell_get_from_text_view;
+GtkSpell*         (*wpidginspell_get_from_text_view)      (GtkTextView*) = wgtkspell_get_from_text_view;
 
-void              (*wgaim_gtkspell_detach)                  (GtkSpell*) = wgtkspell_detach;
+void              (*wpidginspell_detach)                  (GtkSpell*) = wgtkspell_detach;
 
-gboolean          (*wgaim_gtkspell_set_language)            (GtkSpell*,
+gboolean          (*wpidginspell_set_language)            (GtkSpell*,
 							     const gchar*,
 							     GError**) = wgtkspell_set_language;
 
-void              (*wgaim_gtkspell_recheck_all)             (GtkSpell*) = wgtkspell_recheck_all;
+void              (*wpidginspell_recheck_all)             (GtkSpell*) = wgtkspell_recheck_all;
 
 static void load_gtkspell() {
-	wgaim_gtkspell_new_attach = (void*)wgaim_find_and_loadproc("libgtkspell.dll", "gtkspell_new_attach" );
-	wgaim_gtkspell_get_from_text_view = (void*)wgaim_find_and_loadproc("libgtkspell.dll", "gtkspell_get_from_text_view");
-	wgaim_gtkspell_detach = (void*)wgaim_find_and_loadproc("libgtkspell.dll", "gtkspell_detach");
-	wgaim_gtkspell_set_language = (void*)wgaim_find_and_loadproc("libgtkspell.dll", "gtkspell_set_language");
-	wgaim_gtkspell_recheck_all = (void*)wgaim_find_and_loadproc("libgtkspell.dll", "gtkspell_recheck_all");
+	wpidginspell_new_attach = (void*)wgaim_find_and_loadproc("libgtkspell.dll", "gtkspell_new_attach" );
+	wpidginspell_get_from_text_view = (void*)wgaim_find_and_loadproc("libgtkspell.dll", "gtkspell_get_from_text_view");
+	wpidginspell_detach = (void*)wgaim_find_and_loadproc("libgtkspell.dll", "gtkspell_detach");
+	wpidginspell_set_language = (void*)wgaim_find_and_loadproc("libgtkspell.dll", "gtkspell_set_language");
+	wpidginspell_recheck_all = (void*)wgaim_find_and_loadproc("libgtkspell.dll", "gtkspell_recheck_all");
 }
 
 static char* lookup_aspell_path() {
@@ -74,7 +74,7 @@
 	return wgaim_read_reg_string(HKEY_LOCAL_MACHINE, "Software\\Aspell", "Path");
 }
 
-void wgaim_gtkspell_init() {
+void wpidginspell_init() {
 	char *aspell_path = lookup_aspell_path();
 
 	if (aspell_path != NULL) {
--- a/pidgin/win32/wspell.h	Sat Feb 03 05:55:41 2007 +0000
+++ b/pidgin/win32/wspell.h	Sat Feb 03 08:13:34 2007 +0000
@@ -24,26 +24,26 @@
 #define _WSPELL_H_
 #include <gtkspell/gtkspell.h>
 
-void wgaim_gtkspell_init(void);
+void wpidginspell_init(void);
 
-extern GtkSpell* (*wgaim_gtkspell_new_attach)(GtkTextView*, const gchar*, GError**);
+extern GtkSpell* (*wpidginspell_new_attach)(GtkTextView*, const gchar*, GError**);
 #define gtkspell_new_attach( view, lang, error ) \
-wgaim_gtkspell_new_attach( view, lang, error )
+wpidginspell_new_attach( view, lang, error )
 
-extern GtkSpell* (*wgaim_gtkspell_get_from_text_view)(GtkTextView*);
+extern GtkSpell* (*wpidginspell_get_from_text_view)(GtkTextView*);
 #define gtkspell_get_from_text_view( view ) \
-wgaim_gtkspell_get_from_text_view( view )
+wpidginspell_get_from_text_view( view )
 
-extern void (*wgaim_gtkspell_detach)(GtkSpell*);
+extern void (*wpidginspell_detach)(GtkSpell*);
 #define gtkspell_detach( spell ) \
-wgaim_gtkspell_detach( spell )
+wpidginspell_detach( spell )
 
-extern gboolean (*wgaim_gtkspell_set_language)(GtkSpell*,	const gchar*, GError**);
+extern gboolean (*wpidginspell_set_language)(GtkSpell*,	const gchar*, GError**);
 #define gtkspell_set_language( spell, lang, error ) \
-wgaim_gtkspell_set_language( spell, lang, error )
+wpidginspell_set_language( spell, lang, error )
 
-extern void (*wgaim_gtkspell_recheck_all)(GtkSpell*);
+extern void (*wpidginspell_recheck_all)(GtkSpell*);
 #define gtkspell_recheck_all( spell ) \
-wgaim_gtkspell_recheck_all( spell )
+wpidginspell_recheck_all( spell )
 
 #endif /* _WSPELL_H_ */