Index: united-states-of-bug-buddy.c
===================================================================
RCS file: /cvs/gnome/bug-buddy/src/united-states-of-bug-buddy.c,v
retrieving revision 1.59
diff -u -r1.59 united-states-of-bug-buddy.c
--- united-states-of-bug-buddy.c	20 Jan 2004 17:43:52 -0000	1.59
+++ united-states-of-bug-buddy.c	24 Feb 2004 04:06:46 -0000
@@ -1,4 +1,4 @@
-/* bug-buddy bug submitting program
+/*  bug-buddy bug submitting program
  *
  * Copyright (C) 2000 Jacob Berkman
  *
@@ -1154,23 +1154,61 @@
 
 void
 on_druid_cancel_clicked (GtkWidget *w, gpointer data)
-{
-	GtkWidget *d;
-
-	d = gtk_message_dialog_new (GTK_WINDOW (GET_WIDGET ("druid-window")),
+{       
+              
+      GtkWidget *d,*button1,*button2, *l, *image, *hbox, *align;
+       
+ 
+      d = gtk_message_dialog_new (GTK_WINDOW (GET_WIDGET ("druid-window")),
 				    0,
 				    GTK_MESSAGE_QUESTION,
-				    GTK_BUTTONS_YES_NO,
+                                    GTK_BUTTONS_NONE,
 				    _("Are you sure you want to cancel\n"
 				      "this bug report?"));
-	gtk_dialog_set_default_response (GTK_DIALOG (d),
-					 GTK_RESPONSE_YES);
-	if (GTK_RESPONSE_YES != gtk_dialog_run (GTK_DIALOG (d))) {
+	
+          
+	/* This is mainly copied from gtk_button_construct_child(). */
+	button1 = gtk_button_new ();
+	l = gtk_label_new_with_mnemonic ("Continue Bug Report");
+	gtk_label_set_mnemonic_widget (GTK_LABEL (l), GTK_WIDGET (button1));
+	image = gtk_image_new_from_stock (GTK_STOCK_OK, GTK_ICON_SIZE_BUTTON);
+	hbox = gtk_hbox_new (FALSE, 2);
+	align = gtk_alignment_new (0.5, 0.5, 0.0, 0.0);
+	gtk_box_pack_start (GTK_BOX (hbox), image, FALSE, FALSE, 0);
+	gtk_box_pack_end (GTK_BOX (hbox), l, FALSE, FALSE, 0);
+	gtk_container_add (GTK_CONTAINER (button1), align);
+	gtk_container_add (GTK_CONTAINER (align), hbox);
+	gtk_widget_show_all (align);
+        GTK_WIDGET_SET_FLAGS (button1, GTK_CAN_DEFAULT);
+
+	gtk_widget_show (button1);
+
+	gtk_dialog_add_action_widget (d, button1, GTK_RESPONSE_NO);	
+	      		
+	button2 = gtk_button_new ();
+	l = gtk_label_new_with_mnemonic ("Close Bug-Buddy");
+	gtk_label_set_mnemonic_widget (GTK_LABEL (l), GTK_WIDGET (button2));
+	image = gtk_image_new_from_stock (GTK_STOCK_NO, GTK_ICON_SIZE_BUTTON);
+	hbox = gtk_hbox_new (FALSE, 2);
+	align = gtk_alignment_new (0.5, 0.5, 0.0, 0.0);
+	gtk_box_pack_start (GTK_BOX (hbox), image, FALSE, FALSE, 0);
+	gtk_box_pack_end (GTK_BOX (hbox), l, FALSE, FALSE, 0);
+	gtk_container_add (GTK_CONTAINER (button2), align);
+	gtk_container_add (GTK_CONTAINER (align), hbox);
+	gtk_widget_show_all (align);
+        GTK_WIDGET_SET_FLAGS (button2, GTK_CAN_DEFAULT);
+
+	gtk_widget_show (button2);
+
+	gtk_dialog_add_action_widget (d, button2, GTK_RESPONSE_YES);	
+	      		
+       
+        if (GTK_RESPONSE_YES != gtk_dialog_run (GTK_DIALOG (d))) {
 		gtk_widget_destroy (d);
 		return;
-	}
+  	}
 	gtk_widget_destroy (d);
-
+        
 	stop_gdb ();
 	gtk_main_quit ();
 }
