hal: Branch 'master'

[David Zeuthen]

 tools/hal-system-sonypic.c |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

New commits:
diff-tree f93a375b284f18e00a5350beae8e398704c983ae (from d497145f1f904a08ac629c05bcb2d35df7f06ecc)
Author: David Zeuthen <davidz at redhat.com>
Date:   Wed Feb 21 14:04:44 2007 -0500

    use g_ascii_strtoull() instead of g_ascii_strtoll()
    
    Otherwise we would need glib 2.12 rather than 2.6. Pointed out by
    Danny Kukawka <danny.kukawka at web.de>.

diff --git a/tools/hal-system-sonypic.c b/tools/hal-system-sonypic.c
index e6f4b4f..ed90375 100644
--- a/tools/hal-system-sonypic.c
+++ b/tools/hal-system-sonypic.c
@@ -272,8 +272,8 @@ main (int argc, char *argv[])
 				return EXIT_FAILURE;
 			}
 
-			vid = (int) g_ascii_strtoll (usb_vendor_id, NULL, 0);
-			pid = (int) g_ascii_strtoll (usb_product_id, NULL, 0);
+			vid = (int) g_ascii_strtoull (usb_vendor_id, NULL, 0);
+			pid = (int) g_ascii_strtoull (usb_product_id, NULL, 0);
 			ret = sonypi_get_bluetooth_power (&power, vid, pid);
 
 			if (ret == FALSE)