# HG changeset patch
# User Daniel Atallah <daniel.atallah@gmail.com>
# Date 1177462139 0
# Node ID 7f8fd78bf62bfaa996e4e4b232b01212ab3e5939
# Parent  8a4b1d1cd076ce0145321a5544e5d50256f6bd5f# Parent  f1d06ebe7ead738458314100863cf1b734402c92
merge of '88a78587504cdd42570461a2b391b54b5c3d4aab'
     and 'ded0ab999cf695de558bd68830366521ccd637ba'

diff -r f1d06ebe7ead -r 7f8fd78bf62b pidgin/gtkdialogs.c
--- a/pidgin/gtkdialogs.c	Wed Apr 25 00:31:07 2007 +0000
+++ b/pidgin/gtkdialogs.c	Wed Apr 25 00:48:59 2007 +0000
@@ -285,7 +285,7 @@
 	context = gtk_widget_get_pango_context(widget);
 	layout = pango_layout_new(context);
 
-	markup = g_strdup_printf("<span foreground=\"#FFFFFF\" size=\"larger\">%s</span>", VERSION);
+	markup = g_strdup_printf("<span foreground=\"#5c3566\">%s</span>", VERSION);
 	pango_layout_set_font_description(layout, style->font_desc);
 	pango_layout_set_markup(layout, markup, strlen(markup));
 	g_free(markup);
diff -r f1d06ebe7ead -r 7f8fd78bf62b pidgin/gtkimhtmltoolbar.c
--- a/pidgin/gtkimhtmltoolbar.c	Wed Apr 25 00:31:07 2007 +0000
+++ b/pidgin/gtkimhtmltoolbar.c	Wed Apr 25 00:48:59 2007 +0000
@@ -982,7 +982,7 @@
 
 	/* Font Face */
 
-	button = pidgin_pixbuf_toolbar_button_from_stock(GTK_STOCK_SELECT_FONT);
+	button = pidgin_pixbuf_toolbar_button_from_stock(PIDGIN_STOCK_TOOLBAR_FONT_FACE);
 	gtk_size_group_add_widget(sg, button);
 	gtk_box_pack_start(GTK_BOX(hbox), button, FALSE, FALSE, 0);
 	gtk_tooltips_set_tip(toolbar->tooltips, button,
diff -r f1d06ebe7ead -r 7f8fd78bf62b pidgin/pidginstock.c
--- a/pidgin/pidginstock.c	Wed Apr 25 00:31:07 2007 +0000
+++ b/pidgin/pidginstock.c	Wed Apr 25 00:48:59 2007 +0000
@@ -152,6 +152,7 @@
 	{ PIDGIN_STOCK_TOOLBAR_BLOCK, "emblems", "blocked.png", TRUE, FALSE, FALSE, FALSE, FALSE, FALSE },
 	{ PIDGIN_STOCK_TOOLBAR_FGCOLOR, "toolbar", "change-fgcolor.png", TRUE, FALSE, FALSE, FALSE, FALSE, FALSE },
 	{ PIDGIN_STOCK_TOOLBAR_SMILEY, "toolbar", "emote-select.png", TRUE, FALSE, FALSE, FALSE, FALSE, FALSE },
+	{ PIDGIN_STOCK_TOOLBAR_FONT_FACE, "toolbar", "font-face.png", TRUE, FALSE, FALSE, FALSE, FALSE, FALSE },
 	{ PIDGIN_STOCK_TOOLBAR_TEXT_SMALLER, "toolbar", "font-size-down.png", TRUE, FALSE, FALSE, FALSE, FALSE, FALSE },
 	{ PIDGIN_STOCK_TOOLBAR_TEXT_LARGER, "toolbar", "font-size-up.png", TRUE, FALSE, FALSE, FALSE, FALSE, FALSE },
 	{ PIDGIN_STOCK_TOOLBAR_INSERT_IMAGE, "toolbar", "insert-image.png", TRUE, FALSE, FALSE, FALSE, FALSE, FALSE },
diff -r f1d06ebe7ead -r 7f8fd78bf62b pidgin/pidginstock.h
--- a/pidgin/pidginstock.h	Wed Apr 25 00:31:07 2007 +0000
+++ b/pidgin/pidginstock.h	Wed Apr 25 00:48:59 2007 +0000
@@ -113,6 +113,7 @@
 #define PIDGIN_STOCK_TOOLBAR_BLOCK        "pidgin-block"
 #define PIDGIN_STOCK_TOOLBAR_FGCOLOR      "pidgin-fgcolor"
 #define PIDGIN_STOCK_TOOLBAR_SMILEY       "pidgin-smiley"
+#define PIDGIN_STOCK_TOOLBAR_FONT_FACE	  "pidgin-font-face"
 #define PIDGIN_STOCK_TOOLBAR_TEXT_SMALLER "pidgin-text-smaller"
 #define PIDGIN_STOCK_TOOLBAR_TEXT_LARGER  "pidgin-text-larger"
 #define PIDGIN_STOCK_TOOLBAR_INSERT_IMAGE "pidgin-insert-image"
diff -r f1d06ebe7ead -r 7f8fd78bf62b pidgin/pixmaps/logo.png
Binary file pidgin/pixmaps/logo.png has changed
diff -r f1d06ebe7ead -r 7f8fd78bf62b pidgin/pixmaps/toolbar/16/Makefile.am
--- a/pidgin/pixmaps/toolbar/16/Makefile.am	Wed Apr 25 00:31:07 2007 +0000
+++ b/pidgin/pixmaps/toolbar/16/Makefile.am	Wed Apr 25 00:48:59 2007 +0000
@@ -4,6 +4,7 @@
 		change-bgcolor.png \
 		change-fgcolor.png \
 		emote-select.png \
+		font-face.png \
 		font-size-down.png \
 		font-size-up.png \
 		insert-image.png \