comparison src/dialogs.c @ 854:9e2dcad06d3c

[gaim-migrate @ 864] I am the original pimp. :-p This isn't finished yet I just wanted to get it commited. We will see some gaim hacking today :) committer: Tailor Script <tailor@pidgin.im>
author Rob Flynn <gaim@robflynn.com>
date Thu, 07 Sep 2000 17:26:09 +0000
parents 868e7a30b48a
children 3de6e98e8898
comparison
equal deleted inserted replaced
853:050f244b6829 854:9e2dcad06d3c
284 object_data = gtk_object_get_user_data(GTK_OBJECT(w)); 284 object_data = gtk_object_get_user_data(GTK_OBJECT(w));
285 285
286 if (GTK_IS_COLOR_SELECTION_DIALOG(w)) 286 if (GTK_IS_COLOR_SELECTION_DIALOG(w))
287 { 287 {
288 set_state_lock(1); 288 set_state_lock(1);
289 gtk_toggle_button_set_state(GTK_TOGGLE_BUTTON(c->palette), FALSE); 289 gtk_toggle_button_set_state(GTK_TOGGLE_BUTTON(c->fgcolorbtn), FALSE);
290 set_state_lock(0); 290 set_state_lock(0);
291 c->color_dialog = NULL; 291 c->color_dialog = NULL;
292 } 292 }
293 else if (GTK_IS_FONT_SELECTION_DIALOG(w)) 293 else if (GTK_IS_FONT_SELECTION_DIALOG(w))
294 { 294 {
2317 static GtkWidget *fgcseld = NULL; 2317 static GtkWidget *fgcseld = NULL;
2318 static GtkWidget *bgcseld = NULL; 2318 static GtkWidget *bgcseld = NULL;
2319 2319
2320 void cancel_color(GtkWidget *widget, struct conversation *c) 2320 void cancel_color(GtkWidget *widget, struct conversation *c)
2321 { 2321 {
2322 if (c->palette && widget) 2322 if (c->fgcolorbtn && widget)
2323 { 2323 {
2324 set_state_lock(1); 2324 set_state_lock(1);
2325 gtk_toggle_button_set_state(GTK_TOGGLE_BUTTON(c->palette), FALSE); 2325 gtk_toggle_button_set_state(GTK_TOGGLE_BUTTON(c->fgcolorbtn), FALSE);
2326 set_state_lock(0); 2326 set_state_lock(0);
2327 } 2327 }
2328 dialogwindows = g_list_remove(dialogwindows, c->color_dialog); 2328 dialogwindows = g_list_remove(dialogwindows, c->color_dialog);
2329 gtk_widget_destroy(c->color_dialog); 2329 gtk_widget_destroy(c->color_dialog);
2330 c->color_dialog = NULL; 2330 c->color_dialog = NULL;