Drop gtkunixprint-autocleanups.h

Move these definitions where they belong
and git rid of an auxiliary header we don't
need anymore.

diff --git a/gtk/gtkprinter.h b/gtk/gtkprinter.h
index 390c51094fe57d8bec3b4db69a0f152905a49590..55e0fe4c8f9b026d39456473a62722b80514fe68 100644 (file)
--- a/gtk/gtkprinter.h
+++ b/gtk/gtkprinter.h
@@ -160,5 +160,7 @@ void                     gtk_enumerate_printers        (GtkPrinterFunc   func,
                                                        GDestroyNotify   destroy,
                                                        gboolean         wait);
 
+G_DEFINE_AUTOPTR_CLEANUP_FUNC(GtkPrinter, g_object_unref)
+
 G_END_DECLS
 

diff --git a/gtk/gtkprintjob.h b/gtk/gtkprintjob.h
index 8e8b15c8bfe57910729bfe1542182538ffbd16d0..b1e456329847428c377e18a2c24a95332715386b 100644 (file)
--- a/gtk/gtkprintjob.h
+++ b/gtk/gtkprintjob.h
@@ -140,5 +140,7 @@ GDK_AVAILABLE_IN_ALL
 void              gtk_print_job_set_reverse     (GtkPrintJob       *job,
                                                  gboolean           reverse);
 
+G_DEFINE_AUTOPTR_CLEANUP_FUNC(GtkPrintJob, g_object_unref)
+
 G_END_DECLS
 

diff --git a/gtk/gtkprintunixdialog.h b/gtk/gtkprintunixdialog.h
index b5549021d3314ed3ff74094ca78bb5bd91992d9f..3c12c7abfa09bbafebba3eeaaf55fd70c9e64215 100644 (file)
--- a/gtk/gtkprintunixdialog.h
+++ b/gtk/gtkprintunixdialog.h
@@ -85,5 +85,7 @@ gboolean             gtk_print_unix_dialog_get_embed_page_setup    (GtkPrintUnix
 GDK_AVAILABLE_IN_ALL
 gboolean             gtk_print_unix_dialog_get_page_setup_set      (GtkPrintUnixDialog *dialog);
 
+G_DEFINE_AUTOPTR_CLEANUP_FUNC(GtkPrintUnixDialog, g_object_unref)
+
 G_END_DECLS
 

diff --git a/gtk/gtkunixprint-autocleanups.h b/gtk/gtkunixprint-autocleanups.h
deleted file mode 100644 (file)
index e80da85..0000000
--- a/gtk/gtkunixprint-autocleanups.h
+++ /dev/null
@@ -1,28 +0,0 @@
-/* GTK - The GIMP Toolkit
- * Copyright (C) 1995-1997 Peter Mattis, Spencer Kimball and Josh MacDonald
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library. If not, see <http://www.gnu.org/licenses/>.
- */
-
-#if !defined (__GTK_UNIX_PRINT_H_INSIDE__) && !defined (GTK_COMPILATION)
-#error "Only <gtk/gtkunixprint.h> can be included directly."
-#endif
-
-#ifndef __GI_SCANNER__
-
-G_DEFINE_AUTOPTR_CLEANUP_FUNC(GtkPrintJob, g_object_unref)
-G_DEFINE_AUTOPTR_CLEANUP_FUNC(GtkPrinter, g_object_unref)
-G_DEFINE_AUTOPTR_CLEANUP_FUNC(GtkPrintUnixDialog, g_object_unref)
-
-#endif

diff --git a/gtk/gtkunixprint.h b/gtk/gtkunixprint.h
index 4b16932670ba7ffd996b65de33fcf4a3e0a5f998..c285b4ed00c973b165c809336fa97af2b9613dec 100644 (file)
--- a/gtk/gtkunixprint.h
+++ b/gtk/gtkunixprint.h
@@ -23,7 +23,5 @@
 #include <gtk/gtkprintjob.h>
 #include <gtk/gtkprintunixdialog.h>
 
-#include <gtk/gtkunixprint-autocleanups.h>
-
 #undef __GTK_UNIX_PRINT_H_INSIDE__
 

diff --git a/gtk/meson.build b/gtk/meson.build
index a230f2d1d94179e14ed38313c0de5387ff63c8de..65b13ffd48f56e102966ed7ea826b1a8fe843e6a 100644 (file)
--- a/gtk/meson.build
+++ b/gtk/meson.build
@@ -690,7 +690,6 @@ if os_unix
     'gtkprintunixdialog.h',
     'gtkprinter.h',
     'gtkprintjob.h',
-    'gtkunixprint-autocleanups.h',
     'gtkunixprint.h',
   ]
   install_headers(gtk_unix_print_headers, subdir: 'gtk-4.0/unix-print/gtk')