UBUNTU DIFF
=================================================


1a2,4
> 
> #include <gtkmm.h>
> 
96d98
<       int num_bars;
114,131c116,117
<       /* work out how many lines across the graph (plus one)*/
<       num_bars =(g->draw_height) / (fontsize + 5);
<       switch (num_bars){
<               case 1:
<                       break;
<               case 2:
<               case 3:
<                       num_bars=2;
<                       break;
<               case 4:
<                       num_bars=4;
<                       break;
<               default:
<                       num_bars=5;
<       }
< 
<       dely = (g->draw_height) / num_bars; /* round to int to avoid AA blur */
<       real_draw_height = dely * num_bars;
---
>       dely = (g->draw_height) / 5; /* round to int to avoid AA blur */
>       real_draw_height = dely * 5;
133c119
<       for (i = 0; i <= num_bars; ++i) {
---
>       for (i = 0; i <= 5; ++i) {
137c123,127
<               if (i==num_bars)
---
>               switch (i) {
>               case 0:
>                       y = 0.5 + fontsize / 2.0;
>                       break;
>               case 5:
139,143c129,132
<               else {
<                       if (i==0)
<                               y =  0.5 +(i * dely) + (fontsize / 2.0);
<                       else
<                               y =  (i * dely) + (fontsize / 2.0);
---
>                       break;
>               default:
>                       y = i * dely + fontsize / 2.0;
>                       break;
147c136
<               caption = g_strdup_printf("%3d %%", 100 - i * (100/num_bars));
---
>               caption = g_strdup_printf("%3d %%", 100 - i * 20);


UPSTREAM DIFF
========================================



99d98
<       int num_bars;
117,131c116,117
<       /* work out how many lines across the graph (plus one)*/
<       num_bars =(g->draw_height) / (fontsize + 3);
<       switch (num_bars){
<               case 1:
<                       break;
<               case 2:
<               case 3:
<                       num_bars=2;
<                       break;
<               case 4:
<                       num_bars=4;
<                       break;
<               default:
<                       num_bars=5;
<       }
---
>       dely = (g->draw_height) / 5; /* round to int to avoid AA blur */
>       real_draw_height = dely * 5;
133,136c119
<       dely = (g->draw_height) / num_bars; /* round to int to avoid AA blur */
<       real_draw_height = dely * num_bars;
< 
<       for (i = 0; i <= num_bars; ++i) {
---
>       for (i = 0; i <= 5; ++i) {
140c123,127
<               if (i==num_bars)
---
>               switch (i) {
>               case 0:
>                       y = 0.5 + fontsize / 2.0;
>                       break;
>               case 5:
142,146c129,132
<               else {
<                       if (i==0)
<                               y =  0.5 +(i * dely) + (fontsize / 2.0);
<                       else
<                               y =  (i * dely) + (fontsize / 2.0);
---
>                       break;
>               default:
>                       y = i * dely + fontsize / 2.0;
>                       break;
150c136
<               caption = g_strdup_printf("%3d %%", 100 - i * (100/num_bars));
---
>               caption = g_strdup_printf("%3d %%", 100 - i * 20);