Some more debugging and cleanup

po/fr.po

@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Phone 0.0.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-10-30 14:25+0100\n"
+"POT-Creation-Date: 2011-10-30 15:28+0100\n"
 "PO-Revision-Date: 2010-04-24 02:07+0200\n"
 "Last-Translator: Pierre Pronchery <khorben@defora.org>\n"
 "Language-Team: DeforaOS development (French) <devel-fr@lists.defora.org>\n"
@@ -47,11 +47,11 @@ msgstr "Brouillons"
 msgid "Trash"
 msgstr "Corbeille"
 
-#: ../src/phone.c:510 ../src/phone.c:2574
+#: ../src/phone.c:510 ../src/phone.c:2573
 msgid "System preferences"
 msgstr "Préférences système"
 
-#: ../src/phone.c:521 ../src/phone.c:2000
+#: ../src/phone.c:521 ../src/phone.c:1999
 msgid "Plug-ins"
 msgstr "Greffons"
 
@@ -60,280 +60,280 @@ msgstr "Greffons"
 msgid "Checking %s..."
 msgstr "Vérification %s..."
 
-#: ../src/phone.c:748
+#: ../src/phone.c:747
 msgid "Delete this contact?"
 msgstr "Supprimer ce contact?"
 
-#: ../src/phone.c:1071 ../src/phone.c:1237
+#: ../src/phone.c:1070 ../src/phone.c:1236
 msgid "Delete this message?"
 msgstr "Supprimer ce message?"
 
-#: ../src/phone.c:1077 ../src/phone.c:1242
+#: ../src/phone.c:1076 ../src/phone.c:1241
 msgid "Deleting message..."
 msgstr "Suppression du message..."
 
-#: ../src/phone.c:1326
+#: ../src/phone.c:1325
 msgid "translator-credits"
 msgstr "Pierre Pronchery <khorben@defora.org>"
 
-#: ../src/phone.c:1373
+#: ../src/phone.c:1372
 msgid "Unknown contact"
 msgstr "Contact inconnu"
 
-#: ../src/phone.c:1376
+#: ../src/phone.c:1375
 msgid "Unknown number"
 msgstr "Numéro inconnu"
 
-#: ../src/phone.c:1395
+#: ../src/phone.c:1394
 msgid "In conversation"
 msgstr "En conversation"
 
-#: ../src/phone.c:1406
+#: ../src/phone.c:1405
 msgid "Incoming call"
 msgstr "Appel entrant"
 
-#: ../src/phone.c:1416
+#: ../src/phone.c:1415
 msgid "Outgoing call"
 msgstr "Appel sortant"
 
-#: ../src/phone.c:1427
+#: ../src/phone.c:1426
 msgid "Call finished"
 msgstr "Appel terminé"
 
-#: ../src/phone.c:1460
+#: ../src/phone.c:1459
 msgid "_Answer"
 msgstr "_Répondre"
 
-#: ../src/phone.c:1465
+#: ../src/phone.c:1464
 msgid "_Hangup"
 msgstr "Ra_ccrocher"
 
-#: ../src/phone.c:1470
+#: ../src/phone.c:1469
 msgid "_Reject"
 msgstr "Re_jeter"
 
-#: ../src/phone.c:1490
+#: ../src/phone.c:1489
 msgid "Loudspeaker"
 msgstr "Haut-parleur"
 
-#: ../src/phone.c:1498
+#: ../src/phone.c:1497
 msgid "Mute microphone"
 msgstr "Couper le microphone"
 
-#: ../src/phone.c:1506
+#: ../src/phone.c:1505
 msgid "Show dialer"
 msgstr "Afficher le cadran"
 
-#: ../src/phone.c:1547
+#: ../src/phone.c:1546
 #, c-format
 msgid "Enter %s"
 msgstr "Entrer %s"
 
-#: ../src/phone.c:1590
+#: ../src/phone.c:1589
 msgid "Enter"
 msgstr "Entrer"
 
-#: ../src/phone.c:1592
+#: ../src/phone.c:1591
 msgid "Skip"
 msgstr "Ignorer"
 
-#: ../src/phone.c:1620
+#: ../src/phone.c:1619
 msgid "Contacts"
 msgstr "Contacts"
 
-#: ../src/phone.c:1626 ../src/phone.c:1745 ../src/phone.c:1781
+#: ../src/phone.c:1625 ../src/phone.c:1744 ../src/phone.c:1780
-#: ../src/phone.c:1896 ../src/phone.c:2252
+#: ../src/phone.c:1895 ../src/phone.c:2251
 msgid "Call"
 msgstr "Appeler"
 
-#: ../src/phone.c:1632
+#: ../src/phone.c:1631
 msgid "Write"
 msgstr "Écrire"
 
-#: ../src/phone.c:1674 ../src/phone.c:2031 ../src/phone.c:2363
+#: ../src/phone.c:1673 ../src/phone.c:2030 ../src/phone.c:2362
 msgid "Name"
 msgstr "Nom"
 
-#: ../src/phone.c:1720
+#: ../src/phone.c:1719
 msgid "Dialer"
 msgstr "Composer"
 
-#: ../src/phone.c:1747
+#: ../src/phone.c:1746
 msgid "Hang up"
 msgstr "Raccrocher"
 
-#: ../src/phone.c:1775
+#: ../src/phone.c:1774
 msgid "Phone logs"
 msgstr "Journal d'appels"
 
-#: ../src/phone.c:1787
+#: ../src/phone.c:1786
 msgid "Message"
 msgstr "Message"
 
-#: ../src/phone.c:1818
+#: ../src/phone.c:1817
 msgid "Direction"
 msgstr "Direction"
 
-#: ../src/phone.c:1823 ../src/phone.c:1942
+#: ../src/phone.c:1822 ../src/phone.c:1941
 msgid "To/From"
 msgstr "Vers/De"
 
-#: ../src/phone.c:1829 ../src/phone.c:1950
+#: ../src/phone.c:1828 ../src/phone.c:1949
 msgid "Date"
 msgstr "Date"
 
-#: ../src/phone.c:1890
+#: ../src/phone.c:1889
 msgid "Messages"
 msgstr "Messages"
 
-#: ../src/phone.c:1901
+#: ../src/phone.c:1900
 msgid "New message"
 msgstr "Nouveau message"
 
-#: ../src/phone.c:1907 ../src/phone.c:2258
+#: ../src/phone.c:1906 ../src/phone.c:2257
 msgid "Reply"
 msgstr "Répondre"
 
-#: ../src/phone.c:2019
+#: ../src/phone.c:2018
 msgid "Enabled"
 msgstr "Activé"
 
-#: ../src/phone.c:2246
+#: ../src/phone.c:2245
 msgid "Read message"
 msgstr "Lire le message"
 
-#: ../src/phone.c:2264
+#: ../src/phone.c:2263
 msgid "Forward"
 msgstr "Transmettre"
 
-#: ../src/phone.c:2338
+#: ../src/phone.c:2337
 msgid "Phone settings"
 msgstr "Paramètres du téléphone"
 
-#: ../src/phone.c:2415
+#: ../src/phone.c:2414
 msgid "missed calls"
 msgstr "appels manqués"
 
-#: ../src/phone.c:2415
+#: ../src/phone.c:2414
 msgid "missed call"
 msgstr "appel manqué"
 
-#: ../src/phone.c:2424
+#: ../src/phone.c:2423
 msgid "new messages"
 msgstr "nouveaux messages"
 
-#: ../src/phone.c:2425
+#: ../src/phone.c:2424
 msgid "new message"
 msgstr "nouveau message"
 
-#: ../src/phone.c:2443 ../src/phone.c:3379 ../src/phone.c:3383
+#: ../src/phone.c:2442 ../src/phone.c:3378 ../src/phone.c:3382
 msgid "Information"
 msgstr "Information"
 
-#: ../src/phone.c:2453
+#: ../src/phone.c:2452
 msgid "Status"
 msgstr "État"
 
-#: ../src/phone.c:2477
+#: ../src/phone.c:2476
 msgid "_View"
 msgstr "_Vue"
 
-#: ../src/phone.c:2496
+#: ../src/phone.c:2495
 msgid "_Read"
 msgstr "_Lire"
 
-#: ../src/phone.c:2628
+#: ../src/phone.c:2627
 msgid "Open file..."
 msgstr "Ouvrir fichier..."
 
-#: ../src/phone.c:2799
+#: ../src/phone.c:2798
 msgid "Write message"
 msgstr "Écrire un message"
 
-#: ../src/phone.c:2805
+#: ../src/phone.c:2804
 msgid "Send"
 msgstr "Envoyer"
 
-#: ../src/phone.c:2811
+#: ../src/phone.c:2810
 msgid "Attach"
 msgstr "Joindre"
 
-#: ../src/phone.c:2927
+#: ../src/phone.c:2926
 msgid "Attach file..."
 msgstr "Joindre un fichier..."
 
-#: ../src/phone.c:2998
+#: ../src/phone.c:2997
 #, c-format
 msgid "%d message%s, %d/%d characters"
 msgstr "%d message%s, %d/%d caractères"
 
-#: ../src/phone.c:2999
+#: ../src/phone.c:2998
 msgid "s"
 msgstr "s"
 
-#: ../src/phone.c:3063
+#: ../src/phone.c:3062
 msgid "Sending message..."
 msgstr "Envoi du message..."
 
-#: ../src/phone.c:3098
+#: ../src/phone.c:3097
 msgid "Outgoing"
 msgstr "Sortant"
 
-#: ../src/phone.c:3284
+#: ../src/phone.c:3283
 msgid "Operation in progress..."
 msgstr "Opération en cours..."
 
-#: ../src/phone.c:3324 ../src/phone.c:3328
+#: ../src/phone.c:3323 ../src/phone.c:3327
 msgid "Question"
 msgstr "Question"
 
-#: ../src/phone.c:3348 ../src/phone.c:3352
+#: ../src/phone.c:3347 ../src/phone.c:3351
 msgid "Error"
 msgstr "Erreur"
 
-#: ../src/phone.c:3584
+#: ../src/phone.c:3583
 msgid "Name: "
 msgstr "Nom: "
 
-#: ../src/phone.c:3593
+#: ../src/phone.c:3592
 msgid "Number: "
 msgstr "Numéro: "
 
-#: ../src/phone.c:3609
+#: ../src/phone.c:3608
 msgid "New contact"
 msgstr "Nouveau contact"
 
-#: ../src/phone.c:3611
+#: ../src/phone.c:3610
 msgid "Edit contact: "
 msgstr "Modifier contact: "
 
-#: ../src/phone.c:3638
+#: ../src/phone.c:3637
 msgid "The name cannot be empty"
 msgstr "Le nom ne peut être vide"
 
-#: ../src/phone.c:3643
+#: ../src/phone.c:3642
 msgid "The number cannot be empty"
 msgstr "Le numéro ne peut être vide"
 
-#: ../src/phone.c:3778
+#: ../src/phone.c:3777
 msgid "Message sent"
 msgstr "Message envoyé"
 
-#: ../src/phone.c:3803
+#: ../src/phone.c:3802
 #, c-format
 msgid "Wrong %s"
 msgstr "Mauvais %s"
 
-#: ../src/phone.c:3812
+#: ../src/phone.c:3811
 #, c-format
 msgid "%s is valid"
 msgstr "%s valide"
 
-#: ../src/phone.c:3878
+#: ../src/phone.c:3877
 msgid "Raw data (not shown)"
 msgstr "Données brutes (non affichées)"
 
-#: ../src/phone.c:3911
+#: ../src/phone.c:3910
 msgid "Message deleted"
 msgstr "Message effacé"
 

src/modems/hayes.c

@@ -2659,7 +2659,6 @@ static HayesCommandStatus _on_request_sim_pin_valid(HayesCommand * command,
 	if(event->authentication.status != MODEM_AUTHENTICATION_STATUS_OK)
 		return status;
 	/* automatically register */
-	/* XXX should really wait for the telephony application for this */
 	memset(&request, 0, sizeof(&request));
 	request.type = HAYES_REQUEST_OPERATOR_FORMAT_LONG;
 	_hayes_request(modem, &request);
@@ -2668,9 +2667,6 @@ static HayesCommandStatus _on_request_sim_pin_valid(HayesCommand * command,
 	request.type = MODEM_REQUEST_REGISTRATION;
 	request.registration.mode = MODEM_REGISTRATION_MODE_AUTOMATIC;
 	_hayes_request(modem, &request);
-	/* force a registration report */
-	request.type = HAYES_REQUEST_REGISTRATION;
-	_hayes_request(modem, &request);
 	/* report new messages */
 	request.type = HAYES_REQUEST_MESSAGE_UNSOLLICITED_ENABLE;
 	_hayes_request(modem, &request);

src/phone.c

@@ -691,10 +691,9 @@ void phone_code_enter(Phone * phone)
 			phone->en_progress = _phone_create_progress(
 					phone->en_window, buf);
 			_phone_track(phone, PHONE_TRACK_CODE_ENTERED, TRUE);
-			/* FIXME remember the real request name */
 			modem_request_type(phone->modem,
-					MODEM_REQUEST_AUTHENTICATE, "SIM PIN",
+					MODEM_REQUEST_AUTHENTICATE,
-					NULL, code);
+					phone->en_name, NULL, code);
 			break;
 	}
 }