[SCM] ktp-common-internals packaging branch, master, updated. debian/15.12.1-2-1839-gf0635e9

[Maximiliano Curia]

Gitweb-URL: http://git.debian.org/?p=pkg-kde/applications/ktp-common-internals.git;a=commitdiff;h=af255db

The following commit has been merged in the master branch:
commit af255db534c8dedc723dee3061996b6b6cde129b
Author: George Kiagiadakis <kiagiadakis.george at gmail.com>
Date:   Wed Jul 11 16:57:45 2012 +0300

    AddContactDialog: Use KMessageBox::sorry() instead of error() and enhance the strings
---
 KTp/Widgets/add-contact-dialog.cpp | 17 ++++++++---------
 1 file changed, 8 insertions(+), 9 deletions(-)

diff --git a/KTp/Widgets/add-contact-dialog.cpp b/KTp/Widgets/add-contact-dialog.cpp
index 8922736..9a4ce1f 100644
--- a/KTp/Widgets/add-contact-dialog.cpp
+++ b/KTp/Widgets/add-contact-dialog.cpp
@@ -115,15 +115,13 @@ void AddContactDialog::accept()
     }
 
     if (account.isNull()) {
-        KMessageBox::error(this,
-                i18n("Seems like you forgot to select an account. Also do not forget to connect it first."),
-                i18n("No Account Selected"));
+        KMessageBox::sorry(this, i18n("Seems like you forgot to select an account. "
+                                      "Also, do not forget to connect it first."));
     } else if (account->connection().isNull()) {
-        KMessageBox::error(this,
-                i18n("The requested account has disconnected and so the contact could not be added. Sorry."),
-                i18n("Connection Error"));
+        KMessageBox::sorry(this, i18n("The requested account has disconnected "
+                                      "and so the contact could not be added."));
     } else if (d->ui->screenNameLineEdit->text().isEmpty()) {
-        KMessageBox::error(this, i18n("You did not specify the name of the contact to add"));
+        KMessageBox::sorry(this, i18n("You did not specify the name of the contact to add."));
     } else {
         QStringList identifiers = QStringList() << d->ui->screenNameLineEdit->text();
         kDebug() << "Requesting contacts for identifiers:" << identifiers;
@@ -149,7 +147,7 @@ void AddContactDialog::_k_onContactsForIdentifiersFinished(Tp::PendingOperation
     if (op->isError()) {
         kWarning() << "Failed to retrieve a contact for the given identifier"
                    << op->errorName() << op->errorMessage();
-        KMessageBox::error(this, i18n("Failed to construct a contact with the given name"));
+        KMessageBox::sorry(this, i18n("Failed to construct a contact with the given name."));
         setInProgress(false);
     } else {
         kDebug() << "Requesting presence subscription";
@@ -166,7 +164,8 @@ void AddContactDialog::_k_onRequestPresenceSubscriptionFinished(Tp::PendingOpera
     if (op->isError()) {
         kWarning() << "Failed to request presence subscription"
                    << op->errorName() << op->errorMessage();
-        KMessageBox::error(this, i18n("Failed to request presence subscription from the requested contact"));
+        KMessageBox::sorry(this, i18n("Failed to request presence subscription "
+                                      "from the requested contact."));
         setInProgress(false);
     } else {
         QDialog::accept();

-- 
ktp-common-internals packaging