# HG changeset patch
# User Sean Egan <seanegan@gmail.com>
# Date 1071344080 0
# Node ID 1e8322fc19b5b8767cdf3806f849b499613b335d
# Parent  340df1652af1e7a74469dfeff57625bd80fb461b
[gaim-migrate @ 8508]
Merry X-Mas

(My priest uses the term "X-Mas," to refer to the secular celebration that
coincides with Advent, and Christmas to refer to the actual Christmas season
directly after Advent and "X-Mas.")

committer: Tailor Script <tailor@pidgin.im>

diff -r 340df1652af1 -r 1e8322fc19b5 pixmaps/logo.png
Binary file pixmaps/logo.png has changed
diff -r 340df1652af1 -r 1e8322fc19b5 src/gtkconv.c
--- a/src/gtkconv.c	Sat Dec 13 19:31:54 2003 +0000
+++ b/src/gtkconv.c	Sat Dec 13 19:34:40 2003 +0000
@@ -63,6 +63,9 @@
 
 #define AUTO_RESPONSE "&lt;AUTO-REPLY&gt; : "
 
+#define SEND_COLOR "#267726"
+#define RECV_COLOR "#A82F22F"
+
 static char nick_colors[][8] = {
 	"#ba55d3",              /* Medium Orchid */
 	"#ee82ee",              /* Violet */
@@ -4567,10 +4570,10 @@
 						strcpy(color, nick_colors[m]);
 					}
 					else
-						strcpy(color, "#A82F2F");
+						strcpy(color, RECV_COLOR);
 				}
 				else if (flags & GAIM_MESSAGE_SEND)
-					strcpy(color, "#16569E");
+					strcpy(color, SEND_COLOR);
 			}
 		}
 
diff -r 340df1652af1 -r 1e8322fc19b5 src/gtkimhtml.h
--- a/src/gtkimhtml.h	Sat Dec 13 19:31:54 2003 +0000
+++ b/src/gtkimhtml.h	Sat Dec 13 19:34:40 2003 +0000
@@ -91,6 +91,7 @@
 		GtkIMHtmlFormatSpan *sizespan;
 		int fontsize;
 	} edit;
+	char *clipboard_string;
 	GList *format_spans;
 };