AuroraMiddleware/gtk2
1
0
Fork 0
forked from AuroraMiddleware/gtk
Code Issues Pull Requests Projects Releases Wiki Activity

Use g_ascii_formatd when formatting custom paper sizes, since cups doesn't

Browse Source 
2008-03-11  Matthias Clasen  <mclasen@redhat.com>

        * modules/printbackends/cups/gtkprintbackendcups.c: Use
        g_ascii_formatd when formatting custom paper sizes, since
        cups doesn't handle , as decimal separator.  (#521548)



svn path=/trunk/; revision=19762
This commit is contained in:
Matthias Clasen 2008-03-12 01:34:34 +00:00 committed by Matthias Clasen
parent d1639c8730
commit 66b9c59214
2 changed files with 17 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
ChangeLog
View File

@ -1,3 +1,9 @@
2008-03-11 Matthias Clasen <mclasen@redhat.com>
* modules/printbackends/cups/gtkprintbackendcups.c: Use
g_ascii_formatd when formatting custom paper sizes, since
cups doesn't handle , as decimal separator. (#521548)
2008-03-11 Tor Lillqvist <tml@novell.com>
Bug 469868 - Filenames with colon ":" are not saved correctly

17
modules/printbackends/cups/gtkprintbackendcups.c
View File

@ -2464,10 +2464,12 @@ cups_printer_get_options (GtkPrinter *printer,
else
{
gchar *custom_name;
char width[G_ASCII_DTOSTR_BUF_SIZE];
char height[G_ASCII_DTOSTR_BUF_SIZE];
custom_name = g_strdup_printf (_("Custom %.2fx%.2f"),
gtk_paper_size_get_width (paper_size, GTK_UNIT_POINTS),
gtk_paper_size_get_height (paper_size, GTK_UNIT_POINTS));
g_ascii_formatd (width, sizeof (width), "%.2f", gtk_paper_size_get_width (paper_size, GTK_UNIT_POINTS));
g_ascii_formatd (height, sizeof (height), "%.2f", gtk_paper_size_get_height (paper_size, GTK_UNIT_POINTS));
custom_name = g_strdup_printf (_("Custom %sx%s"), width, height);
strncpy (option->defchoice, custom_name, PPD_MAX_NAME);
g_free (custom_name);
}
@ -2977,9 +2979,12 @@ cups_printer_prepare_for_print (GtkPrinter *printer,
gtk_print_settings_set (settings, "cups-PageSize", ppd_paper_name);
else
{
char *custom_name = g_strdup_printf ("Custom.%2fx%.2f",
gtk_paper_size_get_width (paper_size, GTK_UNIT_POINTS),
gtk_paper_size_get_height (paper_size, GTK_UNIT_POINTS));
char width[G_ASCII_DTOSTR_BUF_SIZE];
char height[G_ASCII_DTOSTR_BUF_SIZE];
g_ascii_formatd (width, sizeof (width), "%.2f", gtk_paper_size_get_width (paper_size, GTK_UNIT_POINTS));
g_ascii_formatd (height, sizeof (height), "%.2f", gtk_paper_size_get_height (paper_size, GTK_UNIT_POINTS));
char *custom_name = g_strdup_printf (("Custom.%sx%s"), width, height);
gtk_print_settings_set (settings, "cups-PageSize", custom_name);
g_free (custom_name);
}