[recipes] Make the portal check more comprehensive

[Matthias Clasen <matthiasc src gnome org>]

commit f2e3d4d023db9b6990005b7dcab9da5983d584f8
Author: Matthias Clasen <mclasen redhat com>
Date:   Tue Mar 14 19:34:02 2017 -0400

    Make the portal check more comprehensive
    
    Check for the particular portal we need, and show the
    dialog in one place.

 src/gr-utils.c |   69 +++++++++++++++++++++++++++++++++++++++-----------------
 src/gr-utils.h |    3 +-
 2 files changed, 50 insertions(+), 22 deletions(-)
---
diff --git a/src/gr-utils.c b/src/gr-utils.c
index ced60f8..3134a66 100644
--- a/src/gr-utils.c
+++ b/src/gr-utils.c
@@ -433,31 +433,58 @@ in_flatpak_sandbox (void)
 }
 
 gboolean
-portals_available (void)
+portal_available (GtkWindow  *window,
+                  const char *interface)
 {
-        static GDBusProxy *portal = NULL;
+        g_autoptr(GDBusConnection) bus = NULL;
+        g_autoptr(GDBusProxy) proxy = NULL;
         g_autofree char *owner = NULL;
-
-        if (portal == NULL) {
-                g_autoptr(GDBusConnection) bus = NULL;
-
-                bus = g_bus_get_sync (G_BUS_TYPE_SESSION, NULL, NULL);
-               if (!bus)
-                       return FALSE;
-
-                portal = g_dbus_proxy_new_sync (bus,
-                                                0,
-                                                NULL,
-                                                "org.freedesktop.portal.Desktop",
-                                                "/org/freedesktop/portal/desktop",
-                                                "org.freedesktop.portal.FileChooser",
-                                                NULL,
-                                                NULL);
+        g_autoptr(GVariant) version = NULL;
+        const char *message1;
+        const char *message2;
+        GtkWidget *dialog;
+
+        bus = g_bus_get_sync (G_BUS_TYPE_SESSION, NULL, NULL);
+        if (!bus) {
+                message1 = _("Could not connect to the session bus from inside the Flatpak sandbox.");
+                message2 = _("Certain functionality will not be available.");
+                goto dialog;
         }
 
-        owner = g_dbus_proxy_get_name_owner (portal);
+        proxy = g_dbus_proxy_new_sync (bus,
+                                       0,
+                                       NULL,
+                                       "org.freedesktop.portal.Desktop",
+                                       "/org/freedesktop/portal/desktop",
+                                       interface,
+                                       NULL,
+                                       NULL);
+
+        owner = g_dbus_proxy_get_name_owner (proxy);
+        version = g_dbus_proxy_get_cached_property (proxy, "version");
+
+        if (owner != NULL && version != NULL)
+                return TRUE;
+
+        if (strcmp (interface, "org.freedesktop.portal.FileChooser") == 0)
+                message1 = _("Missing the desktop portal needed to open files from inside a Flatpak 
sandbox.");
+        else if (strcmp (interface, "org.freedestkop.portal.Printing") == 0)
+                message1 = _("Missing the desktop portal needed to print from inside a Flatpak sandbox.");
+        else if (strcmp (interface, "org.freedesktop.portal.OpenURI") == 0)
+                message1 = _("Missing the desktop portal needed to open URLs from inside a Flatpak 
sandbox.");
+
+        message2 = _("Please install xdg-desktop-portal and xdg-desktop-portal-gtk on your system");
 
-        return owner != NULL;
+dialog:
+        dialog = gtk_message_dialog_new (window,
+                                         GTK_DIALOG_MODAL|GTK_DIALOG_DESTROY_WITH_PARENT,
+                                         GTK_MESSAGE_ERROR,
+                                         GTK_BUTTONS_CLOSE,
+                                         "%s %s", message1, message2);
+        g_signal_connect (dialog, "response", G_CALLBACK (gtk_widget_destroy), NULL);
+        gtk_widget_show (dialog);
+
+        return FALSE;
 }
 
 void
diff --git a/src/gr-utils.h b/src/gr-utils.h
index eea9ac2..915d266 100644
--- a/src/gr-utils.h
+++ b/src/gr-utils.h
@@ -57,7 +57,8 @@ void stop_recording (void);
 void record_step (const char *blurb);
 
 gboolean in_flatpak_sandbox (void);
-gboolean portals_available (void);
+gboolean portal_available (GtkWindow  *window,
+                           const char *portal);
 
 void all_headers (GtkListBoxRow *row,
                   GtkListBoxRow *before,