print: Maintain compatibility

gtkunixprint.h is a public header, that needs
to keep being installed in the same location.

gtk/meson.build

@@ -675,8 +675,13 @@ if os_unix and tracker3_dep.found()
   gtk_sources += 'gtksearchenginetracker3.c'
 endif
 
+gtk_unix_print_main_header = [
+  'gtkunixprint.h'
+]
+
 if os_unix
-  install_headers(gtk_unix_print_headers, subdir: 'gtk-4.0/unix-print/gtk')
+  install_headers(gtk_unix_print_main_header, subdir: 'gtk-4.0/unix-print/gtk')
+  install_headers(gtk_unix_print_headers, subdir: 'gtk-4.0/unix-print/gtk/print')
   gtk_sources += gtk_unix_print_sources
 endif
 
@@ -1254,7 +1259,7 @@ if build_gir
   ]
 
   if os_unix
-    gtk_introspection_sources += [ gtk_unix_print_headers, gtk_unix_print_sources ]
+    gtk_introspection_sources += [ gtk_unix_print_headers + gtk_unix_print_main_header, gtk_unix_print_sources ]
   endif
 
   if os_win32

gtk/print/meson.build

@@ -26,7 +26,6 @@ if os_unix
     'gtkprintunixdialog.h',
     'gtkprinter.h',
     'gtkprintjob.h',
-    'gtkunixprint.h',
   ])
 
   gtk_unix_print_sources += files([

modules/printbackends/gtkprintbackendcups.c

@@ -45,8 +45,8 @@
 #include <gmodule.h>
 
 #include <gtk/gtk.h>
+#include <gtk/gtkunixprint.h>
 #include <gtk/print/gtkprintbackendprivate.h>
-#include <gtk/print/gtkunixprint.h>
 #include <gtk/print/gtkprinterprivate.h>
 #include <gtk/gtkprivate.h>
 

modules/printbackends/gtkprintercups.h

@@ -23,7 +23,7 @@
 #include <cups/ppd.h>
 #include "gtkcupsutils.h"
 
-#include <gtk/print/gtkunixprint.h>
+#include <gtk/gtkunixprint.h>
 #include <gtk/print/gtkprinterprivate.h>
 
 #ifdef HAVE_COLORD