[gnome-settings-daemon] wacom: Better check for tablet button mapping errors

[Bastien Nocera <hadess src gnome org>]

commit 1e24c0faa7027f7eea4fc4ed58ff1009e6ca0e09
Author: Bastien Nocera <hadess hadess net>
Date:   Thu Feb 16 15:32:31 2012 +0100

    wacom: Better check for tablet button mapping errors

 plugins/wacom/gsd-wacom-manager.c |    8 +++++---
 1 files changed, 5 insertions(+), 3 deletions(-)
---
diff --git a/plugins/wacom/gsd-wacom-manager.c b/plugins/wacom/gsd-wacom-manager.c
index b9c2380..38889fb 100644
--- a/plugins/wacom/gsd-wacom-manager.c
+++ b/plugins/wacom/gsd-wacom-manager.c
@@ -292,7 +292,8 @@ set_device_buttonmap (GsdWacomDevice *device,
 		g_usleep (300);
 	}
 
-	if (gdk_error_trap_pop () || rc != Success)
+	if ((gdk_error_trap_pop () && rc != MappingSuccess) ||
+	    rc != MappingSuccess)
 		g_warning ("Error in setting button mapping for \"%s\"", gsd_wacom_device_get_tool_name (device));
 
 	g_free (map);
@@ -415,8 +416,9 @@ reset_pad_buttons (GsdWacomDevice *device)
 		g_usleep (300);
 	}
 
-	if (gdk_error_trap_pop () || rc != Success)
-		g_warning ("Error in resetting button mapping for \"%s\"", gsd_wacom_device_get_tool_name (device));
+	if ((gdk_error_trap_pop () && rc != MappingSuccess) ||
+	    rc != MappingSuccess)
+		g_warning ("Error in resetting button mapping for \"%s\" (rc=%d)", gsd_wacom_device_get_tool_name (device), rc);
 
 	g_free (map);