Pidgin

Update of /cvsroot/gaim/gaim
In directory sc8-pr-cvs1:/tmp/cvs-serv28628

Modified Files:
	COPYRIGHT 
Log Message:
alphabetical order will make maintaining this easier


Index: COPYRIGHT
===================================================================
RCS file: /cvsroot/gaim/gaim/COPYRIGHT,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -p -r1.1 -r1.2
--- COPYRIGHT	30 Dec 2003 04:53:31 -0000	1.1
+++ COPYRIGHT	30 Dec 2003 05:18:58 -0000	1.2
@@ -1,96 +1,96 @@
-Paul A
-David Atallah
-Patrick Aussems
+Adam Fritzler
+Akuke Kok
+Ambrose C. Li
+Andrew Echols
+Andrew Molloy
+Andrew Rodland
+Andy Harrison
+Ari Pollak
+Arkadiusz Miskiewicz
+Artem Litvinovich
+Arturo Cisneros, Jr.
+Arun A. Tharuvai
+Benjamin Miller
+Bill Tompkins
+Bjoern Voigt
+Brent Priddy
 Brian Bernas
-Jonas Birmé
+Brian Enigma
+Brian Macke
+Brian Tarricone
+Cerulean Studios, LLC
+Chris Boyle
+Christian Hammond
+Craig Boston
+David Atallah
+David Raeman
+David Smock
+David Stoddard
+Decklin Foster
+Dennis Lambe Jr.
+Eric Warmenhoven
+Etan Reisner
 Ethan Blanton
-Joshua Blanton
+Federicco Mena Quintero
+Felipe Contreras
+G. Sumner Hayes
+Graham Booker
 Herman Bloggs
+Ho-seok Lee
 Jason Boerner
-Graham Booker
-Craig Boston
-Chris Boyle
-Jeremy Brooks
-Sean Burke
-Cerulean Studios, LLC
-Ka-Hing Cheung
-Arturo Cisneros, Jr.
-Vincas Ciziunas
-Joe Clarke
-Todd Cohen
-Felipe Contreras
+Jason Willis
 Jeramey Crawford
-Mark Doliner
-Nuno Donato
+Jeremy Brooks
+Jesse Farmer
 Jim Duchek
-Tom Dyas
-Andrew Echols
-Sean Egan <sean.egan@...>
-Brian Enigma
+Jim Seymour
+Joe Clarke
+John Matthews
+John Silvestri
+Jonas Birmé
+Joshua Blanton
+Junichi Uekawa
+Ka-Hing Cheung
+Karsten Huneycutt
+Kevin Miller
+Kevin Stange
+Kristian Rietveld
 Larry Ewing
-Jesse Farmer
-Rob Flynn <rob@...>
-Nathan Fredrickson
-Decklin Foster
-Adam Fritzler
+Lex Spoon
+Luke Schierer
+Mark Doliner
+Mark Spencer <markster@...>
+Matt Pandina
+Matt Wilson
+Matthew Luckie
 Michael Golden
-Ryan C. Gordon
-Christian Hammond
-Andy Harrison
-G. Sumner Hayes
 Mike Heffner
-Karsten Huneycutt
-Akuke Kok
-Tero Kuusela
-Dennis Lambe Jr.
-Ho-seok Lee
 Moses Lei
-Ambrose C. Li
+Nathan Fredrickson
+Nathan Poznick
+Nathan Walp
+Neil Sanchala
 Nicolas Lichtmaier
-Artem Litvinovich
-Syd Logan
-Matthew Luckie
-Brian Macke
-Willian T. Mahan
-John Matthews
-Ryan McCabe
+Nuno Donato
+Patrick Aussems
+Paul A
+Paul Miller
+Peter Teichman
+Rob Flynn <rob@...>
 Robert McQueen
 Robert Mibus
-Benjamin Miller
-Kevin Miller
-Paul Miller
-Arkadiusz Miskiewicz
-Andrew Molloy
-Matt Pandina
-Ari Pollak
 Robey Pointer
-Nathan Poznick
-Brent Priddy
-Federicco Mena Quintero
-David Raeman
-Etan Reisner
-Kristian Rietveld
+Ryan C. Gordon
+Ryan McCabe
+Sean Burke
+Sean Egan <sean.egan@...>
+Stu Somlinson
+Syd Logan
+Tero Kuusela
 Tim Ringenbach
-Andrew Rodland
-Neil Sanchala
-Luke Schierer
+Todd Cohen
+Tom Dyas
 Torrey Searle
-Jim Seymour
-John Silvestri
-David Smock
-Mark Spencer <markster@...>
-Lex Spoon
-Kevin Stange
-David Stoddard
-Stu Somlinson
-Brian Tarricone
-Peter Teichman
-Arun A. Tharuvai
-Bill Tompkins
-Junichi Uekawa
-Bjoern Voigt
-Nathan Walp
-Eric Warmenhoven
-Jason Willis
-Matt Wilson
+Vincas Ciziunas
+Willian T. Mahan
 Ximian

Update of /cvsroot/gaim/gaim
In directory sc8-pr-cvs1:/tmp/cvs-serv24642

Added Files:
	COPYRIGHT 
Log Message:
Want a boring, tedious job that requires no skills whatsoever?  I have two
of them for you.  IM me.


--- NEW FILE: COPYRIGHT ---
Paul A
David Atallah
Patrick Aussems
Brian Bernas
Jonas Birmé
Ethan Blanton
Joshua Blanton
Herman Bloggs
Jason Boerner
Graham Booker
Craig Boston
Chris Boyle
Jeremy Brooks
Sean Burke
Cerulean Studios, LLC
Ka-Hing Cheung
Arturo Cisneros, Jr.
Vincas Ciziunas
Joe Clarke
Todd Cohen
Felipe Contreras
Jeramey Crawford
Mark Doliner
Nuno Donato
Jim Duchek
Tom Dyas
Andrew Echols
Sean Egan <sean.egan@...>
Brian Enigma
Larry Ewing
Jesse Farmer
Rob Flynn <rob@...>
Nathan Fredrickson
Decklin Foster
Adam Fritzler
Michael Golden
Ryan C. Gordon
Christian Hammond
Andy Harrison
G. Sumner Hayes
Mike Heffner
Karsten Huneycutt
Akuke Kok
Tero Kuusela
Dennis Lambe Jr.
Ho-seok Lee
Moses Lei
Ambrose C. Li
Nicolas Lichtmaier
Artem Litvinovich
Syd Logan
Matthew Luckie
Brian Macke
Willian T. Mahan
John Matthews
Ryan McCabe
Robert McQueen
Robert Mibus
Benjamin Miller
Kevin Miller
Paul Miller
Arkadiusz Miskiewicz
Andrew Molloy
Matt Pandina
Ari Pollak
Robey Pointer
Nathan Poznick
Brent Priddy
Federicco Mena Quintero
David Raeman
Etan Reisner
Kristian Rietveld
Tim Ringenbach
Andrew Rodland
Neil Sanchala
Luke Schierer
Torrey Searle
Jim Seymour
John Silvestri
David Smock
Mark Spencer <markster@...>
Lex Spoon
Kevin Stange
David Stoddard
Stu Somlinson
Brian Tarricone
Peter Teichman
Arun A. Tharuvai
Bill Tompkins
Junichi Uekawa
Bjoern Voigt
Nathan Walp
Eric Warmenhoven
Jason Willis
Matt Wilson
Ximian

Update of /cvsroot/gaim/gaim/src
In directory sc8-pr-cvs1:/tmp/cvs-serv12907/src

Modified Files:
	account.c blist.c connection.c dialogs.c gtkaccount.c 
	gtkblist.c gtkconv.c gtkutils.c gtkutils.h log.c main.c 
	plugin.c prpl.c prpl.h server.c themes.c ui.h util.c 
Log Message:
This is the death of protocol numbers.  There are probably now a few
functions that should now go away, but i'll let our crack team of crazy
patch writers figure out which ones they are.

out-of-tree and unofficial prpl-writers, rejoice!


Index: account.c
===================================================================
RCS file: /cvsroot/gaim/gaim/src/account.c,v
retrieving revision 1.74
retrieving revision 1.75
diff -u -d -p -r1.74 -r1.75
--- account.c	5 Dec 2003 04:03:31 -0000	1.74
+++ account.c	29 Dec 2003 09:03:43 -0000	1.75
@@ -137,10 +137,7 @@ gaim_account_new(const char *username, c
 
 	gaim_account_set_username(account, username);
 
-	if(protocol_id)
-		gaim_account_set_protocol_id(account, protocol_id);
-	else
-		gaim_account_set_protocol(account, GAIM_PROTO_DEFAULT);
+	gaim_account_set_protocol_id(account, protocol_id ? protocol_id : GAIM_PROTO_DEFAULT);
 
 	account->settings = g_hash_table_new_full(g_str_hash, g_str_equal,
 											  g_free, delete_setting);

Index: blist.c
===================================================================
RCS file: /cvsroot/gaim/gaim/src/blist.c,v
retrieving revision 1.122
retrieving revision 1.123
diff -u -d -p -r1.122 -r1.123
--- blist.c	29 Dec 2003 06:13:36 -0000	1.122
+++ blist.c	29 Dec 2003 09:03:43 -0000	1.123
@@ -500,7 +500,7 @@ char *gaim_chat_get_display_name(GaimCha
 		 GaimPluginProtocolInfo *prpl_info;
 		 struct proto_chat_entry *pce;
 
-		 prpl = gaim_find_prpl(gaim_account_get_protocol(chat->account));
+		 prpl = gaim_find_prpl(gaim_account_get_protocol_id(chat->account));
 		 prpl_info = GAIM_PLUGIN_PROTOCOL_INFO(prpl);
 
 		 parts = prpl_info->chat_info(chat->account->gc);
@@ -1349,7 +1349,7 @@ gaim_blist_find_chat(GaimAccount *accoun
 
 				chat = (GaimChat*)node;
 
-				prpl = gaim_find_prpl(gaim_account_get_protocol(chat->account));
+				prpl = gaim_find_prpl(gaim_account_get_protocol_id(chat->account));
 				prpl_info = GAIM_PLUGIN_PROTOCOL_INFO(prpl);
 
 				parts = prpl_info->chat_info(

Index: connection.c
===================================================================
RCS file: /cvsroot/gaim/gaim/src/connection.c,v
retrieving revision 1.52
retrieving revision 1.53
diff -u -d -p -r1.52 -r1.53
--- connection.c	5 Nov 2003 06:15:49 -0000	1.52
+++ connection.c	29 Dec 2003 09:03:43 -0000	1.53
@@ -48,7 +48,7 @@ gaim_connection_new(GaimAccount *account
 
 	gc = g_new0(GaimConnection, 1);
 
-	gc->prpl = gaim_find_prpl(gaim_account_get_protocol(account));
+	gc->prpl = gaim_find_prpl(gaim_account_get_protocol_id(account));
 
 	gaim_connection_set_account(gc, account);
 	gaim_account_set_connection(account, gc);

Index: dialogs.c
===================================================================
RCS file: /cvsroot/gaim/gaim/src/dialogs.c,v
retrieving revision 1.575
retrieving revision 1.576
diff -u -d -p -r1.575 -r1.576
--- dialogs.c	29 Dec 2003 05:14:15 -0000	1.575
+++ dialogs.c	29 Dec 2003 09:03:43 -0000	1.576
@@ -1339,13 +1339,12 @@ void insert_smiley_text(GtkWidget *widge
 {
 	GaimGtkConversation *gtkconv;
 	char *smiley_text = g_object_get_data(G_OBJECT(widget), "smiley_text");
-	GaimProtocol protocol = gaim_account_get_protocol(gaim_conversation_get_account(c));
-	GaimPlugin *proto = gaim_find_prpl(protocol);
-	
+	GaimPlugin *proto = gaim_find_prpl(gaim_account_get_protocol_id(gaim_conversation_get_account(c)));
+
 	gtkconv = GAIM_GTK_CONVERSATION(c);
-	
+
 	gtk_imhtml_insert_smiley(GTK_IMHTML(gtkconv->entry), proto->info->name, smiley_text);
-	
+
 	close_smiley_dialog(NULL, c);
 }
 
@@ -1397,7 +1396,7 @@ void show_smiley_dialog(GaimConversation
 
 	if(c->account)
 		smileys = get_proto_smileys(
-			gaim_account_get_protocol(gaim_conversation_get_account(c)));
+			gaim_account_get_protocol_id(gaim_conversation_get_account(c)));
 	else
 		smileys = get_proto_smileys(GAIM_PROTO_DEFAULT);
 

Index: gtkaccount.c
===================================================================
RCS file: /cvsroot/gaim/gaim/src/gtkaccount.c,v
retrieving revision 1.109
retrieving revision 1.110
diff -u -d -p -r1.109 -r1.110
--- gtkaccount.c	14 Dec 2003 11:03:54 -0000	1.109
+++ gtkaccount.c	29 Dec 2003 09:03:43 -0000	1.110
@@ -81,7 +81,6 @@ typedef struct
 	GaimGtkAccountDialogType type;
 
 	GaimAccount *account;
-	GaimProtocol protocol;
 	char *protocol_id;
 	GaimPlugin *plugin;
 	GaimPluginProtocolInfo *prpl_info;
@@ -152,9 +151,9 @@ static void set_account(GtkListStore *st
 						  GaimAccount *account);
 
 static char *
-proto_name(int proto)
+proto_name(const char *id)
 {
-	GaimPlugin *p = gaim_find_prpl(proto);
+	GaimPlugin *p = gaim_find_prpl(id);
 
 	return ((p && p->info->name) ? _(p->info->name) : _("Unknown"));
 }
@@ -192,12 +191,11 @@ add_pref_box(AccountPrefsDialog *dialog,
 }
 
 static void
-set_account_protocol_cb(GtkWidget *item, GaimProtocol protocol,
+set_account_protocol_cb(GtkWidget *item, const char *id,
 						  AccountPrefsDialog *dialog)
 {
-	if ((dialog->plugin = gaim_find_prpl(protocol)) != NULL) {
+	if ((dialog->plugin = gaim_find_prpl(id)) != NULL) {
 		dialog->prpl_info = GAIM_PLUGIN_PROTOCOL_INFO(dialog->plugin);
-		dialog->protocol  = dialog->prpl_info->protocol;
 
 		if (dialog->protocol_id != NULL)
 			g_free(dialog->protocol_id);
@@ -381,7 +379,7 @@ add_login_options(AccountPrefsDialog *di
 
 	/* Protocol */
 	dialog->protocol_menu = gaim_gtk_protocol_option_menu_new(
-			dialog->protocol, G_CALLBACK(set_account_protocol_cb), dialog);
+			dialog->protocol_id, G_CALLBACK(set_account_protocol_cb), dialog);
 
 	add_pref_box(dialog, vbox, _("Protocol:"), dialog->protocol_menu);
 
@@ -647,15 +645,13 @@ add_protocol_options(AccountPrefsDialog 
 
 		switch (gaim_account_option_get_type(option)) {
 			case GAIM_PREF_BOOLEAN:
-				if (account == NULL ||
-					gaim_account_get_protocol(account) != dialog->protocol) {
-
+				if (account == NULL || !strcmp(gaim_account_get_protocol_id(account), dialog->protocol_id)) {
 					bool_value = gaim_account_option_get_default_bool(option);
-				}
-				else
+				} else {
 					bool_value = gaim_account_get_bool(account,
 						gaim_account_option_get_setting(option),
 						gaim_account_option_get_default_bool(option));
+				}
 
 				check = gtk_check_button_new_with_label(
 					gaim_account_option_get_text(option));
@@ -672,15 +668,13 @@ add_protocol_options(AccountPrefsDialog 
 				break;
 
 			case GAIM_PREF_INT:
-				if (account == NULL ||
-					gaim_account_get_protocol(account) != dialog->protocol) {
-
+				if (account == NULL || !strcmp(gaim_account_get_protocol_id(account), dialog->protocol_id)) {
 					int_value = gaim_account_option_get_default_int(option);
-					}
-				else
+				} else {
 					int_value = gaim_account_get_int(account,
 						gaim_account_option_get_setting(option),
 						gaim_account_option_get_default_int(option));
+				}
 
 				g_snprintf(buf, sizeof(buf), "%d", int_value);
 
@@ -700,15 +694,13 @@ add_protocol_options(AccountPrefsDialog 
 				break;
 
 			case GAIM_PREF_STRING:
-				if (account == NULL ||
-					gaim_account_get_protocol(account) != dialog->protocol) {
-
+				if (account == NULL || !strcmp(gaim_account_get_protocol_id(account), dialog->protocol_id)) {
 					str_value = gaim_account_option_get_default_string(option);
-				}
-				else
+				} else {
 					str_value = gaim_account_get_string(account,
 						gaim_account_option_get_setting(option),
 						gaim_account_option_get_default_string(option));
+				}
 
 				entry = gtk_entry_new();
 
@@ -1198,16 +1190,14 @@ gaim_gtk_account_dialog_show(GaimGtkAcco
 	dialog->sg      = gtk_size_group_new(GTK_SIZE_GROUP_HORIZONTAL);
 
 	if (dialog->account == NULL) {
-		dialog->protocol_id = g_strdup("prpl-oscar");
-		dialog->protocol = GAIM_PROTO_OSCAR;
+		dialog->protocol_id = g_strdup(GAIM_PROTO_DEFAULT);
 	}
 	else {
 		dialog->protocol_id =
 			g_strdup(gaim_account_get_protocol_id(dialog->account));
-		dialog->protocol = gaim_account_get_protocol(dialog->account);
 	}
 
-	if ((dialog->plugin = gaim_find_prpl(dialog->protocol)) != NULL)
+	if ((dialog->plugin = gaim_find_prpl(dialog->protocol_id)) != NULL)
 		dialog->prpl_info = GAIM_PLUGIN_PROTOCOL_INFO(dialog->plugin);
 
 
@@ -1805,7 +1795,7 @@ set_account(GtkListStore *store, GtkTree
 			COLUMN_SCREENNAME, gaim_account_get_username(account),
 			COLUMN_ONLINE, gaim_account_is_connected(account),
 			COLUMN_AUTOLOGIN, gaim_account_get_auto_login(account, GAIM_GTK_UI),
-			COLUMN_PROTOCOL, proto_name(gaim_account_get_protocol(account)),
+			COLUMN_PROTOCOL, proto_name(gaim_account_get_protocol_id(account)),
 			COLUMN_DATA, account,
 			-1);
 

Index: gtkblist.c
===================================================================
RCS file: /cvsroot/gaim/gaim/src/gtkblist.c,v
retrieving revision 1.61
retrieving revision 1.62
diff -u -d -p -r1.61 -r1.62
--- gtkblist.c	29 Dec 2003 06:13:36 -0000	1.61
+++ gtkblist.c	29 Dec 2003 09:03:43 -0000	1.62
@@ -964,7 +964,7 @@ static gboolean gtk_blist_button_press_c
 			b = (GaimBuddy *)node;
 
 		/* Protocol specific options */
-		prpl = gaim_find_prpl(gaim_account_get_protocol(b->account));
+		prpl = gaim_find_prpl(gaim_account_get_protocol_id(b->account));
 
 		if (prpl != NULL)
 			prpl_info = GAIM_PLUGIN_PROTOCOL_INFO(prpl);
@@ -1022,7 +1022,7 @@ static gboolean gtk_blist_button_press_c
 						gtk_menu_item_set_submenu(GTK_MENU_ITEM(menuitem), submenu);
 						gtk_widget_show(submenu);
 
-						prpl = gaim_find_prpl(gaim_account_get_protocol(buddy->account));
+						prpl = gaim_find_prpl(gaim_account_get_protocol_id(buddy->account));
 						prpl_info = prpl ? GAIM_PLUGIN_PROTOCOL_INFO(prpl) : NULL;
 
 						make_buddy_menu(submenu, prpl_info, buddy);
@@ -1744,7 +1744,7 @@ static char *gaim_get_tooltip_text(GaimB
 	GaimPlugin *prpl;
 	GaimPluginProtocolInfo *prpl_info = NULL;
 	char *text = NULL;
-	
+
 	if(GAIM_BLIST_NODE_IS_CHAT(node)) {
 		GaimChat *chat = (GaimChat *)node;
 		char *name = NULL;
@@ -1752,7 +1752,7 @@ static char *gaim_get_tooltip_text(GaimB
 		GList *parts, *tmp;
 		GString *parts_text = g_string_new("");
 
-		prpl = gaim_find_prpl(gaim_account_get_protocol(chat->account));
+		prpl = gaim_find_prpl(gaim_account_get_protocol_id(chat->account));
 		prpl_info = GAIM_PLUGIN_PROTOCOL_INFO(prpl);
 
 		parts = prpl_info->chat_info(chat->account->gc);
@@ -1809,7 +1809,7 @@ static char *gaim_get_tooltip_text(GaimB
 			b = (GaimBuddy *)node;
 		}
 
-		prpl = gaim_find_prpl(gaim_account_get_protocol(b->account));
+		prpl = gaim_find_prpl(gaim_account_get_protocol_id(b->account));
 		prpl_info = GAIM_PLUGIN_PROTOCOL_INFO(prpl);
 
 		if (prpl_info && prpl_info->tooltip_text) {
@@ -1927,7 +1927,7 @@ GdkPixbuf *gaim_gtk_blist_get_status_ico
 		else
 			account = chat->account;
 
-		prpl = gaim_find_prpl(gaim_account_get_protocol(account));
+		prpl = gaim_find_prpl(gaim_account_get_protocol_id(account));
 		if(!prpl)
 			return NULL;
 
@@ -2065,7 +2065,7 @@ static gchar *gaim_gtk_blist_get_name_ma
 		name = gaim_get_buddy_alias(b);
 	esc = g_markup_escape_text(name, strlen(name));
 
-	prpl = gaim_find_prpl(gaim_account_get_protocol(b->account));
+	prpl = gaim_find_prpl(gaim_account_get_protocol_id(b->account));
 
 	if (prpl != NULL)
 		prpl_info = GAIM_PLUGIN_PROTOCOL_INFO(prpl);
@@ -3849,7 +3849,7 @@ create_prpl_icon(GaimAccount *account)
 	const char *protoname = NULL;
 	char buf[256];
 
-	prpl = gaim_find_prpl(gaim_account_get_protocol(account));
+	prpl = gaim_find_prpl(gaim_account_get_protocol_id(account));
 
 	if (prpl != NULL) {
 		prpl_info = GAIM_PLUGIN_PROTOCOL_INFO(prpl);

Index: gtkconv.c
===================================================================
RCS file: /cvsroot/gaim/gaim/src/gtkconv.c,v
retrieving revision 1.277
retrieving revision 1.278
diff -u -d -p -r1.277 -r1.278
--- gtkconv.c	29 Dec 2003 07:19:55 -0000	1.277
+++ gtkconv.c	29 Dec 2003 09:03:43 -0000	1.278
@@ -4544,7 +4544,8 @@ gaim_gtkconv_write_conv(GaimConversation
 	if (gaim_prefs_get_bool("/gaim/gtk/conversations/ignore_font_sizes"))
 		gtk_font_options ^= GTK_IMHTML_NO_SIZES;
 
-	if (GAIM_PLUGIN_PROTOCOL_INFO(gaim_find_prpl(gaim_account_get_protocol(conv->account)))->options &
+	/* this is gonna crash one day, I can feel it. */
+	if (GAIM_PLUGIN_PROTOCOL_INFO(gaim_find_prpl(gaim_account_get_protocol_id(conv->account)))->options &
 	    OPT_PROTO_USE_POINTSIZE) {
 		gtk_font_options ^= GTK_IMHTML_USE_POINTSIZE;
 	}

Index: gtkutils.c
===================================================================
RCS file: /cvsroot/gaim/gaim/src/gtkutils.c,v
retrieving revision 1.56
retrieving revision 1.57
diff -u -d -p -r1.56 -r1.57
--- gtkutils.c	28 Dec 2003 02:41:52 -0000	1.56
+++ gtkutils.c	29 Dec 2003 09:03:43 -0000	1.57
@@ -619,22 +619,22 @@ protocol_menu_cb(GtkWidget *optmenu, GCa
 {
 	GtkWidget *menu;
 	GtkWidget *item;
-	GaimProtocol protocol;
+	const char *protocol;
 	gpointer user_data;
 
 	menu = gtk_option_menu_get_menu(GTK_OPTION_MENU(optmenu));
 	item = gtk_menu_get_active(GTK_MENU(menu));
 
-	protocol = GPOINTER_TO_INT(g_object_get_data(G_OBJECT(item), "protocol"));
+	protocol = g_object_get_data(G_OBJECT(item), "protocol");
 	user_data = (g_object_get_data(G_OBJECT(optmenu), "user_data"));
 
 	if (cb != NULL)
-		((void (*)(GtkWidget *, GaimProtocol, gpointer))cb)(item, protocol,
+		((void (*)(GtkWidget *, const char *, gpointer))cb)(item, protocol,
 															user_data);
 }
 
 GtkWidget *
-gaim_gtk_protocol_option_menu_new(GaimProtocol protocol, GCallback cb,
+gaim_gtk_protocol_option_menu_new(const char *id, GCallback cb,
 								  gpointer user_data)
 {
 	GaimPluginProtocolInfo *prpl_info;
@@ -712,13 +712,12 @@ gaim_gtk_protocol_option_menu_new(GaimPr
 		gtk_box_pack_start(GTK_BOX(hbox), label, TRUE, TRUE, 0);
 		gtk_widget_show(label);
 
-		g_object_set_data(G_OBJECT(item), "protocol",
-						 GINT_TO_POINTER(prpl_info->protocol));
+		g_object_set_data(G_OBJECT(item), "protocol", plugin->info->id);
 
 		gtk_menu_shell_append(GTK_MENU_SHELL(menu), item);
 		gtk_widget_show(item);
 
-		if (prpl_info->protocol == protocol)
+		if (!strcmp(plugin->info->id, id))
 			selected_index = i;
 	}
 
@@ -799,7 +798,7 @@ create_account_menu(GtkWidget *optmenu, 
 		if (check_account_func && !check_account_func(account))
 			continue;
 
-		plugin = gaim_find_prpl(gaim_account_get_protocol(account));
+		plugin = gaim_find_prpl(gaim_account_get_protocol_id(account));
 
 		if (plugin != NULL)
 			prpl_info = GAIM_PLUGIN_PROTOCOL_INFO(plugin);

Index: gtkutils.h
===================================================================
RCS file: /cvsroot/gaim/gaim/src/gtkutils.h,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -d -p -r1.23 -r1.24
--- gtkutils.h	4 Dec 2003 22:09:58 -0000	1.23
+++ gtkutils.h	29 Dec 2003 09:03:43 -0000	1.24
@@ -231,13 +231,13 @@ GtkWidget *gaim_gtk_make_frame(GtkWidget
 /**
  * Creates a drop-down option menu filled with protocols.
  *
- * @param protocol  The protocol to select by default.
+ * @param id        The protocol to select by default.
  * @param cb        The callback to call when a protocol is selected.
  * @param user_data Data to pass to the callback function.
  *
  * @return The drop-down option menu.
  */
-GtkWidget *gaim_gtk_protocol_option_menu_new(GaimProtocol protocol,
+GtkWidget *gaim_gtk_protocol_option_menu_new(const char *id,
 											 GCallback cb,
 											 gpointer user_data);
 

Index: log.c
===================================================================
RCS file: /cvsroot/gaim/gaim/src/log.c,v
retrieving revision 1.76
retrieving revision 1.77
diff -u -d -p -r1.76 -r1.77
--- log.c	15 Dec 2003 01:04:51 -0000	1.76
+++ log.c	29 Dec 2003 09:03:43 -0000	1.77
@@ -249,8 +249,9 @@ static GList *log_lister_common(const ch
 	const char *filename;
 	char *me = g_strdup(gaim_normalize(account, gaim_account_get_username(account)));
 
+	/* does this seem like a bad way to get this component of the path to anyone else? --Nathan */
 	const char *prpl = GAIM_PLUGIN_PROTOCOL_INFO
-		(gaim_find_prpl(gaim_account_get_protocol(account)))->list_icon(account, NULL);
+		(gaim_find_prpl(gaim_account_get_protocol_id(account)))->list_icon(account, NULL);
 	char *path = g_build_filename(gaim_user_dir(), "logs", prpl, me, gaim_normalize(account, screenname), NULL);
 
 	g_free(me);
@@ -430,7 +431,7 @@ static void html_logger_write(GaimLog *l
 		char *guy = g_strdup(gaim_normalize(log->account, gaim_account_get_username(log->account)));
 		char *chat;
 		const char *prpl = GAIM_PLUGIN_PROTOCOL_INFO
-			(gaim_find_prpl(gaim_account_get_protocol(log->account)))->list_icon(log->account, NULL);
+			(gaim_find_prpl(gaim_account_get_protocol_id(log->account)))->list_icon(log->account, NULL);
 		char *dir;
 		char *filename;
 
@@ -577,7 +578,7 @@ static void txt_logger_write(GaimLog *lo
 		char *guy = g_strdup(gaim_normalize(log->account, gaim_account_get_username(log->account)));
 		char *chat;
 		const char *prpl = GAIM_PLUGIN_PROTOCOL_INFO
-			(gaim_find_prpl(gaim_account_get_protocol(log->account)))->list_icon(log->account, NULL);
+			(gaim_find_prpl(gaim_account_get_protocol_id(log->account)))->list_icon(log->account, NULL);
 		char *dir;
 
 		if (log->type == GAIM_LOG_CHAT) {

Index: main.c
===================================================================
RCS file: /cvsroot/gaim/gaim/src/main.c,v
retrieving revision 1.105
retrieving revision 1.106
diff -u -d -p -r1.105 -r1.106
--- main.c	8 Dec 2003 22:54:30 -0000	1.105
+++ main.c	29 Dec 2003 09:03:44 -0000	1.106
@@ -155,7 +155,7 @@ static void dologin(GtkWidget *widget, G
 
 	account = gaim_accounts_find(username, NULL);
 	if (!account) {
-		account = gaim_account_new(username, "prpl-oscar");
+		account = gaim_account_new(username, GAIM_PROTO_DEFAULT);
 		gaim_account_set_remember_password(account, FALSE);
 		gaim_accounts_add(account);
 	}
@@ -470,7 +470,7 @@ static void set_first_user(char *name)
 	account = gaim_accounts_find(name, NULL);
 
 	if (account == NULL) { /* new user */
-		account = gaim_account_new(name, "prpl-oscar");
+		account = gaim_account_new(name, GAIM_PROTO_DEFAULT);
 		gaim_accounts_add(account);
 	}
 

Index: plugin.c
===================================================================
RCS file: /cvsroot/gaim/gaim/src/plugin.c,v
retrieving revision 1.35
retrieving revision 1.36
diff -u -d -p -r1.35 -r1.36
--- plugin.c	16 Oct 2003 03:58:50 -0000	1.35
+++ plugin.c	29 Dec 2003 09:03:44 -0000	1.36
@@ -133,10 +133,17 @@ static gint
 compare_prpl(GaimPlugin *a, GaimPlugin *b)
 {
 	/* neg if a before b, 0 if equal, pos if a after b */
-	return ((GAIM_IS_PROTOCOL_PLUGIN(a)
-			 ? GAIM_PLUGIN_PROTOCOL_INFO(a)->protocol : -1) -
-			((GAIM_IS_PROTOCOL_PLUGIN(b)
-			 ? GAIM_PLUGIN_PROTOCOL_INFO(b)->protocol : -1)));
+	if(GAIM_IS_PROTOCOL_PLUGIN(a)) {
+		if(GAIM_IS_PROTOCOL_PLUGIN(b))
+			return strcmp(a->info->name, b->info->name);
+		else
+			return -1;
+	} else {
+		if(GAIM_IS_PROTOCOL_PLUGIN(b))
+			return 1;
+		else
+			return 0;
+	}
 }
 
 GaimPlugin *
@@ -870,8 +877,7 @@ gaim_plugins_probe(const char *ext)
 				continue;
 			}
 
-			if (GAIM_PLUGIN_PROTOCOL_INFO(plugin)->protocol == GAIM_PROTO_ICQ ||
-				gaim_find_prpl(GAIM_PLUGIN_PROTOCOL_INFO(plugin)->protocol))
+			if (gaim_find_prpl(plugin->info->id))
 			{
 				/* Nothing to see here--move along, move along */
 				gaim_plugin_destroy(plugin);

Index: prpl.c
===================================================================
RCS file: /cvsroot/gaim/gaim/src/prpl.c,v
retrieving revision 1.134
retrieving revision 1.135
diff -u -d -p -r1.134 -r1.135
--- prpl.c	28 Nov 2003 19:30:44 -0000	1.134
+++ prpl.c	29 Dec 2003 09:03:44 -0000	1.135
@@ -78,7 +78,7 @@ gaim_prpl_id_to_num(const char *id)
 }
 
 GaimPlugin *
-gaim_find_prpl(GaimProtocol type)
+gaim_find_prpl(const char *id)
 {
 	GList *l;
 	GaimPlugin *plugin;
@@ -89,7 +89,7 @@ gaim_find_prpl(GaimProtocol type)
 		/* Just In Case (TM) */
 		if (GAIM_IS_PROTOCOL_PLUGIN(plugin)) {
 
-			if (GAIM_PLUGIN_PROTOCOL_INFO(plugin)->protocol == type)
+			if (!strcmp(plugin->info->id, id))
 				return plugin;
 		}
 	}

Index: prpl.h
===================================================================
RCS file: /cvsroot/gaim/gaim/src/prpl.h,v
retrieving revision 1.143
retrieving revision 1.144
diff -u -d -p -r1.143 -r1.144
--- prpl.h	28 Nov 2003 19:30:44 -0000	1.143
+++ prpl.h	29 Dec 2003 09:03:44 -0000	1.144
@@ -83,7 +83,7 @@ typedef enum
 		"in the \"Tools\" menu in the buddy list window."
 
 /** Default protocol */
-#define GAIM_PROTO_DEFAULT GAIM_PROTO_OSCAR
+#define GAIM_PROTO_DEFAULT "prpl-oscar"
 
 /*@}*/
 
@@ -194,7 +194,6 @@ typedef enum
  */
 struct _GaimPluginProtocolInfo
 {
-	GaimProtocol protocol;        /**< The protocol type.         */
 	GaimProtocolOptions options;  /**< Protocol options.          */
 
 	GList *user_splits;      /* A GList of GaimAccountUserSplit */
@@ -349,7 +348,7 @@ GaimProtocol gaim_prpl_id_to_num(const c
  *
  * @param type The protocol plugin;
  */
-GaimPlugin *gaim_find_prpl(GaimProtocol type);
+GaimPlugin *gaim_find_prpl(const char *id);
 
 #ifdef __cplusplus
 }

Index: server.c
===================================================================
RCS file: /cvsroot/gaim/gaim/src/server.c,v
retrieving revision 1.385
retrieving revision 1.386
diff -u -d -p -r1.385 -r1.386
--- server.c	29 Dec 2003 06:13:36 -0000	1.385
+++ server.c	29 Dec 2003 09:03:44 -0000	1.386
@@ -40,7 +40,7 @@
 
 void serv_login(GaimAccount *account)
 {
-	GaimPlugin *p = gaim_find_prpl(gaim_account_get_protocol(account));
+	GaimPlugin *p = gaim_find_prpl(gaim_account_get_protocol_id(account));
 	GaimPluginProtocolInfo *prpl_info = NULL;
 
 	if (account->gc == NULL || p == NULL)

Index: themes.c
===================================================================
RCS file: /cvsroot/gaim/gaim/src/themes.c,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -d -p -r1.26 -r1.27
--- themes.c	4 Dec 2003 05:23:19 -0000	1.26
+++ themes.c	29 Dec 2003 09:03:44 -0000	1.27
@@ -236,8 +236,8 @@ void smiley_theme_probe()
 	}
 }
 
-GSList *get_proto_smileys(int protocol) {
-	GaimPlugin *proto = gaim_find_prpl(protocol);
+GSList *get_proto_smileys(const char *id) {
+	GaimPlugin *proto = gaim_find_prpl(id);
 	struct smiley_list *list, *def;
 
 	if(!current_smiley_theme)

Index: ui.h
===================================================================
RCS file: /cvsroot/gaim/gaim/src/ui.h,v
retrieving revision 1.147
retrieving revision 1.148
diff -u -d -p -r1.147 -r1.148
--- ui.h	27 Dec 2003 20:55:55 -0000	1.147
+++ ui.h	29 Dec 2003 09:03:44 -0000	1.148
@@ -157,6 +157,6 @@ extern void session_end();
 extern void smiley_themeize(GtkWidget *);
 extern void smiley_theme_probe();
 extern void load_smiley_theme(const char *file, gboolean load);
-extern GSList *get_proto_smileys(int protocol);
+extern GSList *get_proto_smileys(const char *id);
 
 #endif /* _UI_H_ */

Index: util.c
===================================================================
RCS file: /cvsroot/gaim/gaim/src/util.c,v
retrieving revision 1.256
retrieving revision 1.257
diff -u -d -p -r1.256 -r1.257
--- util.c	17 Dec 2003 09:33:05 -0000	1.256
+++ util.c	29 Dec 2003 09:03:44 -0000	1.257
@@ -1586,7 +1586,7 @@ gaim_normalize(const GaimAccount *accoun
 	const char *ret = NULL;
 
 	if(account)
-		prpl = gaim_find_prpl(gaim_account_get_protocol(account));
+		prpl = gaim_find_prpl(gaim_account_get_protocol_id(account));
 
 	if(prpl)
 		prpl_info = GAIM_PLUGIN_PROTOCOL_INFO(prpl);

Update of /cvsroot/gaim/gaim/src/protocols/gg
In directory sc8-pr-cvs1:/tmp/cvs-serv12907/src/protocols/gg

Modified Files:
	gg.c 
Log Message:
This is the death of protocol numbers.  There are probably now a few
functions that should now go away, but i'll let our crack team of crazy
patch writers figure out which ones they are.

out-of-tree and unofficial prpl-writers, rejoice!


Index: gg.c
===================================================================
RCS file: /cvsroot/gaim/gaim/src/protocols/gg/gg.c,v
retrieving revision 1.84
retrieving revision 1.85
diff -u -d -p -r1.84 -r1.85
--- gg.c	25 Nov 2003 07:16:10 -0000	1.84
+++ gg.c	29 Dec 2003 09:03:45 -0000	1.85
@@ -1302,7 +1302,6 @@ static GaimPlugin *my_protocol = NULL;
 
 static GaimPluginProtocolInfo prpl_info =
 {
-	GAIM_PROTO_GADUGADU,
 	0,
 	NULL,
 	NULL,

Update of /cvsroot/gaim/gaim/src/protocols/irc
In directory sc8-pr-cvs1:/tmp/cvs-serv12907/src/protocols/irc

Modified Files:
	irc.c 
Log Message:
This is the death of protocol numbers.  There are probably now a few
functions that should now go away, but i'll let our crack team of crazy
patch writers figure out which ones they are.

out-of-tree and unofficial prpl-writers, rejoice!


Index: irc.c
===================================================================
RCS file: /cvsroot/gaim/gaim/src/protocols/irc/irc.c,v
retrieving revision 1.196
retrieving revision 1.197
diff -u -d -p -r1.196 -r1.197
--- irc.c	13 Dec 2003 01:16:22 -0000	1.196
+++ irc.c	29 Dec 2003 09:03:45 -0000	1.197
@@ -467,7 +467,6 @@ static void irc_buddy_free(struct irc_bu
 
 static GaimPluginProtocolInfo prpl_info =
 {
-	GAIM_PROTO_IRC,
 	OPT_PROTO_CHAT_TOPIC | OPT_PROTO_PASSWORD_OPTIONAL,
 	NULL,
 	NULL,

Update of /cvsroot/gaim/gaim/src/protocols/msn
In directory sc8-pr-cvs1:/tmp/cvs-serv12907/src/protocols/msn

Modified Files:
	msn.c 
Log Message:
This is the death of protocol numbers.  There are probably now a few
functions that should now go away, but i'll let our crack team of crazy
patch writers figure out which ones they are.

out-of-tree and unofficial prpl-writers, rejoice!


Index: msn.c
===================================================================
RCS file: /cvsroot/gaim/gaim/src/protocols/msn/msn.c,v
retrieving revision 1.249
retrieving revision 1.250
diff -u -d -p -r1.249 -r1.250
--- msn.c	27 Dec 2003 01:35:04 -0000	1.249
+++ msn.c	29 Dec 2003 09:03:45 -0000	1.250
@@ -1568,7 +1568,6 @@ msn_get_info(GaimConnection *gc, const c
 
 static GaimPluginProtocolInfo prpl_info =
 {
-	GAIM_PROTO_MSN,
 	OPT_PROTO_MAIL_CHECK | OPT_PROTO_BUDDY_ICON,
 	NULL,
 	NULL,

Update of /cvsroot/gaim/gaim/src/protocols/jabber
In directory sc8-pr-cvs1:/tmp/cvs-serv12907/src/protocols/jabber

Modified Files:
	jabber.c 
Log Message:
This is the death of protocol numbers.  There are probably now a few
functions that should now go away, but i'll let our crack team of crazy
patch writers figure out which ones they are.

out-of-tree and unofficial prpl-writers, rejoice!


Index: jabber.c
===================================================================
RCS file: /cvsroot/gaim/gaim/src/protocols/jabber/jabber.c,v
retrieving revision 1.218
retrieving revision 1.219
diff -u -d -p -r1.218 -r1.219
--- jabber.c	23 Dec 2003 17:36:07 -0000	1.218
+++ jabber.c	29 Dec 2003 09:03:45 -0000	1.219
@@ -1083,7 +1083,6 @@ static GList *jabber_actions(GaimConnect
 
 static GaimPluginProtocolInfo prpl_info =
 {
-	GAIM_PROTO_JABBER,
 	OPT_PROTO_CHAT_TOPIC | OPT_PROTO_UNIQUE_CHATNAME,
 	NULL,
 	NULL,

Update of /cvsroot/gaim/gaim/src/protocols/napster
In directory sc8-pr-cvs1:/tmp/cvs-serv12907/src/protocols/napster

Modified Files:
	napster.c 
Log Message:
This is the death of protocol numbers.  There are probably now a few
functions that should now go away, but i'll let our crack team of crazy
patch writers figure out which ones they are.

out-of-tree and unofficial prpl-writers, rejoice!


Index: napster.c
===================================================================
RCS file: /cvsroot/gaim/gaim/src/protocols/napster/napster.c,v
retrieving revision 1.68
retrieving revision 1.69
diff -u -d -p -r1.68 -r1.69
--- napster.c	15 Dec 2003 02:07:03 -0000	1.68
+++ napster.c	29 Dec 2003 09:03:46 -0000	1.69
@@ -551,7 +551,6 @@ static GaimPlugin *my_protocol = NULL;
 
 static GaimPluginProtocolInfo prpl_info =
 {
-	GAIM_PROTO_NAPSTER,
 	OPT_PROTO_CHAT_TOPIC,
 	NULL,
 	NULL,

Update of /cvsroot/gaim/gaim/src/protocols/zephyr
In directory sc8-pr-cvs1:/tmp/cvs-serv12907/src/protocols/zephyr

Modified Files:
	zephyr.c 
Log Message:
This is the death of protocol numbers.  There are probably now a few
functions that should now go away, but i'll let our crack team of crazy
patch writers figure out which ones they are.

out-of-tree and unofficial prpl-writers, rejoice!


Index: zephyr.c
===================================================================
RCS file: /cvsroot/gaim/gaim/src/protocols/zephyr/zephyr.c,v
retrieving revision 1.69
retrieving revision 1.70
diff -u -d -p -r1.69 -r1.70
--- zephyr.c	13 Dec 2003 01:16:23 -0000	1.69
+++ zephyr.c	29 Dec 2003 09:03:47 -0000	1.70
@@ -982,7 +982,6 @@ static GaimPlugin *my_protocol = NULL;
 
 static GaimPluginProtocolInfo prpl_info =
 {
-	GAIM_PROTO_ZEPHYR,
 	OPT_PROTO_NO_PASSWORD,
 	NULL,
 	NULL,

Update of /cvsroot/gaim/gaim/src/protocols/toc
In directory sc8-pr-cvs1:/tmp/cvs-serv12907/src/protocols/toc

Modified Files:
	toc.c 
Log Message:
This is the death of protocol numbers.  There are probably now a few
functions that should now go away, but i'll let our crack team of crazy
patch writers figure out which ones they are.

out-of-tree and unofficial prpl-writers, rejoice!


Index: toc.c
===================================================================
RCS file: /cvsroot/gaim/gaim/src/protocols/toc/toc.c,v
retrieving revision 1.131
retrieving revision 1.132
diff -u -d -p -r1.131 -r1.132
--- toc.c	13 Dec 2003 01:16:23 -0000	1.131
+++ toc.c	29 Dec 2003 09:03:46 -0000	1.132
@@ -2091,7 +2091,6 @@ static void accept_file_dialog(struct ft
 
 static GaimPluginProtocolInfo prpl_info =
 {
-	GAIM_PROTO_TOC,
 	OPT_PROTO_CORRECT_TIME,
 	NULL,
 	NULL,

Update of /cvsroot/gaim/gaim/src/protocols/yahoo
In directory sc8-pr-cvs1:/tmp/cvs-serv12907/src/protocols/yahoo

Modified Files:
	yahoo.c 
Log Message:
This is the death of protocol numbers.  There are probably now a few
functions that should now go away, but i'll let our crack team of crazy
patch writers figure out which ones they are.

out-of-tree and unofficial prpl-writers, rejoice!


Index: yahoo.c
===================================================================
RCS file: /cvsroot/gaim/gaim/src/protocols/yahoo/yahoo.c,v
retrieving revision 1.187
retrieving revision 1.188
diff -u -d -p -r1.187 -r1.188
--- yahoo.c	18 Dec 2003 01:03:00 -0000	1.187
+++ yahoo.c	29 Dec 2003 09:03:47 -0000	1.188
@@ -3099,7 +3099,6 @@ static GaimPlugin *my_protocol = NULL;
 
 static GaimPluginProtocolInfo prpl_info =
 {
-	GAIM_PROTO_YAHOO,
 	OPT_PROTO_MAIL_CHECK | OPT_PROTO_CHAT_TOPIC,
 	NULL, /* user_splits */
 	NULL, /* protocol_options */

Update of /cvsroot/gaim/gaim/src/protocols/trepia
In directory sc8-pr-cvs1:/tmp/cvs-serv12907/src/protocols/trepia

Modified Files:
	trepia.c 
Log Message:
This is the death of protocol numbers.  There are probably now a few
functions that should now go away, but i'll let our crack team of crazy
patch writers figure out which ones they are.

out-of-tree and unofficial prpl-writers, rejoice!


Index: trepia.c
===================================================================
RCS file: /cvsroot/gaim/gaim/src/protocols/trepia/trepia.c,v
retrieving revision 1.42
retrieving revision 1.43
diff -u -d -p -r1.42 -r1.43
--- trepia.c	23 Nov 2003 15:32:25 -0000	1.42
+++ trepia.c	29 Dec 2003 09:03:47 -0000	1.43
@@ -1252,7 +1252,6 @@ trepia_register_user(GaimAccount *accoun
 
 static GaimPluginProtocolInfo prpl_info =
 {
-	GAIM_PROTO_TREPIA,
 	OPT_PROTO_BUDDY_ICON,
 	NULL,
 	NULL,

Update of /cvsroot/gaim/gaim/src/protocols/oscar
In directory sc8-pr-cvs1:/tmp/cvs-serv12907/src/protocols/oscar

Modified Files:
	oscar.c 
Log Message:
This is the death of protocol numbers.  There are probably now a few
functions that should now go away, but i'll let our crack team of crazy
patch writers figure out which ones they are.

out-of-tree and unofficial prpl-writers, rejoice!


Index: oscar.c
===================================================================
RCS file: /cvsroot/gaim/gaim/src/protocols/oscar/oscar.c,v
retrieving revision 1.517
retrieving revision 1.518
diff -u -d -p -r1.517 -r1.518
--- oscar.c	29 Dec 2003 06:13:36 -0000	1.517
+++ oscar.c	29 Dec 2003 09:03:46 -0000	1.518
@@ -6624,7 +6624,6 @@ static void oscar_convo_closed(GaimConne
 
 static GaimPluginProtocolInfo prpl_info =
 {
-	GAIM_PROTO_OSCAR,
 	OPT_PROTO_MAIL_CHECK | OPT_PROTO_BUDDY_ICON | OPT_PROTO_IM_IMAGE,
 	NULL,
 	NULL,

Update of /cvsroot/gaim/gaim/src/protocols/jabber
In directory sc8-pr-cvs1:/tmp/cvs-serv12077

Modified Files:
	buddy.c chat.c message.c roster.c 
Log Message:
fun jabber stuff, which isn't done yet.  mostly harmless, and committing this now makes the next
commit that much easier for a lazy person such as myself to type.


Index: buddy.c
===================================================================
RCS file: /cvsroot/gaim/gaim/src/protocols/jabber/buddy.c,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -d -p -r1.13 -r1.14
--- buddy.c	5 Dec 2003 05:22:18 -0000	1.13
+++ buddy.c	29 Dec 2003 08:59:22 -0000	1.14
@@ -530,8 +530,10 @@ static void jabber_vcard_parse(JabberStr
 	JabberBuddyResource *jbr;
 	GString *info_text;
 	char *resource_name;
+	char *bare_jid;
 	char *title;
 	xmlnode *vcard;
+	GaimBuddy *b;
 
 	if(!from)
 		return;
@@ -539,6 +541,9 @@ static void jabber_vcard_parse(JabberStr
 	/* XXX: make this handle handle errors */
 
 	resource_name = jabber_get_resource(from);
+	bare_jid = jabber_get_bare_jid(from);
+
+	b = gaim_find_buddy(js->gc->account, bare_jid);
 
 	jb = jabber_buddy_find(js, from, TRUE);
 	info_text = g_string_new("");
@@ -580,6 +585,7 @@ static void jabber_vcard_parse(JabberStr
 	}
 
 	g_free(resource_name);
+	g_free(bare_jid);
 
 	if((vcard = xmlnode_get_child(packet, "vCard"))) {
 		xmlnode *child;
@@ -621,6 +627,10 @@ static void jabber_vcard_parse(JabberStr
 				}
 			} else if(text && !strcmp(child->name, "NICKNAME")) {
 				serv_got_alias(js->gc, from, text);
+				if(b) {
+					gaim_blist_node_set_string((GaimBlistNode*)b, "servernick", text);
+					gaim_blist_save();
+				}
 				g_string_append_printf(info_text, "<b>%s:</b> %s<br/>\n",
 						_("Nickname"), text);
 			} else if(text && !strcmp(child->name, "BDAY")) {

Index: chat.c
===================================================================
RCS file: /cvsroot/gaim/gaim/src/protocols/jabber/chat.c,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -d -p -r1.14 -r1.15
--- chat.c	24 Dec 2003 01:48:25 -0000	1.14
+++ chat.c	29 Dec 2003 08:59:22 -0000	1.15
@@ -367,6 +367,12 @@ void jabber_chat_request_room_configure(
 	if(!chat)
 		return;
 
+	if(!chat->muc) {
+		gaim_notify_error(chat->js->gc, _("Room Configuration Error"), _("Room Configuration Error"),
+				_("This room is not capable of being configured"));
+		return;
+	}
+
 	iq = jabber_iq_new_query(chat->js, JABBER_IQ_SET,
 			"http://jabber.org/protocol/muc#owner");
 	query = xmlnode_get_child(iq->node, "query");
@@ -403,3 +409,126 @@ void jabber_chat_create_instant_room(Jab
 
 	g_free(room_jid);
 }
+
+static void jabber_chat_register_x_data_result_cb(JabberStream *js, xmlnode *packet, gpointer data)
+{
+	const char *type = xmlnode_get_attrib(packet, "type");
+
+	if(type && !strcmp(type, "error")) {
+		/* XXX: handle an error (you'll get a 409 if the nick is already registered) */
+	}
+}
+
+static void jabber_chat_register_x_data_cb(JabberStream *js, xmlnode *result, gpointer data)
+{
+	JabberChat *chat = data;
+	xmlnode *query;
+	JabberIq *iq;
+	char *to = g_strdup_printf("%s@...", chat->room, chat->server);
+
+	iq = jabber_iq_new_query(js, JABBER_IQ_SET, "jabber:iq:register");
+	xmlnode_set_attrib(iq->node, "to", to);
+	g_free(to);
+
+	query = xmlnode_get_child(iq->node, "query");
+
+	xmlnode_insert_child(query, result);
+
+	jabber_iq_set_callback(iq, jabber_chat_register_x_data_result_cb, NULL);
+
+	jabber_iq_send(iq);
+}
+
+static void jabber_chat_register_cb(JabberStream *js, xmlnode *packet, gpointer data)
+{
+	xmlnode *query, *x;
+	const char *type = xmlnode_get_attrib(packet, "type");
+	const char *from = xmlnode_get_attrib(packet, "from");
+	char *msg;
+	JabberChat *chat;
+	JabberID *jid;
+
+	if(!type || !from)
+		return;
+
+	if(!strcmp(type, "result")) {
+		jid = jabber_id_new(from);
+
+		if(!jid)
+			return;
+
+		chat = jabber_chat_find(js, jid->node, jid->domain);
+		jabber_id_free(jid);
+
+		if(!chat)
+			return;
+
+		if(!(query = xmlnode_get_child(packet, "query")))
+			return;
+
+		for(x = query->child; x; x = x->next) {
+			const char *xmlns;
+			if(strcmp(x->name, "x"))
+				continue;
+
+			if(!(xmlns = xmlnode_get_attrib(x, "xmlns")))
+				continue;
+
+			if(!strcmp(xmlns, "jabber:x:data")) {
+				jabber_x_data_request(js, x, jabber_chat_register_x_data_cb, chat);
+				return;
+			}
+		}
+	} else if(!strcmp(type, "error")) {
+		/* XXX: how many places is this code duplicated?  Fix it, immediately */
+		xmlnode *errnode = xmlnode_get_child(packet, "error");
+		const char *code = NULL;
+		char *code_txt = NULL;
+		char *msg;
+		char *text = NULL;
+
+		if(errnode) {
+			code = xmlnode_get_attrib(errnode, "code");
+			text = xmlnode_get_data(errnode);
+		}
+
+		if(code)
+			code_txt = g_strdup_printf(_(" (Code %s)"), code);
+
+		msg = g_strdup_printf("%s%s", text ? text : "", code_txt ? code_txt : "");
+		gaim_notify_error(js->gc, _("Registration error"), _("Registration error"), msg);
+
+		g_free(msg);
+		if(code_txt)
+			g_free(code_txt);
+
+		return;
+	}
+
+	msg = g_strdup_printf("Unable to configure room %s", from);
+
+	gaim_notify_info(js->gc, _("Unable to configure"), _("Unable to configure"), msg);
+	g_free(msg);
+
+}
+
+void jabber_chat_register(JabberChat *chat)
+{
+	JabberIq *iq;
+	char *room_jid;
+
+	if(!chat)
+		return;
+
+	room_jid = g_strdup_printf("%s@...", chat->room, chat->server);
+
+	iq = jabber_iq_new_query(chat->js, JABBER_IQ_GET, "jabber:iq:register");
+	xmlnode_set_attrib(iq->node, "to", room_jid);
+	g_free(room_jid);
+
+	jabber_iq_set_callback(iq, jabber_chat_register_cb, NULL);
+
+	jabber_iq_send(iq);
+}
+
+

Index: message.c
===================================================================
RCS file: /cvsroot/gaim/gaim/src/protocols/jabber/message.c,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -d -p -r1.23 -r1.24
--- message.c	28 Dec 2003 04:27:27 -0000	1.23
+++ message.c	29 Dec 2003 08:59:22 -0000	1.24
@@ -483,6 +483,8 @@ int jabber_message_send_chat(GaimConnect
 	if(!strcmp(msg, "/configure") || !strcmp(msg, "/config")) {
 		jabber_chat_request_room_configure(chat);
 		return 1;
+	} else if(!strcmp(msg, "/register")) {
+		jabber_chat_register(chat);
 	}
 
 	jm = g_new0(JabberMessage, 1);

Index: roster.c
===================================================================
RCS file: /cvsroot/gaim/gaim/src/protocols/jabber/roster.c,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -d -p -r1.11 -r1.12
--- roster.c	12 Nov 2003 23:42:43 -0000	1.11
+++ roster.c	29 Dec 2003 08:59:22 -0000	1.12
@@ -55,7 +55,7 @@ static void add_gaim_buddies_in_groups(J
 		const char *alias, GSList *groups)
 {
 	GSList *buddies, *g2, *l;
-	int present =0, idle=0, signon=0, state=0;
+	int present =0, idle=0, state=0;
 
 	buddies = gaim_find_buddies(js->gc->account, jid);
 
@@ -70,7 +70,6 @@ static void add_gaim_buddies_in_groups(J
 
 	if(buddies) {
 		present = ((GaimBuddy*)buddies->data)->present;
-		signon = ((GaimBuddy*)buddies->data)->signon;
 		idle = ((GaimBuddy*)buddies->data)->idle;
 		state = ((GaimBuddy*)buddies->data)->uc;
 	}
@@ -82,6 +81,11 @@ static void add_gaim_buddies_in_groups(J
 		buddies = g_slist_remove(buddies, b);
 
 		if((l = g_slist_find_custom(g2, g->name, (GCompareFunc)strcmp))) {
+			const char *servernick;
+
+			if((servernick = gaim_blist_node_get_string((GaimBlistNode*)b, "servernick")))
+				serv_got_alias(js->gc, jid, servernick);
+
 			if(alias && (!b->alias || strcmp(b->alias, alias)))
 				gaim_blist_alias_buddy(b, alias);
 			g_free(l->data);
@@ -101,11 +105,11 @@ static void add_gaim_buddies_in_groups(J
 		}
 
 		b->present = present;
-		b->signon = signon;
 		b->idle = idle;
 		b->uc = state;
 
 		gaim_blist_add_buddy(b, NULL, g, NULL);
+		gaim_blist_alias_buddy(b, alias);
 		g_free(g2->data);
 		g2 = g_slist_delete_link(g2, g2);
 	}

Update of /cvsroot/gaim/gaim/src
In directory sc8-pr-cvs1:/tmp/cvs-serv29838/src

Modified Files:
	gtkconv.c 
Log Message:
Patch from Gary Kramlich (xgrimx) to remove some old IRC chat stuff


Index: gtkconv.c
===================================================================
RCS file: /cvsroot/gaim/gaim/src/gtkconv.c,v
retrieving revision 1.276
retrieving revision 1.277
diff -u -d -p -r1.276 -r1.277
--- gtkconv.c	29 Dec 2003 06:48:11 -0000	1.276
+++ gtkconv.c	29 Dec 2003 07:19:55 -0000	1.277
@@ -993,10 +993,6 @@ im_cb(GtkWidget *widget, GaimConversatio
 	else
 		return;
 
-	if (*name == '@') name++;
-	if (*name == '%') name++;
-	if (*name == '+') name++;
-
 	account = gaim_conversation_get_account(conv);
 
 	conv2 = gaim_find_conversation_with_account(name, account);
@@ -1186,10 +1182,6 @@ right_click_chat_cb(GtkWidget *widget, G
 	gtk_tree_model_get_iter(GTK_TREE_MODEL(model), &iter, path);
 	gtk_tree_model_get(GTK_TREE_MODEL(model), &iter, 1, &who, -1);
 
-	if (*who == '@') who++;
-	if (*who == '%') who++;
-	if (*who == '+') who++;
-
 	if (event->button == 1 && event->type == GDK_2BUTTON_PRESS) {
 		chat_do_im(conv, who);
 	} else if (event->button == 3 && event->type == GDK_BUTTON_PRESS) {
@@ -2845,13 +2837,7 @@ tab_complete(GaimConversation *conv)
 		char *nick = nicks->data;
 		/* this checks to see if the current nick could be a completion */
 		if (g_ascii_strncasecmp(nick, entered, strlen(entered))) {
-			if (*nick != '+' && *nick != '@' && *nick != '%')
-				continue;
-
 			if (g_ascii_strncasecmp(nick + 1, entered, strlen(entered))) {
-				if (nick[0] != '@' || nick[1] != '+')
-					continue;
-
 				if (g_ascii_strncasecmp(nick + 2, entered, strlen(entered)))
 					continue;
 				else
@@ -2874,10 +2860,6 @@ tab_complete(GaimConversation *conv)
 						 : gaim_conv_chat_get_users(chat));
 
 				nick = nicks->data;
-
-				if (*nick == '@') nick++;
-				if (*nick == '%') nick++;
-				if (*nick == '+') nick++;
 			}
 
 			gtk_text_buffer_get_start_iter(gtkconv->entry_buffer,

Update of /cvsroot/gaim/gaim/src
In directory sc8-pr-cvs1:/tmp/cvs-serv28382/src

Modified Files:
	gtkimhtml.c 
Log Message:
Ka-Hing Cheung fixed the crap out of the bug where
gtk_imhtml_hr_scale causes a crash if you have an
away message with an HR and you look at it
twice in the preferences thing.

Beautimous!



Index: gtkimhtml.c
===================================================================
RCS file: /cvsroot/gaim/gaim/src/gtkimhtml.c,v
retrieving revision 1.255
retrieving revision 1.256
diff -u -d -p -r1.255 -r1.256
--- gtkimhtml.c	29 Dec 2003 02:30:38 -0000	1.255
+++ gtkimhtml.c	29 Dec 2003 07:12:23 -0000	1.256
@@ -1699,6 +1699,16 @@ gtk_imhtml_clear (GtkIMHtml *imhtml)
 		imhtml->format_spans = imhtml->format_spans->next;
 	}
 	g_list_free(del);
+
+	del = imhtml->scalables;
+	while (del) {
+		GtkIMHtmlScalable *scale = del->data;
+		scale->free(scale);
+		del = del->next;
+	}
+	g_list_free(imhtml->scalables);
+	imhtml->scalables = NULL;
+
 	imhtml->edit.bold = NULL;
 	imhtml->edit.italic = NULL;
 	imhtml->edit.underline = NULL;
@@ -2556,7 +2566,6 @@ void gtk_imhtml_close_tags(GtkIMHtml *im
 
 char *gtk_imhtml_get_markup(GtkIMHtml *imhtml)
 {
-	char *text;
 	GtkTextIter start, end;
 
 	gtk_text_buffer_get_start_iter(imhtml->text_buffer, &start);

Update of /cvsroot/gaim/web/htdocs
In directory sc8-pr-cvs1:/tmp/cvs-serv23634/htdocs

Modified Files:
	plugins.php 
Log Message:
"Damn these glasses!"
"Yes sir!
 Glasses, I damn thee!"


Index: plugins.php
===================================================================
RCS file: /cvsroot/gaim/web/htdocs/plugins.php,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -p -r1.3 -r1.4
--- plugins.php	25 Sep 2003 21:04:49 -0000	1.3
+++ plugins.php	29 Dec 2003 06:53:24 -0000	1.4
@@ -8,16 +8,6 @@
 			"URL"  => "http://gaim-e.sourceforge.net/",
 			"TEXT" => "Gaim-e Encryption Plugin"
 		),
-	
-		"rusconv" => array(
-			"URL"  => "http://sourceforge.net/projects/rusconv/",
-			"TEXT" => "KOI8-R <-> CP1251 Converter"
-		),
-
-		"Eric's Plugins" => array(
-			"URL"  => "http://gaim.sourceforge.net/eric/",
-			"TEXT" => "Various plugins and patches Eric's written over the years"
-		),
 
 		"gaim-blogger" => array(
 			"URL"  => "http://gaim-blogger.sourceforge.net",

Update of /cvsroot/gaim/gaim/src
In directory sc8-pr-cvs1:/tmp/cvs-serv22815/src

Modified Files:
	gtkconv.c 
Log Message:
Peekaboo! (Street)


Index: gtkconv.c
===================================================================
RCS file: /cvsroot/gaim/gaim/src/gtkconv.c,v
retrieving revision 1.275
retrieving revision 1.276
diff -u -d -p -r1.275 -r1.276
--- gtkconv.c	29 Dec 2003 05:14:16 -0000	1.275
+++ gtkconv.c	29 Dec 2003 06:48:11 -0000	1.276
@@ -2113,7 +2113,7 @@ gray_stuff_out(GaimConversation *conv)
 		/* Show stuff that applies to IMs, hide stuff that applies to chats */
 
 		/* Deal with buttons */
-		gtk_widget_hide(gtkconv->info);
+		gtk_widget_show(gtkconv->info);
 		gtk_widget_show(gtkconv->send);
 		gtk_widget_show(gtkconv->u.chat->invite);

Update of /cvsroot/gaim/gaim/src
In directory sc8-pr-cvs1:/tmp/cvs-serv19086/src

Modified Files:
	gtkrequest.c 
Log Message:
Remove some debugging lines.  These had been debugging me for a while.

Yeah not really, I just wanted to say that.

Sorry.


Index: gtkrequest.c
===================================================================
RCS file: /cvsroot/gaim/gaim/src/gtkrequest.c,v
retrieving revision 1.52
retrieving revision 1.53
diff -u -d -p -r1.52 -r1.53
--- gtkrequest.c	23 Dec 2003 15:55:49 -0000	1.52
+++ gtkrequest.c	29 Dec 2003 06:16:13 -0000	1.53
@@ -22,7 +22,6 @@
  */
 #include "gtkinternal.h"
 
-#include "debug.h"
 #include "prefs.h"
 
 #include "gtkrequest.h"
@@ -107,8 +106,6 @@ field_string_focus_out_cb(GtkWidget *ent
 {
 	const char *value;
 
-	gaim_debug(GAIM_DEBUG_MISC, "gtkrequest", "field_string_focus_out_cb\n");
-
 	if (gaim_request_field_string_is_multiline(field)) {
 		GtkTextBuffer *buffer;
 		GtkTextIter start_iter, end_iter;
@@ -123,8 +120,6 @@ field_string_focus_out_cb(GtkWidget *ent
 	else
 		value = gtk_entry_get_text(GTK_ENTRY(entry));
 
-	gaim_debug(GAIM_DEBUG_MISC, "gtkrequest", "'%s' = '%s'\n",
-			   gaim_request_field_get_id(field), value);
 	gaim_request_field_string_set_value(field,
 			(*value == '\0' ? NULL : value));

Update of /cvsroot/gaim/gaim/src/protocols/oscar
In directory sc8-pr-cvs1:/tmp/cvs-serv18385/src/protocols/oscar

Modified Files:
	oscar.c 
Log Message:
Move the "Logged In:" tooltip thingy to the core.
Much thanks to Evan Schoenberg of Adium.

This shouldn't affect anything for oscar.  For jabber 
some servers/accounts might start showing a "Logged In:" 
line in people's tooltips.  I'm really not sure when it 
will or won't.  I bet faceprint knows!


Index: oscar.c
===================================================================
RCS file: /cvsroot/gaim/gaim/src/protocols/oscar/oscar.c,v
retrieving revision 1.516
retrieving revision 1.517
diff -u -d -p -r1.516 -r1.517
--- oscar.c	28 Dec 2003 22:12:50 -0000	1.516
+++ oscar.c	29 Dec 2003 06:13:36 -0000	1.517
@@ -5458,9 +5458,8 @@ static char *oscar_tooltip_text(GaimBudd
 			g_free(status);
 		}
 
+		/* XXX REMOVE THIS WHOLE CHUNCK OF CODE WHEN WE FIGURE THIS OUT */
 		if (userinfo != NULL) {
-			char *tstr = gaim_str_seconds_to_string(time(NULL) - userinfo->onlinesince +
-				(gc->login_time_official ? gc->login_time_official - gc->login_time : 0));
 			/* maybe this will help us figure out the rediculous online times */
 			gaim_debug_info("oscar", "time(NULL): %u\n"
 					"user->onlinesince: %u\n"
@@ -5468,11 +5467,6 @@ static char *oscar_tooltip_text(GaimBudd
 					"gc->login_time: %u\n",
 					time(NULL), userinfo->onlinesince, gc->login_time_official,
 					gc->login_time);
-
-			tmp = ret;
-			ret = g_strconcat(tmp, _("<b>Logged In:</b> "), tstr, "\n", NULL);
-			g_free(tmp);
-			g_free(tstr);
 		}
 
 		if ((bi != NULL) && (bi->ipaddr)) {

Update of /cvsroot/gaim/gaim/src
In directory sc8-pr-cvs1:/tmp/cvs-serv11517

Modified Files:
	dialogs.c gtkconv.c 
Log Message:
Add scrollbars to the text input widgets for away messages and conversations.


Index: dialogs.c
===================================================================
RCS file: /cvsroot/gaim/gaim/src/dialogs.c,v
retrieving revision 1.574
retrieving revision 1.575
diff -u -d -p -r1.574 -r1.575
--- dialogs.c	27 Dec 2003 20:55:54 -0000	1.574
+++ dialogs.c	29 Dec 2003 05:14:15 -0000	1.575
@@ -1217,12 +1217,9 @@ void su_away_mess(GtkWidget *widget, str
 
 void create_away_mess(GtkWidget *widget, void *dummy)
 {
-	GtkWidget *hbox;
-	GtkWidget *titlebox;
-	GtkWidget *tbox;
+	GtkWidget *vbox, *hbox;
 	GtkWidget *label;
-	GtkWidget *frame;
-	GtkWidget *fbox;
+	GtkWidget *sw;
 	GtkWidget *button;
 
 	struct create_away *ca = g_new0(struct create_away, 1);
@@ -1230,35 +1227,42 @@ void create_away_mess(GtkWidget *widget,
 	/* Set up window */
 	GAIM_DIALOG(ca->window);
 	gtk_widget_set_size_request(ca->window, -1, 250);
-	gtk_container_set_border_width(GTK_CONTAINER(ca->window), 5);
+	gtk_container_set_border_width(GTK_CONTAINER(ca->window), 6);
 	gtk_window_set_role(GTK_WINDOW(ca->window), "away_mess");
 	gtk_window_set_title(GTK_WINDOW(ca->window), _("New away message"));
 	g_signal_connect(G_OBJECT(ca->window), "delete_event",
 			   G_CALLBACK(destroy_dialog), ca->window);
 
-	tbox = gtk_vbox_new(FALSE, 5);
-	gtk_container_add(GTK_CONTAINER(ca->window), tbox);
-
-	frame = gtk_frame_new(_("New away message"));
-	gtk_box_pack_start(GTK_BOX(tbox), frame, TRUE, TRUE, 0);
+	/*
+	 * This would be higgy... but I think it's pretty ugly  --Mark
+	 * If you want to use this, make sure you add the vbox to the hbox below
+	 */
+	/*
+	hbox = gtk_hbox_new(FALSE, 12);
+	gtk_container_set_border_width(GTK_CONTAINER(hbox), 12);
+	gtk_container_add(GTK_CONTAINER(ca->window), hbox);
+	*/
 
-	fbox = gtk_vbox_new(FALSE, 5);
-	gtk_container_set_border_width(GTK_CONTAINER(fbox), 5);
-	gtk_container_add(GTK_CONTAINER(frame), fbox);
+	vbox = gtk_vbox_new(FALSE, 12);
+	gtk_container_add(GTK_CONTAINER(ca->window), vbox);
 
-	titlebox = gtk_hbox_new(FALSE, 5);
-	gtk_box_pack_start(GTK_BOX(fbox), titlebox, FALSE, FALSE, 0);
+	/* Away message title */
+	hbox = gtk_hbox_new(FALSE, 0);
+	gtk_box_pack_start(GTK_BOX(vbox), hbox, FALSE, FALSE, 0);
 
 	label = gtk_label_new(_("Away title: "));
-	gtk_box_pack_start(GTK_BOX(titlebox), label, FALSE, FALSE, 0);
+	gtk_box_pack_start(GTK_BOX(hbox), label, FALSE, FALSE, 0);
 
 	ca->entry = gtk_entry_new();
-	gtk_box_pack_start(GTK_BOX(titlebox), ca->entry, TRUE, TRUE, 0);
+	gtk_box_pack_start(GTK_BOX(hbox), ca->entry, TRUE, TRUE, 0);
 	gtk_widget_grab_focus(ca->entry);
 
-	frame = gtk_frame_new(NULL);
-	gtk_frame_set_shadow_type(GTK_FRAME(frame), GTK_SHADOW_IN);
-	gtk_box_pack_start(GTK_BOX(fbox), frame, TRUE, TRUE, 0);
+	/* Away message text */
+	sw = gtk_scrolled_window_new(NULL, NULL);
+	gtk_scrolled_window_set_policy(GTK_SCROLLED_WINDOW(sw),
+								   GTK_POLICY_AUTOMATIC, GTK_POLICY_AUTOMATIC);
+	gtk_scrolled_window_set_shadow_type(GTK_SCROLLED_WINDOW(sw), GTK_SHADOW_IN);
+	gtk_box_pack_start(GTK_BOX(vbox), sw, TRUE, TRUE, 0);
 
 	ca->text = gtk_text_view_new();
 	gtk_text_view_set_wrap_mode(GTK_TEXT_VIEW(ca->text), GTK_WRAP_WORD_CHAR);
@@ -1266,7 +1270,7 @@ void create_away_mess(GtkWidget *widget,
 	if (gaim_prefs_get_bool("/gaim/gtk/conversations/spellcheck"))
 		gaim_gtk_setup_gtkspell(GTK_TEXT_VIEW(ca->text));
 
-	gtk_container_add(GTK_CONTAINER(frame), ca->text);
+	gtk_container_add(GTK_CONTAINER(sw), ca->text);
 
 	if (dummy) {
 		struct away_message *amt;
@@ -1291,7 +1295,7 @@ void create_away_mess(GtkWidget *widget,
 	}
 
 	hbox = gtk_hbox_new(FALSE, 5);
-	gtk_box_pack_start(GTK_BOX(tbox), hbox, FALSE, FALSE, 0);
+	gtk_box_pack_start(GTK_BOX(vbox), hbox, FALSE, FALSE, 0);
 
 	button = gaim_pixbuf_button_from_stock(_("Save"), GTK_STOCK_SAVE, GAIM_BUTTON_HORIZONTAL);
 	g_signal_connect(G_OBJECT(button), "clicked", G_CALLBACK(save_away_mess), ca);

Index: gtkconv.c
===================================================================
RCS file: /cvsroot/gaim/gaim/src/gtkconv.c,v
retrieving revision 1.274
retrieving revision 1.275
diff -u -d -p -r1.274 -r1.275
--- gtkconv.c	28 Dec 2003 22:25:18 -0000	1.274
+++ gtkconv.c	29 Dec 2003 05:14:16 -0000	1.275
@@ -3514,10 +3514,9 @@ setup_chat_pane(GaimConversation *conv)
 	GtkWidget *vbox, *hbox;
 	GtkWidget *lbox, *bbox;
 	GtkWidget *label;
-	GtkWidget *sw2;
 	GtkWidget *list;
 	GtkWidget *button;
-	GtkWidget *frame;
+	GtkWidget *sw;
 	GtkListStore *ls;
 	GtkCellRenderer *rend;
 	GtkTreeViewColumn *col;
@@ -3600,12 +3599,12 @@ setup_chat_pane(GaimConversation *conv)
 	gtk_widget_show(gtkchat->count);
 
 	/* Setup the list of users. */
-	sw2 = gtk_scrolled_window_new(NULL, NULL);
-	gtk_scrolled_window_set_policy(GTK_SCROLLED_WINDOW(sw2),
+	sw = gtk_scrolled_window_new(NULL, NULL);
+	gtk_scrolled_window_set_policy(GTK_SCROLLED_WINDOW(sw),
 								   GTK_POLICY_NEVER, GTK_POLICY_AUTOMATIC);
-	gtk_scrolled_window_set_shadow_type(GTK_SCROLLED_WINDOW(sw2), GTK_SHADOW_IN);
-	gtk_box_pack_start(GTK_BOX(lbox), sw2, TRUE, TRUE, 0);
-	gtk_widget_show(sw2);
+	gtk_scrolled_window_set_shadow_type(GTK_SCROLLED_WINDOW(sw), GTK_SHADOW_IN);
+	gtk_box_pack_start(GTK_BOX(lbox), sw, TRUE, TRUE, 0);
+	gtk_widget_show(sw);
 
 	ls = gtk_list_store_new(2, G_TYPE_STRING, G_TYPE_STRING);
 	gtk_tree_sortable_set_sort_column_id(GTK_TREE_SORTABLE(ls), 1,
@@ -3636,7 +3635,7 @@ setup_chat_pane(GaimConversation *conv)
 
 	gtkchat->list = list;
 
-	gtk_container_add(GTK_CONTAINER(sw2), list);
+	gtk_container_add(GTK_CONTAINER(sw), list);
 
 	/* Setup the user list toolbar. */
 	bbox = gtk_hbox_new(TRUE, 5);
@@ -3689,36 +3688,37 @@ setup_chat_pane(GaimConversation *conv)
 					   FALSE, FALSE, 0);
 
 	/* Setup the entry widget. */
-	frame = gtk_frame_new(NULL);
-	gtk_frame_set_shadow_type(GTK_FRAME(frame), GTK_SHADOW_IN);
-	gtk_box_pack_start(GTK_BOX(vbox), frame, TRUE, TRUE, 0);
-	gtk_widget_show(frame);
+	sw = gtk_scrolled_window_new(NULL, NULL);
+	gtk_scrolled_window_set_policy(GTK_SCROLLED_WINDOW(sw),
+								   GTK_POLICY_AUTOMATIC, GTK_POLICY_AUTOMATIC);
+	gtk_scrolled_window_set_shadow_type(GTK_SCROLLED_WINDOW(sw),
+										GTK_SHADOW_IN);
+	gtk_box_pack_start(GTK_BOX(vbox), sw, TRUE, TRUE, 0);
+	gtk_widget_show(sw);
 
 	gtkconv->entry = gtk_imhtml_new(NULL, NULL);
 	gtkconv->entry_buffer = gtk_text_view_get_buffer(GTK_TEXT_VIEW(gtkconv->entry));
-	g_object_set_data(G_OBJECT(gtkconv->entry_buffer), "user_data", conv);
-	gtk_imhtml_set_editable(GTK_IMHTML(gtkconv->entry), TRUE);
 	gaim_setup_imhtml(gtkconv->entry);
+	gtk_imhtml_set_editable(GTK_IMHTML(gtkconv->entry), TRUE);
 	default_formatize(conv);
-
 	gtk_text_view_set_wrap_mode(GTK_TEXT_VIEW(gtkconv->entry), GTK_WRAP_WORD_CHAR);
 	gtk_widget_set_size_request(gtkconv->entry, -1,
 			MAX(gaim_prefs_get_int("/gaim/gtk/conversations/chat/entry_height"),
 				25));
+	g_object_set_data(G_OBJECT(gtkconv->entry_buffer), "user_data", conv);
 
-	/* Connect the signal handlers. */
 	g_signal_connect_swapped(G_OBJECT(gtkconv->entry), "key_press_event",
 							 G_CALLBACK(entry_key_pressed_cb_1),
 							 gtkconv->entry_buffer);
-	g_signal_connect_after(G_OBJECT(gtkconv->entry), "button_press_event",
-						   G_CALLBACK(entry_stop_rclick_cb), NULL);
 	g_signal_connect(G_OBJECT(gtkconv->entry), "key_press_event",
 					 G_CALLBACK(entry_key_pressed_cb_2), conv);
+	g_signal_connect_after(G_OBJECT(gtkconv->entry), "button_press_event",
+						   G_CALLBACK(entry_stop_rclick_cb), NULL);
 
 	if (gaim_prefs_get_bool("/gaim/gtk/conversations/spellcheck"))
 		gaim_gtk_setup_gtkspell(GTK_TEXT_VIEW(gtkconv->entry));
 
-	gtk_container_add(GTK_CONTAINER(frame), GTK_WIDGET(gtkconv->entry));
+	gtk_container_add(GTK_CONTAINER(sw), GTK_WIDGET(gtkconv->entry));
 	gtk_widget_show(gtkconv->entry);
 
 	/* Setup the bottom button box. */
@@ -3739,7 +3739,7 @@ setup_im_pane(GaimConversation *conv)
 	GtkWidget *paned;
 	GtkWidget *vbox;
 	GtkWidget *vbox2;
-	GtkWidget *frame;
+	GtkWidget *sw;
 
 	gtkconv = GAIM_GTK_CONVERSATION(conv);
 	gtkim   = gtkconv->u.im;
@@ -3778,7 +3778,6 @@ setup_im_pane(GaimConversation *conv)
 			gaim_prefs_get_bool("/gaim/gtk/conversations/show_timestamps"));
 
 	gaim_setup_imhtml(gtkconv->imhtml);
-
 	gtk_widget_show(gtkconv->imhtml);
 
 	vbox2 = gtk_vbox_new(FALSE, 5);
@@ -3791,21 +3790,24 @@ setup_im_pane(GaimConversation *conv)
 					   FALSE, FALSE, 0);
 
 	/* Setup the entry widget. */
-	frame = gtk_frame_new(NULL);
-	gtk_frame_set_shadow_type(GTK_FRAME(frame), GTK_SHADOW_IN);
-	gtk_box_pack_start(GTK_BOX(vbox2), frame, TRUE, TRUE, 0);
-	gtk_widget_show(frame);
+	sw = gtk_scrolled_window_new(NULL, NULL);
+	gtk_scrolled_window_set_policy(GTK_SCROLLED_WINDOW(sw),
+								   GTK_POLICY_AUTOMATIC, GTK_POLICY_AUTOMATIC);
+	gtk_scrolled_window_set_shadow_type(GTK_SCROLLED_WINDOW(sw),
+										GTK_SHADOW_IN);
+	gtk_box_pack_start(GTK_BOX(vbox2), sw, TRUE, TRUE, 0);
+	gtk_widget_show(sw);
 
 	gtkconv->entry = gtk_imhtml_new(NULL, NULL);
-	gtk_imhtml_set_editable(GTK_IMHTML(gtkconv->entry), TRUE);
+	gtkconv->entry_buffer = gtk_text_view_get_buffer(GTK_TEXT_VIEW(gtkconv->entry));
 	gaim_setup_imhtml(gtkconv->entry);
+	gtk_imhtml_set_editable(GTK_IMHTML(gtkconv->entry), TRUE);
 	default_formatize(conv);
-	gtkconv->entry_buffer = gtk_text_view_get_buffer(GTK_TEXT_VIEW(gtkconv->entry));
-	g_object_set_data(G_OBJECT(gtkconv->entry_buffer), "user_data", conv);
 	gtk_text_view_set_wrap_mode(GTK_TEXT_VIEW(gtkconv->entry), GTK_WRAP_WORD_CHAR);
 	gtk_widget_set_size_request(gtkconv->entry, -1,
 			MAX(gaim_prefs_get_int("/gaim/gtk/conversations/im/entry_height"),
 				25));
+	g_object_set_data(G_OBJECT(gtkconv->entry_buffer), "user_data", conv);
 
 	g_signal_connect_swapped(G_OBJECT(gtkconv->entry), "key_press_event",
 							 G_CALLBACK(entry_key_pressed_cb_1),
@@ -3823,7 +3825,7 @@ setup_im_pane(GaimConversation *conv)
 	if (gaim_prefs_get_bool("/gaim/gtk/conversations/spellcheck"))
 		gaim_gtk_setup_gtkspell(GTK_TEXT_VIEW(gtkconv->entry));
 
-	gtk_container_add(GTK_CONTAINER(frame), GTK_WIDGET(gtkconv->entry));
+	gtk_container_add(GTK_CONTAINER(sw), GTK_WIDGET(gtkconv->entry));
 	gtk_widget_show(gtkconv->entry);
 
 	gtkconv->bbox = gtk_hbox_new(FALSE, 5);

Update of /cvsroot/gaim/gaim/src
In directory sc8-pr-cvs1:/tmp/cvs-serv23951/src

Modified Files:
	gtkimhtml.c 
Log Message:
syncing my changes from before Christmas.


Index: gtkimhtml.c
===================================================================
RCS file: /cvsroot/gaim/gaim/src/gtkimhtml.c,v
retrieving revision 1.254
retrieving revision 1.255
diff -u -d -p -r1.254 -r1.255
--- gtkimhtml.c	27 Dec 2003 20:55:54 -0000	1.254
+++ gtkimhtml.c	29 Dec 2003 02:30:38 -0000	1.255
@@ -1335,7 +1335,7 @@ GString* gtk_imhtml_append_text_with_ima
 					scalable->add_to(scalable, imhtml, &iter);
 					scalable->scale(scalable, rect.width, rect.height);
 					imhtml->scalables = g_list_append(imhtml->scalables, scalable);
-					wpos = 0;
+					ws[0] = '\0'; wpos = 0;
 					ws[wpos++] = '\n';
 
 					break;

Update of /cvsroot/gaim/gaim/src
In directory sc8-pr-cvs1:/tmp/cvs-serv27320/src

Modified Files:
	conversation.c 
Log Message:
I removed some more of those dumb allocations.  This also fixes a problem 
with changing the text of outgoing messages from a perl script, and I 
guess from C and tcl, also.

Basically, before this change, if you editing a message from a script, 
your changes would get sent to the other person, but the old message 
would still get shown to the Gaim user.


Index: conversation.c
===================================================================
RCS file: /cvsroot/gaim/gaim/src/conversation.c,v
retrieving revision 1.579
retrieving revision 1.580
diff -u -d -p -r1.579 -r1.580
--- conversation.c	26 Dec 2003 19:07:55 -0000	1.579
+++ conversation.c	28 Dec 2003 23:06:57 -0000	1.580
@@ -183,12 +183,14 @@ common_send(GaimConversation *conv, cons
 	GaimConversationType type;
 	GaimConnection *gc;
 	GaimConversationUiOps *ops;
-	char *buf, *buf2, *buffy = NULL;
+	char *buffy = NULL;
 	int plugin_return;
-	int limit;
 	int err = 0;
 	GList *first;
 
+	if (strlen(message) == 0)
+		return;
+
 	gc = gaim_conversation_get_gc(conv);
 
 	g_return_if_fail(gc != NULL);
@@ -196,36 +198,22 @@ common_send(GaimConversation *conv, cons
 	type = gaim_conversation_get_type(conv);
 	ops  = gaim_conversation_get_ui_ops(conv);
 
-	limit = 32 * 1024; /* You shouldn't be sending more than 32K in your
-						  messages. That's a book. */
-
-	buf = g_malloc(limit);
-	strncpy(buf, message, limit);
-
-	if (strlen(buf) == 0) {
-		g_free(buf);
-
-		return;
-	}
-
 	first = g_list_first(conv->send_history);
 
 	if (first->data)
 		g_free(first->data);
 
-	first->data = g_strdup(buf);
+	first->data = g_strdup(message);
 
 	conv->send_history = g_list_prepend(first, NULL);
 
-	buf2 = g_malloc(limit);
-
 	if ((gc->flags & GAIM_CONNECTION_HTML) &&
 		gaim_prefs_get_bool("/core/conversations/send_urls_as_links")) {
 
-		buffy = gaim_markup_linkify(buf);
+		buffy = gaim_markup_linkify(message);
 	}
 	else
-		buffy = g_strdup(buf);
+		buffy = g_strdup(message);
 
 	plugin_return =
 		GPOINTER_TO_INT(gaim_signal_emit_return_1(
@@ -234,22 +222,14 @@ common_send(GaimConversation *conv, cons
 			 ? "displaying-im-msg" : "displaying-chat-msg"),
 			gaim_conversation_get_account(conv), conv, &buffy));
 
-	if (buffy == NULL) {
-		g_free(buf2);
-		g_free(buf);
+	if (buffy == NULL)
 		return;
-	}
 
 	if (plugin_return) {
 		g_free(buffy);
-		g_free(buf2);
-		g_free(buf);
 		return;
 	}
 
-	strncpy(buf, buffy, limit);
-	g_free(buffy);
-
 	gaim_signal_emit(gaim_conversations_get_handle(),
 		(type == GAIM_CONV_IM ? "displayed-im-msg" : "displayed-chat-msg"),
 		gaim_conversation_get_account(conv), conv, buffy);
@@ -257,12 +237,11 @@ common_send(GaimConversation *conv, cons
 	if (type == GAIM_CONV_IM) {
 		GaimConvIm *im = GAIM_CONV_IM(conv);
 
-		buffy = g_strdup(buf);
 		gaim_signal_emit(gaim_conversations_get_handle(), "sending-im-msg",
 						 gaim_conversation_get_account(conv),
 						 gaim_conversation_get_name(conv), &buffy);
 
-		if (buffy != NULL) {
+		if (buffy != NULL && buffy[0] != '\0') {
 			GaimConvImFlags imflags = 0;
 			GaimMessageFlags msgflags = GAIM_MESSAGE_SEND;
 
@@ -275,7 +254,7 @@ common_send(GaimConversation *conv, cons
 							    buffy, imflags);
 
 			if (err > 0)
-				gaim_conv_im_write(im, NULL, buf, msgflags, time(NULL));
+				gaim_conv_im_write(im, NULL, buffy, msgflags, time(NULL));
 
 			if (im->images != NULL) {
 				GSList *tempy;
@@ -296,30 +275,21 @@ common_send(GaimConversation *conv, cons
 			gaim_signal_emit(gaim_conversations_get_handle(), "sent-im-msg",
 							 gaim_conversation_get_account(conv),
 							 gaim_conversation_get_name(conv), buffy);
-
-			g_free(buffy);
 		}
 	}
 	else {
-		buffy = g_strdup(buf);
-
 		gaim_signal_emit(gaim_conversations_get_handle(), "sending-chat-msg",
 						 gaim_conversation_get_account(conv), &buffy,
 						 gaim_conv_chat_get_id(GAIM_CONV_CHAT(conv)));
 
-		if (buffy != NULL) {
+		if (buffy != NULL && buffy[0] != '\0') {
 			err = serv_chat_send(gc, gaim_conv_chat_get_id(GAIM_CONV_CHAT(conv)), buffy);
 
 			gaim_signal_emit(gaim_conversations_get_handle(), "sent-chat-msg",
-							 gaim_conversation_get_account(conv), buf,
+							 gaim_conversation_get_account(conv), buffy,
 							 gaim_conv_chat_get_id(GAIM_CONV_CHAT(conv)));
-
-			g_free(buffy);
 		}
 	}
-
-	g_free(buf2);
-	g_free(buf);
 
 	if (err < 0) {
 		if (err == -E2BIG) {

Update of /cvsroot/gaim/gaim/src
In directory sc8-pr-cvs1:/tmp/cvs-serv19920/src

Modified Files:
	gtkconv.c 
Log Message:
I've got this plan.  It's crazy, but it just might work.  I call it
"Let's not allocate 32KB every time we send a message for no reason."


Index: gtkconv.c
===================================================================
RCS file: /cvsroot/gaim/gaim/src/gtkconv.c,v
retrieving revision 1.273
retrieving revision 1.274
diff -u -d -p -r1.273 -r1.274
--- gtkconv.c	26 Dec 2003 20:34:58 -0000	1.273
+++ gtkconv.c	28 Dec 2003 22:25:18 -0000	1.274
@@ -407,16 +407,15 @@ static void
 send_cb(GtkWidget *widget, GaimConversation *conv)
 {
 	GaimGtkConversation *gtkconv;
-	char *buf, *buf2;
-	int limit;
+	char *buf;
 	GaimConnection *gc = gaim_conversation_get_gc(conv);
 
 	gtkconv = GAIM_GTK_CONVERSATION(conv);
 	
 	if (gc && gc->flags & GAIM_CONNECTION_HTML)
-		buf2 = gtk_imhtml_get_markup(GTK_IMHTML(gtkconv->entry));
+		buf = gtk_imhtml_get_markup(GTK_IMHTML(gtkconv->entry));
 	else
-		buf2 = gtk_imhtml_get_text(GTK_IMHTML(gtkconv->entry));
+		buf = gtk_imhtml_get_text(GTK_IMHTML(gtkconv->entry));
 
 	/*	set_toggle(gtkconv->toolbar.bold,        FALSE);
 	set_toggle(gtkconv->toolbar.italic,      FALSE);
@@ -430,13 +429,6 @@ send_cb(GtkWidget *widget, GaimConversat
 	set_toggle(gtkconv->toolbar.link,        FALSE);
 	*/
 	gtk_widget_grab_focus(gtkconv->entry);
-
-	limit = 32 * 1024; /* This will be done again in gaim_conv_im_send. *shrug* */
-
-	buf = g_malloc(limit);
-	strncpy(buf, buf2, limit);
-
-	g_free(buf2);
 
 	if (strlen(buf) == 0) {
 		g_free(buf);

Update of /cvsroot/gaim/web/htdocs
In directory sc8-pr-cvs1:/tmp/cvs-serv23265

Modified Files:
	contactinfo.php 
Log Message:
Something else that looked like it should be in CVS


Index: contactinfo.php
===================================================================
RCS file: /cvsroot/gaim/web/htdocs/contactinfo.php,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -d -p -r1.20 -r1.21
--- contactinfo.php	27 Oct 2003 20:15:25 -0000	1.20
+++ contactinfo.php	28 Dec 2003 05:50:54 -0000	1.21
@@ -126,9 +126,8 @@
 <br />
 <p>
  <b>Eric Warmenhoven</b> -
- &lt;<a href="mailto:warmenhoven@... />
+ &lt;<a href="mailto:eric@... />
  &nbsp;&nbsp;<b>AIM:</b> EWarmenhoven was suspended (again)<br />
- &nbsp;&nbsp;<b>Jabber:</b> warmenhoven@... />
  &nbsp;&nbsp;<i>Heh</i>
 </p>
 <br />