# HG changeset patch # User Richard Laager # Date 1126290616 0 # Node ID e9251afae7b8b5330e2fe5c400ec149d265cfa44 # Parent 5298197df5bdbc2d668e203cf0b2e715b4cff6b9 [gaim-migrate @ 13722] (13:29:01) Etan Reisner (deryni): You are defining scale after you try to use it. committer: Tailor Script diff -r 5298197df5bd -r e9251afae7b8 src/gtkconv.c --- a/src/gtkconv.c Fri Sep 09 18:23:52 2005 +0000 +++ b/src/gtkconv.c Fri Sep 09 18:30:16 2005 +0000 @@ -126,13 +126,14 @@ static GdkColor *get_nick_color(GaimGtkConversation *gtkconv, const char *name) { static GdkColor col; GtkStyle *style = gtk_widget_get_style(gtkconv->imhtml); + float scale; col = nick_colors[g_str_hash(name) % NUM_NICK_COLORS]; + scale = ((1-(LUMINANCE(style->base[GTK_STATE_NORMAL]) / LUMINANCE(style->white))) * + (LUMINANCE(style->white)/MAX(MAX(col.red, col.blue), col.green))); /* The colors are chosen to look fine on white; we should never have to darken */ if (scale > 1) { - float scale = ((1-(LUMINANCE(style->base[GTK_STATE_NORMAL]) / LUMINANCE(style->white))) * - (LUMINANCE(style->white)/MAX(MAX(col.red, col.blue), col.green))); col.red *= scale; col.green *= scale; col.blue *= scale;