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