diff options
| -rw-r--r-- | mail/ChangeLog | 12 | ||||
| -rw-r--r-- | mail/mail-composer-prefs.c | 6 | ||||
| -rw-r--r-- | mail/mail-preferences.c | 6 |
3 files changed, 18 insertions, 6 deletions
diff --git a/mail/ChangeLog b/mail/ChangeLog index fad489ba9e..7b9834550c 100644 --- a/mail/ChangeLog +++ b/mail/ChangeLog @@ -5,6 +5,18 @@ 2002-03-29 Jeffrey Stedfast <fejj@ximian.com> + * mail-preferences.c (colorpicker_get_color): Don't shift the r, g + and b values here either. + + * mail-composer-prefs.c (colorpicker_get_color): Don't shift the + r, g, b values. + + * mail-preferences.c (mail_preferences_construct): Restore the + labels & colours options from the grave. + (mail_preferences_apply): Save these labels & colours options. + +2002-03-29 Jeffrey Stedfast <fejj@ximian.com> + * mail-composer-prefs.c (mail_composer_prefs_construct): Same here. diff --git a/mail/mail-composer-prefs.c b/mail/mail-composer-prefs.c index 6b1c703038..97ebced5e8 100644 --- a/mail/mail-composer-prefs.c +++ b/mail/mail-composer-prefs.c @@ -106,11 +106,11 @@ colorpicker_get_color (GnomeColorPicker *color) gnome_color_picker_get_i8 (color, &r, &g, &b, &a); - rgb = r >> 8; + rgb = r; rgb <<= 8; - rgb |= g >> 8; + rgb |= g; rgb <<= 8; - rgb |= b >> 8; + rgb |= b; return rgb; } diff --git a/mail/mail-preferences.c b/mail/mail-preferences.c index ac1e3fc4b4..e0bae7e439 100644 --- a/mail/mail-preferences.c +++ b/mail/mail-preferences.c @@ -113,11 +113,11 @@ colorpicker_get_color (GnomeColorPicker *color) gnome_color_picker_get_i8 (color, &r, &g, &b, &a); - rgb = r >> 8; + rgb = r; rgb <<= 8; - rgb |= g >> 8; + rgb |= g; rgb <<= 8; - rgb |= b >> 8; + rgb |= b; return rgb; } |