Merge lp:~ubuntu-mate-dev/indicator-session/mate-integration into lp:indicator-session

[Martin Wimpress ]

This merge proposal adds the remaining support for MATE Desktop. When MATE is the desktop session:

  * "About This Computer" launches `mate-system-monitor --show-system-tab`
  * "Ubuntu Help..." launches the MATE User Guide.
  * "System Settings..." launches `mate-control-center`
  * "Lock/Switch Account..." invokes `mate-screensaver-command --lock`

`mate-system-monitor` is added to debian/control Suggests: to provide the hint it is required for MATE. It is installed by default in Ubuntu MATE.

`mate-user-guide` is added to debian/control Suggests: to provide the hint it is required for MATE. It is installed by default in Ubuntu MATE.

`have_mate_program()` checks that the active session is MATE and the required program exists, making this a safe mechanism to launch `"yelp help:mate-user-guide` specifically for MATE and fall through the just `yelp` on the other desktop environments.

[lp:~ubuntu-mate-dev/indicator-session/mate-integration]

497. By Martin Wimpress  on 2017-06-14

Fold some code. Turn discrete functions into a single generic function.

498. By Martin Wimpress  on 2017-06-14

debian/control: Add Suggests (indicator-session) mate-system-monitor.

499. By Martin Wimpress  on 2017-06-14

Add support for mate-user-guide.

500. By Martin Wimpress  on 2017-06-14

Split XDG_CURRENT_DESKTOP by : and compare each desktop.

[Iain Lane (laney)]

Some small refactoring then looks good.

review: Needs Fixing

[lp:~ubuntu-mate-dev/indicator-session/mate-integration]

501. By Martin Wimpress  on 2017-06-16

Refactor have_mate_program() as per the review comments.

502. By Martin Wimpress  on 2017-06-16

Add support for mate-session-save to handle prompts for shutdown, reboot, log-out, etc.

[Martin Wimpress  (flexiondotorg)]

> Some small refactoring then looks good.

I've refactored have_mate_program() as per you comments. I've also add support for mate-session-save to handle the prompts for shutdown, reboot, etc.

[Jeremy Bícha (jbicha)]

Could you drop the added suggests? That feels like something that MATE should be depending on or recommending rather than indicator-session.

[lp:~ubuntu-mate-dev/indicator-session/mate-integration]

503. By Martin Wimpress  on 2017-06-20

debian/control: Drop Suggests (indicator-session) mate-system-monitor and mate-user-guide as per the review comments.

504. By Martin Wimpress  on 2017-07-15

Remove unnecessary declaration. Whitespace cleanup.

505. By Martin Wimpress  on 2017-07-15

Drop changelog changes.

506. By Martin Wimpress  on 2017-07-17

Declare desktop_names as (const gchar * const *)

507. By Martin Wimpress  on 2017-07-17

Declare desktop_name as GStrv and cast desktop_name to (const gchar * const *)

[Iain Lane (laney)]

ty, looks good to me

review: Approve

[lp:~ubuntu-mate-dev/indicator-session/mate-integration]

508. By Martin Wimpress  on 2017-07-17

debian/changelog: Add MATE Desktop support. (LP: #1697792)

=== modified file 'debian/changelog'
--- debian/changelog	2017-06-05 14:22:45 +0000
+++ debian/changelog	2017-07-17 19:15:26 +0000
@@ -1,3 +1,9 @@
+indicator-session (17.3.20+17.10.20170717-0ubuntu1) artful; urgency=medium
+
+  * Add MATE Desktop support. (LP: #1697792)
+
+ -- Martin Wimpress <[e-mail]>  Mon, 17 Jul 2017 20:13:27 +0100
+
 indicator-session (17.3.20+17.10.20170605-0ubuntu1) artful; urgency=medium
 
   * Don't recommend obsolete Ubuntu Online Accounts settings panel

=== modified file 'debian/control'
--- debian/control	2017-06-05 13:55:18 +0000
+++ debian/control	2017-07-17 19:15:26 +0000
@@ -38,7 +38,7 @@
             unity-control-center | gnome-control-center | mate-control-center,
 Suggests: lightdm,
           apport,
-          zenity
+          zenity,
 Description: indicator showing session management, status and user switching
  This indicator is designed to be placed on the right side of a panel and
  give the user easy control for changing their instant message status.  

=== modified file 'src/backend-dbus/actions.c'
--- src/backend-dbus/actions.c	2017-06-05 13:54:46 +0000
+++ src/backend-dbus/actions.c	2017-07-17 19:15:26 +0000
@@ -90,10 +90,29 @@
 {
   PROMPT_NONE,
   PROMPT_WITH_ZENITY,
-  PROMPT_WITH_UNITY
+  PROMPT_WITH_UNITY,
+  PROMPT_WITH_MATE
 }
 prompt_status_t;
 
+static gboolean
+have_mate_program (const gchar *program)
+{
+  const gchar *xdg_current_desktop;
+  g_auto(GStrv) desktop_names = NULL;
+
+  xdg_current_desktop = g_getenv ("XDG_CURRENT_DESKTOP");
+  if (xdg_current_desktop != NULL) {
+    desktop_names = g_strsplit (xdg_current_desktop, ":", 0);
+    if (g_strv_contains ((const gchar * const *) desktop_names, "MATE")) {
+      g_autofree gchar *path = g_find_program_in_path (program);
+      return path != NULL;
+    }
+  }
+
+  return FALSE;
+}
+
 static prompt_status_t
 get_prompt_status (IndicatorSessionActionsDbus * self)
 {
@@ -102,6 +121,10 @@
 
   if (!g_settings_get_boolean (p->indicator_settings, "suppress-logout-restart-shutdown"))
     {
+      /* can we use the MATE prompt? */
+      if ((prompt == PROMPT_NONE) && have_mate_program ("mate-session-save"))
+          prompt = PROMPT_WITH_MATE;
+
       /* can we use the Unity prompt? */
       if ((prompt == PROMPT_NONE) && p && p->end_session_dialog)
         {
@@ -723,6 +746,15 @@
 }
 
 static void
+run_outside_app (const char * cmd)
+{
+  GError * err = NULL;
+  g_debug ("%s calling \"%s\"", G_STRFUNC, cmd);
+  g_spawn_command_line_async (cmd, &err);
+  log_and_clear_error (&err, G_STRLOC, G_STRFUNC);
+}
+
+static void
 my_logout (IndicatorSessionActions * actions)
 {
   IndicatorSessionActionsDbus * self = INDICATOR_SESSION_ACTIONS_DBUS (actions);
@@ -733,6 +765,11 @@
         show_unity_end_session_dialog (self, END_SESSION_TYPE_LOGOUT);
         break;
 
+      case PROMPT_WITH_MATE:
+        /* --logout-dialog presents Logout and (if available) Switch User options */
+        run_outside_app ("mate-session-save --logout-dialog");
+        break;
+
       case PROMPT_NONE:
         logout_now (self);
         break;
@@ -770,6 +807,11 @@
         show_unity_end_session_dialog (self, END_SESSION_TYPE_REBOOT);
         break;
 
+      case PROMPT_WITH_MATE:
+        /* --shutdown-dialog presents Restart, Shutdown and (if available) Suspend options */
+        run_outside_app ("mate-session-save --shutdown-dialog");
+        break;
+
       case PROMPT_NONE:
         reboot_now (self);
         break;
@@ -799,6 +841,11 @@
         show_unity_end_session_dialog (self, END_SESSION_TYPE_REBOOT);
         break;
 
+      case PROMPT_WITH_MATE:
+        /* --shutdown-dialog presents Restart, Shutdown and (if available) Suspend options */
+        run_outside_app ("mate-session-save --shutdown-dialog");
+        break;
+
       case PROMPT_WITH_ZENITY:
         if (zenity_question (self,
               "system-shutdown",
@@ -820,19 +867,12 @@
 ***/
 
 static void
-run_outside_app (const char * cmd)
-{
-  GError * err = NULL;
-  g_debug ("%s calling \"%s\"", G_STRFUNC, cmd);
-  g_spawn_command_line_async (cmd, &err);
-  log_and_clear_error (&err, G_STRLOC, G_STRFUNC);
-}
-
-static void
 my_help (IndicatorSessionActions * self G_GNUC_UNUSED)
 {
   if (g_getenv ("MIR_SOCKET") != NULL)
     url_dispatch_send("http://www.askubuntu.com", NULL, NULL);
+  else if (have_mate_program ("yelp"))
+    run_outside_app ("yelp help:mate-user-guide");
   else
     run_outside_app ("yelp");
 }
@@ -876,6 +916,8 @@
     url_dispatch_send("settings:///system", NULL, NULL);
   else if (have_unity_control_center ())
     run_outside_app ("unity-control-center");
+  else if (have_mate_program ("mate-control-center"))
+    run_outside_app ("mate-control-center");
   else
     run_outside_app ("gnome-control-center");
 }
@@ -898,6 +940,8 @@
     url_dispatch_send("settings:///system/about", NULL, NULL);
   else if (have_unity_control_center ())
     run_outside_app ("unity-control-center info");
+  else if (have_mate_program ("mate-system-monitor"))
+    run_outside_app ("mate-system-monitor --show-system-tab");
   else
     run_outside_app ("gnome-control-center info");
 }
@@ -922,6 +966,10 @@
           unity_session_call_lock (p->unity_session, p->cancellable, NULL, NULL);
         }
     }
+  else if (have_mate_program ("mate-screensaver-command"))
+    {
+      run_outside_app ("mate-screensaver-command --lock");
+    }
   else
     {
       g_return_if_fail (p->screen_saver != NULL);