# HG changeset patch # User Todd Kulesza # Date 966400232 0 # Node ID c7c0d25906811e2b3add0041b32c5e16acf0a523 # Parent 97b75ed155b038777cd5a2320e1dfed78acc440e [gaim-migrate @ 707] fixed a bug where default colors weren't always properly assigned committer: Tailor Script diff -r 97b75ed155b0 -r c7c0d2590681 src/conversation.c --- a/src/conversation.c Wed Aug 16 03:16:03 2000 +0000 +++ b/src/conversation.c Wed Aug 16 04:30:32 2000 +0000 @@ -82,8 +82,8 @@ GdkBitmap *dark_icon_bm = NULL; char fontface[64]; -int bgcolor = 0; -int fgcolor = 0; +GdkColor bgcolor; +GdkColor fgcolor; void check_everything(GtkWidget *entry); gboolean keypress_callback(GtkWidget *entry, GdkEventKey *event, struct conversation *c); @@ -582,12 +582,12 @@ } if (font_options & OPT_FONT_FGCOL) { - g_snprintf(buf2, BUF_LONG, "%s", c->fgcol, buf); + g_snprintf(buf2, BUF_LONG, "%s", c->fgcol.red, c->fgcol.green, c->fgcol.blue, buf); strcpy(buf, buf2); } if (font_options & OPT_FONT_BGCOL) { - g_snprintf(buf2, BUF_LONG, "%s", c->bgcol, buf); + g_snprintf(buf2, BUF_LONG, "%s", c->bgcol.red, c->bgcol.green, c->bgcol.blue, buf); strcpy(buf, buf2); } diff -r 97b75ed155b0 -r c7c0d2590681 src/dialogs.c --- a/src/dialogs.c Wed Aug 16 03:16:03 2000 +0000 +++ b/src/dialogs.c Wed Aug 16 04:30:32 2000 +0000 @@ -2359,25 +2359,20 @@ static void apply_color_dlg(GtkWidget *w, gpointer d) { gdouble color[3]; - int red, green, blue; if ((int)d == 1) { gtk_color_selection_get_color(GTK_COLOR_SELECTION(GTK_COLOR_SELECTION_DIALOG(fgcseld)->colorsel), color); destroy_colorsel(NULL, (void *)1); - red = ((guint16)(color[0]*65535))>>8; - green = ((guint16)(color[1]*65535))>>8; - blue = ((guint16)(color[2]*65535))>>8; - - fgcolor = ((red & 0xff) << 16) | ((green & 0xff) < 8) | (blue & 0xff); + fgcolor.red = ((guint16)(color[0]*65535))>>8; + fgcolor.green = ((guint16)(color[1]*65535))>>8; + fgcolor.blue = ((guint16)(color[2]*65535))>>8; } else { gtk_color_selection_get_color(GTK_COLOR_SELECTION(GTK_COLOR_SELECTION_DIALOG(bgcseld)->colorsel), color); destroy_colorsel(NULL, (void *)0); - red = ((guint16)(color[0]*65535))>>8; - green = ((guint16)(color[1]*65535))>>8; - blue = ((guint16)(color[2]*65535))>>8; - - bgcolor = ((red & 0xff) << 16) | ((green & 0xff) < 8) | (blue & 0xff); + bgcolor.red = ((guint16)(color[0]*65535))>>8; + bgcolor.green = ((guint16)(color[1]*65535))>>8; + bgcolor.blue = ((guint16)(color[2]*65535))>>8; } } diff -r 97b75ed155b0 -r c7c0d2590681 src/gaim.h --- a/src/gaim.h Wed Aug 16 03:16:03 2000 +0000 +++ b/src/gaim.h Wed Aug 16 04:30:32 2000 +0000 @@ -277,8 +277,8 @@ int makesound; char fontface[128]; int hasfont; - int bgcol; - int fgcol; + GdkColor bgcol; + GdkColor fgcol; /* stuff used just for IM */ GtkWidget *add_button; @@ -397,7 +397,7 @@ #define TYPE_SIGNOFF 4 #define TYPE_KEEPALIVE 5 -#define REVISION "gaim:$Revision: 706 $" +#define REVISION "gaim:$Revision: 707 $" #define FLAPON "FLAPON\r\n\r\n" #define ROAST "Tic/Toc" @@ -426,8 +426,8 @@ /* Globals in dialog.c */ extern char fontface[64]; -extern int bgcolor; -extern int fgcolor; +extern GdkColor bgcolor; +extern GdkColor fgcolor; extern int smiley_array[FACE_TOTAL]; /* Globals in network.c */ diff -r 97b75ed155b0 -r c7c0d2590681 src/gaimrc.c --- a/src/gaimrc.c Wed Aug 16 03:16:03 2000 +0000 +++ b/src/gaimrc.c Wed Aug 16 04:30:32 2000 +0000 @@ -529,9 +529,13 @@ if (p->value[0] != NULL) g_snprintf(fontface, sizeof(fontface), "%s", p->value[0]); } else if (!strcmp(p->option, "foreground")) { - fgcolor = atoi(p->value[0]); + fgcolor.red = atoi(p->value[0]); + fgcolor.green = atoi(p->value[1]); + fgcolor.blue = atoi(p->value[2]); } else if (!strcmp(p->option, "background")) { - bgcolor = atoi(p->value[0]); + bgcolor.red = atoi(p->value[0]); + bgcolor.green = atoi(p->value[1]); + bgcolor.blue = atoi(p->value[2]); } else if (!strcmp(p->option, "report_idle")) { report_idle = atoi(p->value[0]); } else if (!strcmp(p->option, "web_browser")) { @@ -575,8 +579,8 @@ fprintf(f, "\tfont_options { %d }\n", font_options); if (fontface) fprintf(f, "\tfont_face { %s }\n", fontface); - fprintf(f, "\tforeground { %d }\n", fgcolor); - fprintf(f, "\tbackground { %d }\n", bgcolor); + fprintf(f, "\tforeground { %d } { %d } { %d }\n", fgcolor.red, fgcolor.green, fgcolor.blue); + fprintf(f, "\tbackground { %d } { %d } { %d }\n", bgcolor.red, bgcolor.green, bgcolor.blue); fprintf(f, "\treport_idle { %d }\n", report_idle); fprintf(f, "\tweb_browser { %d }\n", web_browser); fprintf(f, "\tweb_command { %s }\n", web_command);