|
| 1 | +From 99aa57bfa59e2578c4ef47e84338f7de85c6f61b Mon Sep 17 00:00:00 2001 |
| 2 | +From: Ray Strode <rstrode@redhat.com> |
| 3 | +Date: Tue, 11 Apr 2023 10:11:05 -0400 |
| 4 | +Subject: [PATCH 2/2] user-manager: Fix another compiler warning |
| 5 | + |
| 6 | +-Wswitch-enum apparently complains about missing entries even if there |
| 7 | +is a default:. |
| 8 | + |
| 9 | +This commit ensures ACT_USER_MANAGER_SEAT_STATE_UNLOADED is added to the |
| 10 | +default case to fix that warning. |
| 11 | +--- |
| 12 | + src/libaccountsservice/act-user-manager.c | 2 ++ |
| 13 | + 1 file changed, 2 insertions(+) |
| 14 | + |
| 15 | +diff --git a/src/libaccountsservice/act-user-manager.c b/src/libaccountsservice/act-user-manager.c |
| 16 | +index 61b4da5..3bbd480 100644 |
| 17 | +--- a/src/libaccountsservice/act-user-manager.c |
| 18 | ++++ b/src/libaccountsservice/act-user-manager.c |
| 19 | +@@ -1727,60 +1727,61 @@ unload_seat (ActUserManager *manager) |
| 20 | + { |
| 21 | + ActUserManagerPrivate *priv = act_user_manager_get_instance_private (manager); |
| 22 | + |
| 23 | + priv->seat.state = ACT_USER_MANAGER_SEAT_STATE_UNLOADED; |
| 24 | + |
| 25 | + g_free (priv->seat.id); |
| 26 | + priv->seat.id = NULL; |
| 27 | + |
| 28 | + g_free (priv->seat.session_id); |
| 29 | + priv->seat.session_id = NULL; |
| 30 | + |
| 31 | + g_debug ("ActUserManager: seat unloaded, so trying to set loaded property"); |
| 32 | + maybe_set_is_loaded (manager); |
| 33 | + } |
| 34 | + |
| 35 | + static void |
| 36 | + load_new_session_incrementally (ActUserManagerNewSession *new_session) |
| 37 | + { |
| 38 | + switch (new_session->state) { |
| 39 | + case ACT_USER_MANAGER_NEW_SESSION_STATE_GET_UID: |
| 40 | + get_uid_for_new_session (new_session); |
| 41 | + break; |
| 42 | + case ACT_USER_MANAGER_NEW_SESSION_STATE_GET_X11_DISPLAY: |
| 43 | + get_x11_display_for_new_session (new_session); |
| 44 | + break; |
| 45 | + case ACT_USER_MANAGER_NEW_SESSION_STATE_MAYBE_ADD: |
| 46 | + maybe_add_new_session (new_session); |
| 47 | + break; |
| 48 | + case ACT_USER_MANAGER_NEW_SESSION_STATE_LOADED: |
| 49 | + break; |
| 50 | ++ case ACT_USER_MANAGER_NEW_SESSION_STATE_UNLOADED: |
| 51 | + default: |
| 52 | + g_assert_not_reached (); |
| 53 | + } |
| 54 | + } |
| 55 | + |
| 56 | + static void |
| 57 | + free_fetch_user_request (ActUserManagerFetchUserRequest *request) |
| 58 | + { |
| 59 | + ActUserManager *manager = request->manager; |
| 60 | + ActUserManagerPrivate *priv = act_user_manager_get_instance_private (manager); |
| 61 | + |
| 62 | + if (request->user != NULL) { |
| 63 | + g_object_set_data (G_OBJECT (request->user), "fetch-user-request", NULL); |
| 64 | + g_object_weak_unref (G_OBJECT (request->user), (GWeakNotify) on_user_destroyed, manager); |
| 65 | + } |
| 66 | + |
| 67 | + priv->fetch_user_requests = g_slist_remove (priv->fetch_user_requests, request); |
| 68 | + if (request->type == ACT_USER_MANAGER_FETCH_USER_FROM_USERNAME_REQUEST) { |
| 69 | + g_free (request->username); |
| 70 | + } |
| 71 | + |
| 72 | + g_free (request->object_path); |
| 73 | + g_free (request->description); |
| 74 | + |
| 75 | + g_cancellable_cancel (request->cancellable); |
| 76 | + g_object_unref (request->cancellable); |
| 77 | + |
| 78 | + |
| 79 | + g_debug ("ActUserManager: unrefing manager owned by fetch user request"); |
| 80 | + g_object_unref (manager); |
| 81 | +@@ -2243,60 +2244,61 @@ load_users (ActUserManager *manager) |
| 82 | + return; |
| 83 | + } |
| 84 | + |
| 85 | + load_user_paths (manager, (const char * const *) user_paths); |
| 86 | + |
| 87 | + load_included_usernames (manager); |
| 88 | + |
| 89 | + priv->list_cached_users_done = TRUE; |
| 90 | + } |
| 91 | + |
| 92 | + static gboolean |
| 93 | + load_seat_incrementally (ActUserManager *manager) |
| 94 | + { |
| 95 | + ActUserManagerPrivate *priv = act_user_manager_get_instance_private (manager); |
| 96 | + |
| 97 | + priv->seat.load_idle_id = 0; |
| 98 | + |
| 99 | + switch (priv->seat.state) { |
| 100 | + case ACT_USER_MANAGER_SEAT_STATE_GET_SESSION_ID: |
| 101 | + get_current_session_id (manager); |
| 102 | + break; |
| 103 | + case ACT_USER_MANAGER_SEAT_STATE_GET_ID: |
| 104 | + get_seat_id_for_current_session (manager); |
| 105 | + break; |
| 106 | + case ACT_USER_MANAGER_SEAT_STATE_GET_SEAT_PROXY: |
| 107 | + get_seat_proxy (manager); |
| 108 | + break; |
| 109 | + case ACT_USER_MANAGER_SEAT_STATE_LOADED: |
| 110 | + g_debug ("ActUserManager: Seat loading sequence complete"); |
| 111 | + break; |
| 112 | ++ case ACT_USER_MANAGER_NEW_SESSION_STATE_UNLOADED: |
| 113 | + default: |
| 114 | + g_assert_not_reached (); |
| 115 | + } |
| 116 | + |
| 117 | + if (priv->seat.state == ACT_USER_MANAGER_SEAT_STATE_LOADED) { |
| 118 | + load_sessions (manager); |
| 119 | + } |
| 120 | + |
| 121 | + maybe_set_is_loaded (manager); |
| 122 | + |
| 123 | + return FALSE; |
| 124 | + } |
| 125 | + |
| 126 | + static gboolean |
| 127 | + load_idle (ActUserManager *manager) |
| 128 | + { |
| 129 | + ActUserManagerPrivate *priv = act_user_manager_get_instance_private (manager); |
| 130 | + |
| 131 | + priv->seat.state = ACT_USER_MANAGER_SEAT_STATE_UNLOADED + 1; |
| 132 | + load_seat_incrementally (manager); |
| 133 | + priv->load_id = 0; |
| 134 | + |
| 135 | + return FALSE; |
| 136 | + } |
| 137 | + |
| 138 | + static void |
| 139 | + queue_load_seat (ActUserManager *manager) |
| 140 | + { |
| 141 | + ActUserManagerPrivate *priv = act_user_manager_get_instance_private (manager); |
| 142 | + |
| 143 | +-- |
| 144 | +2.39.2 |
| 145 | + |
0 commit comments