From d439eed9e84e5f42e1cd50846b620ba9dc1a7efd Mon Sep 17 00:00:00 2001 From: Pierre Pronchery Date: Sat, 16 Apr 2011 01:19:33 +0000 Subject: [PATCH] Preparing for migration to Gtk+ 3.0 --- po/fr.po | 152 ++++++++++++++++++++++---------------------- src/phone.c | 11 ++-- src/plugins/debug.c | 16 ++++- src/plugins/panel.c | 5 +- 4 files changed, 102 insertions(+), 82 deletions(-) diff --git a/po/fr.po b/po/fr.po index c8913ed..8cf1409 100644 --- a/po/fr.po +++ b/po/fr.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: Phone 0.0.0\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2011-04-10 17:29+0200\n" +"POT-Creation-Date: 2011-04-16 03:12+0200\n" "PO-Revision-Date: 2010-04-24 02:07+0200\n" "Last-Translator: Pierre Pronchery \n" "Language-Team: French\n" @@ -211,301 +211,301 @@ msgstr "" " -r\tDélai entre deux tentatives d'accès au modem (ms)\n" " -F\tActiver le contrôle de flux matériel (RTS/CTS)\n" -#: ../src/phone.c:388 +#: ../src/phone.c:389 msgid "Initializing..." msgstr "Initialisation..." -#: ../src/phone.c:439 ../src/phone.c:2233 +#: ../src/phone.c:440 ../src/phone.c:2246 msgid "System preferences" msgstr "Préférences système" -#: ../src/phone.c:450 ../src/phone.c:1816 +#: ../src/phone.c:451 ../src/phone.c:1829 msgid "Plug-ins" msgstr "Greffons" -#: ../src/phone.c:601 +#: ../src/phone.c:602 msgid "Checking SIM PIN code..." msgstr "Vérification du code SIM PIN..." -#: ../src/phone.c:653 +#: ../src/phone.c:654 msgid "Delete this contact?" msgstr "Supprimer ce contact?" -#: ../src/phone.c:1025 ../src/phone.c:1141 +#: ../src/phone.c:1035 ../src/phone.c:1151 msgid "Delete this message?" msgstr "Supprimer ce message?" -#: ../src/phone.c:1031 ../src/phone.c:1146 +#: ../src/phone.c:1041 ../src/phone.c:1156 msgid "Deleting message..." msgstr "Suppression du message..." -#: ../src/phone.c:1242 +#: ../src/phone.c:1252 msgid "Unknown contact" msgstr "Contact inconnu" -#: ../src/phone.c:1249 +#: ../src/phone.c:1259 msgid "Unknown number" msgstr "Numéro inconnu" -#: ../src/phone.c:1261 +#: ../src/phone.c:1271 msgid "In conversation" msgstr "En conversation" -#: ../src/phone.c:1273 +#: ../src/phone.c:1283 msgid "Incoming call" msgstr "Appel entrant" -#: ../src/phone.c:1284 +#: ../src/phone.c:1294 msgid "Outgoing call" msgstr "Appel sortant" -#: ../src/phone.c:1296 +#: ../src/phone.c:1306 msgid "Call finished" msgstr "Appel terminé" -#: ../src/phone.c:1326 +#: ../src/phone.c:1336 msgid "Answer" msgstr "Répondre" -#: ../src/phone.c:1331 +#: ../src/phone.c:1341 msgid "Hangup" msgstr "Raccrocher" -#: ../src/phone.c:1336 +#: ../src/phone.c:1346 msgid "Reject" msgstr "Rejeter" -#: ../src/phone.c:1356 +#: ../src/phone.c:1366 msgid "Loudspeaker" msgstr "Haut-parleur" -#: ../src/phone.c:1364 +#: ../src/phone.c:1374 msgid "Mute microphone" msgstr "Couper le microphone" -#: ../src/phone.c:1398 ../src/phone.c:1400 +#: ../src/phone.c:1408 ../src/phone.c:1410 msgid "Enter SIM PIN code" msgstr "Entrer le code SIM PIN" -#: ../src/phone.c:1442 +#: ../src/phone.c:1452 msgid "Enter" msgstr "Entrer" -#: ../src/phone.c:1444 +#: ../src/phone.c:1454 msgid "Skip" msgstr "Ignorer" -#: ../src/phone.c:1472 +#: ../src/phone.c:1482 msgid "Contacts" msgstr "Contacts" -#: ../src/phone.c:1478 ../src/phone.c:1586 ../src/phone.c:1622 -#: ../src/phone.c:1712 ../src/phone.c:2070 +#: ../src/phone.c:1488 ../src/phone.c:1599 ../src/phone.c:1635 +#: ../src/phone.c:1725 ../src/phone.c:2083 msgid "Call" msgstr "Appeler" -#: ../src/phone.c:1484 +#: ../src/phone.c:1494 msgid "Write" msgstr "Écrire" -#: ../src/phone.c:1518 ../src/phone.c:1847 ../src/phone.c:2181 +#: ../src/phone.c:1528 ../src/phone.c:1860 ../src/phone.c:2194 msgid "Name" msgstr "Nom" -#: ../src/phone.c:1564 +#: ../src/phone.c:1574 msgid "Dialer" msgstr "Composer" -#: ../src/phone.c:1588 +#: ../src/phone.c:1601 msgid "Hang up" msgstr "Raccrocher" -#: ../src/phone.c:1616 +#: ../src/phone.c:1629 msgid "Phone logs" msgstr "Journal d'appels" -#: ../src/phone.c:1628 +#: ../src/phone.c:1641 msgid "Message" msgstr "Message" -#: ../src/phone.c:1658 +#: ../src/phone.c:1671 msgid "Direction" msgstr "Direction" -#: ../src/phone.c:1663 ../src/phone.c:1767 +#: ../src/phone.c:1676 ../src/phone.c:1780 msgid "To/From" msgstr "Vers/De" -#: ../src/phone.c:1669 ../src/phone.c:1773 +#: ../src/phone.c:1682 ../src/phone.c:1786 msgid "Date" msgstr "Date" -#: ../src/phone.c:1706 +#: ../src/phone.c:1719 msgid "Messages" msgstr "Messages" -#: ../src/phone.c:1718 +#: ../src/phone.c:1731 msgid "New message" msgstr "Nouveau message" -#: ../src/phone.c:1724 ../src/phone.c:2076 +#: ../src/phone.c:1737 ../src/phone.c:2089 msgid "Reply" msgstr "Répondre" -#: ../src/phone.c:1742 +#: ../src/phone.c:1755 msgid "Inbox" msgstr "Reçus" -#: ../src/phone.c:1746 +#: ../src/phone.c:1759 msgid "Sent" msgstr "Envoyés" -#: ../src/phone.c:1835 +#: ../src/phone.c:1848 msgid "Enabled" msgstr "Activé" -#: ../src/phone.c:2064 +#: ../src/phone.c:2077 msgid "Read message" msgstr "Lire le message" -#: ../src/phone.c:2082 +#: ../src/phone.c:2095 msgid "Forward" msgstr "Transmettre" -#: ../src/phone.c:2156 +#: ../src/phone.c:2169 msgid "Phone settings" msgstr "Paramètres du téléphone" -#: ../src/phone.c:2237 +#: ../src/phone.c:2250 msgid "Phone device:" msgstr "Noeud d'accès:" -#: ../src/phone.c:2240 +#: ../src/phone.c:2253 msgid "Set the phone device" msgstr "Définir le noeud d'accès" -#: ../src/phone.c:2245 +#: ../src/phone.c:2258 msgid "Enable flow control" msgstr "Active le controle de flux" -#: ../src/phone.c:2343 +#: ../src/phone.c:2356 msgid "Write message" msgstr "Écrire un message" -#: ../src/phone.c:2349 +#: ../src/phone.c:2362 msgid "Send" msgstr "Envoyer" -#: ../src/phone.c:2355 +#: ../src/phone.c:2368 msgid "Attach" msgstr "Attacher" -#: ../src/phone.c:2550 +#: ../src/phone.c:2563 #, c-format msgid "%d message%s, %d/%d characters" msgstr "%d message%s, %d/%d caractères" -#: ../src/phone.c:2551 +#: ../src/phone.c:2564 msgid "s" msgstr "s" -#: ../src/phone.c:2618 +#: ../src/phone.c:2631 msgid "Sending message..." msgstr "Envoi du message..." -#: ../src/phone.c:2645 +#: ../src/phone.c:2658 msgid "Outgoing" msgstr "Sortant" -#: ../src/phone.c:2815 +#: ../src/phone.c:2828 msgid "Operation in progress..." msgstr "Opération en cours..." -#: ../src/phone.c:2849 ../src/phone.c:2854 +#: ../src/phone.c:2862 ../src/phone.c:2867 msgid "Question" msgstr "Question" -#: ../src/phone.c:2874 ../src/phone.c:2879 +#: ../src/phone.c:2887 ../src/phone.c:2892 msgid "Error" msgstr "Erreur" -#: ../src/phone.c:2927 ../src/phone.c:2932 +#: ../src/phone.c:2940 ../src/phone.c:2945 msgid "Information" msgstr "Information" -#: ../src/phone.c:3019 +#: ../src/phone.c:3032 msgid "Unknown" msgstr "Inconnu" -#: ../src/phone.c:3022 +#: ../src/phone.c:3035 msgid "Registering..." msgstr "Enregistrement..." -#: ../src/phone.c:3025 +#: ../src/phone.c:3038 msgid "Denied" msgstr "Refusé" -#: ../src/phone.c:3030 +#: ../src/phone.c:3043 msgid "SIM check..." msgstr "Vérification SIM..." -#: ../src/phone.c:3036 +#: ../src/phone.c:3049 msgid "SIM ready..." msgstr "SIM prête..." -#: ../src/phone.c:3093 +#: ../src/phone.c:3106 msgid "Name: " msgstr "Nom: " -#: ../src/phone.c:3101 +#: ../src/phone.c:3114 msgid "Number: " msgstr "Numéro: " -#: ../src/phone.c:3116 +#: ../src/phone.c:3129 msgid "New contact" msgstr "Nouveau contact" -#: ../src/phone.c:3118 +#: ../src/phone.c:3131 msgid "Edit contact: " msgstr "Modifier contact: " -#: ../src/phone.c:3145 +#: ../src/phone.c:3158 msgid "The name cannot be empty" msgstr "Le nom ne peut être vide" -#: ../src/phone.c:3150 +#: ../src/phone.c:3163 msgid "The number cannot be empty" msgstr "Le numéro ne peut être vide" -#: ../src/phone.c:3258 +#: ../src/phone.c:3271 msgid "New message received" msgstr "Nouveau message reçu" -#: ../src/phone.c:3274 +#: ../src/phone.c:3287 msgid "Message sent" msgstr "Message envoyé" -#: ../src/phone.c:3307 +#: ../src/phone.c:3320 msgid "SIM PIN is valid" msgstr "Code SIM PIN valide" -#: ../src/phone.c:3359 +#: ../src/phone.c:3372 msgid "Could not request new message indications" msgstr "Impossible d'obtenir des notifications de nouveaux messages" -#: ../src/phone.c:3370 +#: ../src/phone.c:3383 msgid "Could not send message" msgstr "Le message n'a pas pu être envoyé" -#: ../src/phone.c:3378 +#: ../src/phone.c:3391 msgid "Wrong SIM PIN code" msgstr "Code SIM PIN erroné" -#: ../src/phone.c:3414 +#: ../src/phone.c:3427 msgid "Raw data (not shown)" msgstr "Données brutes (non affichées)" -#: ../src/phone.c:3429 +#: ../src/phone.c:3442 msgid "Message deleted" msgstr "Message supprimé" diff --git a/src/phone.c b/src/phone.c index 1f4619c..f1f7dcb 100644 --- a/src/phone.c +++ b/src/phone.c @@ -1574,8 +1574,11 @@ static void _show_dialer_window(Phone * phone) gtk_window_set_title(GTK_WINDOW(phone->di_window), _("Dialer")); g_signal_connect(G_OBJECT(phone->di_window), "delete-event", G_CALLBACK( on_phone_closex), NULL); - gdk_add_client_message_filter(gdk_atom_intern(PHONE_CLIENT_MESSAGE, - FALSE), on_phone_filter, phone); +#if !GTK_CHECK_VERSION(3, 0, 0) + gdk_display_add_client_message_filter(gdk_display_get_default(), + gdk_atom_intern(PHONE_CLIENT_MESSAGE, FALSE), + on_phone_filter, phone); +#endif vbox = gtk_vbox_new(FALSE, 4); /* entry */ hbox = gtk_hbox_new(FALSE, 4); @@ -1870,7 +1873,7 @@ void phone_show_plugins(Phone * phone, gboolean show) bbox = gtk_hbutton_box_new(); gtk_button_box_set_layout(GTK_BUTTON_BOX(bbox), GTK_BUTTONBOX_END); - gtk_button_box_set_spacing(GTK_BUTTON_BOX(bbox), 4); + gtk_box_set_spacing(GTK_BOX(bbox), 4); widget = gtk_button_new_from_stock(GTK_STOCK_CANCEL); g_signal_connect_swapped(G_OBJECT(widget), "clicked", G_CALLBACK(_on_plugins_cancel), phone); @@ -2256,7 +2259,7 @@ void phone_show_system(Phone * phone, gboolean show) gtk_box_pack_start(GTK_BOX(vbox), phone->sy_hwflow, FALSE, TRUE, 4); bbox = gtk_hbutton_box_new(); gtk_button_box_set_layout(GTK_BUTTON_BOX(bbox), GTK_BUTTONBOX_END); - gtk_button_box_set_spacing(GTK_BUTTON_BOX(bbox), 4); + gtk_box_set_spacing(GTK_BOX(bbox), 4); widget = gtk_button_new_from_stock(GTK_STOCK_CANCEL); g_signal_connect_swapped(G_OBJECT(widget), "clicked", G_CALLBACK( _on_system_cancel), phone); diff --git a/src/plugins/debug.c b/src/plugins/debug.c index f7d2b7e..e709cb5 100644 --- a/src/plugins/debug.c +++ b/src/plugins/debug.c @@ -1,5 +1,5 @@ /* $Id$ */ -/* Copyright (c) 2010 Pierre Pronchery */ +/* Copyright (c) 2011 Pierre Pronchery */ /* This file is part of DeforaOS Desktop Phone */ /* This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -193,10 +193,19 @@ static int _debug_init(PhonePlugin * plugin) gtk_container_set_border_width(GTK_CONTAINER(vbox), 4); /* gsm queue */ debug->queue = NULL; +#if GTK_CHECK_VERSION(3, 0, 0) + debug->gsm = gtk_combo_box_text_new(); +#else debug->gsm = gtk_combo_box_new_text(); +#endif for(i = 0; _debug_gsm_commands[i].name != NULL; i++) +#if GTK_CHECK_VERSION(3, 0, 0) + gtk_combo_box_text_append(GTK_COMBO_BOX_TEXT(debug->gsm), NULL, + _debug_gsm_commands[i].name); +#else gtk_combo_box_append_text(GTK_COMBO_BOX(debug->gsm), _debug_gsm_commands[i].name); +#endif g_signal_connect_swapped(G_OBJECT(debug->gsm), "changed", G_CALLBACK( _on_debug_queue_changed), plugin); gtk_combo_box_set_active(GTK_COMBO_BOX(debug->gsm), 0); @@ -279,8 +288,13 @@ static void _on_debug_queue_changed(gpointer data) if(debug->queue == NULL) return; +#if GTK_CHECK_VERSION(3, 0, 0) + if((text = gtk_combo_box_text_get_active_text(GTK_COMBO_BOX_TEXT( + debug->gsm))) == NULL) +#else if((text = gtk_combo_box_get_active_text(GTK_COMBO_BOX(debug->gsm))) == NULL) +#endif return; for(i = 0; _debug_gsm_commands[i].name != NULL; i++) if(strcmp(_debug_gsm_commands[i].name, text) == 0) diff --git a/src/plugins/panel.c b/src/plugins/panel.c index b3ed601..5ec2669 100644 --- a/src/plugins/panel.c +++ b/src/plugins/panel.c @@ -22,6 +22,9 @@ #endif #include #include +#if GTK_CHECK_VERSION(3, 0, 0) +# include +#endif #include "Phone.h" #include "../phone.h" @@ -421,7 +424,7 @@ static void _panel_settings(PhonePlugin * plugin) /* button box */ bbox = gtk_hbutton_box_new(); gtk_button_box_set_layout(GTK_BUTTON_BOX(bbox), GTK_BUTTONBOX_END); - gtk_button_box_set_spacing(GTK_BUTTON_BOX(bbox), 4); + gtk_box_set_spacing(GTK_BOX(bbox), 4); widget = gtk_button_new_from_stock(GTK_STOCK_CANCEL); g_signal_connect_swapped(G_OBJECT(widget), "clicked", G_CALLBACK( _on_settings_cancel), plugin);