Mercurial > pidgin
comparison src/gtkconv.c @ 13519:d6dd68a8be06
[gaim-migrate @ 15895]
The error message when using an invalid browser command should not
escape HTML stuffs. Patch from Bjoern Voigt.
Richard, can you add the gtknotify.c changes to your list of stuff
to tweak after we're out of the string freeze?
committer: Tailor Script <tailor@pidgin.im>
author | Mark Doliner <mark@kingant.net> |
---|---|
date | Thu, 16 Mar 2006 04:27:00 +0000 |
parents | cd21f1738063 |
children | d593b7d4f29c |
comparison
equal
deleted
inserted
replaced
13518:cd21f1738063 | 13519:d6dd68a8be06 |
---|---|
8209 */ | 8209 */ |
8210 while(i < numcolors && time(NULL) < breakout_time) | 8210 while(i < numcolors && time(NULL) < breakout_time) |
8211 { | 8211 { |
8212 GdkColor color = { 0, rand() % 65536, rand() % 65536, rand() % 65536 }; | 8212 GdkColor color = { 0, rand() % 65536, rand() % 65536, rand() % 65536 }; |
8213 | 8213 |
8214 gaim_debug(GAIM_DEBUG_WARNING, NULL, | 8214 gaim_debug_warning("gtkconv", |
8215 "Looking for random colors to fill the list, I have found %i so far.\n",i); | 8215 "Looking for random colors to fill the list, I have found %i so far.\n",i); |
8216 | 8216 |
8217 if (color_is_visible(color, background, MIN_COLOR_CONTRAST, MIN_BRIGHTNESS_CONTRAST) && | 8217 if (color_is_visible(color, background, MIN_COLOR_CONTRAST, MIN_BRIGHTNESS_CONTRAST) && |
8218 color_is_visible(color, nick_highlight, MIN_COLOR_CONTRAST / 2, 0) && | 8218 color_is_visible(color, nick_highlight, MIN_COLOR_CONTRAST / 2, 0) && |
8219 color_is_visible(color, send_color, MIN_COLOR_CONTRAST / 4, 0)) | 8219 color_is_visible(color, send_color, MIN_COLOR_CONTRAST / 4, 0)) |
8223 } | 8223 } |
8224 } | 8224 } |
8225 | 8225 |
8226 if (i < numcolors) { | 8226 if (i < numcolors) { |
8227 GdkColor *c = colors; | 8227 GdkColor *c = colors; |
8228 gaim_debug(GAIM_DEBUG_WARNING, NULL, "Unable to generate enough random colors before timeout. %u colors found.\n", i); | 8228 gaim_debug_warning("gtkconv", "Unable to generate enough random colors before timeout. %u colors found.\n", i); |
8229 colors = g_memdup(c, i * sizeof(GdkColor)); | 8229 colors = g_memdup(c, i * sizeof(GdkColor)); |
8230 g_free(c); | 8230 g_free(c); |
8231 *color_count = i; | 8231 *color_count = i; |
8232 | |
8233 } | 8232 } |
8234 | 8233 |
8235 return colors; | 8234 return colors; |
8236 } | 8235 } |