diff options
| author | Matthias Clasen <mclasen@redhat.com> | 2020-08-21 22:36:45 +0000 |
|---|---|---|
| committer | Matthias Clasen <mclasen@redhat.com> | 2020-08-21 22:36:45 +0000 |
| commit | 7a9501b1fbae43f9500c68469f2e81224b5caa84 (patch) | |
| tree | dcdee45b7d1dc5d31a093baac872e0f960654135 | |
| parent | ab5e62ddab4325d7bd7c9fd88d9fb97229d4ae44 (diff) | |
| parent | f4511ff91c2ee541ab91389c3d09f6099f23a430 (diff) | |
| download | gtk+-7a9501b1fbae43f9500c68469f2e81224b5caa84.tar.gz | |
Merge branch 'matthiasc/for-master' into 'master'
Matthiasc/for master
See merge request GNOME/gtk!2461
| -rw-r--r-- | gtk/gtkapplication-dbus.c | 10 | ||||
| -rw-r--r-- | subprojects/pango.wrap | 1 | ||||
| -rw-r--r-- | subprojects/sysprof.wrap | 1 |
3 files changed, 11 insertions, 1 deletions
diff --git a/gtk/gtkapplication-dbus.c b/gtk/gtkapplication-dbus.c index d946e0594e..812163f8f2 100644 --- a/gtk/gtkapplication-dbus.c +++ b/gtk/gtkapplication-dbus.c @@ -25,6 +25,7 @@ #include "gtkapplicationprivate.h" #include "gtksettings.h" #include "gtkprivate.h" +#include "gtkintl.h" #include "gdk/gdkconstructor.h" @@ -687,12 +688,19 @@ gtk_application_impl_dbus_inhibit (GtkApplicationImpl *impl, if (dbus->sm_proxy) { + if (reason == NULL) + /* Translators: This is the 'reason' given when inhibiting + * suspend or screen locking, and the caller hasn't specified + * a reason. + */ + reason = _("Reason not specified"); + res = g_dbus_proxy_call_sync (dbus->sm_proxy, "Inhibit", g_variant_new ("(s@usu)", dbus->application_id, window ? gtk_application_impl_dbus_get_window_system_id (dbus, window) : g_variant_new_uint32 (0), - reason ? reason : "", + reason, flags), G_DBUS_CALL_FLAGS_NONE, G_MAXINT, diff --git a/subprojects/pango.wrap b/subprojects/pango.wrap index 5894951e7a..a1b16695fb 100644 --- a/subprojects/pango.wrap +++ b/subprojects/pango.wrap @@ -3,3 +3,4 @@ directory=pango url=https://gitlab.gnome.org/GNOME/pango.git push-url=ssh://git@gitlab.gnome.org:GNOME/pango.git revision=master +depth=1 diff --git a/subprojects/sysprof.wrap b/subprojects/sysprof.wrap index b1cff4b09f..99aa36ce87 100644 --- a/subprojects/sysprof.wrap +++ b/subprojects/sysprof.wrap @@ -2,3 +2,4 @@ directory=sysprof url=https://gitlab.gnome.org/GNOME/sysprof.git revision=master +depth=1 |