[gnome-settings-daemon] wacom: Allow -1 monitor argument



commit 761a3130be6d853ee08d9c3ae3ccc4d6b8d720c1
Author: Olivier Fourdan <ofourdan redhat com>
Date:   Mon Feb 27 15:59:55 2012 +0100

    wacom: Allow -1 monitor argument
    
    For gsd_wacom_device_set_display(), which means that the
    configuration is reset.

 plugins/wacom/gsd-wacom-device.c |    9 ++++-----
 1 files changed, 4 insertions(+), 5 deletions(-)
---
diff --git a/plugins/wacom/gsd-wacom-device.c b/plugins/wacom/gsd-wacom-device.c
index 50a5269..2821aaf 100644
--- a/plugins/wacom/gsd-wacom-device.c
+++ b/plugins/wacom/gsd-wacom-device.c
@@ -692,14 +692,13 @@ void
 gsd_wacom_device_set_display (GsdWacomDevice *device,
                               int             monitor)
 {
-	GnomeRROutputInfo *output;
+	GnomeRROutputInfo *output = NULL;
 
         g_return_if_fail (GSD_IS_WACOM_DEVICE (device));
-        g_return_if_fail (monitor >= 0);
 
-	output = find_output_by_monitor (gdk_screen_get_default (), monitor);
-	if (output != NULL)
-		set_display_by_output (device, output);
+	if (monitor >= 0)
+		output = find_output_by_monitor (gdk_screen_get_default (), monitor);
+	set_display_by_output (device, output);
 }
 
 static GnomeRROutputInfo*



[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]