Merge branch 'master' into danirabbit/shell-polkit

Author: danirabbit

README.md

@@ -11,7 +11,7 @@ You'll need the following dependencies:
 * libcanberra-dev
 * libclutter-1.0-dev (>= 1.12.0)
 * libgee-0.8-dev
-* libglib2.0-dev (>= 2.44)
+* libglib2.0-dev (>= 2.74)
 * libgnome-desktop-3-dev
 * libgranite-dev (>= 5.4.0)
 * libgtk-3-dev (>= 3.10.0)

meson.build

@@ -69,15 +69,15 @@ add_project_arguments([
         '-DGETTEXT_PACKAGE="@0@"'.format(meson.project_name()),
         '-DGNOME_DESKTOP_USE_UNSTABLE_API',
 
-        '-DGLIB_VERSION_MIN_REQUIRED=GLIB_VERSION_2_44',
-        '-DGLIB_VERSION_MAX_ALLOWED=GLIB_VERSION_2_44',
+        '-DGLIB_VERSION_MIN_REQUIRED=GLIB_VERSION_2_74',
+        '-DGLIB_VERSION_MAX_ALLOWED=GLIB_VERSION_2_74',
     ],
     language: 'c',
 )
 
 
 # Dependencies
-glib_version_required = '2.44.0'
+glib_version_required = '2.74.0'
 gtk_version_required = '3.10.0'
 
 canberra_dep = dependency('libcanberra')

src/Widgets/ScreenShield.vala

@@ -125,10 +125,12 @@ namespace Gala {
             // Listen for keypresses or mouse movement
             key_press_event.connect ((event) => {
                 on_user_became_active ();
+                return Clutter.EVENT_STOP;
             });
 
             motion_event.connect ((event) => {
                 on_user_became_active ();
+                return Clutter.EVENT_STOP;
             });
 
             background_color = Clutter.Color.from_string ("black");