[SCM] KDE Plasma Addons module packaging branch, master, updated. debian/4.13.1-1-333-g5d6336c

[Maximiliano Curia]

Gitweb-URL: http://git.debian.org/?p=pkg-kde/kde-sc/kdeplasma-addons.git;a=commitdiff;h=dcce3fb

The following commit has been merged in the master branch:
commit dcce3fb8dd0fa2e07c5ddaac82a57083b2626adb
Author: Jonathan Riddell <jriddell at canonical.com>
Date:   Wed Aug 19 15:11:55 2009 +0100

    sync with 4.3
---
 debian/patches/kubuntu_04_netbook_runners.diff | 31 +++++++++++++-------------
 1 file changed, 16 insertions(+), 15 deletions(-)

diff --git a/debian/patches/kubuntu_04_netbook_runners.diff b/debian/patches/kubuntu_04_netbook_runners.diff
index 9379fde..21dd840 100644
--- a/debian/patches/kubuntu_04_netbook_runners.diff
+++ b/debian/patches/kubuntu_04_netbook_runners.diff
@@ -10,25 +10,26 @@ Index: contacts/contactsrunner.cpp
  }
  
  ContactsRunner::~ContactsRunner()
-@@ -68,10 +69,18 @@
+@@ -69,10 +69,18 @@
              return;
          }
  
--        bool matchedName = a.realName().contains(term, Qt::CaseInsensitive);
+-        const bool matchedName = a.realName().contains(term, Qt::CaseInsensitive);
 -        bool matchedMail = false;
-+        bool matchedName;
-+        bool matchedMail;
- 
+-
 -        if (!matchedName) {
-+        if (term.compare(i18nc("list of all people in address book", "list contacts"), Qt::CaseInsensitive) == 0) {
-+            matchedName = true;
-+            matchedMail = true;
-+        } else {
-+            matchedName = a.realName().contains(term, Qt::CaseInsensitive);
-+            matchedMail = false;
-+        }
-+
-+        if (!matchedName && !matchedMail) {
++         bool matchedName;
++         bool matchedMail;
++  
++         if (term.compare(i18nc("list of all people in address book", "list contacts"), Qt::CaseInsensitive) == 0) {
++             matchedName = true;
++             matchedMail = true;
++         } else {
++             matchedName = a.realName().contains(term, Qt::CaseInsensitive);
++             matchedMail = false;
++         }
++ 
++         if (!matchedName && !matchedMail) {
              // Name didn't match, so lets try the name portion of the email address
-             int indexOf = a.preferredEmail().indexOf(term, Qt::CaseInsensitive);
+             const int indexOf = a.preferredEmail().indexOf(term, Qt::CaseInsensitive);
              matchedMail = indexOf > -1 && indexOf < a.preferredEmail().indexOf('@');

-- 
KDE Plasma Addons module packaging