gtk+ r19790 - in branches/gtk-2-12: . modules/printbackends/cups

[jensg svn gnome org]

Author: jensg
Date: Wed Mar 12 18:39:26 2008
New Revision: 19790
URL: http://svn.gnome.org/viewvc/gtk+?rev=19790&view=rev

Log:
2008-03-12  Jens Granseuer  <jensgr gmx net>

	Merged from trunk:

        * modules/printbackends/cups/gtkprintbackendcups.c:
        (cups_printer_prepare_for_print): Don't define variables in the
        middle of a block. (#522067)


Modified:
   branches/gtk-2-12/ChangeLog
   branches/gtk-2-12/modules/printbackends/cups/gtkprintbackendcups.c

Modified: branches/gtk-2-12/modules/printbackends/cups/gtkprintbackendcups.c
==============================================================================
--- branches/gtk-2-12/modules/printbackends/cups/gtkprintbackendcups.c	(original)
+++ branches/gtk-2-12/modules/printbackends/cups/gtkprintbackendcups.c	Wed Mar 12 18:39:26 2008
@@ -2982,10 +2982,11 @@
     {
       char width[G_ASCII_DTOSTR_BUF_SIZE];
       char height[G_ASCII_DTOSTR_BUF_SIZE];
+      char *custom_name;
 
       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);
+      custom_name = g_strdup_printf (("Custom.%sx%s"), width, height);
       gtk_print_settings_set (settings, "cups-PageSize", custom_name);
       g_free (custom_name);
     }