| Brad Bishop | 26bdd44 | 2019-08-16 17:08:17 -0400 | [diff] [blame] | 1 | From b80108f01b1425427f98341168ea44c4b1a5a2cf Mon Sep 17 00:00:00 2001 |
| 2 | From: Hongxu Jia <hongxu.jia@windriver.com> |
| 3 | Date: Fri, 28 Jun 2019 16:02:13 +0800 |
| 4 | Subject: [PATCH] use lxdm to replace dm-tool |
| 5 | |
| 6 | OE does not support lightdm but lxdm, |
| 7 | so use lxdm to replace dm-tool |
| 8 | |
| 9 | Upstream-Status: Inappropriate [oe specific] |
| 10 | |
| 11 | Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com> |
| 12 | --- |
| 13 | plugins/actions/actions.c | 8 ++++---- |
| 14 | 1 file changed, 4 insertions(+), 4 deletions(-) |
| 15 | |
| 16 | diff --git a/plugins/actions/actions.c b/plugins/actions/actions.c |
| 17 | index 474798e..63eb41d 100644 |
| 18 | --- a/plugins/actions/actions.c |
| 19 | +++ b/plugins/actions/actions.c |
| 20 | @@ -905,12 +905,12 @@ actions_plugin_actions_allowed (void) |
| 21 | GError *error = NULL; |
| 22 | |
| 23 | /* check for commands we use */ |
| 24 | - path = g_find_program_in_path ("dm-tool"); |
| 25 | + path = g_find_program_in_path ("lxdm"); |
| 26 | if (path != NULL) |
| 27 | PANEL_SET_FLAG (allow_mask, ACTION_TYPE_SWITCH_USER); |
| 28 | else |
| 29 | { |
| 30 | - /* check for gdmflexiserver if dm-tool is not present */ |
| 31 | + /* check for gdmflexiserver if lxdm is not present */ |
| 32 | g_free (path); |
| 33 | path = g_find_program_in_path ("gdmflexiserver"); |
| 34 | if (path != NULL) |
| 35 | @@ -1027,9 +1027,9 @@ actions_plugin_action_activate (GtkWidget *widget, |
| 36 | break; |
| 37 | |
| 38 | case ACTION_TYPE_SWITCH_USER: |
| 39 | - path = g_find_program_in_path ("dm-tool"); |
| 40 | + path = g_find_program_in_path ("lxdm"); |
| 41 | if (path != NULL) |
| 42 | - succeed = g_spawn_command_line_async ("dm-tool switch-to-greeter", &error); |
| 43 | + succeed = g_spawn_command_line_async ("lxdm -c USER_SWITCH", &error); |
| 44 | else |
| 45 | succeed = g_spawn_command_line_async ("gdmflexiserver", &error); |
| 46 | g_free (path); |
| 47 | -- |
| 48 | 2.8.1 |
| 49 | |