[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=28ea30b

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

    Add kubuntu_04_netbook_runners.diff from
    plasma-netbook runners-patches/kdeplasma-addons_runners.diff
---
 debian/changelog                               |  7 ++++++
 debian/patches/kubuntu_04_netbook_runners.diff | 34 ++++++++++++++++++++++++++
 debian/patches/series                          |  1 +
 3 files changed, 42 insertions(+)

diff --git a/debian/changelog b/debian/changelog
index 7eba10e..c4b5eb7 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+kdeplasma-addons (4:4.3.0-0ubuntu4) karmic; urgency=low
+
+  * Add kubuntu_04_netbook_runners.diff from 
+    plasma-netbook runners-patches/kdeplasma-addons_runners.diff
+
+ -- Jonathan Riddell <jriddell at ubuntu.com>  Wed, 19 Aug 2009 15:05:53 +0100
+
 kdeplasma-addons (4:4.3.0-0ubuntu3) karmic; urgency=low
 
   * Disable kubuntu_03_opendestop_setup.diff, it causes it to crash
diff --git a/debian/patches/kubuntu_04_netbook_runners.diff b/debian/patches/kubuntu_04_netbook_runners.diff
new file mode 100644
index 0000000..9379fde
--- /dev/null
+++ b/debian/patches/kubuntu_04_netbook_runners.diff
@@ -0,0 +1,34 @@
+Index: contacts/contactsrunner.cpp
+===================================================================
+--- kdeplasma-addons-4.3.0/runners/contacts/contactsrunner.cpp	(revision 979287)
++++ kdeplasma-addons-4.3.0/runners/contacts/contactsrunner.cpp	(working copy)
+@@ -47,6 +47,7 @@
+     setIgnoredTypes(Plasma::RunnerContext::Directory | Plasma::RunnerContext::File |
+                     Plasma::RunnerContext::NetworkLocation);
+     addSyntax(Plasma::RunnerSyntax(":q:", i18n("Finds people in your address book matching :q:.")));
++    addSyntax(Plasma::RunnerSyntax(i18nc("list of all people in address book", "list contacts"), i18n("List all people in your address book.")));
+ }
+ 
+ ContactsRunner::~ContactsRunner()
+@@ -68,10 +69,18 @@
+             return;
+         }
+ 
+-        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) {
+             // Name didn't match, so lets try the name portion of the email address
+             int indexOf = a.preferredEmail().indexOf(term, Qt::CaseInsensitive);
+             matchedMail = indexOf > -1 && indexOf < a.preferredEmail().indexOf('@');
diff --git a/debian/patches/series b/debian/patches/series
index d7a53bd..03cb340 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,2 +1,3 @@
 kubuntu_02_microblog_default_configuration.diff
 #kubuntu_03_opendestop_setup.diff
+kubuntu_04_netbook_runners.diff

-- 
KDE Plasma Addons module packaging