diff -r 969b74a3e27a -r 4de1981757fc pidgin/gtkpluginpref.c
--- a/pidgin/gtkpluginpref.c	Mon Mar 19 06:11:46 2007 +0000
+++ b/pidgin/gtkpluginpref.c	Mon Mar 19 07:01:17 2007 +0000
@@ -2,9 +2,9 @@
  * @file gtkpluginpref.c GTK+ Plugin preferences
  * @ingroup gtkui
  *
- * gaim
+ * purple
  *
- * Gaim is the legal property of its developers, whose names are too numerous
+ * Purple is the legal property of its developers, whose names are too numerous
  * to list here.  Please refer to the COPYRIGHT file distributed with this
  * source distribution.
  *
@@ -40,7 +40,7 @@
 entry_cb(GtkWidget *entry, gpointer data) {
 	char *pref = data;
 
-	gaim_prefs_set_string(pref, gtk_entry_get_text(GTK_ENTRY(entry)));
+	purple_prefs_set_string(pref, gtk_entry_get_text(GTK_ENTRY(entry)));
 
 	return FALSE;
 }
@@ -57,7 +57,7 @@
 	g_return_if_fail(pref);
 
 	text = gtk_imhtml_get_markup(imhtml);
-	gaim_prefs_set_string(pref, text);
+	purple_prefs_set_string(pref, text);
 	g_free(text);
 }
 
@@ -68,30 +68,30 @@
 }
 
 static void
-make_string_pref(GtkWidget *parent, GaimPluginPref *pref, GtkSizeGroup *sg) {
+make_string_pref(GtkWidget *parent, PurplePluginPref *pref, GtkSizeGroup *sg) {
 	GtkWidget *box, *gtk_label, *entry;
 	const gchar *pref_name;
 	const gchar *pref_label;
-	GaimStringFormatType format;
+	PurpleStringFormatType format;
 
-	pref_name = gaim_plugin_pref_get_name(pref);
-	pref_label = gaim_plugin_pref_get_label(pref);
-	format = gaim_plugin_pref_get_format_type(pref);
+	pref_name = purple_plugin_pref_get_name(pref);
+	pref_label = purple_plugin_pref_get_label(pref);
+	format = purple_plugin_pref_get_format_type(pref);
 
-	switch(gaim_plugin_pref_get_type(pref)) {
-		case GAIM_PLUGIN_PREF_CHOICE:
+	switch(purple_plugin_pref_get_type(pref)) {
+		case PURPLE_PLUGIN_PREF_CHOICE:
 			gtk_label = pidgin_prefs_dropdown_from_list(parent, pref_label,
-											  GAIM_PREF_STRING, pref_name,
-											  gaim_plugin_pref_get_choices(pref));
+											  PURPLE_PREF_STRING, pref_name,
+											  purple_plugin_pref_get_choices(pref));
 			gtk_misc_set_alignment(GTK_MISC(gtk_label), 0, 0.5);
 
 			if(sg)
 				gtk_size_group_add_widget(sg, gtk_label);
 
 			break;
-		case GAIM_PLUGIN_PREF_NONE:
+		case PURPLE_PLUGIN_PREF_NONE:
 		default:
-			if (format == GAIM_STRING_FORMAT_TYPE_NONE)
+			if (format == PURPLE_STRING_FORMAT_TYPE_NONE)
 				box = gtk_hbox_new(FALSE, PIDGIN_HIG_BOX_SPACE);
 			else
 				box = gtk_vbox_new(FALSE, PIDGIN_HIG_BOX_SPACE);
@@ -107,13 +107,13 @@
 			if(sg)
 				gtk_size_group_add_widget(sg, gtk_label);
 
-			if (format == GAIM_STRING_FORMAT_TYPE_NONE)
+			if (format == PURPLE_STRING_FORMAT_TYPE_NONE)
 			{				
 				entry = gtk_entry_new();
-				gtk_entry_set_text(GTK_ENTRY(entry), gaim_prefs_get_string(pref_name));
+				gtk_entry_set_text(GTK_ENTRY(entry), purple_prefs_get_string(pref_name));
 				gtk_entry_set_max_length(GTK_ENTRY(entry),
-									 gaim_plugin_pref_get_max_length(pref));
-				if (gaim_plugin_pref_get_masked(pref))
+									 purple_plugin_pref_get_max_length(pref));
+				if (purple_plugin_pref_get_masked(pref))
 				{
 					gtk_entry_set_visibility(GTK_ENTRY(entry), FALSE);
 					if (gtk_entry_get_invisible_char(GTK_ENTRY(entry)) == '*')
@@ -143,11 +143,11 @@
 				gtk_widget_show(spacer);
 
 				frame = pidgin_create_imhtml(TRUE, &imhtml, &toolbar, NULL);
-				if (!(format & GAIM_STRING_FORMAT_TYPE_HTML))
+				if (!(format & PURPLE_STRING_FORMAT_TYPE_HTML))
 					gtk_widget_destroy(toolbar);
 
-				gtk_imhtml_append_text(GTK_IMHTML(imhtml), gaim_prefs_get_string(pref_name),
-						(format & GAIM_STRING_FORMAT_TYPE_MULTILINE) ? 0 : GTK_IMHTML_NO_NEWLINE);
+				gtk_imhtml_append_text(GTK_IMHTML(imhtml), purple_prefs_get_string(pref_name),
+						(format & PURPLE_STRING_FORMAT_TYPE_MULTILINE) ? 0 : GTK_IMHTML_NO_NEWLINE);
 				gtk_label_set_mnemonic_widget(GTK_LABEL(gtk_label), imhtml);
 				gtk_widget_show_all(frame);
 				g_object_set_data(G_OBJECT(imhtml), "pref-key", (gpointer)pref_name);
@@ -163,28 +163,28 @@
 }
 
 static void
-make_int_pref(GtkWidget *parent, GaimPluginPref *pref, GtkSizeGroup *sg) {
+make_int_pref(GtkWidget *parent, PurplePluginPref *pref, GtkSizeGroup *sg) {
 	GtkWidget *gtk_label;
 	const gchar *pref_name;
 	const gchar *pref_label;
 	gint max, min;
 
-	pref_name = gaim_plugin_pref_get_name(pref);
-	pref_label = gaim_plugin_pref_get_label(pref);
+	pref_name = purple_plugin_pref_get_name(pref);
+	pref_label = purple_plugin_pref_get_label(pref);
 
-	switch(gaim_plugin_pref_get_type(pref)) {
-		case GAIM_PLUGIN_PREF_CHOICE:
+	switch(purple_plugin_pref_get_type(pref)) {
+		case PURPLE_PLUGIN_PREF_CHOICE:
 			gtk_label = pidgin_prefs_dropdown_from_list(parent, pref_label,
-					GAIM_PREF_INT, pref_name, gaim_plugin_pref_get_choices(pref));
+					PURPLE_PREF_INT, pref_name, purple_plugin_pref_get_choices(pref));
 			gtk_misc_set_alignment(GTK_MISC(gtk_label), 0, 0.5);
 
 			if(sg)
 				gtk_size_group_add_widget(sg, gtk_label);
 
 			break;
-		case GAIM_PLUGIN_PREF_NONE:
+		case PURPLE_PLUGIN_PREF_NONE:
 		default:
-			gaim_plugin_pref_get_bounds(pref, &min, &max);
+			purple_plugin_pref_get_bounds(pref, &min, &max);
 			pidgin_prefs_labeled_spin_button(parent, pref_label,
 					pref_name, min, max, sg);
 			break;
@@ -193,8 +193,8 @@
 
 
 static void
-make_info_pref(GtkWidget *parent, GaimPluginPref *pref) {
-	GtkWidget *gtk_label = gtk_label_new(gaim_plugin_pref_get_label(pref));
+make_info_pref(GtkWidget *parent, PurplePluginPref *pref) {
+	GtkWidget *gtk_label = gtk_label_new(purple_plugin_pref_get_label(pref));
 	gtk_misc_set_alignment(GTK_MISC(gtk_label), 0, 0);
 	gtk_label_set_line_wrap(GTK_LABEL(gtk_label), TRUE);
 	gtk_box_pack_start(GTK_BOX(parent), gtk_label, FALSE, FALSE, 0);
@@ -203,7 +203,7 @@
 
 
 GtkWidget *
-pidgin_plugin_pref_create_frame(GaimPluginPrefFrame *frame) {
+pidgin_plugin_pref_create_frame(PurplePluginPrefFrame *frame) {
 	GtkWidget *ret, *parent;
 	GtkSizeGroup *sg;
 	GList *pp;
@@ -216,20 +216,20 @@
 	gtk_container_set_border_width(GTK_CONTAINER(ret), PIDGIN_HIG_BORDER);
 	gtk_widget_show(ret);
 
-	for(pp = gaim_plugin_pref_frame_get_prefs(frame);
+	for(pp = purple_plugin_pref_frame_get_prefs(frame);
 		pp != NULL;
 		pp = pp->next)
 	{
-		GaimPluginPref *pref = (GaimPluginPref *)pp->data;
+		PurplePluginPref *pref = (PurplePluginPref *)pp->data;
 
-		const char *name = gaim_plugin_pref_get_name(pref);
-		const char *label = gaim_plugin_pref_get_label(pref);
+		const char *name = purple_plugin_pref_get_name(pref);
+		const char *label = purple_plugin_pref_get_label(pref);
 
 		if(name == NULL) {
 			if(label == NULL)
 				continue;
 
-			if(gaim_plugin_pref_get_type(pref) == GAIM_PLUGIN_PREF_INFO) {
+			if(purple_plugin_pref_get_type(pref) == PURPLE_PLUGIN_PREF_INFO) {
 				make_info_pref(parent, pref);
 			} else {
 				parent = pidgin_make_frame(ret, label);
@@ -239,14 +239,14 @@
 			continue;
 		}
 
-		switch(gaim_prefs_get_type(name)) {
-			case GAIM_PREF_BOOLEAN:
+		switch(purple_prefs_get_type(name)) {
+			case PURPLE_PREF_BOOLEAN:
 				pidgin_prefs_checkbox(label, name, parent);
 				break;
-			case GAIM_PREF_INT:
+			case PURPLE_PREF_INT:
 				make_int_pref(parent, pref, sg);
 				break;
-			case GAIM_PREF_STRING:
+			case PURPLE_PREF_STRING:
 				make_string_pref(parent, pref, sg);
 				break;
 			default: