[SCM] KDE PIM Libraries module packaging branch, kde4.9, updated. debian/4.8.4-1-23-g5cd80ee

[José Manuel Santamaría Lema]

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

The following commit has been merged in the kde4.9 branch:
commit d4c44fafe48e600a2b37d9d565e0c422b7fa97af
Author: José Manuel Santamaría Lema <panfaust at gmail.com>
Date:   Wed Jan 30 01:10:54 2013 +0100

    Add dont_verify_akonadi_id.diff.
---
 debian/changelog                           |    2 +
 debian/libkpimidentities4.symbols          |    1 -
 debian/patches/dont_verify_akonadi_id.diff |   69 ++++++++++++++++++++++++++++
 debian/patches/series                      |    1 +
 4 files changed, 72 insertions(+), 1 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 27dde8f..2f44d0b 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -11,6 +11,8 @@ kdepimlibs (4:4.9.5-0r1) UNRELEASED; urgency=low
   * Bump kde-sc-dev-latest build dependency to 4:4.9.5.
   * Bump kdelibs5-dev build dependency to 4.9.
   * Bump libakonadi-dev build dependency to 1.8.1.
+  * Add dont_verify_akonadi_id.diff, it makes kmail 4.4.10 remember identity's
+    settings of draft, templates and sent folders.
   * Update some installed files.
   * Update symbols files.
   * Add lintian overrides for hardening-no-fortify-functions.
diff --git a/debian/libkpimidentities4.symbols b/debian/libkpimidentities4.symbols
index 59dc1ce..f8bd891 100644
--- a/debian/libkpimidentities4.symbols
+++ b/debian/libkpimidentities4.symbols
@@ -177,7 +177,6 @@ libkpimidentities.so.4 libkpimidentities4 #MINVER#
  _ZNK14KPIMIdentities8Identity14isXFaceEnabledEv at Base 4:4.3.4
  _ZNK14KPIMIdentities8Identity14mailingAllowedEv at Base 4:4.3.4
  _ZNK14KPIMIdentities8Identity15smimeSigningKeyEv at Base 4:4.3.4
- _ZNK14KPIMIdentities8Identity15verifyAkonadiIdERK7QString at Base 4:4.9.3
  _ZNK14KPIMIdentities8Identity16pgpEncryptionKeyEv at Base 4:4.3.4
  _ZNK14KPIMIdentities8Identity16useSignatureFileEv at Base 4:4.3.4
  _ZNK14KPIMIdentities8Identity17signatureIsInlineEv at Base 4:4.3.4
diff --git a/debian/patches/dont_verify_akonadi_id.diff b/debian/patches/dont_verify_akonadi_id.diff
new file mode 100644
index 0000000..530cc58
--- /dev/null
+++ b/debian/patches/dont_verify_akonadi_id.diff
@@ -0,0 +1,69 @@
+Author: José Manuel Santamaría Lema <panfaust at gmail.com>
+Description: Revert "Fix potential error when identity path is a string (bad conversion)."
+ This patch reverts this upstream commit:
+ https://projects.kde.org/projects/kde/kdepimlibs/repository/revisions/33acd1d6
+ .
+ This commit should be reverted if we are using kmail 4.4.10, because it makes
+ kmail forget the identity's settings of draft, templates and sent folders.
+ -
+ This patch must be removed if kdepimlibs are used with kmail 2, based on akonadi.
+
+--- a/kpimidentities/identity.cpp
++++ b/kpimidentities/identity.cpp
+@@ -428,20 +428,17 @@ QString Identity::dictionary() const
+ 
+ QString Identity::templates() const
+ {
+-  const QString str = property( QLatin1String( s_templates ) ).toString();
+-  return verifyAkonadiId(str);
++  return property( QLatin1String( s_templates ) ).toString();
+ }
+ 
+ QString Identity::drafts() const
+ {
+-  const QString str = property( QLatin1String( s_drafts ) ).toString();
+-  return verifyAkonadiId(str);
++  return property( QLatin1String( s_drafts ) ).toString();
+ }
+ 
+ QString Identity::fcc() const
+ {
+-  const QString str = property( QLatin1String( s_fcc ) ).toString();
+-  return verifyAkonadiId(str);
++  return property( QLatin1String( s_fcc ) ).toString();
+ }
+ 
+ QString Identity::transport() const
+@@ -644,17 +641,3 @@ bool Identity::matchesEmailAddress( const QString & addr ) const
+ 
+   return false;
+ }
+-
+-QString Identity::verifyAkonadiId(const QString& str) const
+-{
+-  if(str.isEmpty())
+-    return str;
+-  bool ok = false;
+-  const qlonglong val = str.toLongLong(&ok);
+-  Q_UNUSED(val);
+-  if(ok) {
+-    return str;
+-  } else {
+-    return QString();
+-  }
+-}
+diff --git a/kpimidentities/identity.h b/kpimidentities/identity.h
+index 349ad4d..22b1f42 100644
+--- a/kpimidentities/identity.h
++++ b/kpimidentities/identity.h
+@@ -311,10 +311,6 @@ class KPIMIDENTITIES_EXPORT Identity
+       void setUoid( uint aUoid );
+ 
+     protected:
+-      /** during migration when it failed it can be a string => not a qlonglong akonadi::id => fix it*/
+-      /** remove it in kde5 */
+-      QString verifyAkonadiId(const QString& str) const;
+-
+       /** @return true if the signature is read from the output of a command */
+       bool signatureIsCommand() const;
+ 
diff --git a/debian/patches/series b/debian/patches/series
index 333e353..bba1e97 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1 +1,2 @@
 03_hide_akonadi_progressbar.diff
+dont_verify_akonadi_id.diff

-- 
KDE PIM Libraries module packaging