# Bazaar merge directive format 2 (Bazaar 0.90)
# revision_id: pgrzegorczyk@gmail.com-20090203194814-h6ftyxukw9cajrii
# target_branch: file:///home/przemo/bzr/java-gnome/mainline/
# testament_sha1: 28dd890d01244a892f9b62fcf794ced21b2b28c5
# timestamp: 2009-02-03 20:48:43 +0100
# base_revision_id: andrew@operationaldynamics.com-20090202092237-\
#   7jxh7k7qgfxmji18
# 
# Begin patch
=== modified file 'src/defs/GtkPageSetupUnixDialog.defs'
--- src/defs/GtkPageSetupUnixDialog.defs	2008-03-27 19:31:26 +0000
+++ src/defs/GtkPageSetupUnixDialog.defs	2009-02-03 19:48:14 +0000
@@ -3,7 +3,7 @@
   (parent "GtkDialog")
   (c-name "GtkPageSetupUnixDialog")
   (gtype-id "GTK_TYPE_PAGE_SETUP_UNIX_DIALOG")
-  (import-header "gtk/gtkpagesetupunixdialog.h")
+  (import-header "gtk/gtkunixprint.h")
 )
 
 (define-function gtk_page_setup_unix_dialog_new

=== modified file 'src/defs/GtkPrintCapabilities.defs'
--- src/defs/GtkPrintCapabilities.defs	2007-07-13 23:24:24 +0000
+++ src/defs/GtkPrintCapabilities.defs	2009-02-03 19:48:14 +0000
@@ -2,7 +2,7 @@
   (in-module "Unixprint")
   (c-name "GtkPrintCapabilities")
   (gtype-id "GTK_TYPE_PRINT_CAPABILITIES")
-  (import-header "gtk/gtkprintunixdialog.h")
+  (import-header "gtk/gtkunixprint.h")
   (values
     '("page-set" "GTK_PRINT_CAPABILITY_PAGE_SET")
     '("copies" "GTK_PRINT_CAPABILITY_COPIES")

=== modified file 'src/defs/GtkPrintJob.defs'
--- src/defs/GtkPrintJob.defs	2007-06-23 15:21:12 +0000
+++ src/defs/GtkPrintJob.defs	2009-02-03 19:48:14 +0000
@@ -3,7 +3,7 @@
   (parent "GObject")
   (c-name "GtkPrintJob")
   (gtype-id "GTK_TYPE_PRINT_JOB")
-  (import-header "gtk/gtkprintjob.h")
+  (import-header "gtk/gtkunixprint.h")
 )
 
 (define-function gtk_print_job_new

=== modified file 'src/defs/GtkPrintUnixDialog.defs'
--- src/defs/GtkPrintUnixDialog.defs	2008-03-27 19:31:26 +0000
+++ src/defs/GtkPrintUnixDialog.defs	2009-02-03 19:48:14 +0000
@@ -3,7 +3,7 @@
   (parent "GtkDialog")
   (c-name "GtkPrintUnixDialog")
   (gtype-id "GTK_TYPE_PRINT_UNIX_DIALOG")
-  (import-header "gtk/gtkprintunixdialog.h")
+  (import-header "gtk/gtkunixprint.h")
 )
 
 (define-function gtk_print_unix_dialog_new

=== modified file 'src/defs/GtkPrinter.defs'
--- src/defs/GtkPrinter.defs	2008-03-08 01:57:26 +0000
+++ src/defs/GtkPrinter.defs	2009-02-03 19:48:14 +0000
@@ -3,7 +3,7 @@
   (parent "GObject")
   (c-name "GtkPrinter")
   (gtype-id "GTK_TYPE_PRINTER")
-  (import-header "gtk/gtkprinter.h")
+  (import-header "gtk/gtkunixprint.h")
 )
 
 (define-function gtk_printer_new

# Begin bundle
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
LMI7gD/uv/xdyRThQkGau9IQ
