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