[gnome-builder/gnome-builder-3-32] flatpak: remove warning workaround

[Christian Hergert <chergert src gnome org>]

commit 75dd662e64a9823b7320c3ecb52679ba5d2648d6
Author: Christian Hergert <chergert redhat com>
Date:   Sat Apr 27 16:44:59 2019 -0700

    flatpak: remove warning workaround
    
    This alters behavior, so it has to go.

 src/plugins/flatpak/gbp-flatpak-runner.c | 29 -----------------------------
 1 file changed, 29 deletions(-)
---
diff --git a/src/plugins/flatpak/gbp-flatpak-runner.c b/src/plugins/flatpak/gbp-flatpak-runner.c
index 15a009260..0b9ac50b1 100644
--- a/src/plugins/flatpak/gbp-flatpak-runner.c
+++ b/src/plugins/flatpak/gbp-flatpak-runner.c
@@ -40,28 +40,6 @@ struct _GbpFlatpakRunner
 
 G_DEFINE_TYPE (GbpFlatpakRunner, gbp_flatpak_runner, IDE_TYPE_RUNNER)
 
-static const gchar *
-get_user_install_path (void)
-{
-  static gchar *path;
-
-  if (g_once_init_enter (&path))
-    {
-      g_autoptr(GFile) file = NULL;
-      g_autoptr(FlatpakInstallation) installation = NULL;
-      gchar *real_path;
-
-      if ((installation = flatpak_installation_new_user (NULL, NULL)))
-        real_path = g_file_get_path (flatpak_installation_get_path (installation));
-      else
-        real_path = g_build_filename (g_get_user_data_dir (), "flatpak", NULL);
-
-      g_once_init_leave (&path, g_steal_pointer (&real_path));
-    }
-
-  return path;
-}
-
 static IdeSubprocessLauncher *
 gbp_flatpak_runner_create_launcher (IdeRunner *runner)
 {
@@ -162,13 +140,6 @@ gbp_flatpak_runner_fixup_launcher (IdeRunner             *runner,
 
   ide_subprocess_launcher_insert_argv (launcher, i++, "--talk-name=org.freedesktop.portal.*");
 
-  /* Override FLAPTAK_USER_DIR to keep flatpak from complaining */
-  if (!ide_subprocess_launcher_getenv (launcher, "FLATPAK_USER_DIR"))
-    ide_subprocess_launcher_setenv (launcher,
-                                    "FLATPAK_USER_DIR",
-                                    get_user_install_path (),
-                                    TRUE);
-
   /* Proxy environment stuff to the launcher */
   if ((env = ide_runner_get_environment (runner)) &&
       (environ_ = ide_environment_get_environ (env)))