diff options
| author | Matthias Clasen <mclasen@redhat.com> | 2006-05-03 17:34:55 +0000 |
|---|---|---|
| committer | Matthias Clasen <matthiasc@src.gnome.org> | 2006-05-03 17:34:55 +0000 |
| commit | d428b288cab93d3691bacd96bd2bf2f7f48f397e (patch) | |
| tree | b0fae1b26cfd1fb5ab725f6fcabcbeb97d2e22aa | |
| parent | 66af313a0f1735b4e3a6307b2791cbe6abf05ceb (diff) | |
| download | gdk-pixbuf-BEFORE_FEDERICO_FILENAME_ENTRY_MERGE.tar.gz | |
Don't use gtk_dialog_run for the error dialog, and improve the dialog inBEFORE_FEDERICO_FILENAME_ENTRY_MERGE
2006-05-03 Matthias Clasen <mclasen@redhat.com>
* gtk/gtkprintoperation-unix.c (unix_finish_send): Don't
use gtk_dialog_run for the error dialog, and improve the
dialog in other ways. (#340510, Christian Persch)
| -rw-r--r-- | ChangeLog | 4 | ||||
| -rw-r--r-- | ChangeLog.pre-2-10 | 4 | ||||
| -rw-r--r-- | gtk/gtkprintoperation-unix.c | 22 | ||||
| -rw-r--r-- | po/ChangeLog | 4 | ||||
| -rw-r--r-- | po/POTFILES.in | 1 |
5 files changed, 26 insertions, 9 deletions
@@ -1,5 +1,9 @@ 2006-05-03 Matthias Clasen <mclasen@redhat.com> + * gtk/gtkprintoperation-unix.c (unix_finish_send): Don't + use gtk_dialog_run for the error dialog, and improve the + dialog in other ways. (#340510, Christian Persch) + * gtk/gtkpagesetupunixdialog.c: Beautify the custom paper size dialog. (#339590, patch by Christian Persch) diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10 index 3ec44bbcd..4d7952a00 100644 --- a/ChangeLog.pre-2-10 +++ b/ChangeLog.pre-2-10 @@ -1,5 +1,9 @@ 2006-05-03 Matthias Clasen <mclasen@redhat.com> + * gtk/gtkprintoperation-unix.c (unix_finish_send): Don't + use gtk_dialog_run for the error dialog, and improve the + dialog in other ways. (#340510, Christian Persch) + * gtk/gtkpagesetupunixdialog.c: Beautify the custom paper size dialog. (#339590, patch by Christian Persch) diff --git a/gtk/gtkprintoperation-unix.c b/gtk/gtkprintoperation-unix.c index c1d14e98f..4f74bf52a 100644 --- a/gtk/gtkprintoperation-unix.c +++ b/gtk/gtkprintoperation-unix.c @@ -36,6 +36,7 @@ #include "gtkprinter.h" #include "gtkprintjob.h" #include "gtkalias.h" +#include "gtkintl.h" typedef struct { GtkPrintJob *job; /* the job we are sending to the printer */ @@ -90,11 +91,14 @@ unix_finish_send (GtkPrintJob *job, GTK_DIALOG_DESTROY_WITH_PARENT, GTK_MESSAGE_ERROR, GTK_BUTTONS_CLOSE, - "Error printing: %s", - error->message); - - gtk_dialog_run (GTK_DIALOG (edialog)); - gtk_widget_destroy (edialog); + _("Error printing") /* FIXME better text */); + gtk_message_dialog_format_secondary_text (GTK_MESSAGE_DIALOG (edialog), + "%s", error->message); + gtk_window_set_modal (GTK_WINDOW (edialog), TRUE); + g_signal_connect (edialog, "response", + G_CALLBACK (gtk_widget_destroy), NULL); + + gtk_window_present (GTK_WINDOW (edialog)); } } @@ -305,10 +309,10 @@ _gtk_print_operation_platform_backend_run_dialog (GtkPrintOperation *op, typedef struct { - GtkPageSetup *page_setup; - GFunc done_cb; - gpointer data; - GDestroyNotify destroy; + GtkPageSetup *page_setup; + GtkPageSetupDoneFunc done_cb; + gpointer data; + GDestroyNotify destroy; } PageSetupResponseData; static void diff --git a/po/ChangeLog b/po/ChangeLog index 689eed74e..04430186e 100644 --- a/po/ChangeLog +++ b/po/ChangeLog @@ -1,3 +1,7 @@ +2006-05-03 Matthias Clasen <mclasen@redhat.com> + + * POTFILES.in: Add gtkprintoperation-unix.c + 2006-05-03 Ankit Patel <ankit644@yahoo.com> * gu.po: Updated Gujarati Translation. diff --git a/po/POTFILES.in b/po/POTFILES.in index 569c2a17d..86d0570b8 100644 --- a/po/POTFILES.in +++ b/po/POTFILES.in @@ -143,6 +143,7 @@ gtk/gtkpreview.c gtk/gtkprinteroptionwidget.c gtk/gtkprintjob.c gtk/gtkprintoperation.c +gtk/gtkprintoperation-unix.c gtk/gtkprintoperation-win32.c gtk/gtkprintunixdialog.c gtk/gtkprogress.c |