#define LOGIN1_SERVICE_NAME "org.freedesktop.login1"
#define LOGIN1_OBJECT_NAME "/org/freedesktop/login1"
#define LOGIN1_MANAGER_INTERFACE_NAME "org.freedesktop.login1.Manager"
-#define DBUS_PROPERTIES_INTERFACE "org.freedesktop.DBus.Properties"
-#define DBUS_PROPERTIES_GET_METHOD "Get"
-#define LOGIN1_SEAT_INTERFACE "org.freedesktop.login1.Seat"
enum {
SEAT_ADDED,
ACTIVE_SESSION_CHANGED,
LAST_SEAT_SIGNAL
};
-static guint seat_signals[LAST_SEAT_SIGNAL] = { 0, 0 };
+static guint seat_signals[LAST_SEAT_SIGNAL] = { 0 };
struct Login1SeatPrivate
{
return singleton;
}
-static GVariant *
-seat_get_property (GDBusConnection *connection,
- Login1Seat *seat,
- const gchar *property_name)
+static void
+update_property (Login1Seat *seat, const gchar *name, GVariant *value)
{
- GVariant *result;
- GError *error = NULL;
-
- result = g_dbus_connection_call_sync (connection,
- LOGIN1_SERVICE_NAME,
- seat->priv->path,
- DBUS_PROPERTIES_INTERFACE,
- DBUS_PROPERTIES_GET_METHOD,
- g_variant_new ("(ss)", LOGIN1_SEAT_INTERFACE, property_name),
- G_VARIANT_TYPE ("(v)"),
- G_DBUS_CALL_FLAGS_NONE,
- -1,
- NULL,
- &error);
- if (error)
- g_warning ("Error updating %s: %s", property_name, error->message);
- g_clear_error (&error);
-
- return result;
+ if (strcmp (name, "CanGraphical") == 0 && g_variant_is_of_type (value, G_VARIANT_TYPE_BOOLEAN))
+ {
+ seat->priv->can_graphical = g_variant_get_boolean (value);
+ g_signal_emit (seat, seat_signals[CAN_GRAPHICAL_CHANGED], 0);
+ }
+ else if (strcmp (name, "ActiveSession") == 0 && g_variant_is_of_type (value, G_VARIANT_TYPE ("(so)")))
+ {
+ const gchar *login1_session_id;
+ g_variant_get (value, "(&so)", &login1_session_id, NULL);
+ g_signal_emit (seat, seat_signals[ACTIVE_SESSION_CHANGED], 0, login1_session_id);
+ }
}
static void
gpointer user_data)
{
Login1Seat *seat = user_data;
+ GVariantIter *iter;
GVariantIter *invalidated_properties;
- const gchar *property_name;
-
- g_variant_get (parameters, "(sa{sv}as)", NULL, NULL, &invalidated_properties);
- while (g_variant_iter_loop (invalidated_properties, "&s", &property_name))
+ const gchar *name;
+ GVariant *value;
+
+ g_variant_get (parameters, "(sa{sv}as)", NULL, &iter, &invalidated_properties);
+ while (g_variant_iter_loop (iter, "{&sv}", &name, &value))
+ update_property (seat, name, value);
+ g_variant_iter_free (iter);
+ while (g_variant_iter_loop (invalidated_properties, "&s", &name))
{
- if (strcmp (property_name, "CanGraphical") == 0)
- {
- GVariant *result;
-
- result = seat_get_property (connection, seat, property_name);
- if (result)
- {
- GVariant *value;
-
- g_variant_get (result, "(v)", &value);
- seat->priv->can_graphical = g_variant_get_boolean (value);
- g_variant_unref (value);
-
- g_signal_emit (seat, seat_signals[CAN_GRAPHICAL_CHANGED], 0);
+ GVariant *result;
+ GError *error = NULL;
- g_variant_unref (result);
- }
- }
- if (strcmp (property_name, "ActiveSession") == 0)
+ result = g_dbus_connection_call_sync (connection,
+ LOGIN1_SERVICE_NAME,
+ seat->priv->path,
+ "org.freedesktop.DBus.Properties",
+ "Get",
+ g_variant_new ("(ss)", "org.freedesktop.login1.Seat", name),
+ G_VARIANT_TYPE ("(v)"),
+ G_DBUS_CALL_FLAGS_NONE,
+ -1,
+ NULL,
+ &error);
+ if (error)
+ g_warning ("Error updating seat property %s: %s", name, error->message);
+ g_clear_error (&error);
+ if (result)
{
- GVariant *result;
-
- result = seat_get_property (connection, seat, property_name);
- if (result)
- {
- GVariant *value1, *value2;
- const gchar *login1_session;
-
- g_variant_get (result, "(v)", &value1);
-
- // returned value should be of type (so)
- value2 = g_variant_get_child_value (value1, 0);
-
- if (value2)
- {
- login1_session = g_variant_get_string (value2, NULL);
-
- if (login1_session)
- {
- g_signal_emit (seat, seat_signals[ACTIVE_SESSION_CHANGED], 0, login1_session);
- }
-
- g_variant_unref (value2);
- }
-
- g_variant_unref (value1);
- g_variant_unref (result);
- }
+ g_variant_get (result, "(v)", &value);
+ update_property (seat, name, value);
+ g_variant_unref (value);
+ g_variant_unref (result);
}
}
g_variant_iter_free (invalidated_properties);
g_list_free_full (self->priv->seats, g_object_unref);
g_dbus_connection_signal_unsubscribe (self->priv->connection, self->priv->signal_id);
- g_object_unref (self->priv->connection);
+ g_clear_object (&self->priv->connection);
G_OBJECT_CLASS (login1_service_parent_class)->finalize (object);
}
g_type_class_add_private (klass, sizeof (Login1ServicePrivate));
service_signals[SEAT_ADDED] =
- g_signal_new ("seat-added",
+ g_signal_new (LOGIN1_SERVICE_SIGNAL_SEAT_ADDED,
G_TYPE_FROM_CLASS (klass),
G_SIGNAL_RUN_LAST,
G_STRUCT_OFFSET (Login1ServiceClass, seat_added),
NULL,
G_TYPE_NONE, 1, LOGIN1_SEAT_TYPE);
service_signals[SEAT_REMOVED] =
- g_signal_new ("seat-removed",
+ g_signal_new (LOGIN1_SERVICE_SIGNAL_SEAT_REMOVED,
G_TYPE_FROM_CLASS (klass),
G_SIGNAL_RUN_LAST,
G_STRUCT_OFFSET (Login1ServiceClass, seat_removed),
g_type_class_add_private (klass, sizeof (Login1SeatPrivate));
seat_signals[CAN_GRAPHICAL_CHANGED] =
- g_signal_new (SIGNAL_LOGIN1_CAN_GRAPHICAL_CHANGED,
+ g_signal_new (LOGIN1_SEAT_SIGNAL_CAN_GRAPHICAL_CHANGED,
G_TYPE_FROM_CLASS (klass),
G_SIGNAL_RUN_LAST,
G_STRUCT_OFFSET (Login1SeatClass, can_graphical_changed),
G_TYPE_NONE, 0);
seat_signals[ACTIVE_SESSION_CHANGED] =
- g_signal_new (SIGNAL_LOGIN1_ACTIVE_SESION_CHANGED,
+ g_signal_new (LOGIN1_SIGNAL_ACTIVE_SESION_CHANGED,
G_TYPE_FROM_CLASS (klass),
G_SIGNAL_RUN_LAST,
G_STRUCT_OFFSET (Login1SeatClass, active_session_changed),
projects / sojka / lightdm.git / blobdiff