gdk: Dissolve gdk-autocleanup.h

Move the autocleanup declarations into their
respective headers.

While we are at it, correct the autocleanup
declaration for GdkEvent to use gdk_event_unref,
not g_object_unref. Oops

27 files changed, 43 insertions, 60 deletions

diff --git a/gdk/gdk-autocleanup.h b/gdk/gdk-autocleanup.h
deleted file mode 100644
index a7c8586962..0000000000
--- a/gdk/gdk-autocleanup.h
+++ /dev/null
@@ -1,45 +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 (__GDK_H_INSIDE__) && !defined (GTK_COMPILATION)
-#error "Only <gdk/gdk.h> can be included directly."
-#endif
-
-#ifndef __GI_SCANNER__
-
-G_DEFINE_AUTOPTR_CLEANUP_FUNC(GdkAppLaunchContext, g_object_unref)
-G_DEFINE_AUTOPTR_CLEANUP_FUNC(GdkClipboard, g_object_unref)
-G_DEFINE_AUTOPTR_CLEANUP_FUNC(GdkContentProvider, g_object_unref)
-G_DEFINE_AUTOPTR_CLEANUP_FUNC(GdkCursor, g_object_unref)
-G_DEFINE_AUTOPTR_CLEANUP_FUNC(GdkDevice, g_object_unref)
-G_DEFINE_AUTOPTR_CLEANUP_FUNC(GdkDisplay, g_object_unref)
-G_DEFINE_AUTOPTR_CLEANUP_FUNC(GdkDisplayManager, g_object_unref)
-G_DEFINE_AUTOPTR_CLEANUP_FUNC(GdkDrag, g_object_unref)
-G_DEFINE_AUTOPTR_CLEANUP_FUNC(GdkDrawContext, g_object_unref)
-G_DEFINE_AUTOPTR_CLEANUP_FUNC(GdkFrameClock, g_object_unref)
-G_DEFINE_AUTOPTR_CLEANUP_FUNC(GdkGLContext, g_object_unref)
-G_DEFINE_AUTOPTR_CLEANUP_FUNC(GdkMonitor, g_object_unref)
-G_DEFINE_AUTOPTR_CLEANUP_FUNC(GdkSeat, g_object_unref)
-G_DEFINE_AUTOPTR_CLEANUP_FUNC(GdkPopupLayout, gdk_popup_layout_unref)
-G_DEFINE_AUTOPTR_CLEANUP_FUNC(GdkVulkanContext, g_object_unref)
-
-G_DEFINE_AUTOPTR_CLEANUP_FUNC(GdkContentFormats, gdk_content_formats_unref)
-G_DEFINE_AUTOPTR_CLEANUP_FUNC(GdkEvent, g_object_unref)
-G_DEFINE_AUTOPTR_CLEANUP_FUNC(GdkFrameTimings, gdk_frame_timings_unref)
-G_DEFINE_AUTOPTR_CLEANUP_FUNC(GdkRGBA, gdk_rgba_free)
-
-#endif
diff --git a/gdk/gdk.h b/gdk/gdk.h
index 37bac5adc2..a91ec39f45 100644
--- a/gdk/gdk.h
+++ b/gdk/gdk.h
@@ -76,8 +76,6 @@
 #include <gdk/gdkversionmacros.h>
 #include <gdk/gdkvulkancontext.h>
 
-#include <gdk/gdk-autocleanup.h>
-
 #undef __GDK_H_INSIDE__
 
 #endif /* __GDK_H__ */
diff --git a/gdk/gdkapplaunchcontext.h b/gdk/gdkapplaunchcontext.h
index 23178483a0..b8e15a752e 100644
--- a/gdk/gdkapplaunchcontext.h
+++ b/gdk/gdkapplaunchcontext.h
@@ -54,6 +54,7 @@ GDK_AVAILABLE_IN_ALL
 void                 gdk_app_launch_context_set_icon_name (GdkAppLaunchContext *context,
                                                            const char          *icon_name);
 
+G_DEFINE_AUTOPTR_CLEANUP_FUNC(GdkAppLaunchContext, g_object_unref)
 
 G_END_DECLS
 
diff --git a/gdk/gdkclipboard.h b/gdk/gdkclipboard.h
index f3b6bba1cc..f8f4178d5e 100644
--- a/gdk/gdkclipboard.h
+++ b/gdk/gdkclipboard.h
@@ -120,6 +120,8 @@ GDK_AVAILABLE_IN_ALL
 void                    gdk_clipboard_set_texture       (GdkClipboard          *clipboard,
                                                          GdkTexture            *texture);
 
+G_DEFINE_AUTOPTR_CLEANUP_FUNC(GdkClipboard, g_object_unref)
+
 G_END_DECLS
 
 #endif /* __GDK_CLIPBOARD_H__ */
diff --git a/gdk/gdkcontentformats.h b/gdk/gdkcontentformats.h
index e37238f1be..3fd1657675 100644
--- a/gdk/gdkcontentformats.h
+++ b/gdk/gdkcontentformats.h
@@ -106,6 +106,8 @@ GDK_AVAILABLE_IN_ALL
 void                    gdk_content_formats_builder_add_gtype   (GdkContentFormatsBuilder       *builder,
                                                                  GType                           type);
 
+G_DEFINE_AUTOPTR_CLEANUP_FUNC(GdkContentFormats, gdk_content_formats_unref)
+
 /* dunno where else to put this */
 #define GDK_TYPE_FILE_LIST (gdk_file_list_get_type ())
 GDK_AVAILABLE_IN_ALL
diff --git a/gdk/gdkcontentprovider.h b/gdk/gdkcontentprovider.h
index d9c6370fed..f3e40c4ce3 100644
--- a/gdk/gdkcontentprovider.h
+++ b/gdk/gdkcontentprovider.h
@@ -111,6 +111,9 @@ GDK_AVAILABLE_IN_ALL
 gboolean                gdk_content_provider_get_value                  (GdkContentProvider     *provider,
                                                                          GValue                 *value,
                                                                          GError                **error);
+
+G_DEFINE_AUTOPTR_CLEANUP_FUNC(GdkContentProvider, g_object_unref)
+
 G_END_DECLS
 
 #endif /* __GDK_CONTENT_PROVIDER_H__ */
diff --git a/gdk/gdkcursor.h b/gdk/gdkcursor.h
index 1a0ea5d772..66de6e531b 100644
--- a/gdk/gdkcursor.h
+++ b/gdk/gdkcursor.h
@@ -64,6 +64,7 @@ int         gdk_cursor_get_hotspot_x     (GdkCursor       *cursor);
 GDK_AVAILABLE_IN_ALL
 int         gdk_cursor_get_hotspot_y     (GdkCursor       *cursor);
 
+G_DEFINE_AUTOPTR_CLEANUP_FUNC(GdkCursor, g_object_unref)
 
 G_END_DECLS
 
diff --git a/gdk/gdkdevice.h b/gdk/gdkdevice.h
index c24c084631..dbf29147e4 100644
--- a/gdk/gdkdevice.h
+++ b/gdk/gdkdevice.h
@@ -126,6 +126,9 @@ GdkSurface *        gdk_device_get_surface_at_position  (GdkDevice *device,
 
 GDK_AVAILABLE_IN_4_2
 guint32             gdk_device_get_timestamp            (GdkDevice *device);
+
+G_DEFINE_AUTOPTR_CLEANUP_FUNC(GdkDevice, g_object_unref)
+
 G_END_DECLS
 
 #endif /* __GDK_DEVICE_H__ */
diff --git a/gdk/gdkdisplay.h b/gdk/gdkdisplay.h
index 52aa502247..c3b1c49469 100644
--- a/gdk/gdkdisplay.h
+++ b/gdk/gdkdisplay.h
@@ -136,7 +136,7 @@ gboolean     gdk_display_get_setting (GdkDisplay *display,
                                       const char *name,
                                       GValue     *value);
 
-
+G_DEFINE_AUTOPTR_CLEANUP_FUNC(GdkDisplay, g_object_unref)
 
 G_END_DECLS
 
diff --git a/gdk/gdkdisplaymanager.h b/gdk/gdkdisplaymanager.h
index d7cbb649af..c6ed7f34ad 100644
--- a/gdk/gdkdisplaymanager.h
+++ b/gdk/gdkdisplaymanager.h
@@ -34,7 +34,6 @@
 
 G_BEGIN_DECLS
 
-
 #define GDK_TYPE_DISPLAY_MANAGER              (gdk_display_manager_get_type ())
 #define GDK_DISPLAY_MANAGER(object)           (G_TYPE_CHECK_INSTANCE_CAST ((object), GDK_TYPE_DISPLAY_MANAGER, GdkDisplayManager))
 #define GDK_IS_DISPLAY_MANAGER(object)        (G_TYPE_CHECK_INSTANCE_TYPE ((object), GDK_TYPE_DISPLAY_MANAGER))
@@ -58,6 +57,7 @@ GdkDisplay *       gdk_display_manager_open_display        (GdkDisplayManager *m
 GDK_AVAILABLE_IN_ALL
 void               gdk_set_allowed_backends                (const char        *backends);
 
+G_DEFINE_AUTOPTR_CLEANUP_FUNC(GdkDisplayManager, g_object_unref)
 
 G_END_DECLS
 
diff --git a/gdk/gdkdrag.h b/gdk/gdkdrag.h
index da1e7a3354..0eb865a2ee 100644
--- a/gdk/gdkdrag.h
+++ b/gdk/gdkdrag.h
@@ -99,6 +99,8 @@ GdkContentProvider *
 GDK_AVAILABLE_IN_ALL
 GdkSurface *    gdk_drag_get_surface (GdkDrag *drag);
 
+G_DEFINE_AUTOPTR_CLEANUP_FUNC(GdkDrag, g_object_unref)
+
 G_END_DECLS
 
 #endif /* __GDK_DND_H__ */
diff --git a/gdk/gdkdrawcontext.h b/gdk/gdkdrawcontext.h
index e818ddd62d..e255c059e0 100644
--- a/gdk/gdkdrawcontext.h
+++ b/gdk/gdkdrawcontext.h
@@ -52,6 +52,8 @@ gboolean                gdk_draw_context_is_in_frame            (GdkDrawContext
 GDK_AVAILABLE_IN_ALL
 const cairo_region_t *  gdk_draw_context_get_frame_region       (GdkDrawContext         *context);
 
+G_DEFINE_AUTOPTR_CLEANUP_FUNC(GdkDrawContext, g_object_unref)
+
 G_END_DECLS
 
 #endif /* __GDK_DRAW_CONTEXT__ */
diff --git a/gdk/gdkdrop.h b/gdk/gdkdrop.h
index 0b57e04976..6ce0e95ae3 100644
--- a/gdk/gdkdrop.h
+++ b/gdk/gdkdrop.h
@@ -31,8 +31,6 @@
 
 G_BEGIN_DECLS
 
-G_DEFINE_AUTOPTR_CLEANUP_FUNC(GdkDrop, g_object_unref)
-
 #define GDK_TYPE_DROP              (gdk_drop_get_type ())
 #define GDK_DROP(object)           (G_TYPE_CHECK_INSTANCE_CAST ((object), GDK_TYPE_DROP, GdkDrop))
 #define GDK_IS_DROP(object)        (G_TYPE_CHECK_INSTANCE_TYPE ((object), GDK_TYPE_DROP))
@@ -85,6 +83,8 @@ const GValue *          gdk_drop_read_value_finish      (GdkDrop
                                                          GAsyncResult           *result,
                                                          GError                **error);
 
+G_DEFINE_AUTOPTR_CLEANUP_FUNC(GdkDrop, g_object_unref)
+
 G_END_DECLS
 
 #endif /* __GDK_DROP_H__ */
diff --git a/gdk/gdkevents.h b/gdk/gdkevents.h
index 21259f172d..f2b6748bfa 100644
--- a/gdk/gdkevents.h
+++ b/gdk/gdkevents.h
@@ -38,7 +38,6 @@
 
 G_BEGIN_DECLS
 
-
 #define GDK_TYPE_EVENT          (gdk_event_get_type ())
 #define GDK_TYPE_EVENT_SEQUENCE (gdk_event_sequence_get_type ())
 
@@ -551,6 +550,9 @@ gboolean               gdk_key_event_get_match (GdkEvent        *event,
                                                 guint           *keyval,
                                                 GdkModifierType *modifiers);
 
+
+G_DEFINE_AUTOPTR_CLEANUP_FUNC(GdkEvent, gdk_event_unref)
+
 G_END_DECLS
 
 #endif /* __GDK_EVENTS_H__ */
diff --git a/gdk/gdkframeclock.h b/gdk/gdkframeclock.h
index 2579fee329..6a1013f675 100644
--- a/gdk/gdkframeclock.h
+++ b/gdk/gdkframeclock.h
@@ -106,6 +106,8 @@ void gdk_frame_clock_get_refresh_info (GdkFrameClock *frame_clock,
 GDK_AVAILABLE_IN_ALL
 double gdk_frame_clock_get_fps (GdkFrameClock *frame_clock);
 
+G_DEFINE_AUTOPTR_CLEANUP_FUNC(GdkFrameClock, g_object_unref)
+
 G_END_DECLS
 
 #endif /* __GDK_FRAME_CLOCK_H__ */
diff --git a/gdk/gdkframetimings.h b/gdk/gdkframetimings.h
index 7ed36301b5..0bf7822ac2 100644
--- a/gdk/gdkframetimings.h
+++ b/gdk/gdkframetimings.h
@@ -51,6 +51,8 @@ gint64           gdk_frame_timings_get_refresh_interval  (GdkFrameTimings *timin
 GDK_AVAILABLE_IN_ALL
 gint64           gdk_frame_timings_get_predicted_presentation_time (GdkFrameTimings *timings);
 
+G_DEFINE_AUTOPTR_CLEANUP_FUNC(GdkFrameTimings, gdk_frame_timings_unref)
+
 G_END_DECLS
 
 #endif /* __GDK_FRAME_TIMINGS_H__ */
diff --git a/gdk/gdkglcontext.h b/gdk/gdkglcontext.h
index 5201f93cb1..777bfd0117 100644
--- a/gdk/gdkglcontext.h
+++ b/gdk/gdkglcontext.h
@@ -114,6 +114,8 @@ GdkGLContext *          gdk_gl_context_get_current              (void);
 GDK_AVAILABLE_IN_ALL
 void                    gdk_gl_context_clear_current            (void);
 
+G_DEFINE_AUTOPTR_CLEANUP_FUNC(GdkGLContext, g_object_unref)
+
 G_END_DECLS
 
 #endif /* __GDK_GL_CONTEXT_H__ */
diff --git a/gdk/gdkgltexture.h b/gdk/gdkgltexture.h
index 54e4fee7e7..a692ebdd24 100644
--- a/gdk/gdkgltexture.h
+++ b/gdk/gdkgltexture.h
@@ -36,8 +36,6 @@ G_BEGIN_DECLS
 typedef struct _GdkGLTexture            GdkGLTexture;
 typedef struct _GdkGLTextureClass       GdkGLTextureClass;
 
-G_DEFINE_AUTOPTR_CLEANUP_FUNC(GdkGLTexture, g_object_unref)
-
 GDK_AVAILABLE_IN_ALL
 GType                   gdk_gl_texture_get_type                (void) G_GNUC_CONST;
 
@@ -52,6 +50,7 @@ GdkTexture *            gdk_gl_texture_new                     (GdkGLContext
 GDK_AVAILABLE_IN_ALL
 void                    gdk_gl_texture_release                 (GdkGLTexture    *self);
 
+G_DEFINE_AUTOPTR_CLEANUP_FUNC(GdkGLTexture, g_object_unref)
 
 G_END_DECLS
 
diff --git a/gdk/gdkmonitor.h b/gdk/gdkmonitor.h
index 31f1cd148c..f42c999c95 100644
--- a/gdk/gdkmonitor.h
+++ b/gdk/gdkmonitor.h
@@ -87,6 +87,8 @@ GdkSubpixelLayout gdk_monitor_get_subpixel_layout (GdkMonitor   *monitor);
 GDK_AVAILABLE_IN_ALL
 gboolean          gdk_monitor_is_valid            (GdkMonitor   *monitor);
 
+G_DEFINE_AUTOPTR_CLEANUP_FUNC(GdkMonitor, g_object_unref)
+
 G_END_DECLS
 
 #endif  /* __GDK_MONITOR_H__ */
diff --git a/gdk/gdkpopuplayout.h b/gdk/gdkpopuplayout.h
index b2ad4ebb58..1243323416 100644
--- a/gdk/gdkpopuplayout.h
+++ b/gdk/gdkpopuplayout.h
@@ -146,6 +146,7 @@ void                    gdk_popup_layout_get_shadow_width       (GdkPopupLayout
                                                                  int                *top,
                                                                  int                *bottom);
 
+G_DEFINE_AUTOPTR_CLEANUP_FUNC(GdkPopupLayout, gdk_popup_layout_unref)
 
 G_END_DECLS
 
diff --git a/gdk/gdkrgba.h b/gdk/gdkrgba.h
index 5fe5b86951..4ecb4b7805 100644
--- a/gdk/gdkrgba.h
+++ b/gdk/gdkrgba.h
@@ -69,6 +69,7 @@ gboolean  gdk_rgba_parse     (GdkRGBA       *rgba,
 GDK_AVAILABLE_IN_ALL
 char *   gdk_rgba_to_string (const GdkRGBA *rgba) G_GNUC_MALLOC;
 
+G_DEFINE_AUTOPTR_CLEANUP_FUNC(GdkRGBA, gdk_rgba_free)
 
 G_END_DECLS
 
diff --git a/gdk/gdkseat.h b/gdk/gdkseat.h
index 97739dc6f5..45cb9ab64f 100644
--- a/gdk/gdkseat.h
+++ b/gdk/gdkseat.h
@@ -86,6 +86,8 @@ GdkDevice *    gdk_seat_get_pointer             (GdkSeat             *seat);
 GDK_AVAILABLE_IN_ALL
 GdkDevice *    gdk_seat_get_keyboard            (GdkSeat             *seat);
 
+G_DEFINE_AUTOPTR_CLEANUP_FUNC(GdkSeat, g_object_unref)
+
 G_END_DECLS
 
 #endif /* __GDK_SEAT_H__ */
diff --git a/gdk/gdksnapshot.h b/gdk/gdksnapshot.h
index e609ea3807..615219c69a 100644
--- a/gdk/gdksnapshot.h
+++ b/gdk/gdksnapshot.h
@@ -29,7 +29,6 @@
 
 G_BEGIN_DECLS
 
-
 typedef struct _GdkSnapshotClass        GdkSnapshotClass;
 
 #define GDK_TYPE_SNAPSHOT               (gdk_snapshot_get_type ())
@@ -37,11 +36,10 @@ typedef struct _GdkSnapshotClass        GdkSnapshotClass;
 #define GDK_SNAPSHOT(obj)               (G_TYPE_CHECK_INSTANCE_CAST ((obj), GDK_TYPE_SNAPSHOT, GdkSnapshot))
 #define GDK_IS_SNAPSHOT(obj)            (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GDK_TYPE_SNAPSHOT))
 
-G_DEFINE_AUTOPTR_CLEANUP_FUNC(GdkSnapshot, g_object_unref)
-
 GDK_AVAILABLE_IN_ALL
 GType           gdk_snapshot_get_type   (void) G_GNUC_CONST;
 
+G_DEFINE_AUTOPTR_CLEANUP_FUNC(GdkSnapshot, g_object_unref)
 
 G_END_DECLS
 
diff --git a/gdk/gdktexture.h b/gdk/gdktexture.h
index 531ae3bbde..8ce4bae5b2 100644
--- a/gdk/gdktexture.h
+++ b/gdk/gdktexture.h
@@ -34,8 +34,6 @@ G_BEGIN_DECLS
 #define GDK_TEXTURE(obj)               (G_TYPE_CHECK_INSTANCE_CAST ((obj), GDK_TYPE_TEXTURE, GdkTexture))
 #define GDK_IS_TEXTURE(obj)            (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GDK_TYPE_TEXTURE))
 
-G_DEFINE_AUTOPTR_CLEANUP_FUNC(GdkTexture, g_object_unref)
-
 typedef struct _GdkTextureClass        GdkTextureClass;
 
 #define GDK_TEXTURE_ERROR       (gdk_texture_error_quark ())
@@ -100,6 +98,8 @@ gboolean                gdk_texture_save_to_tiff               (GdkTexture
 GDK_AVAILABLE_IN_4_6
 GBytes *                gdk_texture_save_to_tiff_bytes         (GdkTexture      *texture);
 
+G_DEFINE_AUTOPTR_CLEANUP_FUNC(GdkTexture, g_object_unref)
+
 G_END_DECLS
 
 #endif /* __GDK_TEXTURE_H__ */
diff --git a/gdk/gdktoplevellayout.h b/gdk/gdktoplevellayout.h
index 872581e0c6..f1a6dc457a 100644
--- a/gdk/gdktoplevellayout.h
+++ b/gdk/gdktoplevellayout.h
@@ -78,6 +78,8 @@ void                    gdk_toplevel_layout_set_resizable (GdkToplevelLayout *la
 GDK_AVAILABLE_IN_ALL
 gboolean                gdk_toplevel_layout_get_resizable (GdkToplevelLayout *layout);
 
+G_DEFINE_AUTOPTR_CLEANUP_FUNC(GdkToplevelLayout, gdk_toplevel_layout_unref)
+
 G_END_DECLS
 
 #endif /* __GDK_TOPLEVEL_LAYOUT_H__ */
diff --git a/gdk/gdkvulkancontext.h b/gdk/gdkvulkancontext.h
index 7b184b81e9..8f2214f3c3 100644
--- a/gdk/gdkvulkancontext.h
+++ b/gdk/gdkvulkancontext.h
@@ -77,6 +77,8 @@ VkSemaphore             gdk_vulkan_context_get_draw_semaphore       (GdkVulkanCo
 #endif /* GDK_RENDERING_VULKAN */
 #endif /* __GI_SCANNER__ */
 
+G_DEFINE_AUTOPTR_CLEANUP_FUNC(GdkVulkanContext, g_object_unref)
+
 G_END_DECLS
 
 #endif /* __GDK_VULKAN_CONTEXT__ */
diff --git a/gdk/meson.build b/gdk/meson.build
index f119fadf9d..6079e821bc 100644
--- a/gdk/meson.build
+++ b/gdk/meson.build
@@ -58,7 +58,6 @@ gdk_public_sources = files([
 ])
 
 gdk_public_headers = files([
-  'gdk-autocleanup.h',
   'gdk.h',
   'gdkapplaunchcontext.h',
   'gdkcairo.h',