[nautilus-ideviceinfo] Add iPhone4 detection



commit ee237466e0b483c186c08588c70ab393d42f4b8f
Author: Bastien Nocera <hadess hadess net>
Date:   Fri Aug 13 10:10:41 2010 +0100

    Add iPhone4 detection
    
    And make devtypes structure more extensible, removing hard-coded
    values from the code itself.

 src/ideviceinfo-property-page.c |    7 ++++---
 1 files changed, 4 insertions(+), 3 deletions(-)
---
diff --git a/src/ideviceinfo-property-page.c b/src/ideviceinfo-property-page.c
index 595544a..3bbddc1 100644
--- a/src/ideviceinfo-property-page.c
+++ b/src/ideviceinfo-property-page.c
@@ -265,10 +265,11 @@ update_ui (CompletedMessage *msg)
 	node = plist_dict_get_item(dict, "ProductType");
 	if (node) {
 		char *devtype = NULL;
-		const char *devtypes[7][2] = {
+		const char *devtypes[][2] = {
 			{"iPhone1,1", "iPhone"},
 			{"iPhone1,2", "iPhone 3G"},
 			{"iPhone2,1", "iPhone 3GS"},
+			{"iPhone3,1", "iPhone 4"},
 			{"iPod1,1", "iPod Touch"},
 			{"iPod2,1", "iPod Touch (2G)"},
 			{"iPod3,1", "iPod Touch (3G)"},
@@ -279,8 +280,8 @@ update_ui (CompletedMessage *msg)
 		plist_get_string_val(node, &devtype);
 		val = devtype;
 		if (devtype) {
-			int i;
-			for (i = 0; i < 6; i++) {
+			guint i;
+			for (i = 0; i < G_N_ELEMENTS(devtypes); i++) {
 				if (g_str_equal(devtypes[i][0], devtype)) {
 					val = g_strdup(devtypes[i][1]);
 					break;



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