[gtk/issue1084: 250/250] Merge branch 'master' into 'issue1084'
- From: Matthias Clasen <matthiasc src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gtk/issue1084: 250/250] Merge branch 'master' into 'issue1084'
- Date: Wed, 20 Jun 2018 14:23:24 +0000 (UTC)
commit cd99f82e0c16e565490480ff8d9f9e1ffbc23018
Merge: 07d6c53346 29fee2e808
Author: Matthias Clasen <mclasen redhat com>
Date: Wed Jun 20 14:21:24 2018 +0000
Merge branch 'master' into 'issue1084'
# Conflicts:
# gdk/gdk.c
.gitlab-ci/test-msys2.sh | 1 +
config.h.meson | 10 +
demos/gtk-demo/clipboard.c | 4 +-
demos/gtk-demo/demo.gresource.xml | 12 +-
demos/gtk-demo/event_axes.c | 2 +-
demos/gtk-demo/images.c | 60 +-
demos/gtk-demo/meson.build | 3 +-
demos/gtk-demo/popover.c | 2 +-
demos/gtk-demo/puzzlepiece.c | 220 ++
demos/gtk-demo/puzzlepiece.h | 23 +
demos/gtk-demo/sliding_puzzle.c | 485 +++
demos/icon-browser/iconbrowserwin.c | 2 -
docs/dnd_internals.txt | 2 +-
docs/reference/gdk/gdk4-sections.txt | 19 +-
docs/reference/gdk/meson.build | 16 +-
docs/reference/gtk/getting_started.xml | 45 +-
docs/reference/gtk/gtk4-docs.xml | 2 +
docs/reference/gtk/gtk4-sections.txt | 44 +-
docs/reference/gtk/input-handling.xml | 35 -
examples/search-bar.c | 20 +-
gdk/broadway/gdkdevice-broadway.c | 10 -
gdk/broadway/gdkdisplay-broadway.h | 3 -
gdk/broadway/gdkdnd-broadway.c | 20 -
gdk/broadway/gdkeventsource.c | 2 +-
gdk/broadway/gdkprivate-broadway.h | 1 -
gdk/broadway/gdksurface-broadway.c | 31 +-
gdk/gdk-autocleanup.h | 3 +-
gdk/gdk-private.h | 9 +-
gdk/gdk.c | 14 +
gdk/gdk.h | 1 +
gdk/gdkclipboard.c | 24 +-
gdk/gdkcontentserializer.c | 4 +-
gdk/gdkdeviceprivate.h | 3 -
gdk/gdkdisplay.c | 20 +-
gdk/gdkdisplayprivate.h | 4 +-
gdk/gdkdnd.c | 250 +-
gdk/gdkdnd.h | 52 +-
gdk/gdkdndprivate.h | 27 +-
gdk/gdkdrop.c | 979 +++++
gdk/gdkdrop.h | 98 +
gdk/gdkdropprivate.h | 81 +
gdk/gdkevents.c | 44 +-
gdk/gdkevents.h | 5 +-
gdk/gdkeventsprivate.h | 4 +-
gdk/gdkinternals.h | 2 -
gdk/gdkseatdefault.c | 6 +-
gdk/gdksurface.c | 207 +-
gdk/gdksurface.h | 22 +-
gdk/gdksurfaceimpl.h | 4 -
gdk/gdktypes.h | 30 +
gdk/meson.build | 2 +
gdk/quartz/GdkQuartzNSWindow.c | 26 +-
gdk/quartz/gdkdevice-core-quartz.c | 11 -
gdk/quartz/gdkdisplay-quartz.h | 1 -
gdk/quartz/gdkdnd-quartz.c | 19 -
gdk/quartz/gdkeventloop-quartz.c | 2 +-
gdk/quartz/gdkevents-quartz.c | 2 +-
gdk/quartz/gdksurface-quartz.c | 19 -
gdk/wayland/gdkdevice-wayland.c | 229 +-
gdk/wayland/gdkdisplay-wayland.c | 21 +-
gdk/wayland/gdkdisplay-wayland.h | 2 -
gdk/wayland/gdkdnd-wayland.c | 463 +--
gdk/wayland/gdkdrop-wayland.c | 325 ++
gdk/wayland/gdkprivate-wayland.h | 41 +-
gdk/wayland/gdkselection-wayland.c | 204 --
gdk/wayland/gdksurface-wayland.c | 19 -
gdk/wayland/meson.build | 1 +
gdk/win32/gdkcairocontext-win32.c | 12 +-
gdk/win32/gdkclipboard-win32.c | 8 +-
gdk/win32/gdkclipdrop-win32.c | 268 +-
gdk/win32/gdkclipdrop-win32.h | 72 +-
gdk/win32/gdkdevice-virtual.c | 8 -
gdk/win32/gdkdevice-win32.c | 8 -
gdk/win32/gdkdevice-wintab.c | 12 -
gdk/win32/gdkdevicemanager-win32.c | 36 -
gdk/win32/gdkdisplay-win32.c | 4 +
gdk/win32/gdkdisplaymanager-win32.c | 5 -
gdk/win32/gdkdrag-win32.c | 1261 +++----
gdk/win32/gdkdrop-win32.c | 1185 +++---
gdk/win32/gdkevents-win32.c | 205 +-
gdk/win32/gdkhdataoutputstream-win32.c | 3 +-
gdk/win32/gdkmain-win32.c | 2 -
gdk/win32/gdkprivate-win32.h | 10 +-
gdk/win32/gdkproperty-win32.c | 44 -
gdk/win32/gdkscreen-win32.c | 1 -
gdk/win32/gdkselection-win32.c | 2866 ---------------
gdk/win32/gdkselection-win32.h | 230 --
gdk/win32/gdksurface-win32.c | 186 +-
gdk/win32/gdksurface-win32.h | 12 +-
gdk/win32/gdkwin32dnd-private.h | 130 +-
gdk/win32/gdkwin32dnd.h | 17 -
gdk/win32/gdkwin32misc.h | 3 -
gdk/x11/gdkdevice-core-x11.c | 52 -
gdk/x11/gdkdevice-xi2.c | 29 -
gdk/x11/gdkdevicemanager-core-x11.c | 8 +-
gdk/x11/gdkdisplay-x11.c | 15 +-
gdk/x11/gdkdisplay-x11.h | 2 +-
gdk/x11/gdkdnd-x11.c | 1031 +-----
gdk/x11/gdkdrop-x11.c | 858 +++++
gdk/x11/gdkeventsource.c | 26 +-
gdk/x11/gdkeventtranslator.c | 2 +-
gdk/x11/gdkprivate-x11.h | 20 +-
gdk/x11/gdkscreen-x11.h | 2 -
gdk/x11/gdksurface-x11.c | 195 +-
gdk/x11/gdkx11surface.h | 3 -
gdk/x11/meson.build | 1 +
gdk/x11/xsettings-client.c | 5 +-
gsk/gl/gskgldriver.c | 6 +-
gsk/gl/gskglrenderer.c | 30 +-
gsk/gskprofiler.c | 2 +-
gtk/a11y/gtk-a11y-autocleanups.h | 1 -
gtk/a11y/gtkentryaccessible.c | 4 +-
gtk/a11y/gtkpictureaccessible.c | 136 +
gtk/a11y/gtkpictureaccessibleprivate.h | 34 +
gtk/a11y/gtkwidgetaccessible.c | 42 +-
gtk/a11y/gtkwidgetaccessible.h | 2 +
gtk/a11y/meson.build | 1 +
gtk/gtk-a11y.h | 2 +-
gtk/gtk.h | 1 +
gtk/gtkaboutdialog.c | 2 +-
gtk/gtkaspectframe.c | 2 -
gtk/gtkbin.c | 4 +-
gtk/gtkbin.h | 3 +-
gtk/gtkbox.c | 22 -
gtk/gtkbuilder.c | 306 +-
gtk/gtkbuilder.h | 22 +-
gtk/gtkbutton.c | 48 +-
gtk/gtkcalendar.c | 83 +-
gtk/gtkcellrendererpixbuf.c | 17 +-
gtk/gtkcenterbox.c | 69 +-
gtk/gtkcolorbutton.c | 70 +-
gtk/gtkcolorbutton.h | 4 -
gtk/gtkcolorscale.c | 25 +-
gtk/gtkcolorscaleprivate.h | 3 -
gtk/gtkcolorswatch.c | 8 +-
gtk/gtkcombobox.c | 206 +-
gtk/gtkcombobox.h | 4 -
gtk/gtkcssnode.c | 15 -
gtk/gtkcssnodeprivate.h | 1 -
gtk/gtkdnd-quartz.c | 1610 ---------
gtk/gtkdnd.c | 257 +-
gtk/gtkdnd.h | 9 +-
gtk/gtkdragdest.c | 12 +-
gtk/gtkdragdest.h | 6 +-
gtk/gtkdrawingarea.c | 9 +-
gtk/gtkentry.c | 125 +-
gtk/gtkexpander.c | 22 +-
gtk/gtkfilechooserbutton.c | 282 +-
gtk/gtkfilechooserbutton.h | 6 +-
gtk/gtkfilechooserentry.c | 21 +-
gtk/gtkfilechoosernativewin32.c | 2 +-
gtk/gtkfilechooserwidget.c | 68 +-
gtk/gtkfontbutton.c | 228 +-
gtk/gtkfontbutton.h | 10 +-
gtk/gtkfontchooserdialog.c | 13 +-
gtk/gtkgesture.c | 12 +-
gtk/gtkgesturemultipress.c | 7 +-
gtk/gtkheaderbar.c | 35 +-
gtk/gtkiconcache.c | 2 +-
gtk/gtkiconhelper.c | 270 +-
gtk/gtkiconhelperprivate.h | 9 +-
gtk/gtkicontheme.c | 4 +-
gtk/gtkiconview.c | 158 +-
gtk/gtkimage.c | 150 +-
gtk/gtkimage.h | 10 -
gtk/gtkimcontextime.c | 1 -
gtk/gtkimcontextsimple.c | 5 +
gtk/gtklabel.c | 6 +-
gtk/gtklinkbutton.c | 2 -
gtk/gtklistbox.c | 8 +-
gtk/gtkmain.c | 39 +-
gtk/gtkmain.h | 6 +
gtk/gtkmarshalers.list | 4 +-
gtk/gtkmessagedialog.c | 38 +-
gtk/gtkmessagedialog.h | 4 -
gtk/gtknotebook.c | 118 +-
gtk/gtkoverlay.c | 115 +-
gtk/gtkoverlay.h | 7 +
gtk/gtkpaned.c | 245 +-
gtk/gtkpathbar.c | 4 -
gtk/gtkpicture.c | 975 +++++
gtk/gtkpicture.h | 92 +
gtk/gtkplacessidebar.c | 114 +-
gtk/gtkplacessidebarprivate.h | 2 +-
gtk/gtkpopover.c | 4 +-
gtk/gtkprintoperation-win32.c | 28 +-
gtk/gtkradiobutton.c | 52 +-
gtk/gtkradiobutton.h | 6 +-
gtk/gtkrange.c | 4 +-
gtk/gtkrendernodepaintable.c | 4 +-
gtk/gtkscrolledwindow.c | 304 +-
gtk/gtkscrolledwindow.h | 5 +-
gtk/gtksizerequest.c | 16 +-
gtk/gtksnapshot.c | 12 +-
gtk/gtkspinbutton.c | 31 +-
gtk/gtkstackswitcher.c | 14 +-
gtk/gtkstatusbar.c | 42 +-
gtk/gtkstatusbar.h | 12 +-
gtk/gtkstylecontext.c | 68 +-
gtk/gtkstylecontext.h | 6 -
gtk/gtkstyleprovider.h | 2 +-
gtk/gtktextview.c | 123 +-
gtk/gtktoolbar.c | 27 +-
gtk/gtktreeview.c | 235 +-
gtk/gtkvideo.c | 10 +-
gtk/gtkwidget.c | 757 ++--
gtk/gtkwidget.h | 27 +-
gtk/gtkwidgetpaintable.c | 8 +-
gtk/gtkwin32.c | 9 +-
gtk/gtkwindow.c | 610 ++--
gtk/gtkwindow.h | 11 +-
gtk/inspector/inspectoroverlay.c | 6 -
gtk/meson.build | 17 +-
gtk/theme/Adwaita/_common.scss | 17 +-
gtk/theme/HighContrast/_common.scss | 17 +-
gtk/ui/gtkvideo.ui | 4 +-
gtk/updateiconcache.c | 2 +-
meson.build | 126 +
modules/printbackends/gtkprintbackendfile.c | 2 +-
po-properties/POTFILES.in | 5 +-
po-properties/pl.po | 562 +--
po/POTFILES.in | 5 +-
po/gl.po | 4757 +++++++++++++++++--------
po/pl.po | 194 +-
tests/testdnd.c | 105 +-
tests/testdnd2.c | 5 +-
tests/testentryicons.c | 1 -
tests/testimage.c | 1 -
tests/testlist3.c | 4 +-
tests/testnotebookdnd.c | 3 +-
tests/testtoolbar.c | 27 +-
tests/testtreednd.c | 3 +-
testsuite/css/nodes/box-packing.rtl.nodes | 2 +-
testsuite/css/nodes/box.rtl.nodes | 4 +-
testsuite/css/nodes/expander.rtl.nodes | 2 +-
testsuite/css/nodes/notebook.bottom.rtl.nodes | 8 +-
testsuite/css/nodes/notebook.top.rtl.nodes | 8 +-
testsuite/css/nodes/paned.rtl.nodes | 4 +-
testsuite/gtk/gestures.c | 6 +-
testsuite/gtk/main.c | 30 +
testsuite/gtk/meson.build | 1 +
testsuite/gtk/notify.c | 9 +
testsuite/gtk/objects-finalize.c | 3 +-
243 files changed, 13051 insertions(+), 14804 deletions(-)
---
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
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]
