Code 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-11-02 18:36+0100\n"
+"POT-Creation-Date: 2011-11-03 03:33+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"
@@ -27,313 +27,313 @@ msgstr ""
 "  -m\tNom du greffon modem à charger\n"
 "  -r\tDélai entre deux tentatives d'accès au modem (ms)\n"
 
-#: ../src/phone.c:357
+#: ../src/phone.c:358
 msgid "All"
 msgstr "Tous"
 
-#: ../src/phone.c:358
+#: ../src/phone.c:359
 msgid "Inbox"
 msgstr "Reçus"
 
-#: ../src/phone.c:359
+#: ../src/phone.c:360
 msgid "Sent"
 msgstr "Envoyés"
 
-#: ../src/phone.c:360
+#: ../src/phone.c:361
 msgid "Drafts"
 msgstr "Brouillons"
 
-#: ../src/phone.c:361
+#: ../src/phone.c:362
 msgid "Trash"
 msgstr "Corbeille"
 
-#: ../src/phone.c:507 ../src/phone.c:2632
+#: ../src/phone.c:508 ../src/phone.c:2633
 msgid "System preferences"
 msgstr "Préférences système"
 
-#: ../src/phone.c:518 ../src/phone.c:2055
+#: ../src/phone.c:519 ../src/phone.c:2056
 msgid "Plug-ins"
 msgstr "Greffons"
 
-#: ../src/phone.c:667
+#: ../src/phone.c:668
 #, c-format
 msgid "Checking %s..."
 msgstr "Vérification %s..."
 
-#: ../src/phone.c:730
+#: ../src/phone.c:731
 msgid "Delete this contact?"
 msgstr "Supprimer ce contact?"
 
-#: ../src/phone.c:1123 ../src/phone.c:1289
+#: ../src/phone.c:1124 ../src/phone.c:1290
 msgid "Delete this message?"
 msgstr "Supprimer ce message?"
 
-#: ../src/phone.c:1129 ../src/phone.c:1294
+#: ../src/phone.c:1130 ../src/phone.c:1295
 msgid "Deleting message..."
 msgstr "Suppression du message..."
 
-#: ../src/phone.c:1378
+#: ../src/phone.c:1379
 msgid "translator-credits"
 msgstr "Pierre Pronchery <khorben@defora.org>"
 
-#: ../src/phone.c:1425
+#: ../src/phone.c:1426
 msgid "Unknown contact"
 msgstr "Contact inconnu"
 
-#: ../src/phone.c:1428
+#: ../src/phone.c:1429
 msgid "Unknown number"
 msgstr "Numéro inconnu"
 
-#: ../src/phone.c:1447
+#: ../src/phone.c:1448
 msgid "In conversation"
 msgstr "En conversation"
 
-#: ../src/phone.c:1458
+#: ../src/phone.c:1459
 msgid "Incoming call"
 msgstr "Appel entrant"
 
-#: ../src/phone.c:1468
+#: ../src/phone.c:1469
 msgid "Outgoing call"
 msgstr "Appel sortant"
 
-#: ../src/phone.c:1479
+#: ../src/phone.c:1480
 msgid "Call finished"
 msgstr "Appel terminé"
 
-#: ../src/phone.c:1513
+#: ../src/phone.c:1514
 msgid "_Answer"
 msgstr "_Répondre"
 
-#: ../src/phone.c:1518
+#: ../src/phone.c:1519
 msgid "_Hangup"
 msgstr "Ra_ccrocher"
 
-#: ../src/phone.c:1523
+#: ../src/phone.c:1524
 msgid "_Reject"
 msgstr "Re_jeter"
 
-#: ../src/phone.c:1544
+#: ../src/phone.c:1545
 msgid "Loudspeaker"
 msgstr "Haut-parleur"
 
-#: ../src/phone.c:1552
+#: ../src/phone.c:1553
 msgid "Mute microphone"
 msgstr "Couper le microphone"
 
-#: ../src/phone.c:1560
+#: ../src/phone.c:1561
 msgid "Show dialer"
 msgstr "Afficher le cadran"
 
-#: ../src/phone.c:1601
+#: ../src/phone.c:1602
 #, c-format
 msgid "Enter %s"
 msgstr "Entrer %s"
 
-#: ../src/phone.c:1644
+#: ../src/phone.c:1645
 msgid "Enter"
 msgstr "Entrer"
 
-#: ../src/phone.c:1646
+#: ../src/phone.c:1647
 msgid "Skip"
 msgstr "Ignorer"
 
-#: ../src/phone.c:1674
+#: ../src/phone.c:1675
 msgid "Contacts"
 msgstr "Contacts"
 
-#: ../src/phone.c:1680 ../src/phone.c:1799 ../src/phone.c:1835
+#: ../src/phone.c:1681 ../src/phone.c:1800 ../src/phone.c:1836
-#: ../src/phone.c:1950 ../src/phone.c:2308
+#: ../src/phone.c:1951 ../src/phone.c:2309
 msgid "Call"
 msgstr "Appeler"
 
-#: ../src/phone.c:1686
+#: ../src/phone.c:1687
 msgid "Write"
 msgstr "Écrire"
 
-#: ../src/phone.c:1728 ../src/phone.c:2086 ../src/phone.c:2419
+#: ../src/phone.c:1729 ../src/phone.c:2087 ../src/phone.c:2420
 msgid "Name"
 msgstr "Nom"
 
-#: ../src/phone.c:1774
+#: ../src/phone.c:1775
 msgid "Dialer"
 msgstr "Composer"
 
-#: ../src/phone.c:1801
+#: ../src/phone.c:1802
 msgid "Hang up"
 msgstr "Raccrocher"
 
-#: ../src/phone.c:1829
+#: ../src/phone.c:1830
 msgid "Phone logs"
 msgstr "Journal d'appels"
 
-#: ../src/phone.c:1841
+#: ../src/phone.c:1842
 msgid "Message"
 msgstr "Message"
 
-#: ../src/phone.c:1872
+#: ../src/phone.c:1873
 msgid "Direction"
 msgstr "Direction"
 
-#: ../src/phone.c:1877 ../src/phone.c:1996
+#: ../src/phone.c:1878 ../src/phone.c:1997
 msgid "To/From"
 msgstr "Vers/De"
 
-#: ../src/phone.c:1883 ../src/phone.c:2004
+#: ../src/phone.c:1884 ../src/phone.c:2005
 msgid "Date"
 msgstr "Date"
 
-#: ../src/phone.c:1944
+#: ../src/phone.c:1945
 msgid "Messages"
 msgstr "Messages"
 
-#: ../src/phone.c:1955
+#: ../src/phone.c:1956
 msgid "New message"
 msgstr "Nouveau message"
 
-#: ../src/phone.c:1961 ../src/phone.c:2314
+#: ../src/phone.c:1962 ../src/phone.c:2315
 msgid "Reply"
 msgstr "Répondre"
 
-#: ../src/phone.c:2074
+#: ../src/phone.c:2075
 msgid "Enabled"
 msgstr "Activé"
 
-#: ../src/phone.c:2302
+#: ../src/phone.c:2303
 msgid "Read message"
 msgstr "Lire le message"
 
-#: ../src/phone.c:2320
+#: ../src/phone.c:2321
 msgid "Forward"
 msgstr "Transmettre"
 
-#: ../src/phone.c:2394
+#: ../src/phone.c:2395
 msgid "Phone settings"
 msgstr "Paramètres du téléphone"
 
-#: ../src/phone.c:2471
+#: ../src/phone.c:2472
 msgid "missed calls"
 msgstr "appels manqués"
 
-#: ../src/phone.c:2471
+#: ../src/phone.c:2472
 msgid "missed call"
 msgstr "appel manqué"
 
-#: ../src/phone.c:2480
+#: ../src/phone.c:2481
 msgid "new messages"
 msgstr "nouveaux messages"
 
-#: ../src/phone.c:2481
+#: ../src/phone.c:2482
 msgid "new message"
 msgstr "nouveau message"
 
-#: ../src/phone.c:2499 ../src/phone.c:3451 ../src/phone.c:3455
+#: ../src/phone.c:2500 ../src/phone.c:3452 ../src/phone.c:3456
 msgid "Information"
 msgstr "Information"
 
-#: ../src/phone.c:2509
+#: ../src/phone.c:2510
 msgid "Status"
 msgstr "État"
 
-#: ../src/phone.c:2533
+#: ../src/phone.c:2534
 msgid "_View"
 msgstr "_Vue"
 
-#: ../src/phone.c:2552
+#: ../src/phone.c:2553
 msgid "_Read"
 msgstr "_Lire"
 
-#: ../src/phone.c:2694
+#: ../src/phone.c:2695
 msgid "Open file..."
 msgstr "Ouvrir fichier..."
 
-#: ../src/phone.c:2870
+#: ../src/phone.c:2871
 msgid "Write message"
 msgstr "Écrire un message"
 
-#: ../src/phone.c:2876
+#: ../src/phone.c:2877
 msgid "Send"
 msgstr "Envoyer"
 
-#: ../src/phone.c:2882
+#: ../src/phone.c:2883
 msgid "Attach"
 msgstr "Joindre"
 
-#: ../src/phone.c:2998
+#: ../src/phone.c:2999
 msgid "Attach file..."
 msgstr "Joindre un fichier..."
 
-#: ../src/phone.c:3070
+#: ../src/phone.c:3071
 #, c-format
 msgid "%d message%s, %d/%d characters"
 msgstr "%d message%s, %d/%d caractères"
 
-#: ../src/phone.c:3071
+#: ../src/phone.c:3072
 msgid "s"
 msgstr "s"
 
-#: ../src/phone.c:3135
+#: ../src/phone.c:3136
 msgid "Sending message..."
 msgstr "Envoi du message..."
 
-#: ../src/phone.c:3170
+#: ../src/phone.c:3171
 msgid "Outgoing"
 msgstr "Sortant"
 
-#: ../src/phone.c:3356
+#: ../src/phone.c:3357
 msgid "Operation in progress..."
 msgstr "Opération en cours..."
 
-#: ../src/phone.c:3396 ../src/phone.c:3400
+#: ../src/phone.c:3397 ../src/phone.c:3401
 msgid "Question"
 msgstr "Question"
 
-#: ../src/phone.c:3420 ../src/phone.c:3424
+#: ../src/phone.c:3421 ../src/phone.c:3425
 msgid "Error"
 msgstr "Erreur"
 
-#: ../src/phone.c:3653
+#: ../src/phone.c:3654
 msgid "Name: "
 msgstr "Nom: "
 
-#: ../src/phone.c:3662
+#: ../src/phone.c:3663
 msgid "Number: "
 msgstr "Numéro: "
 
-#: ../src/phone.c:3678
+#: ../src/phone.c:3679
 msgid "New contact"
 msgstr "Nouveau contact"
 
-#: ../src/phone.c:3680
+#: ../src/phone.c:3681
 msgid "Edit contact: "
 msgstr "Modifier contact: "
 
-#: ../src/phone.c:3707
+#: ../src/phone.c:3708
 msgid "The name cannot be empty"
 msgstr "Le nom ne peut être vide"
 
-#: ../src/phone.c:3712
+#: ../src/phone.c:3713
 msgid "The number cannot be empty"
 msgstr "Le numéro ne peut être vide"
 
-#: ../src/phone.c:3846
+#: ../src/phone.c:3847
 msgid "Message sent"
 msgstr "Message envoyé"
 
-#: ../src/phone.c:3872
+#: ../src/phone.c:3873
 #, c-format
 msgid "Wrong %s"
 msgstr "Mauvais %s"
 
-#: ../src/phone.c:3881
+#: ../src/phone.c:3882
 #, c-format
 msgid "%s is valid"
 msgstr "%s valide"
 
-#: ../src/phone.c:3947
+#: ../src/phone.c:3948
 msgid "Raw data (not shown)"
 msgstr "Données brutes (non affichées)"
 
-#: ../src/phone.c:3983
+#: ../src/phone.c:3984
 msgid "Message deleted"
 msgstr "Message effacé"
 

src/phone.c

@@ -14,7 +14,8 @@ static char const _license[] =
 "You should have received a copy of the GNU General Public License\n"
 "along with this program.  If not, see <http://www.gnu.org/licenses/>.";
 /* FIXME:
- * - keep track of missed calls */
+ * - keep track of missed calls
+ * - let plug-ins keep track of the signal level */
 
 
 

src/plugins/panel.c

@@ -12,6 +12,8 @@
  *
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>. */
+/* FIXME:
+ * - only track battery and signal status when online */
 
 
 
@@ -551,6 +553,7 @@ static gboolean _on_settings_closex(gpointer data)
 static void _on_settings_ok(gpointer data)
 {
 	PhonePlugin * plugin = data;
+	PhonePluginHelper * helper = plugin->helper;
 	Panel * panel = plugin->priv;
 	gboolean value;
 
@@ -573,13 +576,13 @@ static void _on_settings_ok(gpointer data)
 		panel->battery_timeout = 0;
 	}
 	gtk_widget_set_no_show_all(panel->battery_image, !value);
-	plugin->helper->config_set(plugin->helper->phone, "panel", "battery",
+	helper->config_set(helper->phone, "panel", "battery", value
-			value ? "1" : "0");
+			? "1" : "0");
 	/* truncate */
 	value = gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(
 				panel->truncate));
 	gtk_label_set_ellipsize(GTK_LABEL(panel->operator), value
 			? PANGO_ELLIPSIZE_END : PANGO_ELLIPSIZE_NONE);
-	plugin->helper->config_set(plugin->helper->phone, "panel", "truncate",
+	helper->config_set(helper->phone, "panel", "truncate", value
-			value ? "1" : "0");
+			? "1" : "0");
 }