[SCM] ktp-contact-applet packaging branch, master, updated. debian/15.12.1-1-966-gde83ac5

[Maximiliano Curia]

Gitweb-URL: http://git.debian.org/?p=pkg-kde/applications/ktp-desktop-applets.git;a=commitdiff;h=470a0dc

The following commit has been merged in the master branch:
commit 470a0dc6195b74b46e04519c2ca859ec63add66e
Author: Martin Klapetek <martin.klapetek at gmail.com>
Date:   Tue May 8 14:15:38 2012 +0200

    Fix spelling
    
    Reviewed-by: David Edmundson
---
 contact-applet/src/contact-wrapper.h     | 14 +++++++-------
 contact-applet/src/telepathy-contact.cpp |  2 +-
 2 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/contact-applet/src/contact-wrapper.h b/contact-applet/src/contact-wrapper.h
index da94a5a..5e04d0e 100644
--- a/contact-applet/src/contact-wrapper.h
+++ b/contact-applet/src/contact-wrapper.h
@@ -46,22 +46,22 @@ public:
     /** returns the avatar location for the contact */
     QString avatar() const;
 
-    /** returns wether the contact can send files */
+    /** returns whether the contact can send files */
     bool canSendFile() const;
 
-    /** returns wether the contact can start/recieve audio calls */
+    /** returns whether the contact can start/receive audio calls */
     bool canStartAudioCall() const;
 
-    /** returns wether the contact can start/recieve video */
+    /** returns whether the contact can start/receive video */
     bool canStartVideo() const;
 
-    /** returns current contact being rappresented */
+    /** returns current contact being represented */
     Tp::ContactPtr contact() const;
 
     /** returns the display name of the contact */
     QString displayName() const;
 
-    /** returns wether the account is online/offline */
+    /** returns whether the account is online/offline */
     bool isAccountOnline() const;
 
     /** returns the contact presence status (online, offlince ... ) */
@@ -72,8 +72,8 @@ public:
      */
     void setAccount(const Tp::AccountPtr &relatedAccount);
 
-    /** set new contact to rappresent
-     * @param newContact the contact to rappresent
+    /** set new contact to represent
+     * @param newContact the contact to represent
      */
     void setContact(const Tp::ContactPtr &newContact);
 
diff --git a/contact-applet/src/telepathy-contact.cpp b/contact-applet/src/telepathy-contact.cpp
index 7f6c718..7445cb5 100644
--- a/contact-applet/src/telepathy-contact.cpp
+++ b/contact-applet/src/telepathy-contact.cpp
@@ -81,7 +81,7 @@ void TelepathyContact::init()
         // setup qml object so that we can talk to the declarative part
         m_qmlObject = dynamic_cast<QObject*>(m_declarative->rootObject());
 
-        // connect the qml object to recieve signals from C++ end
+        // connect the qml object to receive signals from C++ end
         connect(m_contact, SIGNAL(newContactSet()), m_qmlObject, SLOT(updateContact()));
         connect(m_contact, SIGNAL(avatarChanged()), m_qmlObject, SLOT(updateContact()));
         connect(m_contact, SIGNAL(presenceChanged()), m_qmlObject, SLOT(updateContact()));

-- 
ktp-contact-applet packaging