1 diff -Nur -x '*.orig' -x '*~' pidgin-2.5.5/pidgin/gtkconv.c pidgin-2.5.5.new/pidgin/gtkconv.c
   2 --- pidgin-2.5.5/pidgin/gtkconv.c	2009-03-01 20:37:13.000000000 +0100
   3 +++ pidgin-2.5.5.new/pidgin/gtkconv.c	2009-07-11 18:36:42.000000000 +0200
   4 @@ -3956,6 +3956,7 @@
   5  	GdkPixbuf *pixbuf;
   6  	GtkTreeIter iter;
   7  	gboolean is_me = FALSE;
   8 +	gboolean single_color = FALSE;
   9  	gboolean is_buddy;
  10  	gchar *tmp, *alias_key, *name, *alias;
  11  	int flags;
  12 @@ -3992,8 +3993,14 @@
  13  				"send-name");
  14  		g_object_get(tag, "foreground-gdk", &color, NULL);
  15  	} else {
  16 +	single_color = purple_prefs_get_bool(PIDGIN_PREFS_ROOT "/conversations/chat/single_color_receive_name");
  17 +	if (single_color) {
  18 +	GtkTextTag *tag = gtk_text_tag_table_lookup(gtk_text_buffer_get_tag_table(GTK_IMHTML(gtkconv->imhtml)->text_buffer),"receive-name");
  19 +	g_object_get(tag, "foreground-gdk", &color, NULL);
  20 +	} else {
  21  		color = (GdkColor*)get_nick_color(gtkconv, name);
  22  	}
  23 +	}
  24  
  25  #if GTK_CHECK_VERSION(2,6,0)
  26  	gtk_list_store_insert_with_values(ls, &iter,
  27 @@ -4028,7 +4035,7 @@
  28  
  29  	if (pixbuf)
  30  		g_object_unref(pixbuf);
  31 -	if (is_me && color)
  32 +	if ((is_me || single_color) && color)
  33  		gdk_color_free(color);
  34  	g_free(alias_key);
  35  }
  36 @@ -5465,18 +5472,27 @@
  37  			gtk_text_buffer_get_tag_table(buffer), str);
  38  
  39  	if (buddytag == NULL && create) {
  40 -		if (highlight)
  41 +		if (highlight) {
  42  			buddytag = gtk_text_buffer_create_tag(buffer, str,
  43  					"foreground", get_text_tag_color(gtk_text_tag_table_lookup(
  44  							gtk_text_buffer_get_tag_table(buffer), "highlight-name")),
  45  					"weight", PANGO_WEIGHT_BOLD,
  46  					NULL);
  47 -		else
  48 +		} else {
  49 +			if (purple_prefs_get_bool(PIDGIN_PREFS_ROOT "/conversations/chat/single_color_receive_name")) {
  50 +				buddytag = gtk_text_buffer_create_tag(buffer, str,
  51 +				"foreground", get_text_tag_color(gtk_text_tag_table_lookup(
  52 +				gtk_text_buffer_get_tag_table(buffer), "receive-name")),
  53 +				"weight", purple_find_buddy(purple_conversation_get_account(conv), who) ? PANGO_WEIGHT_BOLD : PANGO_WEIGHT_NORMAL, NULL);
  54 +		} else {
  55 +
  56  			buddytag = gtk_text_buffer_create_tag(
  57  					buffer, str,
  58  					"foreground-gdk", get_nick_color(gtkconv, who),
  59  					"weight", purple_find_buddy(purple_conversation_get_account(conv), who) ? PANGO_WEIGHT_BOLD : PANGO_WEIGHT_NORMAL,
  60  					NULL);
  61 +		}
  62 +		}
  63  
  64  		g_signal_connect(G_OBJECT(buddytag), "event",
  65  				G_CALLBACK(buddytag_event), conv);
  66 @@ -7729,6 +7745,7 @@
  67  	purple_prefs_add_int(PIDGIN_PREFS_ROOT "/conversations/chat/y", 0);
  68  	purple_prefs_add_int(PIDGIN_PREFS_ROOT "/conversations/chat/width", 340);
  69  	purple_prefs_add_int(PIDGIN_PREFS_ROOT "/conversations/chat/height", 390);
  70 +	purple_prefs_add_bool(PIDGIN_PREFS_ROOT "/conversations/chat/single_color_receive_name", FALSE);
  71  
  72  	/* Conversations -> IM */
  73  	purple_prefs_add_none(PIDGIN_PREFS_ROOT "/conversations/im");
  74 diff -Nur -x '*.orig' -x '*~' pidgin-2.5.5/pidgin/gtkprefs.c pidgin-2.5.5.new/pidgin/gtkprefs.c
  75 --- pidgin-2.5.5/pidgin/gtkprefs.c	2009-07-11 18:30:36.000000000 +0200
  76 +++ pidgin-2.5.5.new/pidgin/gtkprefs.c	2009-07-11 18:38:01.000000000 +0200
  77 @@ -1045,6 +1045,8 @@
  78  
  79  	pidgin_prefs_checkbox(_("Show _formatting on incoming messages"),
  80  				PIDGIN_PREFS_ROOT "/conversations/show_incoming_formatting", vbox);
  81 +	pidgin_prefs_checkbox(_("Use same colors for all nicks in group chat"),
  82 +				PIDGIN_PREFS_ROOT "/conversations/chat/single_color_receive_name", vbox);
  83  	pidgin_prefs_checkbox(_("Close IMs immediately when the tab is closed"),
  84  				PIDGIN_PREFS_ROOT "/conversations/im/close_immediately", vbox);
  85