pidgin: 453bf3da: Re-order the ungrouped formatting toolba...

[deryni at pidgin.im]

-----------------------------------------------------------------
Revision: 453bf3da68c1baca3d6585b338ac13df415c9be0
Ancestor: 87a4fd64ae4d373b40df38d1bf8517efb09fdeb6
Author: deryni at pidgin.im
Date: 2009-08-15T05:52:26
Branch: im.pidgin.pidgin
URL: http://d.pidgin.im/viewmtn/revision/info/453bf3da68c1baca3d6585b338ac13df415c9be0

Modified files:
        pidgin/gtkimhtmltoolbar.c

ChangeLog: 

Re-order the ungrouped formatting toolbar buttons to match the order of the
items in the grouped menus.

-------------- next part --------------
============================================================
--- pidgin/gtkimhtmltoolbar.c	a33115107d2e568f64b7058604a0db5798a751ce
+++ pidgin/gtkimhtmltoolbar.c	709585aacd9155b46bf9dbacc24b2f9f26468368
@@ -1232,13 +1232,14 @@ static void gtk_imhtmltoolbar_create_old
 		{PIDGIN_STOCK_TOOLBAR_TEXT_SMALLER, do_small, &toolbar->smaller_size, _("Decrease Font Size")},
 		{"", NULL, NULL, NULL},
 		{PIDGIN_STOCK_TOOLBAR_FONT_FACE, toggle_font, &toolbar->font, _("Font Face")},
+		{PIDGIN_STOCK_TOOLBAR_FGCOLOR, toggle_fg_color, &toolbar->fgcolor, _("Foreground Color")},
 		{PIDGIN_STOCK_TOOLBAR_BGCOLOR, toggle_bg_color, &toolbar->bgcolor, _("Background Color")},
-		{PIDGIN_STOCK_TOOLBAR_FGCOLOR, toggle_fg_color, &toolbar->fgcolor, _("Foreground Color")},
 		{"", NULL, NULL, NULL},
 		{PIDGIN_STOCK_CLEAR, clear_formatting_cb, &toolbar->clear, _("Reset Formatting")},
 		{"", NULL, NULL, NULL},
+		{PIDGIN_STOCK_TOOLBAR_INSERT_IMAGE, insert_image_cb, &toolbar->image, _("Insert IM Image")},
 		{PIDGIN_STOCK_TOOLBAR_INSERT_LINK, insert_link_cb, &toolbar->link, _("Insert Link")},
-		{PIDGIN_STOCK_TOOLBAR_INSERT_IMAGE, insert_image_cb, &toolbar->image, _("Insert IM Image")},
+		{"", NULL, NULL, NULL},
 		{PIDGIN_STOCK_TOOLBAR_SMILEY, insert_smiley_cb, &toolbar->smiley, _("Insert Smiley")},
 		{NULL, NULL, NULL, NULL}
 	};