patches/gtk+-08-default-print-ps.diff
author rohinis
Tue, 29 Nov 2011 17:32:55 +0000
branchs11express-2010-11
changeset 22234 c23e64da3e06
parent 15935 4b99ac4aa84d
permissions -rw-r--r--
2011-11-29 Rohini S <[email protected]> * patches/Python26-22-audio.diff: Fixes CVE-2010-1634 * specs/SUNWPython26.spec: Fixes CR 7085446
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
15672
353b754cc3ff 2009-04-23 Ghee Teo <[email protected]>
gheet
parents:
diff changeset
     1
diff -urN gtk+-2.14.5/gtk/gtkprintoperation-unix.c ../../SUNWgnome-base-libs-2.24.2.hacked/i386/gtk+-2.14.5/gtk/gtkprintoperation-unix.c
353b754cc3ff 2009-04-23 Ghee Teo <[email protected]>
gheet
parents:
diff changeset
     2
--- gtk+-2.14.5/gtk/gtkprintoperation-unix.c	2008-11-24 06:35:36.000000000 +0000
353b754cc3ff 2009-04-23 Ghee Teo <[email protected]>
gheet
parents:
diff changeset
     3
+++ ../../SUNWgnome-base-libs-2.24.2.hacked/i386/gtk+-2.14.5/gtk/gtkprintoperation-unix.c	2009-04-22 16:16:15.025967000 +0100
353b754cc3ff 2009-04-23 Ghee Teo <[email protected]>
gheet
parents:
diff changeset
     4
@@ -665,7 +665,7 @@
353b754cc3ff 2009-04-23 Ghee Teo <[email protected]>
gheet
parents:
diff changeset
     5
   cairo_surface_t *surface;
353b754cc3ff 2009-04-23 Ghee Teo <[email protected]>
gheet
parents:
diff changeset
     6
   static cairo_user_data_key_t key;
353b754cc3ff 2009-04-23 Ghee Teo <[email protected]>
gheet
parents:
diff changeset
     7
   
353b754cc3ff 2009-04-23 Ghee Teo <[email protected]>
gheet
parents:
diff changeset
     8
-  filename = g_build_filename (g_get_tmp_dir (), "previewXXXXXX.pdf", NULL);
353b754cc3ff 2009-04-23 Ghee Teo <[email protected]>
gheet
parents:
diff changeset
     9
+  filename = g_build_filename (g_get_tmp_dir (), "previewXXXXXX.ps", NULL);
353b754cc3ff 2009-04-23 Ghee Teo <[email protected]>
gheet
parents:
diff changeset
    10
   fd = g_mkstemp (filename);
353b754cc3ff 2009-04-23 Ghee Teo <[email protected]>
gheet
parents:
diff changeset
    11
 
353b754cc3ff 2009-04-23 Ghee Teo <[email protected]>
gheet
parents:
diff changeset
    12
   if (fd < 0)
353b754cc3ff 2009-04-23 Ghee Teo <[email protected]>
gheet
parents:
diff changeset
    13
@@ -681,7 +681,7 @@
353b754cc3ff 2009-04-23 Ghee Teo <[email protected]>
gheet
parents:
diff changeset
    14
   h = gtk_paper_size_get_height (paper_size, GTK_UNIT_POINTS);
353b754cc3ff 2009-04-23 Ghee Teo <[email protected]>
gheet
parents:
diff changeset
    15
     
353b754cc3ff 2009-04-23 Ghee Teo <[email protected]>
gheet
parents:
diff changeset
    16
   *dpi_x = *dpi_y = 72;
353b754cc3ff 2009-04-23 Ghee Teo <[email protected]>
gheet
parents:
diff changeset
    17
-  surface = cairo_pdf_surface_create_for_stream (write_preview, GINT_TO_POINTER (fd), w, h);
353b754cc3ff 2009-04-23 Ghee Teo <[email protected]>
gheet
parents:
diff changeset
    18
+  surface = cairo_ps_surface_create_for_stream (write_preview, GINT_TO_POINTER (fd), w, h);
353b754cc3ff 2009-04-23 Ghee Teo <[email protected]>
gheet
parents:
diff changeset
    19
  
353b754cc3ff 2009-04-23 Ghee Teo <[email protected]>
gheet
parents:
diff changeset
    20
   cairo_surface_set_user_data (surface, &key, GINT_TO_POINTER (fd), close_preview);
353b754cc3ff 2009-04-23 Ghee Teo <[email protected]>
gheet
parents:
diff changeset
    21
 
353b754cc3ff 2009-04-23 Ghee Teo <[email protected]>
gheet
parents:
diff changeset
    22
@@ -714,7 +714,7 @@
353b754cc3ff 2009-04-23 Ghee Teo <[email protected]>
gheet
parents:
diff changeset
    23
   paper_size = gtk_page_setup_get_paper_size (page_setup);
353b754cc3ff 2009-04-23 Ghee Teo <[email protected]>
gheet
parents:
diff changeset
    24
   w = gtk_paper_size_get_width (paper_size, GTK_UNIT_POINTS);
353b754cc3ff 2009-04-23 Ghee Teo <[email protected]>
gheet
parents:
diff changeset
    25
   h = gtk_paper_size_get_height (paper_size, GTK_UNIT_POINTS);
353b754cc3ff 2009-04-23 Ghee Teo <[email protected]>
gheet
parents:
diff changeset
    26
-  cairo_pdf_surface_set_size (surface, w, h);
353b754cc3ff 2009-04-23 Ghee Teo <[email protected]>
gheet
parents:
diff changeset
    27
+  cairo_ps_surface_set_size (surface, w, h);
353b754cc3ff 2009-04-23 Ghee Teo <[email protected]>
gheet
parents:
diff changeset
    28
 }
353b754cc3ff 2009-04-23 Ghee Teo <[email protected]>
gheet
parents:
diff changeset
    29
 
353b754cc3ff 2009-04-23 Ghee Teo <[email protected]>
gheet
parents:
diff changeset
    30