Mercurial Mercurial > upstream > oracle > spec-files / annotate
summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | file | latest | revisions | annotate | diff | comparison | raw | help
Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
patches/gtk3+-15-handle-copies.diff
author yippi
Mon, 27 Sep 2010 21:07:51 +0000
changeset 20108 51df67ca9307
parent 18292 9ff9c0fa64d9
permissions -rw-r--r--
I had these modules listed as being owned by me, but they are really owned by wangke, correcting.
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
18292
9ff9c0fa64d9 2010-07-29 Christian Kelly <[email protected]>
chrisk
parents:
diff changeset 
     1
 
diff -urN gtk+-2.19.0/gtk/gtkprintoperation-unix.c ../../SUNWgtk2-2.19.0.hacked/i386/gtk+-2.19.0/gtk/gtkprintoperation-unix.c
9ff9c0fa64d9 2010-07-29 Christian Kelly <[email protected]>
chrisk
parents:
diff changeset 
     2
 
--- gtk+-2.19.0/gtk/gtkprintoperation-unix.c	2010-01-07 14:45:55.518849788 +0000
9ff9c0fa64d9 2010-07-29 Christian Kelly <[email protected]>
chrisk
parents:
diff changeset 
     3
 
+++ ../../SUNWgtk2-2.19.0.hacked/i386/gtk+-2.19.0/gtk/gtkprintoperation-unix.c	2010-01-07 14:54:43.597755579 +0000
9ff9c0fa64d9 2010-07-29 Christian Kelly <[email protected]>
chrisk
parents:
diff changeset 
     4
 
@@ -578,7 +578,12 @@
9ff9c0fa64d9 2010-07-29 Christian Kelly <[email protected]>
chrisk
parents:
diff changeset 
     5
 
           priv->page_ranges = job->page_ranges;
9ff9c0fa64d9 2010-07-29 Christian Kelly <[email protected]>
chrisk
parents:
diff changeset 
     6
 
           priv->num_page_ranges = job->num_page_ranges;
9ff9c0fa64d9 2010-07-29 Christian Kelly <[email protected]>
chrisk
parents:
diff changeset 
     7
9ff9c0fa64d9 2010-07-29 Christian Kelly <[email protected]>
chrisk
parents:
diff changeset 
     8
 
-          priv->manual_num_copies = job->num_copies;
9ff9c0fa64d9 2010-07-29 Christian Kelly <[email protected]>
chrisk
parents:
diff changeset 
     9
 
+          if (gtk_printer_get_capabilities (gtk_print_job_get_printer (job)) &
9ff9c0fa64d9 2010-07-29 Christian Kelly <[email protected]>
chrisk
parents:
diff changeset 
    10
 
+                                            GTK_PRINT_CAPABILITY_COPIES)
9ff9c0fa64d9 2010-07-29 Christian Kelly <[email protected]>
chrisk
parents:
diff changeset 
    11
 
+            priv->manual_num_copies = 1;
9ff9c0fa64d9 2010-07-29 Christian Kelly <[email protected]>
chrisk
parents:
diff changeset 
    12
 
+          else
9ff9c0fa64d9 2010-07-29 Christian Kelly <[email protected]>
chrisk
parents:
diff changeset 
    13
 
+            priv->manual_num_copies = job->num_copies;
9ff9c0fa64d9 2010-07-29 Christian Kelly <[email protected]>
chrisk
parents:
diff changeset 
    14
 
+
9ff9c0fa64d9 2010-07-29 Christian Kelly <[email protected]>
chrisk
parents:
diff changeset 
    15
 
           priv->manual_collation = job->collate;
9ff9c0fa64d9 2010-07-29 Christian Kelly <[email protected]>
chrisk
parents:
diff changeset 
    16
 
           priv->manual_reverse = job->reverse;
9ff9c0fa64d9 2010-07-29 Christian Kelly <[email protected]>
chrisk
parents:
diff changeset 
    17
 
           priv->manual_page_set = job->page_set;
upstream/oracle/spec-files