Re: [evolution-patches] #55063: Missing stock icon in 'Cancel' and 'Quit' button

[Bill Zhu <bill zhu sun com>]

This is patch with Changelog.
please help commit.

Regards

Bill
在2004年03月10日的03:36，JP Rosevear写道： 
> On Mon, 2004-03-08 at 00:59, Bill Zhu wrote:
> > Hi, please help see this patch:
> > 	http://bugzilla.ximian.com/show_bug.cgi?id=55063
> > 
> > this bug is about evolution setup assistant, the changes take place in
> > e-shell-startup-wizzard.c
>
> Approved for HEAD.
>
> -JP
> -- 
> JP Rosevear <jpr ximian com>
> Ximian, Inc.
>
> _______________________________________________
> Evolution-patches mailing list
> Evolution-patches lists ximian com
> http://lists.ximian.com/mailman/listinfo/evolution-patches


Index: e-shell-startup-wizard.c
===================================================================
RCS file: /cvs/gnome/evolution/shell/e-shell-startup-wizard.c,v
retrieving revision 1.47
diff -u -r1.47 e-shell-startup-wizard.c
--- e-shell-startup-wizard.c	8 Jan 2004 14:57:48 -0000	1.47
+++ e-shell-startup-wizard.c	2 Mar 2004 11:58:51 -0000
@@ -791,8 +791,8 @@
 							 GTK_BUTTONS_NONE,
 							 confirmations);
 
-		gtk_dialog_add_button (confirm_dialog, _("Cancel"), GTK_RESPONSE_CANCEL);
-		gtk_dialog_add_button (confirm_dialog, _("Quit Assistant"), GTK_RESPONSE_OK);
+		gtk_dialog_add_button (confirm_dialog, GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL);
+		gtk_dialog_add_button (confirm_dialog, GTK_STOCK_QUIT, GTK_RESPONSE_OK);
 
 		returnvalue = gtk_dialog_run (GTK_DIALOG (confirm_dialog));
 		gtk_widget_destroy (confirm_dialog);
Index: ChangeLog
===================================================================
RCS file: /cvs/gnome/evolution/shell/ChangeLog,v
retrieving revision 1.1401
diff -u -r1.1401 ChangeLog
--- ChangeLog	8 Mar 2004 16:58:34 -0000	1.1401
+++ ChangeLog	10 Mar 2004 07:36:34 -0000
@@ -1,3 +1,9 @@
+2004-03-10  Bill Zhu  <bill zhu sun com>
+	* e-shell-startup-wizzard.c (key_press_event_callback): Used the stock
+	icon in confirm dialog.
+
+	FIXes #55063
+
 2004-03-06  Pratik V. Parikh <pratikvp despammed com>
 
 	* e-shell-window-commands.c (command_quick_reference): Check that