[glib/th/gdbus-unsubscribe-right-away: 2/3] gdbus: move struct definitions for signals in gdbusconnection.c around

[Thomas Haller <thaller src gnome org>]

commit a421268e4eb8ebc08119723d2e75a8ce677a605e
Author: Thomas Haller <thaller redhat com>
Date:   Wed Mar 31 21:43:48 2021 +0200

    gdbus: move struct definitions for signals in gdbusconnection.c around

 gio/gdbusconnection.c | 44 ++++++++++++++++++++++----------------------
 1 file changed, 22 insertions(+), 22 deletions(-)
---
diff --git a/gio/gdbusconnection.c b/gio/gdbusconnection.c
index acaeb97fe..740c65430 100644
--- a/gio/gdbusconnection.c
+++ b/gio/gdbusconnection.c
@@ -3265,6 +3265,28 @@ typedef struct
   GPtrArray *subscribers;  /* (owned) (element-type SignalSubscriber) */
 } SignalData;
 
+typedef struct
+{
+  /* All fields are immutable after construction. */
+  gatomicrefcount ref_count;
+  GDBusSignalCallback callback;
+  gpointer user_data;
+  GDestroyNotify user_data_free_func;
+  guint id;
+  GMainContext *context;
+} SignalSubscriber;
+
+typedef struct
+{
+  SignalSubscriber    *subscriber;  /* (owned) */
+  GDBusMessage        *message;
+  GDBusConnection     *connection;
+  const gchar         *sender;  /* (nullable) for peer-to-peer connections */
+  const gchar         *path;
+  const gchar         *interface;
+  const gchar         *member;
+} SignalInstance;
+
 static void
 signal_data_free (SignalData *signal_data)
 {
@@ -3279,17 +3301,6 @@ signal_data_free (SignalData *signal_data)
   g_free (signal_data);
 }
 
-typedef struct
-{
-  /* All fields are immutable after construction. */
-  gatomicrefcount ref_count;
-  GDBusSignalCallback callback;
-  gpointer user_data;
-  GDestroyNotify user_data_free_func;
-  guint id;
-  GMainContext *context;
-} SignalSubscriber;
-
 static SignalSubscriber *
 signal_subscriber_ref (SignalSubscriber *subscriber)
 {
@@ -3746,17 +3757,6 @@ g_dbus_connection_signal_unsubscribe (GDBusConnection *connection,
 
 /* ---------------------------------------------------------------------------------------------------- */
 
-typedef struct
-{
-  SignalSubscriber    *subscriber;  /* (owned) */
-  GDBusMessage        *message;
-  GDBusConnection     *connection;
-  const gchar         *sender;  /* (nullable) for peer-to-peer connections */
-  const gchar         *path;
-  const gchar         *interface;
-  const gchar         *member;
-} SignalInstance;
-
 /* called on delivery thread (e.g. where g_dbus_connection_signal_subscribe() was called) with
  * no locks held
  */