# HG changeset patch
# User Christian Hammond <chipx86@chipx86.com>
# Date 1047082473 0
# Node ID 6e7196dcfd370bab6469d09c1ecea2d9cf1c3e35
# Parent  4bf9c6e8e43289270e431db23325ed771c3d3fc6
[gaim-migrate @ 4979]
Too many accounts with the same name is a pain in the Send As menu. Now it
shows the protocol as well.

committer: Tailor Script <tailor@pidgin.im>

diff -r 4bf9c6e8e432 -r 6e7196dcfd37 src/gtkconv.c
--- a/src/gtkconv.c	Fri Mar 07 23:49:10 2003 +0000
+++ b/src/gtkconv.c	Sat Mar 08 00:14:33 2003 +0000
@@ -2064,13 +2064,17 @@
 
 	/* Fill it with entries. */
 	for (gcs = connections; gcs != NULL; gcs = gcs->next) {
+
+		char buf[256];
 		struct gaim_connection *gc;
 
 		found_online = TRUE;
 
 		gc = (struct gaim_connection *)gcs->data;
 
-		menuitem = gtk_radio_menu_item_new_with_label(group, gc->username);
+		g_snprintf(buf, sizeof(buf), "%s (%s)", gc->username, gc->prpl->name);
+
+		menuitem = gtk_radio_menu_item_new_with_label(group, buf);
 		group = gtk_radio_menu_item_group(GTK_RADIO_MENU_ITEM(menuitem));
 
 		g_object_set_data(G_OBJECT(menuitem), "user_data", win);
diff -r 4bf9c6e8e432 -r 6e7196dcfd37 src/prpl.h
--- a/src/prpl.h	Fri Mar 07 23:49:10 2003 +0000
+++ b/src/prpl.h	Sat Mar 08 00:14:33 2003 +0000
@@ -89,7 +89,9 @@
 	 * TOC and Oscar send HTML-encoded messages;
 	 * most other protocols don't.
 	 */
-//	#define OPT_PROTO_HTML            0x00000001 this should be per-connection */
+#if 0
+	#define OPT_PROTO_HTML            0x00000001 this should be per-connection */
+#endif
 
 	/**
 	 * Synchronize the time between the local computer and the server.