diff -Nru xfce4-panel-4.11.1/debian/changelog xfce4-panel-4.11.1/debian/changelog --- xfce4-panel-4.11.1/debian/changelog 2014-06-23 05:28:51.000000000 +0000 +++ xfce4-panel-4.11.1/debian/changelog 2014-10-14 10:16:55.000000000 +0000 @@ -1,3 +1,10 @@ +xfce4-panel (4.11.1-0ubuntu2) utopic; urgency=medium + + * debian/patches/02_support-dmtool.patch + - Add support for dm-tool for user-switching (LP: #1320560) + + -- Sean Davis Tue, 14 Oct 2014 06:15:01 -0400 + xfce4-panel (4.11.1-0ubuntu1) utopic; urgency=medium * New upstream release diff -Nru xfce4-panel-4.11.1/debian/patches/02_support-dmtool.patch xfce4-panel-4.11.1/debian/patches/02_support-dmtool.patch --- xfce4-panel-4.11.1/debian/patches/02_support-dmtool.patch 1970-01-01 00:00:00.000000000 +0000 +++ xfce4-panel-4.11.1/debian/patches/02_support-dmtool.patch 2014-10-11 15:34:29.000000000 +0000 @@ -0,0 +1,51 @@ +Description: Support gdmflexiserver or dm-tool + gdmflexiserver is no longer provided by lightdm. Use dm-tool if it is + available. +Author: Sean Davis +Bug-Ubuntu: https://launchpad.net/bugs/1320560 +Last-Update: 2014-10-11 +--- +This patch header follows DEP-3: http://dep.debian.net/deps/dep3/ +--- a/plugins/actions/actions.c ++++ b/plugins/actions/actions.c +@@ -860,9 +860,17 @@ + GError *error = NULL; + + /* check for commands we use */ +- path = g_find_program_in_path ("gdmflexiserver"); ++ path = g_find_program_in_path ("dm-tool"); + if (path != NULL) + PANEL_SET_FLAG (allow_mask, ACTION_TYPE_SWITCH_USER); ++ else ++ { ++ /* check for gdmflexiserver if no dm-tool */ ++ g_free (path); ++ path = g_find_program_in_path ("gdmflexiserver"); ++ if (path != NULL) ++ PANEL_SET_FLAG (allow_mask, ACTION_TYPE_SWITCH_USER); ++ } + g_free (path); + + path = g_find_program_in_path ("xflock4"); +@@ -915,6 +923,7 @@ + gboolean unattended = FALSE; + GError *error = NULL; + gboolean succeed = FALSE; ++ gchar *path; + + entry = g_object_get_qdata (G_OBJECT (widget), action_quark); + panel_return_if_fail (entry != NULL); +@@ -958,7 +967,12 @@ + break; + + case ACTION_TYPE_SWITCH_USER: +- succeed = g_spawn_command_line_async ("gdmflexiserver", &error); ++ path = g_find_program_in_path ("dm-tool"); ++ if (path != NULL) ++ succeed = g_spawn_command_line_async ("dm-tool switch-to-greeter", &error); ++ else ++ succeed = g_spawn_command_line_async ("gdmflexiserver", &error); ++ g_free (path); + break; + + case ACTION_TYPE_LOCK_SCREEN: diff -Nru xfce4-panel-4.11.1/debian/patches/series xfce4-panel-4.11.1/debian/patches/series --- xfce4-panel-4.11.1/debian/patches/series 2014-06-23 05:28:51.000000000 +0000 +++ xfce4-panel-4.11.1/debian/patches/series 2014-10-14 10:14:20.000000000 +0000 @@ -1,2 +1,3 @@ 01_support-non-multiarch-modules.patch xubuntu_migrate-tasklist-separator.patch +02_support-dmtool.patch