diff -Nru telephony-service-0.1+15.04.20150105~rtm/debian/changelog telephony-service-0.1+15.04.20150106~rtm/debian/changelog --- telephony-service-0.1+15.04.20150105~rtm/debian/changelog 2015-01-06 17:40:14.000000000 +0000 +++ telephony-service-0.1+15.04.20150106~rtm/debian/changelog 2015-01-06 17:40:14.000000000 +0000 @@ -1,3 +1,14 @@ +telephony-service (0.1+15.04.20150106~rtm-0ubuntu1) 14.09; urgency=low + + [ Ubuntu daily release ] + * New rebuild forced + + [ Tiago Salem Herrmann ] + * Use only active accounts to send messages. (LP: #1389708) + * Provide the translated string to messaging-menu. (LP: #1389234) + + -- Ubuntu daily release Tue, 06 Jan 2015 17:36:08 +0000 + telephony-service (0.1+15.04.20150105~rtm-0ubuntu1) 14.09; urgency=low [ Ubuntu daily release ] diff -Nru telephony-service-0.1+15.04.20150105~rtm/indicator/messagingmenu.cpp telephony-service-0.1+15.04.20150106~rtm/indicator/messagingmenu.cpp --- telephony-service-0.1+15.04.20150105~rtm/indicator/messagingmenu.cpp 2015-01-05 14:22:58.000000000 +0000 +++ telephony-service-0.1+15.04.20150106~rtm/indicator/messagingmenu.cpp 2015-01-06 17:35:57.000000000 +0000 @@ -148,7 +148,7 @@ timestamp.toMSecsSinceEpoch() * 1000); // the value is expected to be in microseconds messaging_menu_message_add_action(message, "quickReply", - NULL, // label + C::gettext("Send"), // label G_VARIANT_TYPE("s"), NULL // predefined values ); @@ -196,7 +196,7 @@ if (call.number != "x-ofono-private" && call.number != "x-ofono-unknown") { messaging_menu_message_add_action(message, "callBack", - NULL, // label + C::gettext("Call back"), // label NULL, // argument type NULL // predefined values ); @@ -211,7 +211,7 @@ messages = g_variant_new_strv(predefinedMessages, -1); messaging_menu_message_add_action(message, "replyWithMessage", - NULL, // label + C::gettext("Send"), // label G_VARIANT_TYPE("s"), messages // predefined values ); diff -Nru telephony-service-0.1+15.04.20150105~rtm/indicator/textchannelobserver.cpp telephony-service-0.1+15.04.20150106~rtm/indicator/textchannelobserver.cpp --- telephony-service-0.1+15.04.20150105~rtm/indicator/textchannelobserver.cpp 2015-01-05 14:22:58.000000000 +0000 +++ telephony-service-0.1+15.04.20150106~rtm/indicator/textchannelobserver.cpp 2015-01-06 17:35:48.000000000 +0000 @@ -168,10 +168,10 @@ AccountEntry *account = TelepathyHelper::instance()->accountForId(accountId); if (!account || accountId.isEmpty()) { // fallback to the default account - if (TelepathyHelper::instance()->defaultMessagingAccount() && TelepathyHelper::instance()->accounts().size() > 1) { + if (TelepathyHelper::instance()->defaultMessagingAccount() && TelepathyHelper::instance()->activeAccounts().size() > 1) { account = TelepathyHelper::instance()->defaultMessagingAccount(); - } else if (TelepathyHelper::instance()->accounts().size() > 0) { - account = TelepathyHelper::instance()->accounts()[0]; + } else if (TelepathyHelper::instance()->activeAccounts().size() > 0) { + account = TelepathyHelper::instance()->activeAccounts()[0]; } } @@ -513,7 +513,7 @@ void TextChannelObserver::onReplyReceived(const QString &phoneNumber, const QString &reply) { // FIXME - we need to find a better way to deal with dual sim in the messaging-menu - if (!TelepathyHelper::instance()->defaultMessagingAccount() && TelepathyHelper::instance()->accounts().size() > 1) { + if (!TelepathyHelper::instance()->defaultMessagingAccount() && TelepathyHelper::instance()->activeAccounts().size() > 1) { NotifyNotification *notification = notify_notification_new(C::gettext("Please, select a SIM card:"), reply.toStdString().c_str(), ""); @@ -523,7 +523,7 @@ data->observer = this; mNotifications.insert(notification, data); - Q_FOREACH(AccountEntry *account, TelepathyHelper::instance()->accounts()) { + Q_FOREACH(AccountEntry *account, TelepathyHelper::instance()->activeAccounts()) { notify_notification_add_action (notification, account->accountId().toStdString().c_str(), account->displayName().toStdString().c_str(), diff -Nru telephony-service-0.1+15.04.20150105~rtm/po/telephony-service.pot telephony-service-0.1+15.04.20150106~rtm/po/telephony-service.pot --- telephony-service-0.1+15.04.20150105~rtm/po/telephony-service.pot 2015-01-05 14:22:58.000000000 +0000 +++ telephony-service-0.1+15.04.20150106~rtm/po/telephony-service.pot 2015-01-06 17:35:57.000000000 +0000 @@ -8,7 +8,7 @@ msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2014-08-20 11:37+0200\n" +"POT-Creation-Date: 2014-11-04 18:46-0200\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -25,7 +25,7 @@ msgstr[0] "" msgstr[1] "" -#: indicator/messagingmenu.cpp:313 +#: indicator/messagingmenu.cpp:308 #, qt-format msgid "%1 voicemail message" msgid_plural "%1 voicemail messages" @@ -52,24 +52,28 @@ msgid "%1 text messages sent today" msgstr "" -#: approver/approver.cpp:292 +#: approver/approver.cpp:293 msgid "Accept" msgstr "" -#: approver/approver.cpp:275 +#: indicator/messagingmenu.cpp:199 +msgid "Call back" +msgstr "" + +#: approver/approver.cpp:276 msgid "Caller number is not available" msgstr "" -#: approver/approver.cpp:272 +#: approver/approver.cpp:273 #, qt-format msgid "Calling from %1" msgstr "" -#: approver/approver.cpp:268 +#: approver/approver.cpp:269 msgid "Calling from private number" msgstr "" -#: approver/approver.cpp:270 +#: approver/approver.cpp:271 msgid "Calling from unknown number" msgstr "" @@ -77,11 +81,15 @@ msgid "Cancel" msgstr "" -#: approver/approver.cpp:314 +#: indicator/textchannelobserver.cpp:208 +msgid "Deactivate flight mode and try again from the messaging application." +msgstr "" + +#: approver/approver.cpp:315 msgid "Decline" msgstr "" -#: approver/approver.cpp:291 +#: approver/approver.cpp:292 msgid "Hold + Answer" msgstr "" @@ -101,7 +109,7 @@ msgid "I'm running late. I'm on my way." msgstr "" -#: indicator/textchannelobserver.cpp:220 indicator/textchannelobserver.cpp:295 +#: indicator/textchannelobserver.cpp:343 indicator/textchannelobserver.cpp:418 #, qt-format msgid "Message from %1" msgstr "" @@ -122,7 +130,7 @@ msgid "No text messages sent today" msgstr "" -#: indicator/textchannelobserver.cpp:169 indicator/ussdindicator.cpp:79 +#: indicator/textchannelobserver.cpp:271 indicator/ussdindicator.cpp:79 msgid "Ok" msgstr "" @@ -130,7 +138,11 @@ msgid "Phone Calls" msgstr "" -#: Ubuntu/Telephony/contactwatcher.cpp:107 +#: indicator/textchannelobserver.cpp:517 +msgid "Please, select a SIM card:" +msgstr "" + +#: Ubuntu/Telephony/contactwatcher.cpp:136 msgid "Private Number" msgstr "" @@ -151,10 +163,14 @@ msgid "SMS" msgstr "" -#: indicator/textchannelobserver.cpp:175 +#: indicator/textchannelobserver.cpp:277 msgid "Save" msgstr "" +#: indicator/messagingmenu.cpp:151 indicator/messagingmenu.cpp:214 +msgid "Send" +msgstr "" + #: indicator/messagingmenu.cpp:208 msgid "Sorry, I'm still busy. I'll call you later." msgstr "" @@ -176,11 +192,19 @@ msgid "Telephony Service Indicator" msgstr "" -#: Ubuntu/Telephony/contactwatcher.cpp:109 +#: indicator/textchannelobserver.cpp:216 +msgid "The message could not be sent" +msgstr "" + +#: indicator/textchannelobserver.cpp:211 +msgid "Try again from the messaging application." +msgstr "" + +#: Ubuntu/Telephony/contactwatcher.cpp:138 msgid "Unknown Number" msgstr "" -#: approver/approver.cpp:58 +#: approver/approver.cpp:59 msgid "Unknown caller" msgstr "" @@ -188,10 +212,18 @@ msgid "Unknown number" msgstr "" -#: indicator/textchannelobserver.cpp:240 +#: indicator/textchannelobserver.cpp:206 +msgid "Unlock your sim card and try again from the messaging application." +msgstr "" + +#: indicator/textchannelobserver.cpp:228 indicator/textchannelobserver.cpp:363 msgid "View message" msgstr "" -#: indicator/messagingmenu.cpp:311 +#: indicator/messagingmenu.cpp:313 +msgid "Voicemail" +msgstr "" + +#: indicator/messagingmenu.cpp:305 msgid "Voicemail messages" msgstr ""