Mercurial > pidgin.yaz

comparison src/dialogs.c @ 4198:c46c977cfc9e

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
[gaim-migrate @ 4429] Alex Converse (alex4) writes: "Changes all occurences of gtk_color_selection_set_color to gtk_color_selection_set_current_color in dialogs.c and removes some nasty code required to get the former to work." this looks like it changes the bug wherein the color selection dialogs have a random color selected when you open them instead of the current color. committer: Tailor Script <tailor@pidgin.im>
author Luke Schierer <lschiere@pidgin.im>
date Sat, 04 Jan 2003 15:05:15 +0000
parents e6810f691393
children 511c2b63caa4
comparison
equal deleted inserted replaced
4197:1817f5d16e83 4198:c46c977cfc9e
3150 } 3150 }
3151 3151
3152 void show_fgcolor_dialog(struct conversation *c, GtkWidget *color) 3152 void show_fgcolor_dialog(struct conversation *c, GtkWidget *color)
3153 { 3153 {
3154 GtkWidget *colorsel; 3154 GtkWidget *colorsel;
3155 gdouble fgclr[3];
3156 3155
3157 if (color == NULL) { /* we came from the prefs */ 3156 if (color == NULL) { /* we came from the prefs */
3158 if (fgcseld) 3157 if (fgcseld)
3159 return; 3158 return;
3160 fgclr[0] = (gdouble)(fgcolor.red) ;
3161 fgclr[1] = (gdouble)(fgcolor.green);
3162 fgclr[2] = (gdouble)(fgcolor.blue);
3163 3159
3164 fgcseld = gtk_color_selection_dialog_new(_("Select Text Color")); 3160 fgcseld = gtk_color_selection_dialog_new(_("Select Text Color"));
3165 gtk_color_selection_set_color(GTK_COLOR_SELECTION 3161 gtk_color_selection_set_current_color(GTK_COLOR_SELECTION
3166 (GTK_COLOR_SELECTION_DIALOG(fgcseld)->colorsel), fgclr); 3162 (GTK_COLOR_SELECTION_DIALOG(fgcseld)->colorsel), &fgcolor);
3167 g_signal_connect(GTK_OBJECT(fgcseld), "delete_event", 3163 g_signal_connect(GTK_OBJECT(fgcseld), "delete_event",
3168 G_CALLBACK(destroy_colorsel), (void *)1); 3164 G_CALLBACK(destroy_colorsel), (void *)1);
3169 g_signal_connect(GTK_OBJECT(GTK_COLOR_SELECTION_DIALOG(fgcseld)->cancel_button), 3165 g_signal_connect(GTK_OBJECT(GTK_COLOR_SELECTION_DIALOG(fgcseld)->cancel_button),
3170 "clicked", G_CALLBACK(destroy_colorsel), (void *)1); 3166 "clicked", G_CALLBACK(destroy_colorsel), (void *)1);
3171 g_signal_connect(GTK_OBJECT(GTK_COLOR_SELECTION_DIALOG(fgcseld)->ok_button), "clicked", 3167 g_signal_connect(GTK_OBJECT(GTK_COLOR_SELECTION_DIALOG(fgcseld)->ok_button), "clicked",
3175 gdk_window_raise(fgcseld->window); 3171 gdk_window_raise(fgcseld->window);
3176 return; 3172 return;
3177 } 3173 }
3178 3174
3179 if (!c->fg_color_dialog) { 3175 if (!c->fg_color_dialog) {
3180 fgclr[0] = (gdouble)(c->fgcol.red);
3181 fgclr[1] = (gdouble)(c->fgcol.green);
3182 fgclr[2] = (gdouble)(c->fgcol.blue);
3183 3176
3184 c->fg_color_dialog = gtk_color_selection_dialog_new(_("Select Text Color")); 3177 c->fg_color_dialog = gtk_color_selection_dialog_new(_("Select Text Color"));
3185 colorsel = GTK_COLOR_SELECTION_DIALOG(c->fg_color_dialog)->colorsel; 3178 colorsel = GTK_COLOR_SELECTION_DIALOG(c->fg_color_dialog)->colorsel;
3186 gtk_color_selection_set_color(GTK_COLOR_SELECTION(colorsel), fgclr); 3179 gtk_color_selection_set_current_color(GTK_COLOR_SELECTION(colorsel), &fgcolor);
3187 gtk_object_set_user_data(GTK_OBJECT(colorsel), c); 3180 gtk_object_set_user_data(GTK_OBJECT(colorsel), c);
3188 3181
3189 g_signal_connect(GTK_OBJECT(c->fg_color_dialog), "delete_event", 3182 g_signal_connect(GTK_OBJECT(c->fg_color_dialog), "delete_event",
3190 G_CALLBACK(delete_event_dialog), c); 3183 G_CALLBACK(delete_event_dialog), c);
3191 g_signal_connect(GTK_OBJECT(GTK_COLOR_SELECTION_DIALOG(c->fg_color_dialog)->ok_button), 3184 g_signal_connect(GTK_OBJECT(GTK_COLOR_SELECTION_DIALOG(c->fg_color_dialog)->ok_button),
3202 } 3195 }
3203 3196
3204 void show_bgcolor_dialog(struct conversation *c, GtkWidget *color) 3197 void show_bgcolor_dialog(struct conversation *c, GtkWidget *color)
3205 { 3198 {
3206 GtkWidget *colorsel; 3199 GtkWidget *colorsel;
3207 gdouble bgclr[3];
3208 3200
3209 if (color == NULL) { /* we came from the prefs */ 3201 if (color == NULL) { /* we came from the prefs */
3210 if (bgcseld) 3202 if (bgcseld)
3211 return; 3203 return;
3212 bgclr[0] = (gdouble)(bgcolor.red);
3213 bgclr[1] = (gdouble)(bgcolor.green);
3214 bgclr[2] = (gdouble)(bgcolor.blue);
3215 3204
3216 bgcseld = gtk_color_selection_dialog_new(_("Select Background Color")); 3205 bgcseld = gtk_color_selection_dialog_new(_("Select Background Color"));
3217 gtk_color_selection_set_color(GTK_COLOR_SELECTION 3206 gtk_color_selection_set_current_color(GTK_COLOR_SELECTION
3218 (GTK_COLOR_SELECTION_DIALOG(bgcseld)->colorsel), bgclr); 3207 (GTK_COLOR_SELECTION_DIALOG(bgcseld)->colorsel), &bgcolor);
3219 g_signal_connect(GTK_OBJECT(bgcseld), "delete_event", 3208 g_signal_connect(GTK_OBJECT(bgcseld), "delete_event",
3220 G_CALLBACK(destroy_colorsel), NULL); 3209 G_CALLBACK(destroy_colorsel), NULL);
3221 g_signal_connect(GTK_OBJECT(GTK_COLOR_SELECTION_DIALOG(bgcseld)->cancel_button), 3210 g_signal_connect(GTK_OBJECT(GTK_COLOR_SELECTION_DIALOG(bgcseld)->cancel_button),
3222 "clicked", G_CALLBACK(destroy_colorsel), NULL); 3211 "clicked", G_CALLBACK(destroy_colorsel), NULL);
3223 g_signal_connect(GTK_OBJECT(GTK_COLOR_SELECTION_DIALOG(bgcseld)->ok_button), "clicked", 3212 g_signal_connect(GTK_OBJECT(GTK_COLOR_SELECTION_DIALOG(bgcseld)->ok_button), "clicked",
3227 gdk_window_raise(bgcseld->window); 3216 gdk_window_raise(bgcseld->window);
3228 return; 3217 return;
3229 } 3218 }
3230 3219
3231 if (!c->bg_color_dialog) { 3220 if (!c->bg_color_dialog) {
3232 bgclr[0] = (gdouble)(c->bgcol.red);
3233 bgclr[1] = (gdouble)(c->bgcol.green);
3234 bgclr[2] = (gdouble)(c->bgcol.blue);
3235 3221
3236 c->bg_color_dialog = gtk_color_selection_dialog_new(_("Select Background Color")); 3222 c->bg_color_dialog = gtk_color_selection_dialog_new(_("Select Background Color"));
3237 colorsel = GTK_COLOR_SELECTION_DIALOG(c->bg_color_dialog)->colorsel; 3223 colorsel = GTK_COLOR_SELECTION_DIALOG(c->bg_color_dialog)->colorsel;
3238 gtk_color_selection_set_color(GTK_COLOR_SELECTION(colorsel), bgclr); 3224 gtk_color_selection_set_current_color(GTK_COLOR_SELECTION(colorsel), &bgcolor);
3239 gtk_object_set_user_data(GTK_OBJECT(colorsel), c); 3225 gtk_object_set_user_data(GTK_OBJECT(colorsel), c);
3240 3226
3241 g_signal_connect(GTK_OBJECT(c->bg_color_dialog), "delete_event", 3227 g_signal_connect(GTK_OBJECT(c->bg_color_dialog), "delete_event",
3242 G_CALLBACK(delete_event_dialog), c); 3228 G_CALLBACK(delete_event_dialog), c);
3243 g_signal_connect(GTK_OBJECT(GTK_COLOR_SELECTION_DIALOG(c->bg_color_dialog)->ok_button), 3229 g_signal_connect(GTK_OBJECT(GTK_COLOR_SELECTION_DIALOG(c->bg_color_dialog)->ok_button),