# HG changeset patch
# User Sean Egan <seanegan@gmail.com>
# Date 1170492332 0
# Node ID 311315e979f747ccdb19b007971f77831f4e76bf
# Parent  e4c39e261389213593e305c69e69db054b0fb6f8
gtkutils changes

diff -r e4c39e261389 -r 311315e979f7 pidgin/gtkaccount.c
--- a/pidgin/gtkaccount.c	Sat Feb 03 08:24:09 2007 +0000
+++ b/pidgin/gtkaccount.c	Sat Feb 03 08:45:32 2007 +0000
@@ -189,7 +189,7 @@
 
 	gtk_box_pack_start(GTK_BOX(hbox), widget, TRUE, TRUE, GAIM_HIG_BORDER);
 	gtk_widget_show(widget);
-	gaim_set_accessible_label (widget, label);
+	pidgin_set_accessible_label (widget, label);
 
 	return hbox;
 }
@@ -593,7 +593,7 @@
 	gtk_container_add(GTK_CONTAINER(button), dialog->icon_entry);
 	gtk_widget_show(dialog->icon_entry);
 	/* TODO: Uh, isn't this next line pretty useless? */
-	gaim_set_accessible_label (dialog->icon_entry, label);
+	pidgin_set_accessible_label (dialog->icon_entry, label);
 	dialog->cached_icon_path = NULL;
 	dialog->icon_path = NULL;
 
diff -r e4c39e261389 -r 311315e979f7 pidgin/gtkblist.c
--- a/pidgin/gtkblist.c	Sat Feb 03 08:24:09 2007 +0000
+++ b/pidgin/gtkblist.c	Sat Feb 03 08:45:32 2007 +0000
@@ -632,7 +632,7 @@
 			focus = FALSE;
 		}
 		gtk_label_set_mnemonic_widget(GTK_LABEL(label), input);
-		gaim_set_accessible_label(input, label);
+		pidgin_set_accessible_label(input, label);
 		g_object_set_data(G_OBJECT(input), "identifier", (gpointer)pce->identifier);
 		g_object_set_data(G_OBJECT(input), "is_spin", GINT_TO_POINTER(pce->is_int));
 		g_object_set_data(G_OBJECT(input), "required", GINT_TO_POINTER(pce->required));
@@ -743,7 +743,7 @@
 	gtk_box_pack_start(GTK_BOX(rowbox), data->account_menu, TRUE, TRUE, 0);
 	gtk_label_set_mnemonic_widget(GTK_LABEL(label),
 								  GTK_WIDGET(data->account_menu));
-	gaim_set_accessible_label (data->account_menu, label);
+	pidgin_set_accessible_label (data->account_menu, label);
 
 	data->entries_box = gtk_vbox_new(FALSE, 5);
 	gtk_container_add(GTK_CONTAINER(vbox), data->entries_box);
@@ -1006,7 +1006,7 @@
 	account = gaim_buddy_get_account(buddy);
 	permitted = gaim_privacy_check(account, gaim_buddy_get_name(buddy));
 
-	gaim_new_item_from_stock(menu, permitted ? _("_Block") : _("Un_block"),
+	pidgin_new_item_from_stock(menu, permitted ? _("_Block") : _("Un_block"),
 						GAIM_STOCK_BLOCK, G_CALLBACK(toggle_privacy),
 						node, 0 ,0, NULL);
 }
@@ -1057,31 +1057,31 @@
 	}
 
 	if (prpl_info && prpl_info->get_info) {
-		gaim_new_item_from_stock(menu, _("Get _Info"), GAIM_STOCK_INFO,
+		pidgin_new_item_from_stock(menu, _("Get _Info"), GAIM_STOCK_INFO,
 				G_CALLBACK(gtk_blist_menu_info_cb), buddy, 0, 0, NULL);
 	}
-	gaim_new_item_from_stock(menu, _("I_M"), GAIM_STOCK_IM,
+	pidgin_new_item_from_stock(menu, _("I_M"), GAIM_STOCK_IM,
 			G_CALLBACK(gtk_blist_menu_im_cb), buddy, 0, 0, NULL);
 	if (prpl_info && prpl_info->send_file) {
 		if (!prpl_info->can_receive_file ||
 			prpl_info->can_receive_file(buddy->account->gc, buddy->name))
 		{
-			gaim_new_item_from_stock(menu, _("_Send File"),
+			pidgin_new_item_from_stock(menu, _("_Send File"),
 									 GAIM_STOCK_FILE_TRANSFER,
 									 G_CALLBACK(gtk_blist_menu_send_file_cb),
 									 buddy, 0, 0, NULL);
 		}
 	}
 
-	gaim_new_item_from_stock(menu, _("Add Buddy _Pounce"), GAIM_STOCK_POUNCE,
+	pidgin_new_item_from_stock(menu, _("Add Buddy _Pounce"), GAIM_STOCK_POUNCE,
 			G_CALLBACK(gtk_blist_menu_bp_cb), buddy, 0, 0, NULL);
 
 	if(((GaimBlistNode*)buddy)->parent->child->next && !sub && !contact_expanded) {
-		gaim_new_item_from_stock(menu, _("View _Log"), GAIM_STOCK_LOG,
+		pidgin_new_item_from_stock(menu, _("View _Log"), GAIM_STOCK_LOG,
 				G_CALLBACK(gtk_blist_menu_showlog_cb),
 				contact, 0, 0, NULL);
 	} else if (!sub) {
-		gaim_new_item_from_stock(menu, _("View _Log"), GAIM_STOCK_LOG,
+		pidgin_new_item_from_stock(menu, _("View _Log"), GAIM_STOCK_LOG,
 				G_CALLBACK(gtk_blist_menu_showlog_cb), buddy, 0, 0, NULL);
 	}
 
@@ -1092,20 +1092,20 @@
 	pidgin_append_blist_node_extended_menu(menu, (GaimBlistNode *)buddy);
 
 	if (((GaimBlistNode*)buddy)->parent->child->next && !sub && !contact_expanded) {
-		gaim_separator(menu);
-
-		gaim_new_item_from_stock(menu, _("Alias..."), GAIM_STOCK_ALIAS,
+		pidgin_separator(menu);
+
+		pidgin_new_item_from_stock(menu, _("Alias..."), GAIM_STOCK_ALIAS,
 				G_CALLBACK(gtk_blist_menu_alias_cb),
 				contact, 0, 0, NULL);
-		gaim_new_item_from_stock(menu, _("Remove"), GTK_STOCK_REMOVE,
+		pidgin_new_item_from_stock(menu, _("Remove"), GTK_STOCK_REMOVE,
 				G_CALLBACK(pidgin_blist_remove_cb),
 				contact, 0, 0, NULL);
 	} else if (!sub || contact_expanded) {
-		gaim_separator(menu);
-
-		gaim_new_item_from_stock(menu, _("_Alias..."), GAIM_STOCK_ALIAS,
+		pidgin_separator(menu);
+
+		pidgin_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,
+		pidgin_new_item_from_stock(menu, _("_Remove"), GTK_STOCK_REMOVE,
 				G_CALLBACK(pidgin_blist_remove_cb), buddy,
 				0, 0, NULL);
 	}
@@ -1152,14 +1152,14 @@
 	GtkWidget *item;
 
 	menu = gtk_menu_new();
-	gaim_new_item_from_stock(menu, _("Add a _Buddy"), GTK_STOCK_ADD,
+	pidgin_new_item_from_stock(menu, _("Add a _Buddy"), GTK_STOCK_ADD,
 				 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,
+	item = pidgin_new_item_from_stock(menu, _("Add a C_hat"), GTK_STOCK_ADD,
 				 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,
+	pidgin_new_item_from_stock(menu, _("_Delete Group"), GTK_STOCK_REMOVE,
 				 G_CALLBACK(pidgin_blist_remove_cb), node, 0, 0, NULL);
-	gaim_new_item_from_stock(menu, _("_Rename"), NULL,
+	pidgin_new_item_from_stock(menu, _("_Rename"), NULL,
 				 G_CALLBACK(gtk_blist_menu_alias_cb), node, 0, 0, NULL);
 
 	pidgin_append_blist_node_extended_menu(menu, node);
@@ -1177,21 +1177,21 @@
 	autojoin = (gaim_blist_node_get_bool(node, "gtk-autojoin") ||
 			(gaim_blist_node_get_string(node, "gtk-autojoin") != NULL));
 
-	gaim_new_item_from_stock(menu, _("_Join"), GAIM_STOCK_CHAT,
+	pidgin_new_item_from_stock(menu, _("_Join"), GAIM_STOCK_CHAT,
 			G_CALLBACK(gtk_blist_menu_join_cb), node, 0, 0, NULL);
-	gaim_new_check_item(menu, _("Auto-Join"),
+	pidgin_new_check_item(menu, _("Auto-Join"),
 			G_CALLBACK(gtk_blist_menu_autojoin_cb), node, autojoin);
-	gaim_new_item_from_stock(menu, _("View _Log"), GAIM_STOCK_LOG,
+	pidgin_new_item_from_stock(menu, _("View _Log"), GAIM_STOCK_LOG,
 			G_CALLBACK(gtk_blist_menu_showlog_cb), node, 0, 0, NULL);
 
 	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,
+	pidgin_separator(menu);
+
+	pidgin_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,
+	pidgin_new_item_from_stock(menu, _("_Remove"), GTK_STOCK_REMOVE,
 				 G_CALLBACK(pidgin_blist_remove_cb), node, 0, 0, NULL);
 
 	return menu;
@@ -1204,20 +1204,20 @@
 
 	menu = gtk_menu_new();
 
-	gaim_new_item_from_stock(menu, _("View _Log"), GAIM_STOCK_LOG,
+	pidgin_new_item_from_stock(menu, _("View _Log"), GAIM_STOCK_LOG,
 				 G_CALLBACK(gtk_blist_menu_showlog_cb),
 				 node, 0, 0, NULL);
 
-	gaim_separator(menu);
-
-	gaim_new_item_from_stock(menu, _("_Alias..."), GAIM_STOCK_ALIAS,
+	pidgin_separator(menu);
+
+	pidgin_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,
+	pidgin_new_item_from_stock(menu, _("_Remove"), GTK_STOCK_REMOVE,
 				 G_CALLBACK(pidgin_blist_remove_cb), node, 0, 0, NULL);
 
-	gaim_separator(menu);
-
-	gaim_new_item_from_stock(menu, _("_Collapse"), GTK_STOCK_ZOOM_OUT,
+	pidgin_separator(menu);
+
+	pidgin_new_item_from_stock(menu, _("_Collapse"), GTK_STOCK_ZOOM_OUT,
 				 G_CALLBACK(pidgin_blist_collapse_contact_cb),
 				 node, 0, 0, NULL);
 
@@ -1237,15 +1237,15 @@
 	pidgin_blist_make_buddy_menu(menu, b, FALSE);
 
 	if(GAIM_BLIST_NODE_IS_CONTACT(node)) {
-		gaim_separator(menu);
+		pidgin_separator(menu);
 
 		if(gtknode->contact_expanded) {
-			gaim_new_item_from_stock(menu, _("_Collapse"),
+			pidgin_new_item_from_stock(menu, _("_Collapse"),
 						 GTK_STOCK_ZOOM_OUT,
 						 G_CALLBACK(pidgin_blist_collapse_contact_cb),
 						 node, 0, 0, NULL);
 		} else {
-			gaim_new_item_from_stock(menu, _("_Expand"),
+			pidgin_new_item_from_stock(menu, _("_Expand"),
 						 GTK_STOCK_ZOOM_IN,
 						 G_CALLBACK(pidgin_blist_expand_contact_cb), node,
 						 0, 0, NULL);
@@ -2041,7 +2041,7 @@
 
 				if (GAIM_BLIST_NODE_IS_BUDDY(node) || GAIM_BLIST_NODE_IS_CONTACT(node)) {
 					GaimBuddy *b = GAIM_BLIST_NODE_IS_BUDDY(node) ? (GaimBuddy*)node : gaim_contact_get_priority_buddy((GaimContact*)node);
-					gaim_dnd_file_manage(sd, b->account, b->name);
+					pidgin_dnd_file_manage(sd, b->account, b->name);
 					gtk_drag_finish(dc, TRUE, (dc->action == GDK_ACTION_MOVE), t);
 				} else {
 					gtk_drag_finish(dc, FALSE, FALSE, t);
@@ -2345,7 +2345,7 @@
 	{
 		struct tooltip_data *td = l->data;
 
-		if (td->avatar && gaim_gdk_pixbuf_is_opaque(td->avatar))
+		if (td->avatar && pidgin_gdk_pixbuf_is_opaque(td->avatar))
 			gtk_paint_flat_box(style, gtkblist->tipwindow->window, GTK_STATE_NORMAL, GTK_SHADOW_OUT,
 					NULL, gtkblist->tipwindow, "tooltip",
 					max_width - (td->avatar_width+ TOOLTIP_BORDER)-1,
@@ -5231,7 +5231,7 @@
 										  GTK_RESPONSE_OK, FALSE);
 
 	gtk_entry_set_activates_default (GTK_ENTRY(data->entry), TRUE);
-	gaim_set_accessible_label (data->entry, label);
+	pidgin_set_accessible_label (data->entry, label);
 
 	g_signal_connect(G_OBJECT(data->entry), "changed",
 					 G_CALLBACK(pidgin_set_sensitive_if_input),
@@ -5252,7 +5252,7 @@
 		gtk_widget_grab_focus(GTK_WIDGET(data->entry_for_alias));
 
 	gtk_entry_set_activates_default (GTK_ENTRY(data->entry_for_alias), TRUE);
-	gaim_set_accessible_label (data->entry_for_alias, label);
+	pidgin_set_accessible_label (data->entry_for_alias, label);
 
 	label = gtk_label_new(_("Group:"));
 	gtk_misc_set_alignment(GTK_MISC(label), 0, 0.5);
@@ -5261,7 +5261,7 @@
 	data->combo = gtk_combo_new();
 	gtk_combo_set_popdown_strings(GTK_COMBO(data->combo), groups_tree());
 	gtk_table_attach_defaults(GTK_TABLE(table), data->combo, 1, 2, 2, 3);
-	gaim_set_accessible_label (data->combo, label);
+	pidgin_set_accessible_label (data->combo, label);
 
 	/* Set up stuff for the account box */
 	label = gtk_label_new(_("Account:"));
@@ -5272,7 +5272,7 @@
 			G_CALLBACK(add_buddy_select_account_cb), NULL, data);
 
 	gtk_table_attach_defaults(GTK_TABLE(table), data->account_box, 1, 2, 3, 4);
-	gaim_set_accessible_label (data->account_box, label);
+	pidgin_set_accessible_label (data->account_box, label);
 	/* End of account box */
 
 	g_signal_connect(G_OBJECT(data->window), "response",
@@ -5461,7 +5461,7 @@
 			focus = FALSE;
 		}
 		gtk_label_set_mnemonic_widget(GTK_LABEL(label), input);
-		gaim_set_accessible_label(input, label);
+		pidgin_set_accessible_label(input, label);
 		g_object_set_data(G_OBJECT(input), "identifier", (gpointer)pce->identifier);
 		g_object_set_data(G_OBJECT(input), "is_spin", GINT_TO_POINTER(pce->is_int));
 		g_object_set_data(G_OBJECT(input), "required", GINT_TO_POINTER(pce->required));
@@ -5589,7 +5589,7 @@
 			G_CALLBACK(addchat_select_account_cb),
 			chat_account_filter_func, data);
 	gtk_box_pack_start(GTK_BOX(rowbox), data->account_menu, TRUE, TRUE, 0);
-	gaim_set_accessible_label (data->account_menu, label);
+	pidgin_set_accessible_label (data->account_menu, label);
 
 	data->entries_box = gtk_vbox_new(FALSE, 5);
 	gtk_container_set_border_width(GTK_CONTAINER(data->entries_box), 0);
@@ -5610,7 +5610,7 @@
 		gtk_entry_set_text(GTK_ENTRY(data->alias_entry), alias);
 	gtk_box_pack_end(GTK_BOX(rowbox), data->alias_entry, TRUE, TRUE, 0);
 	gtk_entry_set_activates_default(GTK_ENTRY(data->alias_entry), TRUE);
-	gaim_set_accessible_label (data->alias_entry, label);
+	pidgin_set_accessible_label (data->alias_entry, label);
 
 	rowbox = gtk_hbox_new(FALSE, 5);
 	gtk_box_pack_start(GTK_BOX(vbox), rowbox, FALSE, FALSE, 0);
@@ -5629,7 +5629,7 @@
 		gtk_entry_set_text(GTK_ENTRY(GTK_COMBO(data->group_combo)->entry),
 						   group->name);
 	}
-	gaim_set_accessible_label (data->group_combo, label);
+	pidgin_set_accessible_label (data->group_combo, label);
 
 	g_signal_connect(G_OBJECT(data->window), "response",
 					 G_CALLBACK(add_chat_resp_cb), data);
@@ -6219,7 +6219,7 @@
 			gtk_widget_show(menuitem);
 		}
 		else
-			gaim_separator(menu);
+			pidgin_separator(menu);
 	}
 
 	g_list_free(actions);
@@ -6317,7 +6317,7 @@
 			gtk_menu_shell_append(GTK_MENU_SHELL(submenu), menuitem);
 			gtk_widget_show(menuitem);
 
-			gaim_separator(submenu);
+			pidgin_separator(submenu);
 
 			gc = gaim_account_get_connection(account);
 			if (gc && GAIM_CONNECTION_IS_CONNECTED(gc)) {
@@ -6341,7 +6341,7 @@
 							g_object_set_data_full(G_OBJECT(menuitem), "plugin_action", action, (GDestroyNotify)gaim_plugin_action_free);
 							gtk_widget_show(menuitem);
 						} else
-							gaim_separator(submenu);
+							pidgin_separator(submenu);
 					}
 				} else {
 					menuitem = gtk_menu_item_new_with_label(_("No actions available"));
@@ -6356,7 +6356,7 @@
 				gtk_widget_show(menuitem);
 			}
 
-			gaim_separator(submenu);
+			pidgin_separator(submenu);
 
 			menuitem = gtk_menu_item_new_with_mnemonic(_("_Disable"));
 			g_signal_connect(G_OBJECT(menuitem), "activate",
@@ -6369,7 +6369,7 @@
 	}
 
 	if(disabled_accounts) {
-		gaim_separator(accountmenu);
+		pidgin_separator(accountmenu);
 		menuitem = gtk_menu_item_new_with_label(_("Enable Account"));
 		gtk_menu_shell_append(GTK_MENU_SHELL(accountmenu), menuitem);
 		gtk_widget_show(menuitem);
diff -r e4c39e261389 -r 311315e979f7 pidgin/gtkconv.c
--- a/pidgin/gtkconv.c	Sat Feb 03 08:24:09 2007 +0000
+++ b/pidgin/gtkconv.c	Sat Feb 03 08:45:32 2007 +0000
@@ -1606,7 +1606,7 @@
 	menu = gtk_menu_new();
 
 	if (!is_me) {
-		button = gaim_new_item_from_stock(menu, _("IM"), GAIM_STOCK_IM,
+		button = pidgin_new_item_from_stock(menu, _("IM"), GAIM_STOCK_IM,
 					G_CALLBACK(menu_chat_im_cb), PIDGIN_CONVERSATION(conv), 0, 0, NULL);
 
 		if (gc == NULL)
@@ -1617,7 +1617,7 @@
 
 		if (prpl_info && prpl_info->send_file)
 		{
-			button = gaim_new_item_from_stock(menu, _("Send File"),
+			button = pidgin_new_item_from_stock(menu, _("Send File"),
 				GAIM_STOCK_FILE_TRANSFER, G_CALLBACK(menu_chat_send_file_cb),
 				PIDGIN_CONVERSATION(conv), 0, 0, NULL);
 
@@ -1632,10 +1632,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,
+			button = pidgin_new_item_from_stock(menu, _("Un-Ignore"), GAIM_STOCK_IGNORE,
 							G_CALLBACK(ignore_cb), PIDGIN_CONVERSATION(conv), 0, 0, NULL);
 		else
-			button = gaim_new_item_from_stock(menu, _("Ignore"), GAIM_STOCK_IGNORE,
+			button = pidgin_new_item_from_stock(menu, _("Ignore"), GAIM_STOCK_IGNORE,
 							G_CALLBACK(ignore_cb), PIDGIN_CONVERSATION(conv), 0, 0, NULL);
 
 		if (gc == NULL)
@@ -1645,7 +1645,7 @@
 	}
 
 	if (prpl_info && (prpl_info->get_info || prpl_info->get_cb_info)) {
-		button = gaim_new_item_from_stock(menu, _("Info"), GAIM_STOCK_INFO,
+		button = pidgin_new_item_from_stock(menu, _("Info"), GAIM_STOCK_INFO,
 						G_CALLBACK(menu_chat_info_cb), PIDGIN_CONVERSATION(conv), 0, 0, NULL);
 
 		if (gc == NULL)
@@ -1655,7 +1655,7 @@
 	}
 
 	if (prpl_info && prpl_info->get_cb_away) {
-		button = gaim_new_item_from_stock(menu, _("Get Away Message"), GAIM_STOCK_AWAY,
+		button = pidgin_new_item_from_stock(menu, _("Get Away Message"), GAIM_STOCK_AWAY,
 					G_CALLBACK(menu_chat_get_away_cb), PIDGIN_CONVERSATION(conv), 0, 0, NULL);
 
 		if (gc == NULL)
@@ -1666,10 +1666,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,
+			button = pidgin_new_item_from_stock(menu, _("Remove"), GTK_STOCK_REMOVE,
 						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,
+			button = pidgin_new_item_from_stock(menu, _("Add"), GTK_STOCK_ADD,
 						G_CALLBACK(menu_chat_add_remove_cb), PIDGIN_CONVERSATION(conv), 0, 0, NULL);
 
 		if (gc == NULL)
@@ -1678,7 +1678,7 @@
 		g_object_set_data_full(G_OBJECT(button), "user_data", g_strdup(who), g_free);
 	}
 
-	button = gaim_new_item_from_stock(menu, _("Last said"), GTK_STOCK_INDEX,
+	button = pidgin_new_item_from_stock(menu, _("Last said"), GTK_STOCK_INDEX,
 						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(PIDGIN_CONVERSATION(conv), who))
@@ -2562,26 +2562,26 @@
 	if (gtkconv->u.im->anim &&
 		!(gdk_pixbuf_animation_is_static_image(gtkconv->u.im->anim)))
 	{
-		gaim_new_check_item(menu, _("Animate"),
+		pidgin_new_check_item(menu, _("Animate"),
 							G_CALLBACK(toggle_icon_animate_cb), gtkconv,
 							gtkconv->u.im->icon_timer);
 	}
 
-	gaim_new_item_from_stock(menu, _("Hide Icon"), NULL, G_CALLBACK(remove_icon),
+	pidgin_new_item_from_stock(menu, _("Hide Icon"), NULL, G_CALLBACK(remove_icon),
 							 gtkconv, 0, 0, NULL);
 
-	gaim_new_item_from_stock(menu, _("Save Icon As..."), GTK_STOCK_SAVE_AS,
+	pidgin_new_item_from_stock(menu, _("Save Icon As..."), GTK_STOCK_SAVE_AS,
 							 G_CALLBACK(icon_menu_save_cb), gtkconv,
 							 0, 0, NULL);
 
-	gaim_new_item_from_stock(menu, _("Set Custom Icon..."), NULL,
+	pidgin_new_item_from_stock(menu, _("Set Custom Icon..."), NULL,
 							 G_CALLBACK(set_custom_icon_cb), gtkconv,
 							 0, 0, NULL);
 
 	/* Is there a custom icon for this person? */
 	pref = custom_icon_pref_name(gtkconv);
 	if (pref && *pref) {
-		gaim_new_item_from_stock(menu, _("Remove Custom Icon"), NULL,
+		pidgin_new_item_from_stock(menu, _("Remove Custom Icon"), NULL,
 							G_CALLBACK(remove_custom_icon_cb), gtkconv,
 							0, 0, NULL);
 	}
@@ -3988,7 +3988,7 @@
 	g_return_if_fail(menu != NULL);
 	g_return_if_fail(gtkconv != NULL);
 
-	menuitem = gaim_new_item_from_stock(NULL, _("_Send"), GAIM_STOCK_SEND,
+	menuitem = pidgin_new_item_from_stock(NULL, _("_Send"), GAIM_STOCK_SEND,
 										G_CALLBACK(send_menu_cb), gtkconv,
 										0, 0, NULL);
 	if (gtk_text_buffer_get_char_count(imhtml->text_buffer) == 0)
@@ -4458,7 +4458,7 @@
 	}
 	else if (sd->target == gdk_atom_intern("text/uri-list", FALSE)) {
 		if (gaim_conversation_get_type(conv) == GAIM_CONV_TYPE_IM)
-			gaim_dnd_file_manage(sd, gaim_conversation_get_account(conv), gaim_conversation_get_name(conv));
+			pidgin_dnd_file_manage(sd, gaim_conversation_get_account(conv), gaim_conversation_get_name(conv));
 		gtk_drag_finish(dc, TRUE, (dc->action == GDK_ACTION_MOVE), t);
 	}
 	else
@@ -7587,7 +7587,7 @@
 	g_object_set_data(G_OBJECT(notebook->menu), "clicked_tab", gtkconv);
 
 	menu = notebook->menu;
-	gaim_separator(GTK_WIDGET(menu));
+	pidgin_separator(GTK_WIDGET(menu));
 
 	item = gtk_menu_item_new_with_label(_("Close other tabs"));
 	gtk_widget_show(item);
@@ -7601,7 +7601,7 @@
 	g_signal_connect(G_OBJECT(item), "activate",
 					G_CALLBACK(close_window), win);
 
-	gaim_separator(menu);
+	pidgin_separator(menu);
 
 	item = gtk_menu_item_new_with_label(_("Detach this tab"));
 	gtk_widget_show(item);
diff -r e4c39e261389 -r 311315e979f7 pidgin/gtkdebug.c
--- a/pidgin/gtkdebug.c	Sat Feb 03 08:24:09 2007 +0000
+++ b/pidgin/gtkdebug.c	Sat Feb 03 08:45:32 2007 +0000
@@ -590,11 +590,11 @@
 
 static void
 regex_popup_cb(GtkEntry *entry, GtkWidget *menu, DebugWindow *win) {
-	gaim_separator(menu);
-	gaim_new_check_item(menu, _("Invert"),
+	pidgin_separator(menu);
+	pidgin_new_check_item(menu, _("Invert"),
 						G_CALLBACK(regex_menu_cb),
 						"/gaim/gtk/debug/invert", win->invert);
-	gaim_new_check_item(menu, _("Highlight matches"),
+	pidgin_new_check_item(menu, _("Highlight matches"),
 						G_CALLBACK(regex_menu_cb),
 						"/gaim/gtk/debug/highlight", win->highlight);
 }
diff -r e4c39e261389 -r 311315e979f7 pidgin/gtkdocklet.c
--- a/pidgin/gtkdocklet.c	Sat Feb 03 08:24:09 2007 +0000
+++ b/pidgin/gtkdocklet.c	Sat Feb 03 08:45:32 2007 +0000
@@ -474,7 +474,7 @@
 
 	popular_statuses = gaim_savedstatuses_get_popular(6);
 	if (popular_statuses != NULL)
-		gaim_separator(submenu);
+		pidgin_separator(submenu);
 	for (cur = popular_statuses; cur != NULL; cur = cur->next)
 	{
 		GaimSavedStatus *saved_status = cur->data;
@@ -486,7 +486,7 @@
 	}
 	g_list_free(popular_statuses);
 
-	gaim_separator(submenu);
+	pidgin_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(pidgin_status_window_show), NULL, 0, 0, NULL);
@@ -529,22 +529,22 @@
 	}
 	gtk_menu_shell_append(GTK_MENU_SHELL(menu), menuitem);
 
-	gaim_separator(menu);
+	pidgin_separator(menu);
 
-	menuitem = gaim_new_item_from_stock(menu, _("New Message..."), GAIM_STOCK_IM, G_CALLBACK(pidgindialogs_im), NULL, 0, 0, NULL);
+	menuitem = pidgin_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);
 
 	menuitem = docklet_status_submenu();
 	gtk_menu_shell_append(GTK_MENU_SHELL(menu), menuitem);
 
-	gaim_separator(menu);
+	pidgin_separator(menu);
 
-	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);
+	pidgin_new_item_from_stock(menu, _("Accounts"), GAIM_STOCK_ACCOUNTS, G_CALLBACK(pidgin_accounts_window_show), NULL, 0, 0, NULL);
+	pidgin_new_item_from_stock(menu, _("Plugins"), GAIM_STOCK_PLUGIN, G_CALLBACK(pidgin_plugin_dialog_show), NULL, 0, 0, NULL);
+	pidgin_new_item_from_stock(menu, _("Preferences"), GTK_STOCK_PREFERENCES, G_CALLBACK(pidgin_prefs_show), NULL, 0, 0, NULL);
 
-	gaim_separator(menu);
+	pidgin_separator(menu);
 
 	menuitem = gtk_check_menu_item_new_with_label(_("Mute Sounds"));
 	gtk_check_menu_item_set_active(GTK_CHECK_MENU_ITEM(menuitem), gaim_prefs_get_bool("/gaim/gtk/sound/mute"));
@@ -558,13 +558,13 @@
 	g_signal_connect(G_OBJECT(menuitem), "toggled", G_CALLBACK(docklet_toggle_blink), NULL);
 	gtk_menu_shell_append(GTK_MENU_SHELL(menu), menuitem);
 
-	gaim_separator(menu);
+	pidgin_separator(menu);
 
 	/* TODO: need a submenu to change status, this needs to "link"
 	 * to the status in the buddy list gtkstatusbox
 	 */
 
-	gaim_new_item_from_stock(menu, _("Quit"), GTK_STOCK_QUIT, G_CALLBACK(gaim_core_quit), NULL, 0, 0, NULL);
+	pidgin_new_item_from_stock(menu, _("Quit"), GTK_STOCK_QUIT, G_CALLBACK(gaim_core_quit), NULL, 0, 0, NULL);
 
 #ifdef _WIN32
 	g_signal_connect(menu, "leave-notify-event", G_CALLBACK(docklet_menu_leave_enter), NULL);
diff -r e4c39e261389 -r 311315e979f7 pidgin/gtkimhtmltoolbar.c
--- a/pidgin/gtkimhtmltoolbar.c	Sat Feb 03 08:24:09 2007 +0000
+++ b/pidgin/gtkimhtmltoolbar.c	Sat Feb 03 08:45:32 2007 +0000
@@ -916,7 +916,7 @@
 	sg = gtk_size_group_new(GTK_SIZE_GROUP_BOTH);
 
 	/* Bold */
-	button = gaim_pixbuf_toolbar_button_from_stock(GTK_STOCK_BOLD);
+	button = pidgin_pixbuf_toolbar_button_from_stock(GTK_STOCK_BOLD);
 	gtk_size_group_add_widget(sg, button);
 	gtk_box_pack_start(GTK_BOX(hbox), button, FALSE, FALSE, 0);
 	gtk_tooltips_set_tip(toolbar->tooltips, button, _("Bold"), NULL);
@@ -927,7 +927,7 @@
 	toolbar->bold = button;
 
 	/* Italic */
-	button = gaim_pixbuf_toolbar_button_from_stock(GTK_STOCK_ITALIC);
+	button = pidgin_pixbuf_toolbar_button_from_stock(GTK_STOCK_ITALIC);
 	gtk_size_group_add_widget(sg, button);
 	gtk_box_pack_start(GTK_BOX(hbox), button, FALSE, FALSE, 0);
 	gtk_tooltips_set_tip(toolbar->tooltips, button, _("Italic"), NULL);
@@ -938,7 +938,7 @@
 	toolbar->italic = button;
 
 	/* Underline */
-	button = gaim_pixbuf_toolbar_button_from_stock(GTK_STOCK_UNDERLINE);
+	button = pidgin_pixbuf_toolbar_button_from_stock(GTK_STOCK_UNDERLINE);
 	gtk_size_group_add_widget(sg, button);
 	gtk_box_pack_start(GTK_BOX(hbox), button, FALSE, FALSE, 0);
 	gtk_tooltips_set_tip(toolbar->tooltips, button, _("Underline"), NULL);
@@ -953,7 +953,7 @@
 	gtk_box_pack_start(GTK_BOX(hbox), sep, FALSE, FALSE, 0);
 
 	/* Increase font size */
-	button = gaim_pixbuf_toolbar_button_from_stock(GAIM_STOCK_TEXT_BIGGER);
+	button = pidgin_pixbuf_toolbar_button_from_stock(GAIM_STOCK_TEXT_BIGGER);
 	gtk_size_group_add_widget(sg, button);
 	gtk_box_pack_start(GTK_BOX(hbox), button, FALSE, FALSE, 0);
 	gtk_tooltips_set_tip(toolbar->tooltips, button,
@@ -965,7 +965,7 @@
 	toolbar->larger_size = button;
 
 	/* Decrease font size */
-	button = gaim_pixbuf_toolbar_button_from_stock(GAIM_STOCK_TEXT_SMALLER);
+	button = pidgin_pixbuf_toolbar_button_from_stock(GAIM_STOCK_TEXT_SMALLER);
 	gtk_size_group_add_widget(sg, button);
 	gtk_box_pack_start(GTK_BOX(hbox), button, FALSE, FALSE, 0);
 	gtk_tooltips_set_tip(toolbar->tooltips, button,
@@ -982,7 +982,7 @@
 
 	/* Font Face */
 
-	button = gaim_pixbuf_toolbar_button_from_stock(GTK_STOCK_SELECT_FONT);
+	button = pidgin_pixbuf_toolbar_button_from_stock(GTK_STOCK_SELECT_FONT);
 	gtk_size_group_add_widget(sg, button);
 	gtk_box_pack_start(GTK_BOX(hbox), button, FALSE, FALSE, 0);
 	gtk_tooltips_set_tip(toolbar->tooltips, button,
@@ -994,7 +994,7 @@
 	toolbar->font = button;
 
 	/* Foreground Color */
-	button = gaim_pixbuf_toolbar_button_from_stock(GAIM_STOCK_FGCOLOR);
+	button = pidgin_pixbuf_toolbar_button_from_stock(GAIM_STOCK_FGCOLOR);
 	gtk_size_group_add_widget(sg, button);
 	gtk_box_pack_start(GTK_BOX(hbox), button, FALSE, FALSE, 0);
 	gtk_tooltips_set_tip(toolbar->tooltips, button,
@@ -1006,7 +1006,7 @@
 	toolbar->fgcolor = button;
 
 	/* Background Color */
-	button = gaim_pixbuf_toolbar_button_from_stock(GAIM_STOCK_BGCOLOR);
+	button = pidgin_pixbuf_toolbar_button_from_stock(GAIM_STOCK_BGCOLOR);
 	gtk_size_group_add_widget(sg, button);
 	gtk_box_pack_start(GTK_BOX(hbox), button, FALSE, FALSE, 0);
 	gtk_tooltips_set_tip(toolbar->tooltips, button,
@@ -1022,7 +1022,7 @@
 	gtk_box_pack_start(GTK_BOX(hbox), sep, FALSE, FALSE, 0);
 
 	/* Reset Formatting */
-	button = gaim_pixbuf_toolbar_button_from_stock(GAIM_STOCK_CLEAR);
+	button = pidgin_pixbuf_toolbar_button_from_stock(GAIM_STOCK_CLEAR);
 	gtk_size_group_add_widget(sg, button);
 	gtk_box_pack_start(GTK_BOX(hbox), button, FALSE, FALSE, 0);
 	gtk_tooltips_set_tip(toolbar->tooltips, button,
@@ -1038,7 +1038,7 @@
 	gtk_box_pack_start(GTK_BOX(hbox), sep, FALSE, FALSE, 0);
 
 	/* Insert Link */
-	button = gaim_pixbuf_toolbar_button_from_stock(GAIM_STOCK_LINK);
+	button = pidgin_pixbuf_toolbar_button_from_stock(GAIM_STOCK_LINK);
 	gtk_size_group_add_widget(sg, button);
 	gtk_box_pack_start(GTK_BOX(hbox), button, FALSE, FALSE, 0);
 	gtk_tooltips_set_tip(toolbar->tooltips, button, _("Insert link"), NULL);
@@ -1048,7 +1048,7 @@
 	toolbar->link = button;
 
 	/* Insert IM Image */
-	button = gaim_pixbuf_toolbar_button_from_stock(GAIM_STOCK_IMAGE);
+	button = pidgin_pixbuf_toolbar_button_from_stock(GAIM_STOCK_IMAGE);
 	gtk_size_group_add_widget(sg, button);
 	gtk_box_pack_start(GTK_BOX(hbox), button, FALSE, FALSE, 0);
 	gtk_tooltips_set_tip(toolbar->tooltips, button, _("Insert image"), NULL);
@@ -1059,7 +1059,7 @@
 	toolbar->image = button;
 
 	/* Insert Smiley */
-	button = gaim_pixbuf_toolbar_button_from_stock(GAIM_STOCK_SMILEY);
+	button = pidgin_pixbuf_toolbar_button_from_stock(GAIM_STOCK_SMILEY);
 	gtk_size_group_add_widget(sg, button);
 	gtk_box_pack_start(GTK_BOX(hbox), button, FALSE, FALSE, 0);
 	gtk_tooltips_set_tip(toolbar->tooltips, button, _("Insert smiley"), NULL);
diff -r e4c39e261389 -r 311315e979f7 pidgin/gtklog.c
--- a/pidgin/gtklog.c	Sat Feb 03 08:24:09 2007 +0000
+++ b/pidgin/gtklog.c	Sat Feb 03 08:45:32 2007 +0000
@@ -414,7 +414,7 @@
 	g_signal_connect (G_OBJECT(lv->treeview), "row-activated",
 			G_CALLBACK(log_row_activated_cb),
 			lv);
-	gaim_set_accessible_label(lv->treeview, lv->label);
+	pidgin_set_accessible_label(lv->treeview, lv->label);
 
 	/* Log size ************/
 	if(log_size) {
diff -r e4c39e261389 -r 311315e979f7 pidgin/gtknotify.c
--- a/pidgin/gtknotify.c	Sat Feb 03 08:24:09 2007 +0000
+++ b/pidgin/gtknotify.c	Sat Feb 03 08:45:32 2007 +0000
@@ -958,9 +958,9 @@
 	else if (!strcmp(web_browser, "epiphany") ||
 		!strcmp(web_browser, "galeon"))
 	{
-		if (place == GAIM_BROWSER_NEW_WINDOW)
+		if (place == PIDGIN_BROWSER_NEW_WINDOW)
 			command = g_strdup_printf("%s -w %s", web_browser, escaped);
-		else if (place == GAIM_BROWSER_NEW_TAB)
+		else if (place == PIDGIN_BROWSER_NEW_TAB)
 			command = g_strdup_printf("%s -n %s", web_browser, escaped);
 		else
 			command = g_strdup_printf("%s %s", web_browser, escaped);
@@ -998,15 +998,15 @@
 		if (!strcmp(web_browser, "firefox"))
 			args = "-a firefox";
 
-		if (place == GAIM_BROWSER_NEW_WINDOW)
+		if (place == PIDGIN_BROWSER_NEW_WINDOW)
 			remote_command = g_strdup_printf("%s %s -remote "
 											 "openURL(%s,new-window)",
 											 web_browser, args, escaped);
-		else if (place == GAIM_BROWSER_NEW_TAB)
+		else if (place == PIDGIN_BROWSER_NEW_TAB)
 			remote_command = g_strdup_printf("%s %s -remote "
 											 "openURL(%s,new-tab)",
 											 web_browser, args, escaped);
-		else if (place == GAIM_BROWSER_CURRENT)
+		else if (place == PIDGIN_BROWSER_CURRENT)
 			remote_command = g_strdup_printf("%s %s -remote "
 											 "openURL(%s)",
 											 web_browser, args, escaped);
@@ -1015,13 +1015,13 @@
 	{
 		command = g_strdup_printf("netscape %s", escaped);
 
-		if (place == GAIM_BROWSER_NEW_WINDOW)
+		if (place == PIDGIN_BROWSER_NEW_WINDOW)
 		{
 			remote_command = g_strdup_printf("netscape -remote "
 											 "openURL(%s,new-window)",
 											 escaped);
 		}
-		else if (place == GAIM_BROWSER_CURRENT)
+		else if (place == PIDGIN_BROWSER_CURRENT)
 		{
 			remote_command = g_strdup_printf("netscape -remote "
 											 "openURL(%s)", escaped);
@@ -1029,11 +1029,11 @@
 	}
 	else if (!strcmp(web_browser, "opera"))
 	{
-		if (place == GAIM_BROWSER_NEW_WINDOW)
+		if (place == PIDGIN_BROWSER_NEW_WINDOW)
 			command = g_strdup_printf("opera -newwindow %s", escaped);
-		else if (place == GAIM_BROWSER_NEW_TAB)
+		else if (place == PIDGIN_BROWSER_NEW_TAB)
 			command = g_strdup_printf("opera -newpage %s", escaped);
-		else if (place == GAIM_BROWSER_CURRENT)
+		else if (place == PIDGIN_BROWSER_CURRENT)
 		{
 			remote_command = g_strdup_printf("opera -remote "
 											 "openURL(%s)", escaped);
diff -r e4c39e261389 -r 311315e979f7 pidgin/gtkpounce.c
--- a/pidgin/gtkpounce.c	Sat Feb 03 08:24:09 2007 +0000
+++ b/pidgin/gtkpounce.c	Sat Feb 03 08:45:32 2007 +0000
@@ -539,7 +539,7 @@
 
 	gtk_box_pack_start(GTK_BOX(hbox), dialog->account_menu, FALSE, FALSE, 0);
 	gtk_widget_show(dialog->account_menu);
-	gaim_set_accessible_label (dialog->account_menu, label);
+	pidgin_set_accessible_label (dialog->account_menu, label);
 
 	/* Buddy: */
 	hbox = gtk_hbox_new(FALSE, GAIM_HIG_BOX_SPACE);
@@ -561,7 +561,7 @@
 
 	g_signal_connect(G_OBJECT(dialog->buddy_entry), "changed",
 			 G_CALLBACK(buddy_changed_cb), dialog);
-	gaim_set_accessible_label (dialog->buddy_entry, label);
+	pidgin_set_accessible_label (dialog->buddy_entry, label);
 
 	if (cur_pounce != NULL) {
 		gtk_entry_set_text(GTK_ENTRY(dialog->buddy_entry),
diff -r e4c39e261389 -r 311315e979f7 pidgin/gtkprefs.c
--- a/pidgin/gtkprefs.c	Sat Feb 03 08:24:09 2007 +0000
+++ b/pidgin/gtkprefs.c	Sat Feb 03 08:45:32 2007 +0000
@@ -123,7 +123,7 @@
 		gtk_misc_set_alignment(GTK_MISC(label), 0.0, 0.5);
 	}
 
-	gaim_set_accessible_label (spin, label);
+	pidgin_set_accessible_label (spin, label);
 
 	return hbox;
 }
@@ -167,7 +167,7 @@
 		gtk_misc_set_alignment(GTK_MISC(label), 0.0, 0.5);
 	}
 
-	gaim_set_accessible_label(entry, label);
+	pidgin_set_accessible_label(entry, label);
 
 	return hbox;
 }
@@ -239,7 +239,7 @@
 
 	if (label != NULL) {
 		gtk_label_set_mnemonic_widget(GTK_LABEL(label), dropdown);
-		gaim_set_accessible_label (dropdown, label);
+		pidgin_set_accessible_label (dropdown, label);
 	}
 
 	if (type == GAIM_PREF_INT)
@@ -696,7 +696,7 @@
 
 	gtk_widget_show_all(ret);
 
-	gaim_set_accessible_label (view, label);
+	pidgin_set_accessible_label (view, label);
 
 	return ret;
 }
@@ -1058,7 +1058,7 @@
 		gtk_entry_set_text(GTK_ENTRY(entry),
 		                   gaim_network_get_my_ip(-1));
 
-	gaim_set_accessible_label (entry, label);
+	pidgin_set_accessible_label (entry, label);
 
 
 	if (gaim_prefs_get_bool("/core/network/auto_ip")) {
@@ -1128,7 +1128,7 @@
 
 		hbox = gtk_hbox_new(TRUE, 5);
 		gtk_box_pack_start(GTK_BOX(vbox), hbox, FALSE, FALSE, 0);
-		gaim_set_accessible_label (entry, label);
+		pidgin_set_accessible_label (entry, label);
 
 		label = gtk_label_new_with_mnemonic(_("_Port:"));
 		gtk_misc_set_alignment(GTK_MISC(label), 1.0, 0.5);
@@ -1147,7 +1147,7 @@
 
 			gtk_entry_set_text(GTK_ENTRY(entry), buf);
 		}
-		gaim_set_accessible_label (entry, label);
+		pidgin_set_accessible_label (entry, label);
 
 		label = gtk_label_new_with_mnemonic(_("_User:"));
 		gtk_misc_set_alignment(GTK_MISC(label), 1.0, 0.5);
@@ -1165,7 +1165,7 @@
 
 		hbox = gtk_hbox_new(TRUE, 5);
 		gtk_box_pack_start(GTK_BOX(vbox), hbox, FALSE, FALSE, 0);
-		gaim_set_accessible_label (entry, label);
+		pidgin_set_accessible_label (entry, label);
 
 		label = gtk_label_new_with_mnemonic(_("Pa_ssword:"));
 		gtk_misc_set_alignment(GTK_MISC(label), 1.0, 0.5);
@@ -1183,7 +1183,7 @@
 		if (proxy_info != NULL && gaim_proxy_info_get_password(proxy_info) != NULL)
 			gtk_entry_set_text(GTK_ENTRY(entry),
 					   gaim_proxy_info_get_password(proxy_info));
-		gaim_set_accessible_label (entry, label);
+		pidgin_set_accessible_label (entry, label);
 	}
 
 	gtk_widget_show_all(ret);
@@ -1298,10 +1298,10 @@
 		hbox = gtk_hbox_new(FALSE, 0);
 		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,
-			_("New window"), GAIM_BROWSER_NEW_WINDOW,
-			_("New tab"), GAIM_BROWSER_NEW_TAB,
+			_("Browser default"), PIDGIN_BROWSER_DEFAULT,
+			_("Existing window"), PIDGIN_BROWSER_CURRENT,
+			_("New window"), PIDGIN_BROWSER_NEW_WINDOW,
+			_("New tab"), PIDGIN_BROWSER_NEW_TAB,
 			NULL);
 		gtk_misc_set_alignment(GTK_MISC(label), 0, 0.5);
 		gtk_size_group_add_widget(sg, label);
@@ -1334,7 +1334,7 @@
 					   gaim_prefs_get_path("/gaim/gtk/browsers/command"));
 	g_signal_connect(G_OBJECT(entry), "focus-out-event",
 					 G_CALLBACK(manual_browser_set), NULL);
-	gaim_set_accessible_label (entry, label);
+	pidgin_set_accessible_label (entry, label);
 
 	gtk_widget_show_all(ret);
 	return ret;
@@ -1633,7 +1633,7 @@
 			!strcmp(gaim_prefs_get_string("/gaim/gtk/sound/method"),
 					"custom"));
 
-	gaim_set_accessible_label (entry, label);
+	pidgin_set_accessible_label (entry, label);
 #endif /* _WIN32 */
 
 	vbox = pidgin_make_frame (ret, _("Sound Options"));
@@ -2034,7 +2034,7 @@
 #ifndef _WIN32
 	/* Browsers */
 	gaim_prefs_add_none("/gaim/gtk/browsers");
-	gaim_prefs_add_int("/gaim/gtk/browsers/place", GAIM_BROWSER_DEFAULT);
+	gaim_prefs_add_int("/gaim/gtk/browsers/place", PIDGIN_BROWSER_DEFAULT);
 	gaim_prefs_add_path("/gaim/gtk/browsers/command", "");
 	gaim_prefs_add_string("/gaim/gtk/browsers/browser", "mozilla");
 #endif
diff -r e4c39e261389 -r 311315e979f7 pidgin/gtkprivacy.c
--- a/pidgin/gtkprivacy.c	Sat Feb 03 08:24:09 2007 +0000
+++ b/pidgin/gtkprivacy.c	Sat Feb 03 08:45:32 2007 +0000
@@ -403,7 +403,7 @@
 												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);
+	pidgin_set_accessible_label (dropdown, label);
 	dialog->account = pidgin_account_option_menu_get_selected(dropdown);
 
 	/* Add the drop-down list with the allow/block types. */
@@ -415,7 +415,7 @@
 	menu = gtk_menu_new();
 
 	for (i = 0; i < menu_entry_count; i++) {
-		gaim_new_item(menu, _(menu_entries[i].text));
+		pidgin_new_item(menu, _(menu_entries[i].text));
 
 		if (menu_entries[i].num == dialog->account->perm_deny)
 			selected = i;
diff -r e4c39e261389 -r 311315e979f7 pidgin/gtkrequest.c
--- a/pidgin/gtkrequest.c	Sat Feb 03 08:24:09 2007 +0000
+++ b/pidgin/gtkrequest.c	Sat Feb 03 08:45:32 2007 +0000
@@ -429,7 +429,7 @@
 		}
 	}
 
-	gaim_set_accessible_label (entry, label);
+	pidgin_set_accessible_label (entry, label);
 	data->u.input.entry = entry;
 
 	/* Show everything. */
diff -r e4c39e261389 -r 311315e979f7 pidgin/gtkroomlist.c
--- a/pidgin/gtkroomlist.c	Sat Feb 03 08:24:09 2007 +0000
+++ b/pidgin/gtkroomlist.c	Sat Feb 03 08:45:32 2007 +0000
@@ -303,9 +303,9 @@
 	info.room = room;
 
 	menu = gtk_menu_new();
-	gaim_new_item_from_stock(menu, _("_Join"), GAIM_STOCK_CHAT,
+	pidgin_new_item_from_stock(menu, _("_Join"), GAIM_STOCK_CHAT,
 		                         G_CALLBACK(do_join_cb), &info, 0, 0, NULL);
-	gaim_new_item_from_stock(menu, _("_Add"), GTK_STOCK_ADD,
+	pidgin_new_item_from_stock(menu, _("_Add"), GTK_STOCK_ADD,
 		                         G_CALLBACK(do_add_room_cb), &info, 0, 0, NULL);
 
 	gtk_widget_show_all(menu);
@@ -443,16 +443,16 @@
 	gtk_widget_show(dialog->stop_button);
 
 	/* list button */
-	dialog->list_button = gaim_pixbuf_button_from_stock(_("_Get List"), GTK_STOCK_REFRESH,
-	                                                    GAIM_BUTTON_HORIZONTAL);
+	dialog->list_button = pidgin_pixbuf_button_from_stock(_("_Get List"), GTK_STOCK_REFRESH,
+	                                                    PIDGIN_BUTTON_HORIZONTAL);
 	gtk_box_pack_start(GTK_BOX(bbox), dialog->list_button, FALSE, FALSE, 0);
 	g_signal_connect(G_OBJECT(dialog->list_button), "clicked",
 	                 G_CALLBACK(list_button_cb), dialog);
 	gtk_widget_show(dialog->list_button);
 
 	/* add button */
-	dialog->add_button = gaim_pixbuf_button_from_stock(_("_Add Chat"), GTK_STOCK_ADD,
-	                                                    GAIM_BUTTON_HORIZONTAL);
+	dialog->add_button = pidgin_pixbuf_button_from_stock(_("_Add Chat"), GTK_STOCK_ADD,
+	                                                    PIDGIN_BUTTON_HORIZONTAL);
 	gtk_box_pack_start(GTK_BOX(bbox), dialog->add_button, FALSE, FALSE, 0);
 	g_signal_connect(G_OBJECT(dialog->add_button), "clicked",
 	                 G_CALLBACK(add_room_to_blist_cb), dialog);
@@ -460,8 +460,8 @@
 	gtk_widget_show(dialog->add_button);
 
 	/* join button */
-	dialog->join_button = gaim_pixbuf_button_from_stock(_("_Join"), GAIM_STOCK_CHAT,
-	                                                    GAIM_BUTTON_HORIZONTAL);
+	dialog->join_button = pidgin_pixbuf_button_from_stock(_("_Join"), GAIM_STOCK_CHAT,
+	                                                    PIDGIN_BUTTON_HORIZONTAL);
 	gtk_box_pack_start(GTK_BOX(bbox), dialog->join_button, FALSE, FALSE, 0);
 	g_signal_connect(G_OBJECT(dialog->join_button), "clicked",
 					 G_CALLBACK(join_button_cb), dialog);
diff -r e4c39e261389 -r 311315e979f7 pidgin/gtksavedstatuses.c
--- a/pidgin/gtksavedstatuses.c	Sat Feb 03 08:24:09 2007 +0000
+++ b/pidgin/gtksavedstatuses.c	Sat Feb 03 08:45:32 2007 +0000
@@ -576,8 +576,8 @@
 	gtk_box_pack_end(GTK_BOX(vbox), bbox, FALSE, TRUE, 0);
 
 	/* Use button */
-	button = gaim_pixbuf_button_from_stock(_("_Use"), GTK_STOCK_EXECUTE,
-										  GAIM_BUTTON_HORIZONTAL);
+	button = pidgin_pixbuf_button_from_stock(_("_Use"), GTK_STOCK_EXECUTE,
+										  PIDGIN_BUTTON_HORIZONTAL);
 	dialog->use_button = button;
 	gtk_box_pack_start(GTK_BOX(bbox), button, FALSE, FALSE, 0);
 	gtk_widget_set_sensitive(button, FALSE);
@@ -1210,16 +1210,16 @@
 					 G_CALLBACK(status_editor_cancel_cb), dialog);
 
 	/* Use button */
-	button = gaim_pixbuf_button_from_stock(_("_Use"), GTK_STOCK_EXECUTE,
-										   GAIM_BUTTON_HORIZONTAL);
+	button = pidgin_pixbuf_button_from_stock(_("_Use"), GTK_STOCK_EXECUTE,
+										   PIDGIN_BUTTON_HORIZONTAL);
 	gtk_box_pack_start(GTK_BOX(bbox), button, FALSE, FALSE, 0);
 
 	g_signal_connect(G_OBJECT(button), "clicked",
 					 G_CALLBACK(status_editor_ok_cb), dialog);
 
 	/* Save & Use button */
-	button = gaim_pixbuf_button_from_stock(_("Sa_ve & Use"), GTK_STOCK_OK,
-										   GAIM_BUTTON_HORIZONTAL);
+	button = pidgin_pixbuf_button_from_stock(_("Sa_ve & Use"), GTK_STOCK_OK,
+										   PIDGIN_BUTTON_HORIZONTAL);
 	dialog->saveanduse_button = GTK_BUTTON(button);
 	gtk_box_pack_start(GTK_BOX(bbox), button, FALSE, FALSE, 0);
 	if (dialog->original_title == NULL)
diff -r e4c39e261389 -r 311315e979f7 pidgin/gtkstatusbox.c
--- a/pidgin/gtkstatusbox.c	Sat Feb 03 08:24:09 2007 +0000
+++ b/pidgin/gtkstatusbox.c	Sat Feb 03 08:45:32 2007 +0000
@@ -245,7 +245,7 @@
 
 		box->icon_box_menu = gtk_menu_new();
 
-		menu_item = gaim_new_item_from_stock(box->icon_box_menu, _("Remove"), GTK_STOCK_REMOVE,
+		menu_item = pidgin_new_item_from_stock(box->icon_box_menu, _("Remove"), GTK_STOCK_REMOVE,
 						     G_CALLBACK(remove_buddy_icon_cb),
 						     box, 0, 0, NULL);
 		if (gaim_prefs_get_path("/gaim/gtk/accounts/buddyicon") == NULL)
@@ -2016,7 +2016,7 @@
 	}
 
 	if (status_box->buddy_icon != NULL) {
-	        status_box->icon_opaque = gaim_gdk_pixbuf_is_opaque(status_box->buddy_icon);
+	        status_box->icon_opaque = pidgin_gdk_pixbuf_is_opaque(status_box->buddy_icon);
 		gtk_image_set_from_pixbuf(GTK_IMAGE(status_box->icon), status_box->buddy_icon);
 		status_box->buddy_icon_hover = gdk_pixbuf_copy(status_box->buddy_icon);
 		do_colorshift(status_box->buddy_icon_hover, status_box->buddy_icon_hover, 32);
diff -r e4c39e261389 -r 311315e979f7 pidgin/gtkutils.c
--- a/pidgin/gtkutils.c	Sat Feb 03 08:24:09 2007 +0000
+++ b/pidgin/gtkutils.c	Sat Feb 03 08:45:32 2007 +0000
@@ -87,7 +87,7 @@
 };
 
 void
-gaim_setup_imhtml(GtkWidget *imhtml)
+pidgin_setup_imhtml(GtkWidget *imhtml)
 {
 	g_return_if_fail(imhtml != NULL);
 	g_return_if_fail(GTK_IS_IMHTML(imhtml));
@@ -170,7 +170,7 @@
 		gtk_imhtmltoolbar_attach(GTK_IMHTMLTOOLBAR(toolbar), imhtml);
 		gtk_imhtmltoolbar_associate_smileys(GTK_IMHTMLTOOLBAR(toolbar), "default");
 	}
-	gaim_setup_imhtml(imhtml);
+	pidgin_setup_imhtml(imhtml);
 
 	gtk_container_add(GTK_CONTAINER(sw), imhtml);
 
@@ -237,7 +237,7 @@
 		gtk_widget_show(to_toggle);
 }
 
-void gaim_separator(GtkWidget *menu)
+void pidgin_separator(GtkWidget *menu)
 {
 	GtkWidget *menuitem;
 
@@ -246,7 +246,7 @@
 	gtk_menu_shell_append(GTK_MENU_SHELL(menu), menuitem);
 }
 
-GtkWidget *gaim_new_item(GtkWidget *menu, const char *str)
+GtkWidget *pidgin_new_item(GtkWidget *menu, const char *str)
 {
 	GtkWidget *menuitem;
 	GtkWidget *label;
@@ -265,11 +265,11 @@
 	gtk_widget_add_accelerator(menuitem, "activate", accel, str[0],
 				   GDK_MOD1_MASK, GTK_ACCEL_LOCKED);
 */
-	gaim_set_accessible_label (menuitem, label);
+	pidgin_set_accessible_label (menuitem, label);
 	return menuitem;
 }
 
-GtkWidget *gaim_new_check_item(GtkWidget *menu, const char *str,
+GtkWidget *pidgin_new_check_item(GtkWidget *menu, const char *str,
 		GtkSignalFunc sf, gpointer data, gboolean checked)
 {
 	GtkWidget *menuitem;
@@ -289,7 +289,7 @@
 }
 
 GtkWidget *
-gaim_pixbuf_toolbar_button_from_stock(const char *icon)
+pidgin_pixbuf_toolbar_button_from_stock(const char *icon)
 {
 	GtkWidget *button, *image, *bbox;
 
@@ -309,14 +309,14 @@
 }
 
 GtkWidget *
-gaim_pixbuf_button_from_stock(const char *text, const char *icon,
-							  GaimButtonOrientation style)
+pidgin_pixbuf_button_from_stock(const char *text, const char *icon,
+							  PidginButtonOrientation style)
 {
 	GtkWidget *button, *image, *label, *bbox, *ibox, *lbox = NULL;
 
 	button = gtk_button_new();
 
-	if (style == GAIM_BUTTON_HORIZONTAL) {
+	if (style == PIDGIN_BUTTON_HORIZONTAL) {
 		bbox = gtk_hbox_new(FALSE, 0);
 		ibox = gtk_hbox_new(FALSE, 0);
 		if (text)
@@ -342,7 +342,7 @@
 		gtk_label_set_text_with_mnemonic(GTK_LABEL(label), text);
 		gtk_label_set_mnemonic_widget(GTK_LABEL(label), button);
 		gtk_box_pack_start(GTK_BOX(lbox), label, FALSE, TRUE, 0);
-		gaim_set_accessible_label (button, label);
+		pidgin_set_accessible_label (button, label);
 	}
 
 	gtk_widget_show_all(bbox);
@@ -351,7 +351,7 @@
 }
 
 
-GtkWidget *gaim_new_item_from_stock(GtkWidget *menu, const char *str, const char *icon, GtkSignalFunc sf, gpointer data, guint accel_key, guint accel_mods, char *mod)
+GtkWidget *pidgin_new_item_from_stock(GtkWidget *menu, const char *str, const char *icon, GtkSignalFunc sf, gpointer data, guint accel_key, guint accel_mods, char *mod)
 {
 	GtkWidget *menuitem;
 	/*
@@ -413,7 +413,7 @@
 	gtk_misc_set_alignment(GTK_MISC(label), 0, 0);
 	gtk_box_pack_start(GTK_BOX(vbox), label, FALSE, FALSE, 0);
 	gtk_widget_show(label);
-	gaim_set_accessible_label (vbox, label);
+	pidgin_set_accessible_label (vbox, label);
 
 	hbox = gtk_hbox_new(FALSE, GAIM_HIG_BOX_SPACE);
 	gtk_box_pack_start (GTK_BOX (vbox), hbox, FALSE, FALSE, 0);
@@ -527,7 +527,7 @@
 
 		gtk_menu_shell_append(GTK_MENU_SHELL(menu), item);
 		gtk_widget_show(item);
-		gaim_set_accessible_label (item, label);
+		pidgin_set_accessible_label (item, label);
 
 		if (id != NULL && !strcmp(plugin->info->id, id))
 			selected_index = i;
@@ -684,7 +684,7 @@
 
 		gtk_menu_shell_append(GTK_MENU_SHELL(menu), item);
 		gtk_widget_show(item);
-		gaim_set_accessible_label (item, label);
+		pidgin_set_accessible_label (item, label);
 
 		if (default_account != NULL && account == default_account)
 			selected_index = i;
@@ -1078,7 +1078,7 @@
 }
 
 void
-gaim_set_accessible_label (GtkWidget *w, GtkWidget *l)
+pidgin_set_accessible_label (GtkWidget *w, GtkWidget *l)
 {
 	AtkObject *acc, *label;
 	AtkObject *rel_obj[1];
@@ -1385,7 +1385,7 @@
 }
 
 void
-gaim_dnd_file_manage(GtkSelectionData *sd, GaimAccount *account, const char *who)
+pidgin_dnd_file_manage(GtkSelectionData *sd, GaimAccount *account, const char *who)
 {
 	GList *tmp;
 	GdkPixbuf *pb;
@@ -1698,7 +1698,7 @@
                             gpointer object)
 {
 	if (act == NULL) {
-		gaim_separator(menu);
+		pidgin_separator(menu);
 	} else {
 		GtkWidget *menuitem;
 
@@ -3132,7 +3132,7 @@
 }
 
 
-gboolean gaim_gdk_pixbuf_is_opaque(GdkPixbuf *pixbuf) {
+gboolean pidgin_gdk_pixbuf_is_opaque(GdkPixbuf *pixbuf) {
         int width, height, rowstride, i;
         unsigned char *pixels;
         unsigned char *row;
diff -r e4c39e261389 -r 311315e979f7 pidgin/gtkutils.h
--- a/pidgin/gtkutils.h	Sat Feb 03 08:24:09 2007 +0000
+++ b/pidgin/gtkutils.h	Sat Feb 03 08:45:32 2007 +0000
@@ -32,19 +32,19 @@
 
 typedef enum
 {
-	GAIM_BUTTON_HORIZONTAL,
-	GAIM_BUTTON_VERTICAL
+	PIDGIN_BUTTON_HORIZONTAL,
+	PIDGIN_BUTTON_VERTICAL
 
-} GaimButtonOrientation;
+} PidginButtonOrientation;
 
 typedef enum
 {
-	GAIM_BUTTON_NONE = 0,
-	GAIM_BUTTON_TEXT,
-	GAIM_BUTTON_IMAGE,
-	GAIM_BUTTON_TEXT_IMAGE
+	PIDGIN_BUTTON_NONE = 0,
+	PIDGIN_BUTTON_TEXT,
+	PIDGIN_BUTTON_IMAGE,
+	PIDGIN_BUTTON_TEXT_IMAGE
 
-} GaimButtonStyle;
+} PidginButtonStyle;
 
 typedef enum
 {
@@ -56,12 +56,12 @@
 #ifndef _WIN32
 typedef enum
 {
-	GAIM_BROWSER_DEFAULT = 0,
-	GAIM_BROWSER_CURRENT,
-	GAIM_BROWSER_NEW_WINDOW,
-	GAIM_BROWSER_NEW_TAB
+	PIDGIN_BROWSER_DEFAULT = 0,
+	PIDGIN_BROWSER_CURRENT,
+	PIDGIN_BROWSER_NEW_WINDOW,
+	PIDGIN_BROWSER_NEW_TAB
 
-} GaimBrowserPlace;
+} PidginBrowserPlace;
 #endif /* _WIN32 */
 
 /**
@@ -70,7 +70,7 @@
  *
  * @param imhtml The gtkimhtml widget to setup.
  */
-void gaim_setup_imhtml(GtkWidget *imhtml);
+void pidgin_setup_imhtml(GtkWidget *imhtml);
 
 /**
  * Create an GtkIMHtml widget and associated GtkIMHtmlToolbar widget.  This
@@ -131,7 +131,7 @@
  *
  * @param menu The menu to add a separator to.
  */
-void gaim_separator(GtkWidget *menu);
+void pidgin_separator(GtkWidget *menu);
 
 /**
  * Creates a menu item.
@@ -141,7 +141,7 @@
  *
  * @return The newly created menu item.
  */
-GtkWidget *gaim_new_item(GtkWidget *menu, const char *str);
+GtkWidget *pidgin_new_item(GtkWidget *menu, const char *str);
 
 /**
  * Creates a check menu item.
@@ -154,7 +154,7 @@
  *
  * @return The newly created menu item.
  */
-GtkWidget *gaim_new_check_item(GtkWidget *menu, const char *str,
+GtkWidget *pidgin_new_check_item(GtkWidget *menu, const char *str,
 		GtkSignalFunc sf, gpointer data, gboolean checked);
 
 /**
@@ -172,7 +172,7 @@
  *
  * @return The newly created menu item.
  */
-GtkWidget *gaim_new_item_from_stock(GtkWidget *menu, const char *str,
+GtkWidget *pidgin_new_item_from_stock(GtkWidget *menu, const char *str,
 									const char *icon, GtkSignalFunc sf,
 									gpointer data, guint accel_key,
 									guint accel_mods, char *mod);
@@ -186,8 +186,8 @@
  *
  * @return The button.
  */
-GtkWidget *gaim_pixbuf_button_from_stock(const char *text, const char *icon,
-										 GaimButtonOrientation style);
+GtkWidget *pidgin_pixbuf_button_from_stock(const char *text, const char *icon,
+										 PidginButtonOrientation style);
 
 /**
  * Creates a toolbar button with the stock icon.
@@ -196,7 +196,7 @@
  *
  * @return The button.
  */
-GtkWidget *gaim_pixbuf_toolbar_button_from_stock(const char *stock);
+GtkWidget *pidgin_pixbuf_toolbar_button_from_stock(const char *stock);
 
 /**
  * Creates a HIG preferences frame.
@@ -334,7 +334,7 @@
  * @param w The widget that we want to name.
  * @param l A GtkLabel that we want to use as the ATK name for the widget.
  */
-void gaim_set_accessible_label(GtkWidget *w, GtkWidget *l);
+void pidgin_set_accessible_label(GtkWidget *w, GtkWidget *l);
 
 /**
  * A valid GtkMenuPositionFunc.  This is used to determine where 
@@ -364,7 +364,7 @@
  * @param account Account to be used (may be NULL if conv is not NULL)
  * @param who Buddy name (may be NULL if conv is not NULL)
  */
-void gaim_dnd_file_manage(GtkSelectionData *sd, GaimAccount *account, const char *who);
+void pidgin_dnd_file_manage(GtkSelectionData *sd, GaimAccount *account, const char *who);
 
 /**
  * Convenience wrapper for gaim_buddy_icon_get_scale_size
@@ -552,7 +552,7 @@
  * @param pixbuf  The pixbug
  * @return TRUE if the pixbuf is opaque around the edges, FALSE otherwise
  */
-gboolean gaim_gdk_pixbuf_is_opaque(GdkPixbuf *pixbuf);
+gboolean pidgin_gdk_pixbuf_is_opaque(GdkPixbuf *pixbuf);
 
 #if !GTK_CHECK_VERSION(2,2,0)
 /**
diff -r e4c39e261389 -r 311315e979f7 pidgin/plugins/convcolors.c
--- a/pidgin/plugins/convcolors.c	Sat Feb 03 08:24:09 2007 +0000
+++ b/pidgin/plugins/convcolors.c	Sat Feb 03 08:45:32 2007 +0000
@@ -278,8 +278,8 @@
 		hbox = gtk_hbox_new(FALSE, GAIM_HIG_BOX_SPACE);
 		gtk_box_pack_start(GTK_BOX(vbox), hbox, FALSE, FALSE, 0);
 
-		button = gaim_pixbuf_button_from_stock(" Color", GTK_STOCK_SELECT_COLOR,
-				GAIM_BUTTON_HORIZONTAL);
+		button = pidgin_pixbuf_button_from_stock(" Color", GTK_STOCK_SELECT_COLOR,
+				PIDGIN_BUTTON_HORIZONTAL);
 		gtk_box_pack_start(GTK_BOX(hbox), button, FALSE, FALSE, 0);
 		g_signal_connect(G_OBJECT(button), "clicked", G_CALLBACK(set_color),
 				formats[i].prefix);
diff -r e4c39e261389 -r 311315e979f7 pidgin/plugins/gaimrc.c
--- a/pidgin/plugins/gaimrc.c	Sat Feb 03 08:24:09 2007 +0000
+++ b/pidgin/plugins/gaimrc.c	Sat Feb 03 08:45:32 2007 +0000
@@ -455,8 +455,8 @@
 	                                hbox);
 	gtk_size_group_add_widget(labelsg, check);
 
-	widget = gaim_pixbuf_button_from_stock("", GTK_STOCK_SELECT_FONT,
-	                                       GAIM_BUTTON_HORIZONTAL);
+	widget = pidgin_pixbuf_button_from_stock("", GTK_STOCK_SELECT_FONT,
+	                                       PIDGIN_BUTTON_HORIZONTAL);
 	gtk_box_pack_start(GTK_BOX(hbox), widget, FALSE, FALSE, 0);
 	gtk_size_group_add_widget(widgetsg, widget);
 	gtk_widget_set_sensitive(widget,
@@ -515,7 +515,7 @@
 		                                color_prefs_set[i], hbox);
 		gtk_size_group_add_widget(labelsg, check);
 
-		color_widgets[i] = gaim_pixbuf_button_from_stock("", GTK_STOCK_SELECT_COLOR, GAIM_BUTTON_HORIZONTAL);
+		color_widgets[i] = pidgin_pixbuf_button_from_stock("", GTK_STOCK_SELECT_COLOR, PIDGIN_BUTTON_HORIZONTAL);
 		gtk_size_group_add_widget(widgetsg, color_widgets[i]);
 		gtk_box_pack_start(GTK_BOX(hbox), color_widgets[i], FALSE,
 		                   FALSE, 0);
@@ -560,7 +560,7 @@
 		                                font_prefs_set[i], hbox);
 		gtk_size_group_add_widget(labelsg, check);
 
-		font_widgets[i] = gaim_pixbuf_button_from_stock("", GTK_STOCK_SELECT_FONT, GAIM_BUTTON_HORIZONTAL);
+		font_widgets[i] = pidgin_pixbuf_button_from_stock("", GTK_STOCK_SELECT_FONT, PIDGIN_BUTTON_HORIZONTAL);
 		gtk_size_group_add_widget(widgetsg, font_widgets[i]);
 		gtk_box_pack_start(GTK_BOX(hbox), font_widgets[i], FALSE,
 		                   FALSE, 0);
diff -r e4c39e261389 -r 311315e979f7 pidgin/plugins/gevolution/add_buddy_dialog.c
--- a/pidgin/plugins/gevolution/add_buddy_dialog.c	Sat Feb 03 08:24:09 2007 +0000
+++ b/pidgin/plugins/gevolution/add_buddy_dialog.c	Sat Feb 03 08:45:32 2007 +0000
@@ -577,8 +577,8 @@
 	gtk_widget_show(bbox);
 
 	/* "New Person" button */
-	button = gaim_pixbuf_button_from_stock(_("New Person"), GTK_STOCK_NEW,
-										   GAIM_BUTTON_HORIZONTAL);
+	button = pidgin_pixbuf_button_from_stock(_("New Person"), GTK_STOCK_NEW,
+										   PIDGIN_BUTTON_HORIZONTAL);
 	gtk_box_pack_start(GTK_BOX(bbox), button, FALSE, FALSE, 0);
 	gtk_widget_show(button);
 
@@ -594,8 +594,8 @@
 					 G_CALLBACK(cancel_cb), dialog);
 
 	/* "Select Buddy" button */
-	button = gaim_pixbuf_button_from_stock(_("Select Buddy"), GTK_STOCK_APPLY,
-										   GAIM_BUTTON_HORIZONTAL);
+	button = pidgin_pixbuf_button_from_stock(_("Select Buddy"), GTK_STOCK_APPLY,
+										   PIDGIN_BUTTON_HORIZONTAL);
 	dialog->select_button = button;
 	gtk_box_pack_start(GTK_BOX(bbox), button, FALSE, FALSE, 0);
 	gtk_widget_set_sensitive(button, FALSE);
diff -r e4c39e261389 -r 311315e979f7 pidgin/plugins/gevolution/assoc-buddy.c
--- a/pidgin/plugins/gevolution/assoc-buddy.c	Sat Feb 03 08:24:09 2007 +0000
+++ b/pidgin/plugins/gevolution/assoc-buddy.c	Sat Feb 03 08:45:32 2007 +0000
@@ -466,8 +466,8 @@
 	gtk_widget_show(bbox);
 
 	/* "New Person" button */
-	button = gaim_pixbuf_button_from_stock(_("New Person"), GTK_STOCK_NEW,
-										   GAIM_BUTTON_HORIZONTAL);
+	button = pidgin_pixbuf_button_from_stock(_("New Person"), GTK_STOCK_NEW,
+										   PIDGIN_BUTTON_HORIZONTAL);
 	gtk_box_pack_start(GTK_BOX(bbox), button, FALSE, FALSE, 0);
 	gtk_widget_show(button);
 
@@ -483,9 +483,9 @@
 					 G_CALLBACK(cancel_cb), dialog);
 
 	/* "Associate Buddy" button */
-	button = gaim_pixbuf_button_from_stock(_("_Associate Buddy"),
+	button = pidgin_pixbuf_button_from_stock(_("_Associate Buddy"),
 										   GTK_STOCK_APPLY,
-										   GAIM_BUTTON_HORIZONTAL);
+										   PIDGIN_BUTTON_HORIZONTAL);
 	dialog->assoc_button = button;
 	gtk_box_pack_start(GTK_BOX(bbox), button, FALSE, FALSE, 0);
 	gtk_widget_set_sensitive(button, FALSE);