phonemgr r312 - in trunk: . libgsm

[hadess svn gnome org]

Author: hadess
Date: Wed Jun 18 15:19:51 2008
New Revision: 312
URL: http://svn.gnome.org/viewvc/phonemgr?rev=312&view=rev

Log:
2008-06-18  Bastien Nocera  <hadess hadess net>

	* libgsm/phonemgr-listener.c
	(phonemgr_listener_get_phonebook_entry),
	(phonemgr_listener_list_all_data): Fix reversed retval in
	_get_phonebook_entry, Use the entry location to create the UUID,
	avoids problems with memory offsets in drivers



Modified:
   trunk/ChangeLog
   trunk/libgsm/phonemgr-listener.c

Modified: trunk/libgsm/phonemgr-listener.c
==============================================================================
--- trunk/libgsm/phonemgr-listener.c	(original)
+++ trunk/libgsm/phonemgr-listener.c	Wed Jun 18 15:19:51 2008
@@ -1215,7 +1215,7 @@
 		return TRUE;
 	}
 
-	return (error != GN_ERR_NONE);
+	return (error == GN_ERR_NONE);
 }
 
 char *
@@ -1292,6 +1292,7 @@
 				g_mutex_unlock (l->mutex);
 				break;
 			}
+
 			a = g_ptr_array_sized_new (memstat.used);
 			for (i = 1, found = 0; found <= memstat.used; i++) {
 				gn_phonebook_entry entry;
@@ -1299,7 +1300,7 @@
 					break;
 				} else if (entry.empty == FALSE) {
 					char *uuid;
-					uuid = g_strdup_printf ("GPM-UUID-%s-%s-%d", l->imei, "ME", i);
+					uuid = g_strdup_printf ("GPM-UUID-%s-%s-%d", l->imei, "ME", entry.location);
 					g_ptr_array_add (a, uuid);
 					found++;
 				}