From 666ea0d6fde9eda6b86a224ba3b444a7bbd31f46 Mon Sep 17 00:00:00 2001 From: Robert Ancell Date: Mon, 11 Dec 2017 15:14:12 +1300 Subject: Fix warnings with new g_object_ref type checking in GLib --- liblightdm-gobject/greeter.c | 2 +- src/seat-local.c | 2 +- src/seat-unity.c | 2 +- src/seat.c | 10 +++++----- 4 files changed, 8 insertions(+), 8 deletions(-) diff --git a/liblightdm-gobject/greeter.c b/liblightdm-gobject/greeter.c index dbe05dfe..531a507a 100644 --- a/liblightdm-gobject/greeter.c +++ b/liblightdm-gobject/greeter.c @@ -2291,7 +2291,7 @@ request_get_user_data (GAsyncResult *result) static GObject * request_get_source_object (GAsyncResult *result) { - return g_object_ref (REQUEST (result)->greeter); + return g_object_ref (G_OBJECT (REQUEST (result)->greeter)); } static void diff --git a/src/seat-local.c b/src/seat-local.c index d003b18b..3b9d6729 100644 --- a/src/seat-local.c +++ b/src/seat-local.c @@ -310,7 +310,7 @@ seat_local_create_display_server (Seat *s, Session *session) if (strcmp (session_type, "x") == 0) return DISPLAY_SERVER (create_x_server (seat)); else if (strcmp (session_type, "mir") == 0) - return g_object_ref (get_unity_system_compositor (seat)); + return g_object_ref (DISPLAY_SERVER (get_unity_system_compositor (seat))); else if (strcmp (session_type, "wayland") == 0) return create_wayland_session (seat); else diff --git a/src/seat-unity.c b/src/seat-unity.c index 2c0b750d..16dde12b 100644 --- a/src/seat-unity.c +++ b/src/seat-unity.c @@ -233,7 +233,7 @@ seat_unity_create_display_server (Seat *seat, Session *session) if (strcmp (session_type, "x") == 0) return DISPLAY_SERVER (create_x_server (seat)); else if (strcmp (session_type, "mir") == 0) - return g_object_ref (SEAT_UNITY (seat)->priv->compositor); + return g_object_ref (DISPLAY_SERVER (SEAT_UNITY (seat)->priv->compositor)); else { l_warning (seat, "Can't create unsupported display server '%s'", session_type); diff --git a/src/seat.c b/src/seat.c index fa236e72..14617425 100644 --- a/src/seat.c +++ b/src/seat.c @@ -586,7 +586,7 @@ switch_to_greeter_from_failed_session (Seat *seat, Session *session) else { g_clear_object (&seat->priv->session_to_activate); - seat->priv->session_to_activate = g_object_ref (greeter_session); + seat->priv->session_to_activate = g_object_ref (SESSION (greeter_session)); if (can_share_display_server (seat, session_get_display_server (session))) session_set_display_server (SESSION (greeter_session), session_get_display_server (session)); @@ -1482,7 +1482,7 @@ seat_switch_to_greeter (Seat *seat) return FALSE; g_clear_object (&seat->priv->session_to_activate); - seat->priv->session_to_activate = g_object_ref (greeter_session); + seat->priv->session_to_activate = g_object_ref (SESSION (greeter_session)); display_server = create_display_server (seat, SESSION (greeter_session)); session_set_display_server (SESSION (greeter_session), display_server); @@ -1554,7 +1554,7 @@ switch_authentication_complete_cb (Session *session, Seat *seat) else { g_clear_object (&seat->priv->session_to_activate); - seat->priv->session_to_activate = g_object_ref (greeter_session); + seat->priv->session_to_activate = g_object_ref (SESSION (greeter_session)); display_server = create_display_server (seat, SESSION (greeter_session)); session_set_display_server (SESSION (greeter_session), display_server); @@ -1701,7 +1701,7 @@ seat_lock (Seat *seat, const gchar *username) session_set_display_server (SESSION (greeter_session), display_server); g_clear_object (&seat->priv->session_to_activate); - seat->priv->session_to_activate = g_object_ref (greeter_session); + seat->priv->session_to_activate = g_object_ref (SESSION (greeter_session)); if (reuse_xserver) { @@ -1808,8 +1808,8 @@ seat_real_start (Seat *seat) } g_clear_object (&seat->priv->session_to_activate); - seat->priv->session_to_activate = g_object_ref (greeter_session); session = SESSION (greeter_session); + seat->priv->session_to_activate = g_object_ref (session); display_server = create_display_server (seat, session); session_set_display_server (session, display_server); -- cgit v1.2.1