From: Matthias Clasen <mclasen@redhat.com>
Date: Wed, 20 Jun 2018 14:21:24 +0000 (+0000)
Subject: Merge branch 'master' into 'issue1084'
X-Git-Tag: archive/raspbian/4.4.1+ds1-2+rpi1^2~18^2~22^2~51^2
X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=cd99f82e0c16e565490480ff8d9f9e1ffbc23018;p=gtk4.git

Merge branch 'master' into 'issue1084'

# Conflicts:
#   gdk/gdk.c
---

cd99f82e0c16e565490480ff8d9f9e1ffbc23018
diff --cc gdk/gdk-private.h
index c6a45ed48f,2d96acc2da..f6c712c3e7
--- a/gdk/gdk-private.h
+++ b/gdk/gdk-private.h
@@@ -39,7 -31,6 +31,8 @@@ void gdk_display_set_double_click_dista
  void gdk_display_set_cursor_theme          (GdkDisplay   *display,
                                              const char   *theme,
                                              int           size);
+ gboolean gdk_running_in_sandbox (void);
  
 +const gchar *   gdk_get_startup_notification_id (void);
 +
  #endif /* __GDK__PRIVATE_H__ */
diff --cc gdk/gdk.c
index 94d27ee87e,b92d374cc9..b6c3bda972
--- a/gdk/gdk.c
+++ b/gdk/gdk.c
@@@ -250,22 -216,19 +250,35 @@@ gdk_display_open_default (void
    return display;
  }
  
 +/*< private >
 + *
 + * gdk_get_startup_notification_id
 + *
 + * Returns the original value of the DESKTOP_STARTUP_ID environment
 + * variable if it was defined and valid, or %NULL otherwise.
 + *
 + * Returns: (nullable) (transfer none): the original value of the
 + *   DESKTOP_STARTUP_ID environment variable, or %NULL.
 + */
 +const gchar *
 +gdk_get_startup_notification_id (void)
 +{
 +  return startup_notification_id;
 +}
 +
+ gboolean
+ gdk_running_in_sandbox (void)
+ {
+   char *path;
+   gboolean ret;
+ 
+   path = g_build_filename (g_get_user_runtime_dir (), "flatpak-info", NULL);
+   ret = g_file_test (path, G_FILE_TEST_EXISTS);
+   g_free (path);
+ 
+   return ret;
+ }
+ 
  /**
   * SECTION:threads
   * @Short_description: Functions for using GDK in multi-threaded programs