Import upstream version 12.10.1

16 files changed, 112 insertions, 107 deletions

diff --git a/src/dbus-accounts.c b/src/dbus-accounts.c
index 4443657..b013df0 100644
--- a/src/dbus-accounts.c
+++ b/src/dbus-accounts.c
@@ -1,5 +1,5 @@
 /*
- * Generated by gdbus-codegen 2.33.3. DO NOT EDIT.
+ * Generated by gdbus-codegen 2.33.10. DO NOT EDIT.
  *
  * The license of this code is the same as for the source it was derived from.
  */
@@ -624,7 +624,7 @@ static const _ExtendedGDBusInterfaceInfo _accounts_interface_info =
 GDBusInterfaceInfo *
 accounts_interface_info (void)
 {
-  return (GDBusInterfaceInfo *) &_accounts_interface_info;
+  return (GDBusInterfaceInfo *) &_accounts_interface_info.parent_struct;
 }
 
 /**
@@ -1676,7 +1676,7 @@ accounts_proxy_set_property (GObject      *object,
     g_variant_new ("(ssv)", "org.freedesktop.Accounts", info->parent_struct.name, variant),
     G_DBUS_CALL_FLAGS_NONE,
     -1,
-    NULL, (GAsyncReadyCallback) accounts_proxy_set_property_cb, (gpointer) info);
+    NULL, (GAsyncReadyCallback) accounts_proxy_set_property_cb, (GDBusPropertyInfo *) &info->parent_struct);
   g_variant_unref (variant);
 }
 
@@ -1693,7 +1693,7 @@ accounts_proxy_g_signal (GDBusProxy *proxy,
   guint num_params;
   guint n;
   guint signal_id;
-  info = (_ExtendedGDBusSignalInfo *) g_dbus_interface_info_lookup_signal ((GDBusInterfaceInfo *) &_accounts_interface_info, signal_name);
+  info = (_ExtendedGDBusSignalInfo *) g_dbus_interface_info_lookup_signal ((GDBusInterfaceInfo *) &_accounts_interface_info.parent_struct, signal_name);
   if (info == NULL)
     return;
   num_params = g_variant_n_children (parameters);
@@ -1735,7 +1735,7 @@ accounts_proxy_g_properties_changed (GDBusProxy *_proxy,
   g_variant_get (changed_properties, "a{sv}", &iter);
   while (g_variant_iter_next (iter, "{&sv}", &key, NULL))
     {
-      info = (_ExtendedGDBusPropertyInfo *) g_dbus_interface_info_lookup_property ((GDBusInterfaceInfo *) &_accounts_interface_info, key);
+      info = (_ExtendedGDBusPropertyInfo *) g_dbus_interface_info_lookup_property ((GDBusInterfaceInfo *) &_accounts_interface_info.parent_struct, key);
       g_datalist_remove_data (&proxy->priv->qdata, key);
       if (info != NULL)
         g_object_notify (G_OBJECT (proxy), info->hyphen_name);
@@ -1743,7 +1743,7 @@ accounts_proxy_g_properties_changed (GDBusProxy *_proxy,
   g_variant_iter_free (iter);
   for (n = 0; invalidated_properties[n] != NULL; n++)
     {
-      info = (_ExtendedGDBusPropertyInfo *) g_dbus_interface_info_lookup_property ((GDBusInterfaceInfo *) &_accounts_interface_info, invalidated_properties[n]);
+      info = (_ExtendedGDBusPropertyInfo *) g_dbus_interface_info_lookup_property ((GDBusInterfaceInfo *) &_accounts_interface_info.parent_struct, invalidated_properties[n]);
       g_datalist_remove_data (&proxy->priv->qdata, invalidated_properties[n]);
       if (info != NULL)
         g_object_notify (G_OBJECT (proxy), info->hyphen_name);
@@ -2083,7 +2083,7 @@ _accounts_skeleton_handle_get_property (
   _ExtendedGDBusPropertyInfo *info;
   GVariant *ret;
   ret = NULL;
-  info = (_ExtendedGDBusPropertyInfo *) g_dbus_interface_info_lookup_property ((GDBusInterfaceInfo *) &_accounts_interface_info, property_name);
+  info = (_ExtendedGDBusPropertyInfo *) g_dbus_interface_info_lookup_property ((GDBusInterfaceInfo *) &_accounts_interface_info.parent_struct, property_name);
   g_assert (info != NULL);
   pspec = g_object_class_find_property (G_OBJECT_GET_CLASS (skeleton), info->hyphen_name);
   if (pspec == NULL)
@@ -2117,7 +2117,7 @@ _accounts_skeleton_handle_set_property (
   _ExtendedGDBusPropertyInfo *info;
   gboolean ret;
   ret = FALSE;
-  info = (_ExtendedGDBusPropertyInfo *) g_dbus_interface_info_lookup_property ((GDBusInterfaceInfo *) &_accounts_interface_info, property_name);
+  info = (_ExtendedGDBusPropertyInfo *) g_dbus_interface_info_lookup_property ((GDBusInterfaceInfo *) &_accounts_interface_info.parent_struct, property_name);
   g_assert (info != NULL);
   pspec = g_object_class_find_property (G_OBJECT_GET_CLASS (skeleton), info->hyphen_name);
   if (pspec == NULL)
@@ -2340,14 +2340,14 @@ _accounts_emit_changed (gpointer user_data)
     }
   if (num_changes > 0)
     {
-      GList *connections, *l;
+      GList *connections, *ll;
       GVariant *signal_variant;
       signal_variant = g_variant_ref_sink (g_variant_new ("(sa{sv}as)", "org.freedesktop.Accounts",
                                            &builder, &invalidated_builder));
       connections = g_dbus_interface_skeleton_get_connections (G_DBUS_INTERFACE_SKELETON (skeleton));
-      for (l = connections; l != NULL; l = l->next)
+      for (ll = connections; ll != NULL; ll = ll->next)
         {
-          GDBusConnection *connection = l->data;
+          GDBusConnection *connection = ll->data;
 
           g_dbus_connection_emit_signal (connection,
                                          NULL, g_dbus_interface_skeleton_get_object_path (G_DBUS_INTERFACE_SKELETON (skeleton)),
diff --git a/src/dbus-accounts.h b/src/dbus-accounts.h
index d9da913..4999a2b 100644
--- a/src/dbus-accounts.h
+++ b/src/dbus-accounts.h
@@ -1,5 +1,5 @@
 /*
- * Generated by gdbus-codegen 2.33.3. DO NOT EDIT.
+ * Generated by gdbus-codegen 2.33.10. DO NOT EDIT.
  *
  * The license of this code is the same as for the source it was derived from.
  */
diff --git a/src/dbus-consolekit-manager.c b/src/dbus-consolekit-manager.c
index e0decbe..c032cd9 100644
--- a/src/dbus-consolekit-manager.c
+++ b/src/dbus-consolekit-manager.c
@@ -1,5 +1,5 @@
 /*
- * Generated by gdbus-codegen 2.33.3. DO NOT EDIT.
+ * Generated by gdbus-codegen 2.33.10. DO NOT EDIT.
  *
  * The license of this code is the same as for the source it was derived from.
  */
@@ -1016,7 +1016,7 @@ static const _ExtendedGDBusInterfaceInfo _console_kit_manager_interface_info =
 GDBusInterfaceInfo *
 console_kit_manager_interface_info (void)
 {
-  return (GDBusInterfaceInfo *) &_console_kit_manager_interface_info;
+  return (GDBusInterfaceInfo *) &_console_kit_manager_interface_info.parent_struct;
 }
 
 /**
@@ -3523,7 +3523,7 @@ console_kit_manager_proxy_g_signal (GDBusProxy *proxy,
   guint num_params;
   guint n;
   guint signal_id;
-  info = (_ExtendedGDBusSignalInfo *) g_dbus_interface_info_lookup_signal ((GDBusInterfaceInfo *) &_console_kit_manager_interface_info, signal_name);
+  info = (_ExtendedGDBusSignalInfo *) g_dbus_interface_info_lookup_signal ((GDBusInterfaceInfo *) &_console_kit_manager_interface_info.parent_struct, signal_name);
   if (info == NULL)
     return;
   num_params = g_variant_n_children (parameters);
@@ -3565,7 +3565,7 @@ console_kit_manager_proxy_g_properties_changed (GDBusProxy *_proxy,
   g_variant_get (changed_properties, "a{sv}", &iter);
   while (g_variant_iter_next (iter, "{&sv}", &key, NULL))
     {
-      info = (_ExtendedGDBusPropertyInfo *) g_dbus_interface_info_lookup_property ((GDBusInterfaceInfo *) &_console_kit_manager_interface_info, key);
+      info = (_ExtendedGDBusPropertyInfo *) g_dbus_interface_info_lookup_property ((GDBusInterfaceInfo *) &_console_kit_manager_interface_info.parent_struct, key);
       g_datalist_remove_data (&proxy->priv->qdata, key);
       if (info != NULL)
         g_object_notify (G_OBJECT (proxy), info->hyphen_name);
@@ -3573,7 +3573,7 @@ console_kit_manager_proxy_g_properties_changed (GDBusProxy *_proxy,
   g_variant_iter_free (iter);
   for (n = 0; invalidated_properties[n] != NULL; n++)
     {
-      info = (_ExtendedGDBusPropertyInfo *) g_dbus_interface_info_lookup_property ((GDBusInterfaceInfo *) &_console_kit_manager_interface_info, invalidated_properties[n]);
+      info = (_ExtendedGDBusPropertyInfo *) g_dbus_interface_info_lookup_property ((GDBusInterfaceInfo *) &_console_kit_manager_interface_info.parent_struct, invalidated_properties[n]);
       g_datalist_remove_data (&proxy->priv->qdata, invalidated_properties[n]);
       if (info != NULL)
         g_object_notify (G_OBJECT (proxy), info->hyphen_name);
@@ -3895,7 +3895,7 @@ _console_kit_manager_skeleton_handle_get_property (
   _ExtendedGDBusPropertyInfo *info;
   GVariant *ret;
   ret = NULL;
-  info = (_ExtendedGDBusPropertyInfo *) g_dbus_interface_info_lookup_property ((GDBusInterfaceInfo *) &_console_kit_manager_interface_info, property_name);
+  info = (_ExtendedGDBusPropertyInfo *) g_dbus_interface_info_lookup_property ((GDBusInterfaceInfo *) &_console_kit_manager_interface_info.parent_struct, property_name);
   g_assert (info != NULL);
   pspec = g_object_class_find_property (G_OBJECT_GET_CLASS (skeleton), info->hyphen_name);
   if (pspec == NULL)
@@ -3929,7 +3929,7 @@ _console_kit_manager_skeleton_handle_set_property (
   _ExtendedGDBusPropertyInfo *info;
   gboolean ret;
   ret = FALSE;
-  info = (_ExtendedGDBusPropertyInfo *) g_dbus_interface_info_lookup_property ((GDBusInterfaceInfo *) &_console_kit_manager_interface_info, property_name);
+  info = (_ExtendedGDBusPropertyInfo *) g_dbus_interface_info_lookup_property ((GDBusInterfaceInfo *) &_console_kit_manager_interface_info.parent_struct, property_name);
   g_assert (info != NULL);
   pspec = g_object_class_find_property (G_OBJECT_GET_CLASS (skeleton), info->hyphen_name);
   if (pspec == NULL)
diff --git a/src/dbus-consolekit-manager.h b/src/dbus-consolekit-manager.h
index 60c7413..eddc6f1 100644
--- a/src/dbus-consolekit-manager.h
+++ b/src/dbus-consolekit-manager.h
@@ -1,5 +1,5 @@
 /*
- * Generated by gdbus-codegen 2.33.3. DO NOT EDIT.
+ * Generated by gdbus-codegen 2.33.10. DO NOT EDIT.
  *
  * The license of this code is the same as for the source it was derived from.
  */
diff --git a/src/dbus-consolekit-seat.c b/src/dbus-consolekit-seat.c
index aa3c9ad..368cddf 100644
--- a/src/dbus-consolekit-seat.c
+++ b/src/dbus-consolekit-seat.c
@@ -1,5 +1,5 @@
 /*
- * Generated by gdbus-codegen 2.33.3. DO NOT EDIT.
+ * Generated by gdbus-codegen 2.33.10. DO NOT EDIT.
  *
  * The license of this code is the same as for the source it was derived from.
  */
@@ -542,7 +542,7 @@ static const _ExtendedGDBusInterfaceInfo _console_kit_seat_interface_info =
 GDBusInterfaceInfo *
 console_kit_seat_interface_info (void)
 {
-  return (GDBusInterfaceInfo *) &_console_kit_seat_interface_info;
+  return (GDBusInterfaceInfo *) &_console_kit_seat_interface_info.parent_struct;
 }
 
 /**
@@ -1673,7 +1673,7 @@ console_kit_seat_proxy_g_signal (GDBusProxy *proxy,
   guint num_params;
   guint n;
   guint signal_id;
-  info = (_ExtendedGDBusSignalInfo *) g_dbus_interface_info_lookup_signal ((GDBusInterfaceInfo *) &_console_kit_seat_interface_info, signal_name);
+  info = (_ExtendedGDBusSignalInfo *) g_dbus_interface_info_lookup_signal ((GDBusInterfaceInfo *) &_console_kit_seat_interface_info.parent_struct, signal_name);
   if (info == NULL)
     return;
   num_params = g_variant_n_children (parameters);
@@ -1715,7 +1715,7 @@ console_kit_seat_proxy_g_properties_changed (GDBusProxy *_proxy,
   g_variant_get (changed_properties, "a{sv}", &iter);
   while (g_variant_iter_next (iter, "{&sv}", &key, NULL))
     {
-      info = (_ExtendedGDBusPropertyInfo *) g_dbus_interface_info_lookup_property ((GDBusInterfaceInfo *) &_console_kit_seat_interface_info, key);
+      info = (_ExtendedGDBusPropertyInfo *) g_dbus_interface_info_lookup_property ((GDBusInterfaceInfo *) &_console_kit_seat_interface_info.parent_struct, key);
       g_datalist_remove_data (&proxy->priv->qdata, key);
       if (info != NULL)
         g_object_notify (G_OBJECT (proxy), info->hyphen_name);
@@ -1723,7 +1723,7 @@ console_kit_seat_proxy_g_properties_changed (GDBusProxy *_proxy,
   g_variant_iter_free (iter);
   for (n = 0; invalidated_properties[n] != NULL; n++)
     {
-      info = (_ExtendedGDBusPropertyInfo *) g_dbus_interface_info_lookup_property ((GDBusInterfaceInfo *) &_console_kit_seat_interface_info, invalidated_properties[n]);
+      info = (_ExtendedGDBusPropertyInfo *) g_dbus_interface_info_lookup_property ((GDBusInterfaceInfo *) &_console_kit_seat_interface_info.parent_struct, invalidated_properties[n]);
       g_datalist_remove_data (&proxy->priv->qdata, invalidated_properties[n]);
       if (info != NULL)
         g_object_notify (G_OBJECT (proxy), info->hyphen_name);
@@ -2045,7 +2045,7 @@ _console_kit_seat_skeleton_handle_get_property (
   _ExtendedGDBusPropertyInfo *info;
   GVariant *ret;
   ret = NULL;
-  info = (_ExtendedGDBusPropertyInfo *) g_dbus_interface_info_lookup_property ((GDBusInterfaceInfo *) &_console_kit_seat_interface_info, property_name);
+  info = (_ExtendedGDBusPropertyInfo *) g_dbus_interface_info_lookup_property ((GDBusInterfaceInfo *) &_console_kit_seat_interface_info.parent_struct, property_name);
   g_assert (info != NULL);
   pspec = g_object_class_find_property (G_OBJECT_GET_CLASS (skeleton), info->hyphen_name);
   if (pspec == NULL)
@@ -2079,7 +2079,7 @@ _console_kit_seat_skeleton_handle_set_property (
   _ExtendedGDBusPropertyInfo *info;
   gboolean ret;
   ret = FALSE;
-  info = (_ExtendedGDBusPropertyInfo *) g_dbus_interface_info_lookup_property ((GDBusInterfaceInfo *) &_console_kit_seat_interface_info, property_name);
+  info = (_ExtendedGDBusPropertyInfo *) g_dbus_interface_info_lookup_property ((GDBusInterfaceInfo *) &_console_kit_seat_interface_info.parent_struct, property_name);
   g_assert (info != NULL);
   pspec = g_object_class_find_property (G_OBJECT_GET_CLASS (skeleton), info->hyphen_name);
   if (pspec == NULL)
diff --git a/src/dbus-consolekit-seat.h b/src/dbus-consolekit-seat.h
index b3d3938..fd80a4a 100644
--- a/src/dbus-consolekit-seat.h
+++ b/src/dbus-consolekit-seat.h
@@ -1,5 +1,5 @@
 /*
- * Generated by gdbus-codegen 2.33.3. DO NOT EDIT.
+ * Generated by gdbus-codegen 2.33.10. DO NOT EDIT.
  *
  * The license of this code is the same as for the source it was derived from.
  */
diff --git a/src/dbus-consolekit-session.c b/src/dbus-consolekit-session.c
index 02b5fdd..ecb5173 100644
--- a/src/dbus-consolekit-session.c
+++ b/src/dbus-consolekit-session.c
@@ -1,5 +1,5 @@
 /*
- * Generated by gdbus-codegen 2.33.3. DO NOT EDIT.
+ * Generated by gdbus-codegen 2.33.10. DO NOT EDIT.
  *
  * The license of this code is the same as for the source it was derived from.
  */
@@ -1018,7 +1018,7 @@ static const _ExtendedGDBusInterfaceInfo _console_kit_session_interface_info =
 GDBusInterfaceInfo *
 console_kit_session_interface_info (void)
 {
-  return (GDBusInterfaceInfo *) &_console_kit_session_interface_info;
+  return (GDBusInterfaceInfo *) &_console_kit_session_interface_info.parent_struct;
 }
 
 /**
@@ -4476,7 +4476,7 @@ console_kit_session_proxy_set_property (GObject      *object,
     g_variant_new ("(ssv)", "org.freedesktop.ConsoleKit.Session", info->parent_struct.name, variant),
     G_DBUS_CALL_FLAGS_NONE,
     -1,
-    NULL, (GAsyncReadyCallback) console_kit_session_proxy_set_property_cb, (gpointer) info);
+    NULL, (GAsyncReadyCallback) console_kit_session_proxy_set_property_cb, (GDBusPropertyInfo *) &info->parent_struct);
   g_variant_unref (variant);
 }
 
@@ -4493,7 +4493,7 @@ console_kit_session_proxy_g_signal (GDBusProxy *proxy,
   guint num_params;
   guint n;
   guint signal_id;
-  info = (_ExtendedGDBusSignalInfo *) g_dbus_interface_info_lookup_signal ((GDBusInterfaceInfo *) &_console_kit_session_interface_info, signal_name);
+  info = (_ExtendedGDBusSignalInfo *) g_dbus_interface_info_lookup_signal ((GDBusInterfaceInfo *) &_console_kit_session_interface_info.parent_struct, signal_name);
   if (info == NULL)
     return;
   num_params = g_variant_n_children (parameters);
@@ -4535,7 +4535,7 @@ console_kit_session_proxy_g_properties_changed (GDBusProxy *_proxy,
   g_variant_get (changed_properties, "a{sv}", &iter);
   while (g_variant_iter_next (iter, "{&sv}", &key, NULL))
     {
-      info = (_ExtendedGDBusPropertyInfo *) g_dbus_interface_info_lookup_property ((GDBusInterfaceInfo *) &_console_kit_session_interface_info, key);
+      info = (_ExtendedGDBusPropertyInfo *) g_dbus_interface_info_lookup_property ((GDBusInterfaceInfo *) &_console_kit_session_interface_info.parent_struct, key);
       g_datalist_remove_data (&proxy->priv->qdata, key);
       if (info != NULL)
         g_object_notify (G_OBJECT (proxy), info->hyphen_name);
@@ -4543,7 +4543,7 @@ console_kit_session_proxy_g_properties_changed (GDBusProxy *_proxy,
   g_variant_iter_free (iter);
   for (n = 0; invalidated_properties[n] != NULL; n++)
     {
-      info = (_ExtendedGDBusPropertyInfo *) g_dbus_interface_info_lookup_property ((GDBusInterfaceInfo *) &_console_kit_session_interface_info, invalidated_properties[n]);
+      info = (_ExtendedGDBusPropertyInfo *) g_dbus_interface_info_lookup_property ((GDBusInterfaceInfo *) &_console_kit_session_interface_info.parent_struct, invalidated_properties[n]);
       g_datalist_remove_data (&proxy->priv->qdata, invalidated_properties[n]);
       if (info != NULL)
         g_object_notify (G_OBJECT (proxy), info->hyphen_name);
@@ -5027,7 +5027,7 @@ _console_kit_session_skeleton_handle_get_property (
   _ExtendedGDBusPropertyInfo *info;
   GVariant *ret;
   ret = NULL;
-  info = (_ExtendedGDBusPropertyInfo *) g_dbus_interface_info_lookup_property ((GDBusInterfaceInfo *) &_console_kit_session_interface_info, property_name);
+  info = (_ExtendedGDBusPropertyInfo *) g_dbus_interface_info_lookup_property ((GDBusInterfaceInfo *) &_console_kit_session_interface_info.parent_struct, property_name);
   g_assert (info != NULL);
   pspec = g_object_class_find_property (G_OBJECT_GET_CLASS (skeleton), info->hyphen_name);
   if (pspec == NULL)
@@ -5061,7 +5061,7 @@ _console_kit_session_skeleton_handle_set_property (
   _ExtendedGDBusPropertyInfo *info;
   gboolean ret;
   ret = FALSE;
-  info = (_ExtendedGDBusPropertyInfo *) g_dbus_interface_info_lookup_property ((GDBusInterfaceInfo *) &_console_kit_session_interface_info, property_name);
+  info = (_ExtendedGDBusPropertyInfo *) g_dbus_interface_info_lookup_property ((GDBusInterfaceInfo *) &_console_kit_session_interface_info.parent_struct, property_name);
   g_assert (info != NULL);
   pspec = g_object_class_find_property (G_OBJECT_GET_CLASS (skeleton), info->hyphen_name);
   if (pspec == NULL)
@@ -5304,14 +5304,14 @@ _console_kit_session_emit_changed (gpointer user_data)
     }
   if (num_changes > 0)
     {
-      GList *connections, *l;
+      GList *connections, *ll;
       GVariant *signal_variant;
       signal_variant = g_variant_ref_sink (g_variant_new ("(sa{sv}as)", "org.freedesktop.ConsoleKit.Session",
                                            &builder, &invalidated_builder));
       connections = g_dbus_interface_skeleton_get_connections (G_DBUS_INTERFACE_SKELETON (skeleton));
-      for (l = connections; l != NULL; l = l->next)
+      for (ll = connections; ll != NULL; ll = ll->next)
         {
-          GDBusConnection *connection = l->data;
+          GDBusConnection *connection = ll->data;
 
           g_dbus_connection_emit_signal (connection,
                                          NULL, g_dbus_interface_skeleton_get_object_path (G_DBUS_INTERFACE_SKELETON (skeleton)),
diff --git a/src/dbus-consolekit-session.h b/src/dbus-consolekit-session.h
index 5156522..d827e77 100644
--- a/src/dbus-consolekit-session.h
+++ b/src/dbus-consolekit-session.h
@@ -1,5 +1,5 @@
 /*
- * Generated by gdbus-codegen 2.33.3. DO NOT EDIT.
+ * Generated by gdbus-codegen 2.33.10. DO NOT EDIT.
  *
  * The license of this code is the same as for the source it was derived from.
  */
diff --git a/src/dbus-display-manager.c b/src/dbus-display-manager.c
index 0545062..c2fc250 100644
--- a/src/dbus-display-manager.c
+++ b/src/dbus-display-manager.c
@@ -1,5 +1,5 @@
 /*
- * Generated by gdbus-codegen 2.33.3. DO NOT EDIT.
+ * Generated by gdbus-codegen 2.33.10. DO NOT EDIT.
  *
  * The license of this code is the same as for the source it was derived from.
  */
@@ -341,7 +341,7 @@ static const _ExtendedGDBusInterfaceInfo _display_manager_seat_interface_info =
 GDBusInterfaceInfo *
 display_manager_seat_interface_info (void)
 {
-  return (GDBusInterfaceInfo *) &_display_manager_seat_interface_info;
+  return (GDBusInterfaceInfo *) &_display_manager_seat_interface_info.parent_struct;
 }
 
 /**
@@ -1174,7 +1174,7 @@ display_manager_seat_proxy_set_property (GObject      *object,
     g_variant_new ("(ssv)", "org.freedesktop.DisplayManager.Seat", info->parent_struct.name, variant),
     G_DBUS_CALL_FLAGS_NONE,
     -1,
-    NULL, (GAsyncReadyCallback) display_manager_seat_proxy_set_property_cb, (gpointer) info);
+    NULL, (GAsyncReadyCallback) display_manager_seat_proxy_set_property_cb, (GDBusPropertyInfo *) &info->parent_struct);
   g_variant_unref (variant);
 }
 
@@ -1191,7 +1191,7 @@ display_manager_seat_proxy_g_signal (GDBusProxy *proxy,
   guint num_params;
   guint n;
   guint signal_id;
-  info = (_ExtendedGDBusSignalInfo *) g_dbus_interface_info_lookup_signal ((GDBusInterfaceInfo *) &_display_manager_seat_interface_info, signal_name);
+  info = (_ExtendedGDBusSignalInfo *) g_dbus_interface_info_lookup_signal ((GDBusInterfaceInfo *) &_display_manager_seat_interface_info.parent_struct, signal_name);
   if (info == NULL)
     return;
   num_params = g_variant_n_children (parameters);
@@ -1233,7 +1233,7 @@ display_manager_seat_proxy_g_properties_changed (GDBusProxy *_proxy,
   g_variant_get (changed_properties, "a{sv}", &iter);
   while (g_variant_iter_next (iter, "{&sv}", &key, NULL))
     {
-      info = (_ExtendedGDBusPropertyInfo *) g_dbus_interface_info_lookup_property ((GDBusInterfaceInfo *) &_display_manager_seat_interface_info, key);
+      info = (_ExtendedGDBusPropertyInfo *) g_dbus_interface_info_lookup_property ((GDBusInterfaceInfo *) &_display_manager_seat_interface_info.parent_struct, key);
       g_datalist_remove_data (&proxy->priv->qdata, key);
       if (info != NULL)
         g_object_notify (G_OBJECT (proxy), info->hyphen_name);
@@ -1241,7 +1241,7 @@ display_manager_seat_proxy_g_properties_changed (GDBusProxy *_proxy,
   g_variant_iter_free (iter);
   for (n = 0; invalidated_properties[n] != NULL; n++)
     {
-      info = (_ExtendedGDBusPropertyInfo *) g_dbus_interface_info_lookup_property ((GDBusInterfaceInfo *) &_display_manager_seat_interface_info, invalidated_properties[n]);
+      info = (_ExtendedGDBusPropertyInfo *) g_dbus_interface_info_lookup_property ((GDBusInterfaceInfo *) &_display_manager_seat_interface_info.parent_struct, invalidated_properties[n]);
       g_datalist_remove_data (&proxy->priv->qdata, invalidated_properties[n]);
       if (info != NULL)
         g_object_notify (G_OBJECT (proxy), info->hyphen_name);
@@ -1613,7 +1613,7 @@ _display_manager_seat_skeleton_handle_get_property (
   _ExtendedGDBusPropertyInfo *info;
   GVariant *ret;
   ret = NULL;
-  info = (_ExtendedGDBusPropertyInfo *) g_dbus_interface_info_lookup_property ((GDBusInterfaceInfo *) &_display_manager_seat_interface_info, property_name);
+  info = (_ExtendedGDBusPropertyInfo *) g_dbus_interface_info_lookup_property ((GDBusInterfaceInfo *) &_display_manager_seat_interface_info.parent_struct, property_name);
   g_assert (info != NULL);
   pspec = g_object_class_find_property (G_OBJECT_GET_CLASS (skeleton), info->hyphen_name);
   if (pspec == NULL)
@@ -1647,7 +1647,7 @@ _display_manager_seat_skeleton_handle_set_property (
   _ExtendedGDBusPropertyInfo *info;
   gboolean ret;
   ret = FALSE;
-  info = (_ExtendedGDBusPropertyInfo *) g_dbus_interface_info_lookup_property ((GDBusInterfaceInfo *) &_display_manager_seat_interface_info, property_name);
+  info = (_ExtendedGDBusPropertyInfo *) g_dbus_interface_info_lookup_property ((GDBusInterfaceInfo *) &_display_manager_seat_interface_info.parent_struct, property_name);
   g_assert (info != NULL);
   pspec = g_object_class_find_property (G_OBJECT_GET_CLASS (skeleton), info->hyphen_name);
   if (pspec == NULL)
@@ -1798,14 +1798,14 @@ _display_manager_seat_emit_changed (gpointer user_data)
     }
   if (num_changes > 0)
     {
-      GList *connections, *l;
+      GList *connections, *ll;
       GVariant *signal_variant;
       signal_variant = g_variant_ref_sink (g_variant_new ("(sa{sv}as)", "org.freedesktop.DisplayManager.Seat",
                                            &builder, &invalidated_builder));
       connections = g_dbus_interface_skeleton_get_connections (G_DBUS_INTERFACE_SKELETON (skeleton));
-      for (l = connections; l != NULL; l = l->next)
+      for (ll = connections; ll != NULL; ll = ll->next)
         {
-          GDBusConnection *connection = l->data;
+          GDBusConnection *connection = ll->data;
 
           g_dbus_connection_emit_signal (connection,
                                          NULL, g_dbus_interface_skeleton_get_object_path (G_DBUS_INTERFACE_SKELETON (skeleton)),
diff --git a/src/dbus-display-manager.h b/src/dbus-display-manager.h
index 7feec38..b0fffc8 100644
--- a/src/dbus-display-manager.h
+++ b/src/dbus-display-manager.h
@@ -1,5 +1,5 @@
 /*
- * Generated by gdbus-codegen 2.33.3. DO NOT EDIT.
+ * Generated by gdbus-codegen 2.33.10. DO NOT EDIT.
  *
  * The license of this code is the same as for the source it was derived from.
  */
diff --git a/src/dbus-upower.c b/src/dbus-upower.c
index 687849b..1cdcc88 100644
--- a/src/dbus-upower.c
+++ b/src/dbus-upower.c
@@ -1,5 +1,5 @@
 /*
- * Generated by gdbus-codegen 2.33.3. DO NOT EDIT.
+ * Generated by gdbus-codegen 2.33.10. DO NOT EDIT.
  *
  * The license of this code is the same as for the source it was derived from.
  */
@@ -642,7 +642,7 @@ static const _ExtendedGDBusInterfaceInfo _dbus_upower_interface_info =
 GDBusInterfaceInfo *
 dbus_upower_interface_info (void)
 {
-  return (GDBusInterfaceInfo *) &_dbus_upower_interface_info;
+  return (GDBusInterfaceInfo *) &_dbus_upower_interface_info.parent_struct;
 }
 
 /**
@@ -2117,7 +2117,7 @@ dbus_upower_proxy_set_property (GObject      *object,
     g_variant_new ("(ssv)", "org.freedesktop.UPower", info->parent_struct.name, variant),
     G_DBUS_CALL_FLAGS_NONE,
     -1,
-    NULL, (GAsyncReadyCallback) dbus_upower_proxy_set_property_cb, (gpointer) info);
+    NULL, (GAsyncReadyCallback) dbus_upower_proxy_set_property_cb, (GDBusPropertyInfo *) &info->parent_struct);
   g_variant_unref (variant);
 }
 
@@ -2134,7 +2134,7 @@ dbus_upower_proxy_g_signal (GDBusProxy *proxy,
   guint num_params;
   guint n;
   guint signal_id;
-  info = (_ExtendedGDBusSignalInfo *) g_dbus_interface_info_lookup_signal ((GDBusInterfaceInfo *) &_dbus_upower_interface_info, signal_name);
+  info = (_ExtendedGDBusSignalInfo *) g_dbus_interface_info_lookup_signal ((GDBusInterfaceInfo *) &_dbus_upower_interface_info.parent_struct, signal_name);
   if (info == NULL)
     return;
   num_params = g_variant_n_children (parameters);
@@ -2176,7 +2176,7 @@ dbus_upower_proxy_g_properties_changed (GDBusProxy *_proxy,
   g_variant_get (changed_properties, "a{sv}", &iter);
   while (g_variant_iter_next (iter, "{&sv}", &key, NULL))
     {
-      info = (_ExtendedGDBusPropertyInfo *) g_dbus_interface_info_lookup_property ((GDBusInterfaceInfo *) &_dbus_upower_interface_info, key);
+      info = (_ExtendedGDBusPropertyInfo *) g_dbus_interface_info_lookup_property ((GDBusInterfaceInfo *) &_dbus_upower_interface_info.parent_struct, key);
       g_datalist_remove_data (&proxy->priv->qdata, key);
       if (info != NULL)
         g_object_notify (G_OBJECT (proxy), info->hyphen_name);
@@ -2184,7 +2184,7 @@ dbus_upower_proxy_g_properties_changed (GDBusProxy *_proxy,
   g_variant_iter_free (iter);
   for (n = 0; invalidated_properties[n] != NULL; n++)
     {
-      info = (_ExtendedGDBusPropertyInfo *) g_dbus_interface_info_lookup_property ((GDBusInterfaceInfo *) &_dbus_upower_interface_info, invalidated_properties[n]);
+      info = (_ExtendedGDBusPropertyInfo *) g_dbus_interface_info_lookup_property ((GDBusInterfaceInfo *) &_dbus_upower_interface_info.parent_struct, invalidated_properties[n]);
       g_datalist_remove_data (&proxy->priv->qdata, invalidated_properties[n]);
       if (info != NULL)
         g_object_notify (G_OBJECT (proxy), info->hyphen_name);
@@ -2620,7 +2620,7 @@ _dbus_upower_skeleton_handle_get_property (
   _ExtendedGDBusPropertyInfo *info;
   GVariant *ret;
   ret = NULL;
-  info = (_ExtendedGDBusPropertyInfo *) g_dbus_interface_info_lookup_property ((GDBusInterfaceInfo *) &_dbus_upower_interface_info, property_name);
+  info = (_ExtendedGDBusPropertyInfo *) g_dbus_interface_info_lookup_property ((GDBusInterfaceInfo *) &_dbus_upower_interface_info.parent_struct, property_name);
   g_assert (info != NULL);
   pspec = g_object_class_find_property (G_OBJECT_GET_CLASS (skeleton), info->hyphen_name);
   if (pspec == NULL)
@@ -2654,7 +2654,7 @@ _dbus_upower_skeleton_handle_set_property (
   _ExtendedGDBusPropertyInfo *info;
   gboolean ret;
   ret = FALSE;
-  info = (_ExtendedGDBusPropertyInfo *) g_dbus_interface_info_lookup_property ((GDBusInterfaceInfo *) &_dbus_upower_interface_info, property_name);
+  info = (_ExtendedGDBusPropertyInfo *) g_dbus_interface_info_lookup_property ((GDBusInterfaceInfo *) &_dbus_upower_interface_info.parent_struct, property_name);
   g_assert (info != NULL);
   pspec = g_object_class_find_property (G_OBJECT_GET_CLASS (skeleton), info->hyphen_name);
   if (pspec == NULL)
@@ -2943,14 +2943,14 @@ _dbus_upower_emit_changed (gpointer user_data)
     }
   if (num_changes > 0)
     {
-      GList *connections, *l;
+      GList *connections, *ll;
       GVariant *signal_variant;
       signal_variant = g_variant_ref_sink (g_variant_new ("(sa{sv}as)", "org.freedesktop.UPower",
                                            &builder, &invalidated_builder));
       connections = g_dbus_interface_skeleton_get_connections (G_DBUS_INTERFACE_SKELETON (skeleton));
-      for (l = connections; l != NULL; l = l->next)
+      for (ll = connections; ll != NULL; ll = ll->next)
         {
-          GDBusConnection *connection = l->data;
+          GDBusConnection *connection = ll->data;
 
           g_dbus_connection_emit_signal (connection,
                                          NULL, g_dbus_interface_skeleton_get_object_path (G_DBUS_INTERFACE_SKELETON (skeleton)),
diff --git a/src/dbus-upower.h b/src/dbus-upower.h
index f02f23f..65ea926 100644
--- a/src/dbus-upower.h
+++ b/src/dbus-upower.h
@@ -1,5 +1,5 @@
 /*
- * Generated by gdbus-codegen 2.33.3. DO NOT EDIT.
+ * Generated by gdbus-codegen 2.33.10. DO NOT EDIT.
  *
  * The license of this code is the same as for the source it was derived from.
  */
diff --git a/src/dbus-user.c b/src/dbus-user.c
index 2b46f01..027715c 100644
--- a/src/dbus-user.c
+++ b/src/dbus-user.c
@@ -1,5 +1,5 @@
 /*
- * Generated by gdbus-codegen 2.33.3. DO NOT EDIT.
+ * Generated by gdbus-codegen 2.33.10. DO NOT EDIT.
  *
  * The license of this code is the same as for the source it was derived from.
  */
@@ -1103,7 +1103,7 @@ static const _ExtendedGDBusInterfaceInfo _accounts_user_interface_info =
 GDBusInterfaceInfo *
 accounts_user_interface_info (void)
 {
-  return (GDBusInterfaceInfo *) &_accounts_user_interface_info;
+  return (GDBusInterfaceInfo *) &_accounts_user_interface_info.parent_struct;
 }
 
 /**
@@ -4151,7 +4151,7 @@ accounts_user_proxy_set_property (GObject      *object,
     g_variant_new ("(ssv)", "org.freedesktop.Accounts.User", info->parent_struct.name, variant),
     G_DBUS_CALL_FLAGS_NONE,
     -1,
-    NULL, (GAsyncReadyCallback) accounts_user_proxy_set_property_cb, (gpointer) info);
+    NULL, (GAsyncReadyCallback) accounts_user_proxy_set_property_cb, (GDBusPropertyInfo *) &info->parent_struct);
   g_variant_unref (variant);
 }
 
@@ -4168,7 +4168,7 @@ accounts_user_proxy_g_signal (GDBusProxy *proxy,
   guint num_params;
   guint n;
   guint signal_id;
-  info = (_ExtendedGDBusSignalInfo *) g_dbus_interface_info_lookup_signal ((GDBusInterfaceInfo *) &_accounts_user_interface_info, signal_name);
+  info = (_ExtendedGDBusSignalInfo *) g_dbus_interface_info_lookup_signal ((GDBusInterfaceInfo *) &_accounts_user_interface_info.parent_struct, signal_name);
   if (info == NULL)
     return;
   num_params = g_variant_n_children (parameters);
@@ -4210,7 +4210,7 @@ accounts_user_proxy_g_properties_changed (GDBusProxy *_proxy,
   g_variant_get (changed_properties, "a{sv}", &iter);
   while (g_variant_iter_next (iter, "{&sv}", &key, NULL))
     {
-      info = (_ExtendedGDBusPropertyInfo *) g_dbus_interface_info_lookup_property ((GDBusInterfaceInfo *) &_accounts_user_interface_info, key);
+      info = (_ExtendedGDBusPropertyInfo *) g_dbus_interface_info_lookup_property ((GDBusInterfaceInfo *) &_accounts_user_interface_info.parent_struct, key);
       g_datalist_remove_data (&proxy->priv->qdata, key);
       if (info != NULL)
         g_object_notify (G_OBJECT (proxy), info->hyphen_name);
@@ -4218,7 +4218,7 @@ accounts_user_proxy_g_properties_changed (GDBusProxy *_proxy,
   g_variant_iter_free (iter);
   for (n = 0; invalidated_properties[n] != NULL; n++)
     {
-      info = (_ExtendedGDBusPropertyInfo *) g_dbus_interface_info_lookup_property ((GDBusInterfaceInfo *) &_accounts_user_interface_info, invalidated_properties[n]);
+      info = (_ExtendedGDBusPropertyInfo *) g_dbus_interface_info_lookup_property ((GDBusInterfaceInfo *) &_accounts_user_interface_info.parent_struct, invalidated_properties[n]);
       g_datalist_remove_data (&proxy->priv->qdata, invalidated_properties[n]);
       if (info != NULL)
         g_object_notify (G_OBJECT (proxy), info->hyphen_name);
@@ -4814,7 +4814,7 @@ _accounts_user_skeleton_handle_get_property (
   _ExtendedGDBusPropertyInfo *info;
   GVariant *ret;
   ret = NULL;
-  info = (_ExtendedGDBusPropertyInfo *) g_dbus_interface_info_lookup_property ((GDBusInterfaceInfo *) &_accounts_user_interface_info, property_name);
+  info = (_ExtendedGDBusPropertyInfo *) g_dbus_interface_info_lookup_property ((GDBusInterfaceInfo *) &_accounts_user_interface_info.parent_struct, property_name);
   g_assert (info != NULL);
   pspec = g_object_class_find_property (G_OBJECT_GET_CLASS (skeleton), info->hyphen_name);
   if (pspec == NULL)
@@ -4848,7 +4848,7 @@ _accounts_user_skeleton_handle_set_property (
   _ExtendedGDBusPropertyInfo *info;
   gboolean ret;
   ret = FALSE;
-  info = (_ExtendedGDBusPropertyInfo *) g_dbus_interface_info_lookup_property ((GDBusInterfaceInfo *) &_accounts_user_interface_info, property_name);
+  info = (_ExtendedGDBusPropertyInfo *) g_dbus_interface_info_lookup_property ((GDBusInterfaceInfo *) &_accounts_user_interface_info.parent_struct, property_name);
   g_assert (info != NULL);
   pspec = g_object_class_find_property (G_OBJECT_GET_CLASS (skeleton), info->hyphen_name);
   if (pspec == NULL)
@@ -5021,14 +5021,14 @@ _accounts_user_emit_changed (gpointer user_data)
     }
   if (num_changes > 0)
     {
-      GList *connections, *l;
+      GList *connections, *ll;
       GVariant *signal_variant;
       signal_variant = g_variant_ref_sink (g_variant_new ("(sa{sv}as)", "org.freedesktop.Accounts.User",
                                            &builder, &invalidated_builder));
       connections = g_dbus_interface_skeleton_get_connections (G_DBUS_INTERFACE_SKELETON (skeleton));
-      for (l = connections; l != NULL; l = l->next)
+      for (ll = connections; ll != NULL; ll = ll->next)
         {
-          GDBusConnection *connection = l->data;
+          GDBusConnection *connection = ll->data;
 
           g_dbus_connection_emit_signal (connection,
                                          NULL, g_dbus_interface_skeleton_get_object_path (G_DBUS_INTERFACE_SKELETON (skeleton)),
diff --git a/src/dbus-user.h b/src/dbus-user.h
index b331459..87eb9ce 100644
--- a/src/dbus-user.h
+++ b/src/dbus-user.h
@@ -1,5 +1,5 @@
 /*
- * Generated by gdbus-codegen 2.33.3. DO NOT EDIT.
+ * Generated by gdbus-codegen 2.33.10. DO NOT EDIT.
  *
  * The license of this code is the same as for the source it was derived from.
  */
diff --git a/src/indicator-session.c b/src/indicator-session.c
index 53ff87e..3038948 100644
--- a/src/indicator-session.c
+++ b/src/indicator-session.c
@@ -36,7 +36,6 @@ with this program.  If not, see <http://www.gnu.org/licenses/>.
 #include <libindicator/indicator.h>
 #include <libindicator/indicator-object.h>
 #include <libindicator/indicator-service-manager.h>
-#include <libindicator/indicator-image-helper.h>
 
 #include "shared-names.h"
 #include "user-widget.h"
@@ -117,6 +116,8 @@ indicator_session_class_init (IndicatorSessionClass *klass)
 static void
 indicator_session_init (IndicatorSession *self)
 {
+  const gchar * icon_name;
+
   self->settings = g_settings_new ("com.canonical.indicator.session");
 
   /* Now let's fire these guys up. */
@@ -131,9 +132,8 @@ indicator_session_init (IndicatorSession *self)
   self->entry.name_hint = PACKAGE;
   self->entry.accessible_desc = _("Session Menu");
   self->entry.label = GTK_LABEL (gtk_label_new ("User Name"));
-  self->entry.image = greeter_mode
-                    ? indicator_image_helper (GREETER_ICON_DEFAULT)
-                    : indicator_image_helper (ICON_DEFAULT);
+  icon_name = greeter_mode ? GREETER_ICON_DEFAULT : ICON_DEFAULT;
+  self->entry.image = GTK_IMAGE (gtk_image_new_from_icon_name (icon_name, GTK_ICON_SIZE_BUTTON));
   self->entry.menu = GTK_MENU (dbusmenu_gtkmenu_new(INDICATOR_SESSION_DBUS_NAME,
                                                     INDICATOR_SESSION_DBUS_OBJECT));
   g_settings_bind (self->settings, "show-real-name-on-panel",
@@ -341,7 +341,8 @@ receive_signal (GDBusProxy * proxy,
     }
   else if (!g_strcmp0(signal_name, "RestartRequired"))
     {
-      indicator_image_helper_update (self->entry.image, greeter_mode ? GREETER_ICON_RESTART : ICON_RESTART);
+      const gchar * icon_name = greeter_mode ? GREETER_ICON_RESTART : ICON_RESTART;
+      gtk_image_set_from_icon_name (GTK_IMAGE(self->entry.image), icon_name, GTK_ICON_SIZE_MENU);
       self->entry.accessible_desc = _("Device Menu (reboot required)");
       g_signal_emit (G_OBJECT(self), INDICATOR_OBJECT_SIGNAL_ACCESSIBLE_DESC_UPDATE_ID, 0, &self->entry);
     }
diff --git a/src/user-widget.c b/src/user-widget.c
index b0d2dd4..79b87b0 100644
--- a/src/user-widget.c
+++ b/src/user-widget.c
@@ -89,9 +89,8 @@ user_widget_init (UserWidget *self)
   // Create the UI elements.
   priv->user_image = gtk_image_new ();
   gtk_misc_set_alignment(GTK_MISC(priv->user_image), 0.0, 0.0);
-  gtk_misc_set_padding (GTK_MISC(priv->user_image),0, 4.0);
 
-  priv->user_name = gtk_label_new ("");
+  priv->user_name = gtk_label_new (NULL);
 
   priv->container = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 4);
 
@@ -180,40 +179,43 @@ user_widget_primitive_draw_cb_gtk_3 (GtkWidget *widget,
 ****
 ***/
 
-static const int ICON_SIZE = 24;
-
 static void
 update_icon (UserWidget * self, DbusmenuMenuitem * mi)
 {
-  GdkPixbuf * pixbuf = NULL;
+  gboolean updated = FALSE;
+  GtkImage * image = GTK_IMAGE(self->priv->user_image);
 
-  /* first, try the menuitem's icon property */
+  /* first try the menuitem's icon property */
   const gchar * icon_name = dbusmenu_menuitem_property_get (mi, USER_ITEM_PROP_ICON);
-  if (icon_name)
+  if (icon_name != NULL)
     {
-      GError* error = NULL;
-      pixbuf = gdk_pixbuf_new_from_file_at_size (icon_name, ICON_SIZE, ICON_SIZE, &error);
-      if (error != NULL)
+      int width = 18; /* arbitrary default values */
+      int height = 18;
+      GError * err = NULL;
+      GdkPixbuf * pixbuf = NULL;
+
+      /* load the image */
+      gtk_icon_size_lookup (GTK_ICON_SIZE_MENU, &width, &height);
+      pixbuf = gdk_pixbuf_new_from_file_at_size (icon_name, width, height, &err);
+      if (err == NULL)
         {
-          g_warning ("Couldn't load the image \"%s\": %s", icon_name, error->message);
-          g_clear_error (&error);
+          gtk_image_set_from_pixbuf (image, pixbuf);
+          g_object_unref (pixbuf);
+          updated = TRUE;
+        }
+      else
+        {
+          g_warning ("Couldn't load the image \"%s\": %s", icon_name, err->message);
+          g_clear_error (&err);
         }
     }
 
-  /* as a fallback, try to use the default user icon */
-  if (pixbuf == NULL)
-    {
-      pixbuf = gtk_icon_theme_load_icon (gtk_icon_theme_get_default (),
-                                         USER_ITEM_ICON_DEFAULT,
-                                         ICON_SIZE,
-                                         GTK_ICON_LOOKUP_FORCE_SIZE,
-                                         NULL);
-    }
-
-  if (pixbuf != NULL)
+  /* as a fallback, use the default user icon */
+  if (!updated)
     {
-      gtk_image_set_from_pixbuf (GTK_IMAGE(self->priv->user_image), pixbuf);
-      g_object_unref (pixbuf);
+      gtk_image_set_from_icon_name (image,
+                                    USER_ITEM_ICON_DEFAULT,
+                                    GTK_ICON_SIZE_MENU);
     }
 }
 
@@ -277,7 +279,9 @@ user_widget_set_twin_item (UserWidget * self, DbusmenuMenuitem * mi)
 
  /**
   * user_widget_new:
-  * @returns: a new #UserWidget.
+  * @item: the #DbusmenuMenuitem this widget will render.
+  *
+  * Returns: (transfer full): a new #UserWidget.
   **/
 GtkWidget*
 user_widget_new (DbusmenuMenuitem *item)