Merge branch 'debug-controller-unused' into 'main'

gdebugcontrollerdbus: Mark a variable as G_GNUC_UNUSED See merge request GNOME/glib!2519

Merge branch 'debug-controller-unused' into 'main'
420238e0 · Sebastian Dröge · c3735c1b · cd9ed612 · 420238e0
Commit 420238e0 authored 3 years ago by Sebastian Dröge
--- a/gio/gdebugcontrollerdbus.c
+++ b/gio/gdebugcontrollerdbus.c
@@ -342,13 +342,14 @@ authorize_cb (GObject      *object,
              gpointer      user_data)
 {
  GDebugControllerDBus *self = G_DEBUG_CONTROLLER_DBUS (object);
-  GDebugControllerDBusPrivate *priv = g_debug_controller_dbus_get_instance_private (self);
+  GDebugControllerDBusPrivate *priv G_GNUC_UNUSED  /* when compiling with G_DISABLE_ASSERT */;
  GTask *task = G_TASK (result);
  GDBusMethodInvocation *invocation = g_task_get_task_data (task);
  GVariant *parameters = g_dbus_method_invocation_get_parameters (invocation);
  gboolean enabled = FALSE;
  gboolean authorized;

+  priv = g_debug_controller_dbus_get_instance_private (self);
  authorized = g_task_propagate_boolean (task, NULL);

  if (!authorized)