Only request a signal request once the last one obtained

This commit is contained in:
Pierre Pronchery 2011-11-03 15:41:53 +00:00
parent c3b1b9c00a
commit 4a48c51c08
2 changed files with 77 additions and 80 deletions

142
po/fr.po
View File

@ -8,7 +8,7 @@ msgid ""
msgstr "" msgstr ""
"Project-Id-Version: Phone 0.0.0\n" "Project-Id-Version: Phone 0.0.0\n"
"Report-Msgid-Bugs-To: \n" "Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2011-11-03 14:33+0100\n" "POT-Creation-Date: 2011-11-03 16:39+0100\n"
"PO-Revision-Date: 2010-04-24 02:07+0200\n" "PO-Revision-Date: 2010-04-24 02:07+0200\n"
"Last-Translator: Pierre Pronchery <khorben@defora.org>\n" "Last-Translator: Pierre Pronchery <khorben@defora.org>\n"
"Language-Team: DeforaOS development (French) <devel-fr@lists.defora.org>\n" "Language-Team: DeforaOS development (French) <devel-fr@lists.defora.org>\n"
@ -47,11 +47,11 @@ msgstr "Brouillons"
msgid "Trash" msgid "Trash"
msgstr "Corbeille" msgstr "Corbeille"
#: ../src/phone.c:508 ../src/phone.c:2633 #: ../src/phone.c:508 ../src/phone.c:2629
msgid "System preferences" msgid "System preferences"
msgstr "Préférences système" msgstr "Préférences système"
#: ../src/phone.c:519 ../src/phone.c:2056 #: ../src/phone.c:519 ../src/phone.c:2052
msgid "Plug-ins" msgid "Plug-ins"
msgstr "Greffons" msgstr "Greffons"
@ -64,276 +64,276 @@ msgstr "Vérification %s..."
msgid "Delete this contact?" msgid "Delete this contact?"
msgstr "Supprimer ce contact?" msgstr "Supprimer ce contact?"
#: ../src/phone.c:1124 ../src/phone.c:1290 #: ../src/phone.c:1120 ../src/phone.c:1286
msgid "Delete this message?" msgid "Delete this message?"
msgstr "Supprimer ce message?" msgstr "Supprimer ce message?"
#: ../src/phone.c:1130 ../src/phone.c:1295 #: ../src/phone.c:1126 ../src/phone.c:1291
msgid "Deleting message..." msgid "Deleting message..."
msgstr "Suppression du message..." msgstr "Suppression du message..."
#: ../src/phone.c:1379 #: ../src/phone.c:1375
msgid "translator-credits" msgid "translator-credits"
msgstr "Pierre Pronchery <khorben@defora.org>" msgstr "Pierre Pronchery <khorben@defora.org>"
#: ../src/phone.c:1426 #: ../src/phone.c:1422
msgid "Unknown contact" msgid "Unknown contact"
msgstr "Contact inconnu" msgstr "Contact inconnu"
#: ../src/phone.c:1429 #: ../src/phone.c:1425
msgid "Unknown number" msgid "Unknown number"
msgstr "Numéro inconnu" msgstr "Numéro inconnu"
#: ../src/phone.c:1448 #: ../src/phone.c:1444
msgid "In conversation" msgid "In conversation"
msgstr "En conversation" msgstr "En conversation"
#: ../src/phone.c:1459 #: ../src/phone.c:1455
msgid "Incoming call" msgid "Incoming call"
msgstr "Appel entrant" msgstr "Appel entrant"
#: ../src/phone.c:1469 #: ../src/phone.c:1465
msgid "Outgoing call" msgid "Outgoing call"
msgstr "Appel sortant" msgstr "Appel sortant"
#: ../src/phone.c:1480 #: ../src/phone.c:1476
msgid "Call finished" msgid "Call finished"
msgstr "Appel terminé" msgstr "Appel terminé"
#: ../src/phone.c:1514 #: ../src/phone.c:1510
msgid "_Answer" msgid "_Answer"
msgstr "_Répondre" msgstr "_Répondre"
#: ../src/phone.c:1519 #: ../src/phone.c:1515
msgid "_Hangup" msgid "_Hangup"
msgstr "Ra_ccrocher" msgstr "Ra_ccrocher"
#: ../src/phone.c:1524 #: ../src/phone.c:1520
msgid "_Reject" msgid "_Reject"
msgstr "Re_jeter" msgstr "Re_jeter"
#: ../src/phone.c:1545 #: ../src/phone.c:1541
msgid "Loudspeaker" msgid "Loudspeaker"
msgstr "Haut-parleur" msgstr "Haut-parleur"
#: ../src/phone.c:1553 #: ../src/phone.c:1549
msgid "Mute microphone" msgid "Mute microphone"
msgstr "Couper le microphone" msgstr "Couper le microphone"
#: ../src/phone.c:1561 #: ../src/phone.c:1557
msgid "Show dialer" msgid "Show dialer"
msgstr "Afficher le cadran" msgstr "Afficher le cadran"
#: ../src/phone.c:1602 #: ../src/phone.c:1598
#, c-format #, c-format
msgid "Enter %s" msgid "Enter %s"
msgstr "Entrer %s" msgstr "Entrer %s"
#: ../src/phone.c:1645 #: ../src/phone.c:1641
msgid "Enter" msgid "Enter"
msgstr "Entrer" msgstr "Entrer"
#: ../src/phone.c:1647 #: ../src/phone.c:1643
msgid "Skip" msgid "Skip"
msgstr "Ignorer" msgstr "Ignorer"
#: ../src/phone.c:1675 #: ../src/phone.c:1671
msgid "Contacts" msgid "Contacts"
msgstr "Contacts" msgstr "Contacts"
#: ../src/phone.c:1681 ../src/phone.c:1800 ../src/phone.c:1836 #: ../src/phone.c:1677 ../src/phone.c:1796 ../src/phone.c:1832
#: ../src/phone.c:1951 ../src/phone.c:2309 #: ../src/phone.c:1947 ../src/phone.c:2305
msgid "Call" msgid "Call"
msgstr "Appeler" msgstr "Appeler"
#: ../src/phone.c:1687 #: ../src/phone.c:1683
msgid "Write" msgid "Write"
msgstr "Écrire" msgstr "Écrire"
#: ../src/phone.c:1729 ../src/phone.c:2087 ../src/phone.c:2420 #: ../src/phone.c:1725 ../src/phone.c:2083 ../src/phone.c:2416
msgid "Name" msgid "Name"
msgstr "Nom" msgstr "Nom"
#: ../src/phone.c:1775 #: ../src/phone.c:1771
msgid "Dialer" msgid "Dialer"
msgstr "Composer" msgstr "Composer"
#: ../src/phone.c:1802 #: ../src/phone.c:1798
msgid "Hang up" msgid "Hang up"
msgstr "Raccrocher" msgstr "Raccrocher"
#: ../src/phone.c:1830 #: ../src/phone.c:1826
msgid "Phone logs" msgid "Phone logs"
msgstr "Journal d'appels" msgstr "Journal d'appels"
#: ../src/phone.c:1842 #: ../src/phone.c:1838
msgid "Message" msgid "Message"
msgstr "Message" msgstr "Message"
#: ../src/phone.c:1873 #: ../src/phone.c:1869
msgid "Direction" msgid "Direction"
msgstr "Direction" msgstr "Direction"
#: ../src/phone.c:1878 ../src/phone.c:1997 #: ../src/phone.c:1874 ../src/phone.c:1993
msgid "To/From" msgid "To/From"
msgstr "Vers/De" msgstr "Vers/De"
#: ../src/phone.c:1884 ../src/phone.c:2005 #: ../src/phone.c:1880 ../src/phone.c:2001
msgid "Date" msgid "Date"
msgstr "Date" msgstr "Date"
#: ../src/phone.c:1945 #: ../src/phone.c:1941
msgid "Messages" msgid "Messages"
msgstr "Messages" msgstr "Messages"
#: ../src/phone.c:1956 #: ../src/phone.c:1952
msgid "New message" msgid "New message"
msgstr "Nouveau message" msgstr "Nouveau message"
#: ../src/phone.c:1962 ../src/phone.c:2315 #: ../src/phone.c:1958 ../src/phone.c:2311
msgid "Reply" msgid "Reply"
msgstr "Répondre" msgstr "Répondre"
#: ../src/phone.c:2075 #: ../src/phone.c:2071
msgid "Enabled" msgid "Enabled"
msgstr "Activé" msgstr "Activé"
#: ../src/phone.c:2303 #: ../src/phone.c:2299
msgid "Read message" msgid "Read message"
msgstr "Lire le message" msgstr "Lire le message"
#: ../src/phone.c:2321 #: ../src/phone.c:2317
msgid "Forward" msgid "Forward"
msgstr "Transmettre" msgstr "Transmettre"
#: ../src/phone.c:2395 #: ../src/phone.c:2391
msgid "Phone settings" msgid "Phone settings"
msgstr "Paramètres du téléphone" msgstr "Paramètres du téléphone"
#: ../src/phone.c:2472 #: ../src/phone.c:2468
msgid "missed calls" msgid "missed calls"
msgstr "appels manqués" msgstr "appels manqués"
#: ../src/phone.c:2472 #: ../src/phone.c:2468
msgid "missed call" msgid "missed call"
msgstr "appel manqué" msgstr "appel manqué"
#: ../src/phone.c:2481 #: ../src/phone.c:2477
msgid "new messages" msgid "new messages"
msgstr "nouveaux messages" msgstr "nouveaux messages"
#: ../src/phone.c:2482 #: ../src/phone.c:2478
msgid "new message" msgid "new message"
msgstr "nouveau message" msgstr "nouveau message"
#: ../src/phone.c:2500 ../src/phone.c:3452 ../src/phone.c:3456 #: ../src/phone.c:2496 ../src/phone.c:3448 ../src/phone.c:3452
msgid "Information" msgid "Information"
msgstr "Information" msgstr "Information"
#: ../src/phone.c:2510 #: ../src/phone.c:2506
msgid "Status" msgid "Status"
msgstr "État" msgstr "État"
#: ../src/phone.c:2534 #: ../src/phone.c:2530
msgid "_View" msgid "_View"
msgstr "_Vue" msgstr "_Vue"
#: ../src/phone.c:2553 #: ../src/phone.c:2549
msgid "_Read" msgid "_Read"
msgstr "_Lire" msgstr "_Lire"
#: ../src/phone.c:2695 #: ../src/phone.c:2691
msgid "Open file..." msgid "Open file..."
msgstr "Ouvrir fichier..." msgstr "Ouvrir fichier..."
#: ../src/phone.c:2871 #: ../src/phone.c:2867
msgid "Write message" msgid "Write message"
msgstr "Écrire un message" msgstr "Écrire un message"
#: ../src/phone.c:2877 #: ../src/phone.c:2873
msgid "Send" msgid "Send"
msgstr "Envoyer" msgstr "Envoyer"
#: ../src/phone.c:2883 #: ../src/phone.c:2879
msgid "Attach" msgid "Attach"
msgstr "Joindre" msgstr "Joindre"
#: ../src/phone.c:2999 #: ../src/phone.c:2995
msgid "Attach file..." msgid "Attach file..."
msgstr "Joindre un fichier..." msgstr "Joindre un fichier..."
#: ../src/phone.c:3071 #: ../src/phone.c:3067
#, c-format #, c-format
msgid "%d message%s, %d/%d characters" msgid "%d message%s, %d/%d characters"
msgstr "%d message%s, %d/%d caractères" msgstr "%d message%s, %d/%d caractères"
#: ../src/phone.c:3072 #: ../src/phone.c:3068
msgid "s" msgid "s"
msgstr "s" msgstr "s"
#: ../src/phone.c:3136 #: ../src/phone.c:3132
msgid "Sending message..." msgid "Sending message..."
msgstr "Envoi du message..." msgstr "Envoi du message..."
#: ../src/phone.c:3171 #: ../src/phone.c:3167
msgid "Outgoing" msgid "Outgoing"
msgstr "Sortant" msgstr "Sortant"
#: ../src/phone.c:3357 #: ../src/phone.c:3353
msgid "Operation in progress..." msgid "Operation in progress..."
msgstr "Opération en cours..." msgstr "Opération en cours..."
#: ../src/phone.c:3397 ../src/phone.c:3401 #: ../src/phone.c:3393 ../src/phone.c:3397
msgid "Question" msgid "Question"
msgstr "Question" msgstr "Question"
#: ../src/phone.c:3421 ../src/phone.c:3425 #: ../src/phone.c:3417 ../src/phone.c:3421
msgid "Error" msgid "Error"
msgstr "Erreur" msgstr "Erreur"
#: ../src/phone.c:3654 #: ../src/phone.c:3650
msgid "Name: " msgid "Name: "
msgstr "Nom: " msgstr "Nom: "
#: ../src/phone.c:3663 #: ../src/phone.c:3659
msgid "Number: " msgid "Number: "
msgstr "Numéro: " msgstr "Numéro: "
#: ../src/phone.c:3679 #: ../src/phone.c:3675
msgid "New contact" msgid "New contact"
msgstr "Nouveau contact" msgstr "Nouveau contact"
#: ../src/phone.c:3681 #: ../src/phone.c:3677
msgid "Edit contact: " msgid "Edit contact: "
msgstr "Modifier contact: " msgstr "Modifier contact: "
#: ../src/phone.c:3708 #: ../src/phone.c:3704
msgid "The name cannot be empty" msgid "The name cannot be empty"
msgstr "Le nom ne peut être vide" msgstr "Le nom ne peut être vide"
#: ../src/phone.c:3713 #: ../src/phone.c:3709
msgid "The number cannot be empty" msgid "The number cannot be empty"
msgstr "Le numéro ne peut être vide" msgstr "Le numéro ne peut être vide"
#: ../src/phone.c:3847 #: ../src/phone.c:3843
msgid "Message sent" msgid "Message sent"
msgstr "Message envoyé" msgstr "Message envoyé"
#: ../src/phone.c:3873 #: ../src/phone.c:3869
#, c-format #, c-format
msgid "Wrong %s" msgid "Wrong %s"
msgstr "Mauvais %s" msgstr "Mauvais %s"
#: ../src/phone.c:3882 #: ../src/phone.c:3878
#, c-format #, c-format
msgid "%s is valid" msgid "%s is valid"
msgstr "%s valide" msgstr "%s valide"
#: ../src/phone.c:3945 #: ../src/phone.c:3941
msgid "Raw data (not shown)" msgid "Raw data (not shown)"
msgstr "Données brutes (non affichées)" msgstr "Données brutes (non affichées)"
#: ../src/phone.c:3981 #: ../src/phone.c:3977
msgid "Message deleted" msgid "Message deleted"
msgstr "Message effacé" msgstr "Message effacé"

View File

@ -901,16 +901,12 @@ int phone_event(Phone * phone, PhoneEvent * event)
MODEM_EVENT_TYPE_AUTHENTICATION); MODEM_EVENT_TYPE_AUTHENTICATION);
break; break;
case PHONE_EVENT_TYPE_STARTING: case PHONE_EVENT_TYPE_STARTING:
if(ret == 0) if(ret == 0 && (ret = modem_start(phone->modem)) == 0)
ret = modem_start(phone->modem);
if(ret == 0)
phone_event_type(phone, phone_event_type(phone,
PHONE_EVENT_TYPE_STARTED); PHONE_EVENT_TYPE_STARTED);
break; break;
case PHONE_EVENT_TYPE_STOPPING: case PHONE_EVENT_TYPE_STOPPING:
if(ret == 0) if(ret == 0 && (ret = modem_stop(phone->modem)) == 0)
ret = modem_stop(phone->modem);
if(ret == 0)
phone_event_type(phone, phone_event_type(phone,
PHONE_EVENT_TYPE_STOPPED); PHONE_EVENT_TYPE_STOPPED);
break; break;
@ -4054,9 +4050,10 @@ static gboolean _phone_timeout_track(gpointer data)
_phone_progress_pulse(phone->me_progress); _phone_progress_pulse(phone->me_progress);
if(phone->tracks[PHONE_TRACK_MESSAGE_SENT]) if(phone->tracks[PHONE_TRACK_MESSAGE_SENT])
_phone_progress_pulse(phone->wr_progress); _phone_progress_pulse(phone->wr_progress);
if(phone->tracks[PHONE_TRACK_SIGNAL_LEVEL] if(phone->tracks[PHONE_TRACK_SIGNAL_LEVEL])
&& modem_request_type(phone->modem, {
MODEM_REQUEST_SIGNAL_LEVEL) != 0) modem_request_type(phone->modem, MODEM_REQUEST_SIGNAL_LEVEL);
_phone_track(phone, PHONE_TRACK_SIGNAL_LEVEL, FALSE); _phone_track(phone, PHONE_TRACK_SIGNAL_LEVEL, FALSE);
}
return TRUE; return TRUE;
} }