packages: kde4-kdepimlibs/kde4-kdepimlibs-branch.diff, kde4-kdepimlibs/kde4...

arekm arekm at pld-linux.org
Wed Aug 19 21:51:25 CEST 2009 

Author: arekm                        Date: Wed Aug 19 19:51:25 2009 GMT
Module: packages                      Tag: HEAD
---- Log message:
- rel 3; branch diff is back

---- Files affected:
packages/kde4-kdepimlibs:
   kde4-kdepimlibs-branch.diff (1.14 -> 1.15) , kde4-kdepimlibs.spec (1.89 -> 1.90) 

---- Diffs:

================================================================
Index: packages/kde4-kdepimlibs/kde4-kdepimlibs-branch.diff
diff -u packages/kde4-kdepimlibs/kde4-kdepimlibs-branch.diff:1.14 packages/kde4-kdepimlibs/kde4-kdepimlibs-branch.diff:1.15
--- packages/kde4-kdepimlibs/kde4-kdepimlibs-branch.diff:1.14	Fri Jun 26 12:01:52 2009
+++ packages/kde4-kdepimlibs/kde4-kdepimlibs-branch.diff	Wed Aug 19 21:51:19 2009
@@ -1,713 +1,478 @@
-Index: kresources/kresources_manager.desktop
+Index: kpimutils/linklocator.cpp
 ===================================================================
---- kresources/kresources_manager.desktop	(.../tags/KDE/4.2.3/kdepimlibs)	(wersja 987537)
-+++ kresources/kresources_manager.desktop	(.../branches/KDE/4.2/kdepimlibs)	(wersja 987537)
-@@ -29,6 +29,7 @@
- Name[ro]=Gestionar KResurse
- Name[ru]=Управление источниками данных
- Name[se]=KResources-gieđahalli
-+Name[sk]=KResources manažér
- Name[sl]=Upravnik KResources
- Name[sr]=Менаџер к‑ресурса
- Name[sr at latin]=Menadžer k‑resursa
-@@ -71,6 +72,7 @@
- Comment[ro]=Gestionar KResurse
- Comment[ru]=Управление источниками данных
- Comment[se]=KResources-gieđahalli
-+Comment[sk]=KResources manažér
- Comment[sl]=Upravnik KResources
- Comment[sr]=Менаџер к‑ресурса
- Comment[sr at latin]=Menadžer k‑resursa
-Index: kresources/factory.cpp
-===================================================================
---- kresources/factory.cpp	(.../tags/KDE/4.2.3/kdepimlibs)	(wersja 987537)
-+++ kresources/factory.cpp	(.../branches/KDE/4.2/kdepimlibs)	(wersja 987537)
-@@ -57,9 +57,15 @@
-     QMap<QString, KService::Ptr> mTypeMap;
- };
- 
--typedef QMap<QString, Factory*> factoryMap;
--K_GLOBAL_STATIC( factoryMap, mSelves )
-+class FactoryMap : public QMap<QString, Factory*>
-+{
-+public:
- 
-+    ~FactoryMap() { qDeleteAll(*this); }
-+};
-+
-+K_GLOBAL_STATIC( FactoryMap, mSelves )
-+
- Factory *Factory::self( const QString &resourceFamily )
+--- kpimutils/linklocator.cpp	(.../tags/KDE/4.3.0/kdepimlibs)	(wersja 1013409)
++++ kpimutils/linklocator.cpp	(.../branches/KDE/4.3/kdepimlibs)	(wersja 1013409)
+@@ -107,15 +107,19 @@
  {
-   kDebug();
-Index: kresources/kresources.desktop
-===================================================================
---- kresources/kresources.desktop	(.../tags/KDE/4.2.3/kdepimlibs)	(wersja 987537)
-+++ kresources/kresources.desktop	(.../branches/KDE/4.2/kdepimlibs)	(wersja 987537)
-@@ -38,6 +38,7 @@
- Name[ro]=Resurse KDE
- Name[ru]=Источники данных
- Name[se]=KDE-resurssat
-+Name[sk]=KDE zdroje
- Name[sl]=Viri KDE
- Name[sr]=КДЕ ресурси
- Name[sr at latin]=KDE resursi
-@@ -79,6 +80,7 @@
- Comment[ro]=Configurare resurse KDE
- Comment[ru]=Настроить источники данных KDE
- Comment[se]=Heivet KDE-resurssaid
-+Comment[sk]=Konfiguruj KDE zdroje
- Comment[sl]=Nastavi vire KDE
- Comment[sr]=Подеси ресурсе КДЕ‑а
- Comment[sr at latin]=Podesi resurse KDE‑a
-Index: kresources/kresources_plugin.desktop
-===================================================================
---- kresources/kresources_plugin.desktop	(.../tags/KDE/4.2.3/kdepimlibs)	(wersja 987537)
-+++ kresources/kresources_plugin.desktop	(.../branches/KDE/4.2/kdepimlibs)	(wersja 987537)
-@@ -29,6 +29,7 @@
- Name[ro]=Modul KResurse
- Name[ru]=Модуль KResources
- Name[se]=KResources-lassemodula
-+Name[sk]=KResources zásuvný modul
- Name[sl]=Vstavek KResources
- Name[sr]=Прикључак радног оквира к‑ресурса
- Name[sr at latin]=Priključak radnog okvira k‑resursa
-@@ -70,6 +71,7 @@
- Comment[pt_BR]=Plug-in do KResource
- Comment[ro]=Modul de arhitectură KResurse
- Comment[ru]=Модуль инфраструктуры KResource
-+Comment[sk]=KResources Framework zásuvný modul
- Comment[sl]=Vstavek za ogrodje KResources
- Comment[sr]=Прикључак радног оквира к‑ресурса
- Comment[sr at latin]=Priključak radnog okvira k‑resursa
-Index: kcal/localdir.desktop
-===================================================================
---- kcal/localdir.desktop	(.../tags/KDE/4.2.3/kdepimlibs)	(wersja 987537)
-+++ kcal/localdir.desktop	(.../branches/KDE/4.2/kdepimlibs)	(wersja 987537)
-@@ -29,6 +29,7 @@
- Name[ro]=Calendar în director local
- Name[ru]=Календарь в локальной папке
- Name[se]=Kaleandar báikkálaš katalogas
-+Name[sk]=Kalendár v lokálnom adresári.
- Name[sl]=Koledar v krajevnem imeniku
- Name[sr]=Календар у локалној фасцикли
- Name[sr at latin]=Kalendar u lokalnoj fascikli
-@@ -41,6 +42,7 @@
- Name[zh_TW]=本地端目錄裡的行事曆
- Comment=Provides access to calendar items, each stored in a single file, in a given directory
- Comment[ca]=Proporciona l'accés als elements d'un calendari, cada un emmagatzemat en un fitxer individual, en un directori donat
-+Comment[cs]=Poskytuje přístup k položkám kalendáře, každé uložené v jednom souboru v daném adresáři
- Comment[da]=Giver adgang til kalenderelementer, hver lagret i en enkelt fil, i en given mappe
- Comment[de]=Ermöglicht Zugriff auf Kalender, die jeweils in einzelnen Dateien in einem vorgegebenen Ordner gespeichert sind. 
- Comment[el]=Προσφέρει πρόσβαση σε αντικείμενα ημερολογίου, αποθηκευμένα σε ξεχωριστά αρχεία, σε ένα
δοσμένο κατάλογο
-@@ -65,6 +67,7 @@
- Comment[ro]=Oferă acces la elemente de calendar, fiecare stocat într-un singur fișier, într-un anumit director
- Comment[ru]=Хранение каждого события или задачи в отдельных файлах в указанной локальной папке.
- Comment[se]=Dáinna beasat kaleandarmerkošidda, vurkejuvvon okta fiilan, dihto katalogas
-+Comment[sk]=Poskytuje prístup do položiek adresára, každá uložená v jednoduchom súbore v danom adresári.
- Comment[sl]=Nudi dostop do koledarskih vnosov, ki so shranjeni vsak posebej v svoji datoteki, v danem imeniku
- Comment[sr]=Пружа приступ календарским ставкама, складиштеним у појединачним фајловима у датој фасцикли.
- Comment[sr at latin]=Pruža pristup kalendarskim stavkama, skladištenim u pojedinačnim fajlovima u datoj fascikli.
-Index: kcal/local.desktop
-===================================================================
---- kcal/local.desktop	(.../tags/KDE/4.2.3/kdepimlibs)	(wersja 987537)
-+++ kcal/local.desktop	(.../branches/KDE/4.2/kdepimlibs)	(wersja 987537)
-@@ -29,6 +29,7 @@
- Name[ro]=Calendar în fișier local
- Name[ru]=Календарь в локальном файле
- Name[se]=Kaleandar báikkálaš fiillas
-+Name[sk]=Kalendár v lokálnom súbore
- Name[sl]=Koledar v krajevni datoteki
- Name[sr]=Календар у локалном фајлу
- Name[sr at latin]=Kalendar u lokalnom fajlu
-@@ -41,6 +42,7 @@
- Name[zh_TW]=本地端檔案裡的行事曆
- Comment=Provides access to a calendar stored in a single local file
- Comment[ca]=Proporciona l'accés a un calendari emmagatzemat en un fitxer local individual
-+Comment[cs]=Poskytuje přístup ke kalendáři uloženém v jednom lokálním souboru
- Comment[da]=Giver adgang til en kalender lagret i en enkelt lokal fil
- Comment[de]=Ermöglicht Zugriff auf einen Kalender, der in einer einzigen Dateien lokal gespeichert ist
- Comment[el]=Προσφέρει πρόσβαση σε ένα ημερολόγιο αποθηκευμένο σε ένα τοπικό αρχείο
-@@ -65,6 +67,7 @@
- Comment[ro]=Oferă acces la un calendar stocat într-un singur fișier local
- Comment[ru]=Хранение календаря в одном локальном файле
- Comment[se]=Dáinna beasat kaleandarii vurkejuvvon okta báikásaš fiilan
-+Comment[sk]=Poskytuje prístup ku kalendáru uloženému v jednoduchom lokálnom súbore.
- Comment[sl]=Nudi dostop do koledarja, ki je shranjen v eni sami krajevni datoteki
- Comment[sr]=Пружа приступ календару складиштеном у једном локалном фајлу
- Comment[sr at latin]=Pruža pristup kalendaru skladištenom u jednom lokalnom fajlu
-Index: kcal/kcal_manager.desktop
+   QString url;
+   if ( atUrl() ) {
+-    // handle cases like this: <link>http://foobar.org/</link>
++    // for reference: rfc1738:
++    // Thus, only alphanumerics, the special characters "$-_.+!*'(),", and
++    // reserved characters used for their reserved purposes may be used
++    // unencoded within a URL.
++    // NOTE: this implementation is not RFC conforming
+     int start = mPos;
+     while ( mPos < (int)mText.length() &&
+             mText[mPos] > ' ' && mText[mPos] != '"' &&
+-            QString( "<>()[]" ).indexOf( mText[mPos] ) == -1 ) {
++            QString( "<>[]" ).indexOf( mText[mPos] ) == -1 ) {
+       ++mPos;
+     }
+ 
+-    /* some URLs really end with:  # / & - _    */
++    // some URLs really end with:  # / & - _
+     const QString allowedSpecialChars = QString( "#/&-_" );
+     while ( mPos > start && mText[mPos-1].isPunct() &&
+             allowedSpecialChars.indexOf( mText[mPos-1] ) == -1 ) {
+@@ -268,20 +272,38 @@
+     ch = locator.mText[locator.mPos];
+     if ( flags & PreserveSpaces ) {
+       if ( ch == ' ' ) {
++        if ( locator.mPos + 1 < locator.mText.length() ) {
++          if ( locator.mText[locator.mPos + 1] != ' ' ) {
++
++            // A single space, make it breaking if not at the start or end of the line
++            const bool endOfLine = locator.mText[locator.mPos + 1] == '\n';
++            if ( !startOfLine && !endOfLine )
++              result += ' ';
++            else
++              result += "&nbsp;";
++          }
++          else {
++
++            // Whitespace of more than one space, make it all non-breaking
++            while( locator.mPos < locator.mText.length() && locator.mText[locator.mPos] == ' ' ) {
++              result += "&nbsp;";
++              locator.mPos++;
++              x++;
++            }
++
++            // We incremented once to often, undo that
++            locator.mPos--;
++            x--;
++          }
++        }
++        else {
++          // Last space in the text, it is non-breaking
++          result += "&nbsp;";
++        }
++
+         if ( startOfLine ) {
+-          result += "&nbsp;";
+-          locator.mPos++, x++;
+           startOfLine = false;
+         }
+-        while ( locator.mText[locator.mPos] == ' ' ) {
+-          result += ' ';
+-          locator.mPos++, x++;
+-          if ( locator.mText[locator.mPos] == ' ' ) {
+-            result += "&nbsp;";
+-            locator.mPos++, x++;
+-          }
+-        }
+-        locator.mPos--, x--;
+         continue;
+       } else if ( ch == '\t' ) {
+         do
+Index: kpimutils/tests/testlinklocator.cpp
 ===================================================================
---- kcal/kcal_manager.desktop	(.../tags/KDE/4.2.3/kdepimlibs)	(wersja 987537)
-+++ kcal/kcal_manager.desktop	(.../branches/KDE/4.2/kdepimlibs)	(wersja 987537)
+--- kpimutils/tests/testlinklocator.cpp	(.../tags/KDE/4.3.0/kdepimlibs)	(wersja 1013409)
++++ kpimutils/tests/testlinklocator.cpp	(.../branches/KDE/4.3/kdepimlibs)	(wersja 1013409)
 @@ -19,6 +19,7 @@
- Name[km]=ប្រតិទិន
- Name[lt]=Kalendorius
- Name[lv]=Kalendārs
-+Name[mai]=कैलेंडर
- Name[nb]=Kalender
- Name[nds]=Kalenner
- Name[nl]=Agenda
-@@ -30,6 +31,7 @@
- Name[pt_BR]=Calendário
- Name[ru]=Календарь
- Name[se]=Kaleandar
-+Name[sk]=Kalendár
- Name[sl]=Koledar
- Name[sr]=Календар
- Name[sr at latin]=Kalendar
-Index: kcal/recurrence.cpp
-===================================================================
---- kcal/recurrence.cpp	(.../tags/KDE/4.2.3/kdepimlibs)	(wersja 987537)
-+++ kcal/recurrence.cpp	(.../branches/KDE/4.2/kdepimlibs)	(wersja 987537)
-@@ -941,12 +941,35 @@
-   for ( i = 0, count = d->mRRules.count();  i < count;  ++i ) {
-     times += d->mRRules[i]->timesInInterval( start, end );
-   }
--  times += d->mRDateTimes;
--  KDateTime kdt( startDateTime() );
+   Boston, MA 02110-1301, USA.
+ */
+ #include <qtest_kde.h>
++#include <kdebug.h>
+ 
+ #include "testlinklocator.h"
+ #include "testlinklocator.moc"
+@@ -104,3 +105,126 @@
+   QVERIFY( llq.getEmailAddress() == "foo at bar-bar.baz" );
+ }
+ 
++void LinkLocatorTest::testGetUrl()
++{
++  QStringList brackets;
++  brackets << "" << "";   // no brackets
++  brackets << "(" << ")";
++  brackets << "<" << ">";
++  brackets << "[" << "]";
++  brackets << "<link>" << "</link>";
++
++  for (int i = 0; i < brackets.count(); i += 2)
++    testGetUrl2(brackets[i], brackets[i+1]);
++}
 +
-+  // add rdatetimes that fit in the interval
-+  for ( i = 0, count = d->mRDateTimes.count();  i < count;  ++i ) {
-+    if ( d->mRDateTimes[i] >= start && d->mRDateTimes[i] <= end ) {
-+      times += d->mRDateTimes[i];
++void LinkLocatorTest::testGetUrl2(const QString &left, const QString &right)
++{
++  QStringList schemas;
++  schemas << "http://";
++  schemas << "https://";
++  schemas << "vnc://";
++  schemas << "fish://";
++  schemas << "ftp://";
++  schemas << "ftps://";
++  schemas << "sftp://";
++  schemas << "smb://";
++  schemas << "file://";
++
++  QStringList urls;
++  urls << "www.kde.org";
++  urls << "user at www.kde.org";
++  urls << "user:pass at www.kde.org";
++  urls << "user:pass at www.kde.org:1234";
++  urls << "user:pass at www.kde.org:1234/sub/path";
++  urls << "user:pass at www.kde.org:1234/sub/path?a=1";
++  urls << "user:pass at www.kde.org:1234/sub/path?a=1#anchor";
++  urls << "user:pass at www.kde.org:1234/sub/path/special(123)?a=1#anchor";
++  urls << "user:pass at www.kde.org:1234/sub/path:with:colon/special(123)?a=1#anchor";
++
++  foreach (QString schema, schemas)
++  {
++    foreach (QString url, urls)
++    {
++      QString test(left + schema + url + right);
++      LinkLocator ll(test, left.length());
++      QString gotUrl = ll.getUrl();
++
++      bool ok = ( gotUrl == (schema + url) );
++      //qDebug() << "check:" << (ok ? "OK" : "NOK") << test << "=>" << (schema + url);
++      QVERIFY2( ok, qPrintable(test) );
 +    }
 +  }
 +
-+  // add rdates that fit in the interval
-+  KDateTime kdt( d->mStartDateTime );
-   for ( i = 0, count = d->mRDates.count();  i < count;  ++i ) {
-     kdt.setDate( d->mRDates[i] );
--    times += kdt;
-+    if ( kdt >= start && kdt <= end ) {
-+      times += kdt;
++  QStringList urlsWithoutSchema;
++  urlsWithoutSchema << ".kde.org";
++  urlsWithoutSchema << ".kde.org:1234/sub/path";
++  urlsWithoutSchema << ".kde.org:1234/sub/path?a=1";
++  urlsWithoutSchema << ".kde.org:1234/sub/path?a=1#anchor";
++  urlsWithoutSchema << ".kde.org:1234/sub/path/special(123)?a=1#anchor";
++  urlsWithoutSchema << ".kde.org:1234/sub/path:with:colon/special(123)?a=1#anchor";
++
++  QStringList starts;
++  starts << "www" << "ftp" << "news:www";
++
++  foreach (QString start, starts)
++  {
++    foreach (QString url, urlsWithoutSchema)
++    {
++      QString test(left + start + url + right);
++      LinkLocator ll(test, left.length());
++      QString gotUrl = ll.getUrl();
++
++      bool ok = ( gotUrl == (start + url) );
++      //qDebug() << "check:" << (ok ? "OK" : "NOK") << test << "=>" << (start + url);
++      QVERIFY2( ok, qPrintable(test) );
 +    }
-   }
++  }
 +
-+  // Recurrence::timesInInterval(...) doesn't explicitly add mStartDateTime to the list
-+  // of times to be returned. It calls mRRules[i]->timesInInterval(...) which include
-+  // mStartDateTime.
-+  // So, If we have rdates/rdatetimes but don't have any rrule we must explicitly
-+  // add mStartDateTime to the list, otherwise we won't see the first occurrence.
-+  if ( ( !d->mRDates.isEmpty() || !d->mRDateTimes.isEmpty() ) &&
-+       d->mRRules.isEmpty() &&
-+       start <= d->mStartDateTime &&
-+       end >= d->mStartDateTime ) {
-+    times += d->mStartDateTime;
++  // mailto
++  {
++    QString addr = "mailto:test at kde.org";
++    QString test(left + addr + right);
++    LinkLocator ll(test, left.length());
++
++    QString gotUrl = ll.getUrl();
++
++    bool ok = ( gotUrl == addr );
++    //qDebug() << "check:" << (ok ? "OK" : "NOK") << test << "=>" << addr;
++    QVERIFY2( ok, qPrintable(test) );
 +  }
++}
 +
-   times.sortUnique();
++void LinkLocatorTest::testHtmlConvert_data()
++{
++  QTest::addColumn<QString>("plainText");
++  QTest::addColumn<int>("flags");
++  QTest::addColumn<QString>("htmlText");
++
++  //QTest::newRow( "" ) << "foo" << 0 << "foo";
++  //QTest::newRow( "" ) << "  foo " << 0 << "  foo ";
++  // Linker error when using PreserveSpaces, therefore the hardcoded 0x01
++  QTest::newRow( "" ) << " foo" << 0x01 << "&nbsp;foo";
++  QTest::newRow( "" ) << "  foo" << 0x01 << "&nbsp;&nbsp;foo";
++  QTest::newRow( "" ) << "  foo  " << 0x01 << "&nbsp;&nbsp;foo&nbsp;&nbsp;";
++  QTest::newRow( "" ) << "  foo " << 0x01 << "&nbsp;&nbsp;foo&nbsp;";
++  QTest::newRow( "" ) << "bla bla bla bla bla" << 0x01 << "bla bla bla bla bla";
++  QTest::newRow( "" ) << "bla bla bla \n  bla bla bla " << 0x01
++                      << "bla bla bla&nbsp;<br />\n&nbsp;&nbsp;bla bla bla&nbsp;";
++  QTest::newRow( "" ) << "bla bla  bla" << 0x01
++                      << "bla bla&nbsp;&nbsp;bla";
++  QTest::newRow( "" ) << " bla bla \n bla bla a\n  bla bla " << 0x01
++                      << "&nbsp;bla bla&nbsp;<br />\n&nbsp;bla bla a<br />\n&nbsp;&nbsp;bla bla&nbsp;";
++}
++
++void LinkLocatorTest::testHtmlConvert()
++{
++  QFETCH(QString, plainText);
++  QFETCH(int, flags);
++  QFETCH(QString, htmlText);
++
++  QString actualHtml = LinkLocator::convertToHtml( plainText, flags );
++  QCOMPARE( actualHtml, htmlText );
++}
++
++
+Index: kpimutils/tests/testlinklocator.h
+===================================================================
+--- kpimutils/tests/testlinklocator.h	(.../tags/KDE/4.3.0/kdepimlibs)	(wersja 1013409)
++++ kpimutils/tests/testlinklocator.h	(.../branches/KDE/4.3/kdepimlibs)	(wersja 1013409)
+@@ -29,6 +29,12 @@
+   Q_OBJECT
+   private Q_SLOTS:
+     void testGetEmailAddress();
++    void testGetUrl();
++    void testHtmlConvert();
++    void testHtmlConvert_data();
++
++  private:
++    void testGetUrl2(const QString &left, const QString &right);
+ };
  
-   // Remove excluded times
-Index: kcal/htmlexport.cpp
+ #endif
+Index: kcal/icalformat_p.cpp
 ===================================================================
---- kcal/htmlexport.cpp	(.../tags/KDE/4.2.3/kdepimlibs)	(wersja 987537)
-+++ kcal/htmlexport.cpp	(.../branches/KDE/4.2/kdepimlibs)	(wersja 987537)
-@@ -501,7 +501,7 @@
-     *ts << " class=\"done\"";
-   }
-   *ts << ">\n";
--  *ts << "    " << i18nc( "@info to-do percent complete",
-+  *ts << "    " << i18nc( "@info/plain to-do percent complete",
-                           "%1 %", todo->percentComplete() ) << "\n";
-   *ts << "  </td>\n";
- 
-@@ -664,7 +664,7 @@
- void HtmlExport::createFooter( QTextStream *ts )
- {
-   // FIXME: Implement this in a translatable way!
--  QString trailer = i18nc( "@info", "This page was created " );
-+  QString trailer = i18nc( "@info/plain", "This page was created " );
- 
- /*  bool hasPerson = false;
-   bool hasCredit = false;
-@@ -672,27 +672,27 @@
-   QString mail, name, credit, creditURL;*/
-   if ( !d->mSettings->eMail().isEmpty() ) {
-     if ( !d->mSettings->name().isEmpty() ) {
--      trailer += i18nc( "@info page creator email link with name",
-+      trailer += i18nc( "@info/plain page creator email link with name",
-                         "by <link url='mailto:%1'>%2</link>",
-                         d->mSettings->eMail(), d->mSettings->name() );
-     } else {
--      trailer += i18nc( "@info page creator email link",
-+      trailer += i18nc( "@info/plain page creator email link",
-                         "by <link url='mailto:%1'>%2</link>",
-                         d->mSettings->eMail(), d->mSettings->eMail() );
-     }
-   } else {
-     if ( !d->mSettings->name().isEmpty() ) {
--      trailer += i18nc( "@info page creator name only",
-+      trailer += i18nc( "@info/plain page creator name only",
-                         "by %1 ", d->mSettings->name() );
-     }
-   }
-   if ( !d->mSettings->creditName().isEmpty() ) {
-     if ( !d->mSettings->creditURL().isEmpty() ) {
--      trailer += i18nc( "@info page credit with name and link",
-+      trailer += i18nc( "@info/plain page credit with name and link",
-                         "with <link url='%1'>%2</link>",
-                         d->mSettings->creditURL(), d->mSettings->creditName() );
-     } else {
--      trailer += i18nc( "@info page credit name only",
-+      trailer += i18nc( "@info/plain page credit name only",
-                         "with %1", d->mSettings->creditName() );
-     }
-   }
-@@ -759,7 +759,7 @@
-   if ( d->mHolidayMap[date].isEmpty() ) {
-     d->mHolidayMap[date] = name;
-   } else {
--    d->mHolidayMap[date] = i18nc( "@info holiday by date and name",
-+    d->mHolidayMap[date] = i18nc( "@info/plain holiday by date and name",
-                                   "%1, %2", d->mHolidayMap[date], name );
-   }
- }
+--- kcal/icalformat_p.cpp	(.../tags/KDE/4.3.0/kdepimlibs)	(wersja 1013409)
++++ kcal/icalformat_p.cpp	(.../branches/KDE/4.3/kdepimlibs)	(wersja 1013409)
+@@ -629,7 +629,7 @@
+     if ( !c.key().startsWith( "X-KDE" ) &&          //krazy:exclude=strings
+          !c.key().startsWith( "X-LibKCal" ) &&      //krazy:exclude=strings
+          !c.key().startsWith( "X-MICROSOFT" ) &&    //krazy:exclude=strings
+-         !c.key().startsWith( "X-MOZILLA" ) &&      //krazy:exclude=strings
++         !c.key().startsWith( "X-MOZ" ) &&          //krazy:exclude=strings
+          !c.key().startsWith( "X-PILOT" ) ) {       //krazy:exclude=strings
+       // use text values for the typical X-FOO property.
+       // except for vendor specific X-FOO properties.
 Index: kcal/incidenceformatter.cpp
 ===================================================================
---- kcal/incidenceformatter.cpp	(.../tags/KDE/4.2.3/kdepimlibs)	(wersja 987537)
-+++ kcal/incidenceformatter.cpp	(.../branches/KDE/4.2/kdepimlibs)	(wersja 987537)
-@@ -402,11 +402,12 @@
-     tmpStr += "<td>" + eventViewerFormatAttachments( event ) + "</td>";
-     tmpStr += "</tr>";
-   }
--
-+  KDateTime kdt = event->created().toTimeSpec( spec );
-   tmpStr += "</table>";
-   tmpStr += "<p><em>" +
-             i18n( "Creation date: %1", KGlobal::locale()->formatDateTime(
--                    event->created().dateTime(), KLocale::ShortDate ) ) + "</em>";
-+                    kdt.dateTime(),
-+                    KLocale::ShortDate ) ) + "</em>";
-   return tmpStr;
- }
- 
-@@ -449,8 +450,10 @@
-   }
-   tmpStr += eventViewerFormatAttendees( todo );
-   tmpStr += eventViewerFormatAttachments( todo );
-+
-+  KDateTime kdt = todo->created().toTimeSpec( spec );
-   tmpStr += "<p><em>" + i18n( "Creation date: %1",
--    KGlobal::locale()->formatDateTime( todo->created().dateTime(), KLocale::ShortDate ) ) + "</em>";
-+    KGlobal::locale()->formatDateTime( kdt.dateTime(), KLocale::ShortDate ) ) + "</em>";
-   return tmpStr;
- }
+--- kcal/incidenceformatter.cpp	(.../tags/KDE/4.3.0/kdepimlibs)	(wersja 1013409)
++++ kcal/incidenceformatter.cpp	(.../branches/KDE/4.3/kdepimlibs)	(wersja 1013409)
+@@ -1541,11 +1541,13 @@
+   {
+     if ( incidence && incidence->revision() > 0 && ( existingIncidence || !helper->calendar() ) ) {
+       html += tdOpen;
+-      if ( incBase->type() == "Todo" ) {
+-        //TODO: 4.4, remove the []
+-        html += helper->makeLink( "reply", i18n( "[Enter this into my to-do list]" ) );
+-      } else {
+-        html += helper->makeLink( "reply", i18n( "[Enter this into my calendar]" ) );
++      if ( incBase ) {
++        if ( incBase->type() == "Todo" ) {
++          //TODO: 4.4, remove the []
++          html += helper->makeLink( "reply", i18n( "[Enter this into my to-do list]" ) );
++        } else {
++          html += helper->makeLink( "reply", i18n( "[Enter this into my calendar]" ) );
++        }
+       }
+       html += tdClose;
+     }
+@@ -1589,7 +1591,7 @@
+       html += tdClose;
  
-@@ -655,26 +658,41 @@
- {
-   QString html;
-   QString descr;
--  if ( !incidence->descriptionIsRich() ) {
--    descr = string2HTML( incidence->description() );
--  } else {
--    descr = incidence->richDescription();
--    if ( noHtmlMode ) {
--      descr = cleanHtml( descr );
-+  QStringList comments;
-+  if ( !incidence->description().isEmpty() ) {
-+    if ( !incidence->descriptionIsRich() ) {
-+      descr = string2HTML( incidence->description() );
-+    } else {
-+      descr = incidence->richDescription();
-+      if ( noHtmlMode ) {
-+        descr = cleanHtml( descr );
+       // Check in calendar
+-      if ( incBase->type() == "Event" ) {
++      if ( incBase && incBase->type() == "Event" ) {
+         html += tdOpen;
+         //TODO: 4.4, remove the []
+         //TODO: 4.4, change to "Check calendar"
+@@ -1613,10 +1615,12 @@
+     html += tdOpen;
+     //TODO: 4.4, remove the []
+     //TODO: 4.4, change string to "Enter this response into my..."
+-    if ( incBase->type() == "Todo" ) {
+-      html += helper->makeLink( "reply", i18n( "[Enter this into my to-do list]" ) );
+-    } else {
+-      html += helper->makeLink( "reply", i18n( "[Enter this into my calendar]" ) );
++    if ( incBase ) {
++      if ( incBase->type() == "Todo" ) {
++        html += helper->makeLink( "reply", i18n( "[Enter this into my to-do list]" ) );
++      } else {
++        html += helper->makeLink( "reply", i18n( "[Enter this into my calendar]" ) );
 +      }
-+      descr = eventViewerAddTag( "p", descr );
      }
<<Diff was trimmed, longer than 597 lines>>

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/kde4-kdepimlibs/kde4-kdepimlibs-branch.diff?r1=1.14&r2=1.15&f=u
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/kde4-kdepimlibs/kde4-kdepimlibs.spec?r1=1.89&r2=1.90&f=u

More information about the pld-cvs-commit mailing list