wayland: don't attempt to unqueue events when events are paused

[~andy/gtk] / gdk / gdkscreen.c

diff --git a/gdk/gdkscreen.c b/gdk/gdkscreen.c
index 0ed04b14c14d2a0df85e09de5477082d43290a1c..93fef6d06a967ae163327d1dfe8c5e5fd6b1608a 100644 (file)
--- a/gdk/gdkscreen.c
+++ b/gdk/gdkscreen.c
@@ -16,13 +16,12 @@
  * Library General Public License for more details.
  *
  * You should have received a copy of the GNU Library General Public
- * License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
+ * License along with this library. If not, see <http://www.gnu.org/licenses/>.
  */
 
 #include "config.h"
 
+#include "gdkinternals.h"
 #include "gdkscreenprivate.h"
 #include "gdkrectangle.h"
 #include "gdkwindow.h"
@@ -725,6 +724,7 @@ gdk_screen_get_monitor_width_mm     (GdkScreen *screen,
 {
   g_return_val_if_fail (GDK_IS_SCREEN (screen), -1);
   g_return_val_if_fail (monitor_num >= 0, -1);
+  g_return_val_if_fail (monitor_num < gdk_screen_get_n_monitors (screen), -1);
 
   return GDK_SCREEN_GET_CLASS (screen)->get_monitor_width_mm (screen, monitor_num);
 }
@@ -746,6 +746,7 @@ gdk_screen_get_monitor_height_mm (GdkScreen *screen,
 {
   g_return_val_if_fail (GDK_IS_SCREEN (screen), -1);
   g_return_val_if_fail (monitor_num >= 0, -1);
+  g_return_val_if_fail (monitor_num < gdk_screen_get_n_monitors (screen), -1);
 
   return GDK_SCREEN_GET_CLASS (screen)->get_monitor_height_mm (screen, monitor_num);
 }
@@ -770,6 +771,7 @@ gdk_screen_get_monitor_plug_name (GdkScreen *screen,
 {
   g_return_val_if_fail (GDK_IS_SCREEN (screen), NULL);
   g_return_val_if_fail (monitor_num >= 0, NULL);
+  g_return_val_if_fail (monitor_num < gdk_screen_get_n_monitors (screen), NULL);
 
   return GDK_SCREEN_GET_CLASS (screen)->get_monitor_plug_name (screen, monitor_num);
 }
@@ -799,6 +801,7 @@ gdk_screen_get_monitor_geometry (GdkScreen    *screen,
 {
   g_return_if_fail (GDK_IS_SCREEN (screen));
   g_return_if_fail (monitor_num >= 0);
+  g_return_if_fail (monitor_num < gdk_screen_get_n_monitors (screen));
 
   GDK_SCREEN_GET_CLASS(screen)->get_monitor_geometry (screen, monitor_num, dest);
 }
@@ -829,6 +832,7 @@ gdk_screen_get_monitor_workarea (GdkScreen    *screen,
 {
   g_return_if_fail (GDK_IS_SCREEN (screen));
   g_return_if_fail (monitor_num >= 0);
+  g_return_if_fail (monitor_num < gdk_screen_get_n_monitors (screen));
 
   GDK_SCREEN_GET_CLASS (screen)->get_monitor_workarea (screen, monitor_num, dest);
 }