From 40e3b9736490a8dab2da7ecb782af76ba9afd9f9 Mon Sep 17 00:00:00 2001 From: Matthias Clasen Date: Thu, 6 Apr 2006 03:47:00 +0000 Subject: [PATCH] Use GTK_RESPONSE_CANCEL/OK instead of GTK_RESPONSE_REJECT/ACCEPT, to make 2006-04-05 Matthias Clasen * gtk/gtkprintunixdialog.c: * gtk/gtkprintoperation-unix.c: Use GTK_RESPONSE_CANCEL/OK instead of GTK_RESPONSE_REJECT/ACCEPT, to make Esc close the dialog, and to not use values which are documented as reserved for apps. --- ChangeLog | 8 ++++++++ ChangeLog.pre-2-10 | 8 ++++++++ gtk/gtkprintoperation-unix.c | 2 +- gtk/gtkprintunixdialog.c | 14 +++++++------- 4 files changed, 24 insertions(+), 8 deletions(-) diff --git a/ChangeLog b/ChangeLog index b3975a8f22..32705182c6 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,11 @@ +2006-04-05 Matthias Clasen + + * gtk/gtkprintunixdialog.c: + * gtk/gtkprintoperation-unix.c: Use GTK_RESPONSE_CANCEL/OK + instead of GTK_RESPONSE_REJECT/ACCEPT, to make Esc close + the dialog, and to not use values which are documented + as reserved for apps. + 2006-04-05 Alexander Larsson * modules/printbackends/lpr/gtkprintbackendlpr.c: diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10 index b3975a8f22..32705182c6 100644 --- a/ChangeLog.pre-2-10 +++ b/ChangeLog.pre-2-10 @@ -1,3 +1,11 @@ +2006-04-05 Matthias Clasen + + * gtk/gtkprintunixdialog.c: + * gtk/gtkprintoperation-unix.c: Use GTK_RESPONSE_CANCEL/OK + instead of GTK_RESPONSE_REJECT/ACCEPT, to make Esc close + the dialog, and to not use values which are documented + as reserved for apps. + 2006-04-05 Alexander Larsson * modules/printbackends/lpr/gtkprintbackendlpr.c: diff --git a/gtk/gtkprintoperation-unix.c b/gtk/gtkprintoperation-unix.c index 330a873196..3e88f1ae79 100644 --- a/gtk/gtkprintoperation-unix.c +++ b/gtk/gtkprintoperation-unix.c @@ -145,7 +145,7 @@ _gtk_print_operation_platform_backend_run_dialog (GtkPrintOperation *op, gtk_print_unix_dialog_set_page_setup (GTK_PRINT_UNIX_DIALOG (pd), page_setup); *do_print = FALSE; - if (gtk_dialog_run (GTK_DIALOG (pd)) == GTK_RESPONSE_ACCEPT) + if (gtk_dialog_run (GTK_DIALOG (pd)) == GTK_RESPONSE_OK) { GtkPrintOperationUnix *op_unix; GtkPrinter *printer; diff --git a/gtk/gtkprintunixdialog.c b/gtk/gtkprintunixdialog.c index 9191d34b2f..d15ca64bbd 100644 --- a/gtk/gtkprintunixdialog.c +++ b/gtk/gtkprintunixdialog.c @@ -395,12 +395,12 @@ gtk_print_unix_dialog_init (GtkPrintUnixDialog *dialog) NULL); gtk_dialog_add_buttons (GTK_DIALOG (dialog), - GTK_STOCK_CANCEL, GTK_RESPONSE_REJECT, - GTK_STOCK_PRINT, GTK_RESPONSE_ACCEPT, + GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL, + GTK_STOCK_PRINT, GTK_RESPONSE_OK, NULL); - gtk_dialog_set_default_response (GTK_DIALOG (dialog), GTK_RESPONSE_ACCEPT); - gtk_dialog_set_response_sensitive (GTK_DIALOG (dialog), GTK_RESPONSE_ACCEPT, FALSE); + gtk_dialog_set_default_response (GTK_DIALOG (dialog), GTK_RESPONSE_OK); + gtk_dialog_set_response_sensitive (GTK_DIALOG (dialog), GTK_RESPONSE_OK, FALSE); } static void @@ -974,7 +974,7 @@ update_dialog_from_settings (GtkPrintUnixDialog *dialog) gtk_widget_hide (dialog->priv->image_quality_page); gtk_widget_hide (dialog->priv->finishing_page); gtk_widget_hide (dialog->priv->color_page); - gtk_dialog_set_response_sensitive (GTK_DIALOG (dialog), GTK_RESPONSE_ACCEPT, FALSE); + gtk_dialog_set_response_sensitive (GTK_DIALOG (dialog), GTK_RESPONSE_OK, FALSE); return; } @@ -1240,7 +1240,7 @@ selected_printer_changed (GtkTreeSelection *selection, if (printer != NULL && !_gtk_printer_has_details (printer)) { - gtk_dialog_set_response_sensitive (GTK_DIALOG (dialog), GTK_RESPONSE_ACCEPT, FALSE); + gtk_dialog_set_response_sensitive (GTK_DIALOG (dialog), GTK_RESPONSE_OK, FALSE); dialog->priv->request_details_tag = g_signal_connect (printer, "details-acquired", G_CALLBACK (printer_details_acquired), dialog); @@ -1268,7 +1268,7 @@ selected_printer_changed (GtkTreeSelection *selection, g_object_unref (dialog->priv->current_printer); } - gtk_dialog_set_response_sensitive (GTK_DIALOG (dialog), GTK_RESPONSE_ACCEPT, TRUE); + gtk_dialog_set_response_sensitive (GTK_DIALOG (dialog), GTK_RESPONSE_OK, TRUE); dialog->priv->current_printer = printer; if (printer != NULL)