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

arekm arekm at pld-linux.org
Thu May 28 21:37:24 CEST 2009 

Author: arekm                        Date: Thu May 28 19:37:24 2009 GMT
Module: packages                      Tag: HEAD
---- Log message:
- rel 6; branch diff is back

---- Files affected:
packages/kde4-kdepimlibs:
   kde4-kdepimlibs-branch.diff (1.12 -> 1.13) , kde4-kdepimlibs.spec (1.80 -> 1.81) 

---- Diffs:

================================================================
Index: packages/kde4-kdepimlibs/kde4-kdepimlibs-branch.diff
diff -u packages/kde4-kdepimlibs/kde4-kdepimlibs-branch.diff:1.12 packages/kde4-kdepimlibs/kde4-kdepimlibs-branch.diff:1.13
--- packages/kde4-kdepimlibs/kde4-kdepimlibs-branch.diff:1.12	Sun Apr 19 18:52:38 2009
+++ packages/kde4-kdepimlibs/kde4-kdepimlibs-branch.diff	Thu May 28 21:37:18 2009
@@ -1,791 +1,483 @@
-Index: kresources/kresources_manager.desktop
+Index: kresources/factory.cpp
 ===================================================================
---- kresources/kresources_manager.desktop	(.../tags/KDE/4.2.2/kdepimlibs)	(wersja 956244)
-+++ kresources/kresources_manager.desktop	(.../branches/KDE/4.2/kdepimlibs)	(wersja 956244)
-@@ -27,7 +27,7 @@
- Name[pt]=Gestor do KResources
- Name[pt_BR]=Gerenciador do KResource
- Name[ro]=Gestionar KResurse
--Name[ru]=Управление источниками
-+Name[ru]=Управление источниками данных
- Name[se]=KResources-gieđahalli
- Name[sl]=Upravnik KResources
- Name[sr]=Менаџер к‑ресурса
-@@ -69,7 +69,7 @@
- Comment[pt]=Gestor do KResources
- Comment[pt_BR]=Gerenciador do KResource
- Comment[ro]=Gestionar KResurse
--Comment[ru]=Управление источниками
-+Comment[ru]=Управление источниками данных
- Comment[se]=KResources-gieđahalli
- Comment[sl]=Upravnik KResources
- Comment[sr]=Менаџер к‑ресурса
-Index: kresources/kresources.desktop
-===================================================================
---- kresources/kresources.desktop	(.../tags/KDE/4.2.2/kdepimlibs)	(wersja 956244)
-+++ kresources/kresources.desktop	(.../branches/KDE/4.2/kdepimlibs)	(wersja 956244)
-@@ -36,7 +36,7 @@
- Name[pt]=Recursos do KDE
- Name[pt_BR]=Fontes de dados do KDE
- Name[ro]=Resurse KDE
--Name[ru]=Источники KDE
-+Name[ru]=Источники данных
- Name[se]=KDE-resurssat
- Name[sl]=Viri KDE
- Name[sr]=КДЕ ресурси
-@@ -77,7 +77,7 @@
- Comment[pt]=Configurar os Recursos do KDE
- Comment[pt_BR]=Configurar as fontes de dados do KDE
- Comment[ro]=Configurare resurse KDE
--Comment[ru]=Настроить источники KDE
-+Comment[ru]=Настроить источники данных KDE
- Comment[se]=Heivet KDE-resurssaid
- Comment[sl]=Nastavi vire KDE
- Comment[sr]=Подеси ресурсе КДЕ‑а
-Index: kmime/kmime_message.cpp
-===================================================================
---- kmime/kmime_message.cpp	(.../tags/KDE/4.2.2/kdepimlibs)	(wersja 956244)
-+++ kmime/kmime_message.cpp	(.../branches/KDE/4.2/kdepimlibs)	(wersja 956244)
-@@ -63,13 +63,17 @@
- 
-   //From
-   h = from(); // "From" is mandatory
--  newHead += h->as7BitString() + '\n';
--  KMime::removeHeader( d->head, h->type() );
-+  if ( !h->isEmpty() ) {
-+    newHead += h->as7BitString() + '\n';
-+    KMime::removeHeader( d->head, h->type() );
-+  }
- 
-   //Subject
-   h = subject(); // "Subject" is mandatory
--  newHead += h->as7BitString() + '\n';
--  KMime::removeHeader( d->head, h->type() );
-+  if ( !h->isEmpty() ) {
-+    newHead += h->as7BitString() + '\n';
-+    KMime::removeHeader( d->head, h->type() );
-+  }
- 
-   //To
-   if ( ( h = to( false )) != 0 && !h->isEmpty() ) {
-@@ -91,8 +95,10 @@
- 
-   //Date
-   h = date(); // "Date" is mandatory
--  newHead += h->as7BitString() + '\n';
--  KMime::removeHeader( d->head, h->type() );
-+  if ( !h->isEmpty() ) {
-+    newHead += h->as7BitString() + '\n';
-+    KMime::removeHeader( d->head, h->type() );
-+  }
- 
-   //References
-   if ( ( h = references( false )) != 0 && !h->isEmpty() ) {
-Index: kmime/tests/kmime_message_test.cpp
-===================================================================
---- kmime/tests/kmime_message_test.cpp	(.../tags/KDE/4.2.2/kdepimlibs)	(wersja 956244)
-+++ kmime/tests/kmime_message_test.cpp	(.../branches/KDE/4.2/kdepimlibs)	(wersja 956244)
-@@ -143,3 +143,32 @@
-   delete msg;
- }
+--- kresources/factory.cpp	(.../tags/KDE/4.2.3/kdepimlibs)	(wersja 974231)
++++ kresources/factory.cpp	(.../branches/KDE/4.2/kdepimlibs)	(wersja 974231)
+@@ -57,9 +57,15 @@
+     QMap<QString, KService::Ptr> mTypeMap;
+ };
  
-+void MessageTest::missingHeadersTest()
+-typedef QMap<QString, Factory*> factoryMap;
+-K_GLOBAL_STATIC( factoryMap, mSelves )
++class FactoryMap : public QMap<QString, Factory*>
 +{
-+  // Test that the message body is OK even though some headers are missing
-+  KMime::Message msg;
-+  QString body = "Hi Donald, look at those nice pictures I found!\n";
-+  QString content = "From: georgebush at whitehouse.org\n"
-+    "To: donaldrumsfeld at whitehouse.org\n"
-+    "Subject: Cute Kittens\n"
-+    "\n" + body;
-+  msg.setContent( content.toAscii() );
-+  msg.parse();
-+  msg.assemble();
-+
-+  QCOMPARE( body, QString::fromAscii( msg.body() ) );
-+
-+  // Now create a new message, based on the content of the first one.
-+  // The body of the new message should still be the same.
-+  // (there was a bug that caused missing mandatory headers to be
-+  //  added as a empty newline, which caused parts of the header to
-+  //  leak into the body)
-+  KMime::Message msg2;
-+  qDebug() << msg.encodedContent();
-+  msg2.setContent( msg.encodedContent() );
-+  msg2.parse();
-+  msg2.assemble();
++public:
+ 
++    ~FactoryMap() { qDeleteAll(*this); }
++};
 +
-+  QCOMPARE( body, QString::fromAscii( msg2.body() ) );
-+}
++K_GLOBAL_STATIC( FactoryMap, mSelves )
 +
-Index: kmime/tests/kmime_message_test.h
-===================================================================
---- kmime/tests/kmime_message_test.h	(.../tags/KDE/4.2.2/kdepimlibs)	(wersja 956244)
-+++ kmime/tests/kmime_message_test.h	(.../branches/KDE/4.2/kdepimlibs)	(wersja 956244)
-@@ -29,6 +29,7 @@
-     void testMainBodyPart();
-     void testBrunosMultiAssembleBug();
-     void testWillsAndTillsCrash();
-+    void missingHeadersTest();
- };
- 
- 
+ Factory *Factory::self( const QString &resourceFamily )
+ {
+   kDebug();
 Index: kcal/localdir.desktop
 ===================================================================
---- kcal/localdir.desktop	(.../tags/KDE/4.2.2/kdepimlibs)	(wersja 956244)
-+++ kcal/localdir.desktop	(.../branches/KDE/4.2/kdepimlibs)	(wersja 956244)
-@@ -69,6 +69,7 @@
- Comment[sr]=Пружа приступ календарским ставкама, складиштеним у појединачним фајловима у датој фасцикли.
- Comment[sr at latin]=Pruža pristup kalendarskim stavkama, skladištenim u pojedinačnim fajlovima u datoj fascikli.
- Comment[sv]=Ger tillgång till kalenderobjekt, vart och ett lagrat i en enskild lokal fil, i en given katalog
-+Comment[tr]=Belirli bir dizinde, her biri tek bir dosyada depolanmış takvim ögelerine erişim sağlar
- Comment[uk]=Надає доступ до записів календаря, кожен з яких зберігається у окремому файлі у вказаному каталозі
- Comment[x-test]=xxProvides access to calendar items, each stored in a single file, in a given directoryxx
- Comment[zh_CN]=提供对被存储在给定目录下单独文件中的日历内容的访问支持
+--- kcal/localdir.desktop	(.../tags/KDE/4.2.3/kdepimlibs)	(wersja 974231)
++++ kcal/localdir.desktop	(.../branches/KDE/4.2/kdepimlibs)	(wersja 974231)
+@@ -41,6 +41,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]=Προσφέρει πρόσβαση σε αντικείμενα ημερολογίου, αποθηκευμένα σε ξεχωριστά αρχεία, σε ένα
δοσμένο κατάλογο
 Index: kcal/local.desktop
 ===================================================================
---- kcal/local.desktop	(.../tags/KDE/4.2.2/kdepimlibs)	(wersja 956244)
-+++ kcal/local.desktop	(.../branches/KDE/4.2/kdepimlibs)	(wersja 956244)
-@@ -69,6 +69,7 @@
- Comment[sr]=Пружа приступ календару складиштеном у једном локалном фајлу
- Comment[sr at latin]=Pruža pristup kalendaru skladištenom u jednom lokalnom fajlu
- Comment[sv]=Ger tillgång till en kalender lagrad i en enda lokal fil
-+Comment[tr]=TEk bir yerel dosyada depolanmış bir takvime erişim sağlar
- Comment[uk]=Надає доступ до календаря, що зберігається у окремому локальному файлі
- Comment[x-test]=xxProvides access to a calendar stored in a single local filexx
- Comment[zh_CN]=提供对被存储在单独的本地文件中的日历的访问支持
-Index: kcal/icalformat_p.cpp
-===================================================================
---- kcal/icalformat_p.cpp	(.../tags/KDE/4.2.2/kdepimlibs)	(wersja 956244)
-+++ kcal/icalformat_p.cpp	(.../branches/KDE/4.2/kdepimlibs)	(wersja 956244)
-@@ -202,7 +202,7 @@
+--- kcal/local.desktop	(.../tags/KDE/4.2.3/kdepimlibs)	(wersja 974231)
++++ kcal/local.desktop	(.../branches/KDE/4.2/kdepimlibs)	(wersja 974231)
+@@ -41,6 +41,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]=Προσφέρει πρόσβαση σε ένα ημερολόγιο αποθηκευμένο σε ένα τοπικό αρχείο
+Index: kcal/kcal_manager.desktop
+===================================================================
+--- kcal/kcal_manager.desktop	(.../tags/KDE/4.2.3/kdepimlibs)	(wersja 974231)
++++ kcal/kcal_manager.desktop	(.../branches/KDE/4.2/kdepimlibs)	(wersja 974231)
+@@ -19,6 +19,7 @@
+ Name[km]=ប្រតិទិន
+ Name[lt]=Kalendorius
+ Name[lv]=Kalendārs
++Name[mai]=कैलेंडर
+ Name[nb]=Kalender
+ Name[nds]=Kalenner
+ Name[nl]=Agenda
+Index: kcal/recurrence.cpp
+===================================================================
+--- kcal/recurrence.cpp	(.../tags/KDE/4.2.3/kdepimlibs)	(wersja 974231)
++++ kcal/recurrence.cpp	(.../branches/KDE/4.2/kdepimlibs)	(wersja 974231)
+@@ -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() );
++
++  // 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];
++    }
++  }
++
++  // 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;
++    }
+   }
++
++  // 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;
++  }
++
+   times.sortUnique();
  
-   // start time
--  if ( todo->hasStartDate() || todo->recurs() ) {
-+  if ( todo->hasStartDate() ) {
-     icaltimetype start;
-     if ( todo->allDay() ) {
-       start = writeICalDate( todo->dtStart( true ).date() );
-Index: kcal/incidenceformatter.cpp
+   // Remove excluded times
+Index: kcal/htmlexport.cpp
 ===================================================================
---- kcal/incidenceformatter.cpp	(.../tags/KDE/4.2.2/kdepimlibs)	(wersja 956244)
-+++ kcal/incidenceformatter.cpp	(.../branches/KDE/4.2/kdepimlibs)	(wersja 956244)
-@@ -1476,8 +1476,7 @@
-       html += "</td></tr><tr>";
+--- kcal/htmlexport.cpp	(.../tags/KDE/4.2.3/kdepimlibs)	(wersja 974231)
++++ kcal/htmlexport.cpp	(.../branches/KDE/4.2/kdepimlibs)	(wersja 974231)
+@@ -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() );
      }
-     html += "<td>";
--
--    if ( !existingIncidence ) {
-+    if ( incidence && !existingIncidence ) {
-       // Accept
-       html += helper->makeLink( "accept", i18nc( "accept to-do request", "[Accept]" ) );
-       html += "</td><td> &nbsp; </td><td>";
-Index: kblog/blogger1.cpp
-===================================================================
---- kblog/blogger1.cpp	(.../tags/KDE/4.2.2/kdepimlibs)	(wersja 956244)
-+++ kblog/blogger1.cpp	(.../branches/KDE/4.2/kdepimlibs)	(wersja 956244)
-@@ -345,6 +345,7 @@
-   kDebug () << "TOP:" << result[0].typeName();
-   if ( result[0].type() == QVariant::Map && readPostFromMap( post, result[0].toMap() ) ) {
-     kDebug() << "Emitting fetchedPost()";
-+    post->setStatus( KBlog::BlogPost::Fetched );
-     emit q->fetchedPost( post );
    } else {
-     kError() << "Could not fetch post out of the result from the server.";
-Index: kblog/gdata_p.h
-===================================================================
---- kblog/gdata_p.h	(.../tags/KDE/4.2.2/kdepimlibs)	(wersja 956244)
-+++ kblog/gdata_p.h	(.../branches/KDE/4.2/kdepimlibs)	(wersja 956244)
-@@ -44,17 +44,11 @@
-   public:
-     QString mAuthenticationString;
-     QDateTime mAuthenticationTime;
--    QMap<KJob *,QByteArray> mCreatePostBuffer;
-     QMap<KJob *,KBlog::BlogPost*> mCreatePostMap;
--    QMap<KJob *,QByteArray> mCreateCommentBuffer;
-     QMap<KJob *,QMap<KBlog::BlogPost *,KBlog::BlogComment *> > mCreateCommentMap;
--    QMap<KJob *,QByteArray> mRemoveCommentBuffer;
-     QMap<KJob *,QMap<KBlog::BlogPost *,KBlog::BlogComment *> > mRemoveCommentMap;
--    QMap<KJob *,QByteArray> mModifyPostBuffer;
-     QMap<KJob *,KBlog::BlogPost *> mModifyPostMap;
--    QMap<KJob *,QByteArray> mRemovePostBuffer;
-     QMap<KJob *,KBlog::BlogPost *> mRemovePostMap;
--    QMap<KJob *,QByteArray> mFetchProfileIdBuffer;
-     QMap<Syndication::Loader *,KBlog::BlogPost *> mFetchPostMap;
-     QMap<Syndication::Loader *,KBlog::BlogPost *> mListCommentsMap;
-     QMap<Syndication::Loader *,int> mListRecentPostsMap;
-@@ -63,7 +57,6 @@
-     GDataPrivate();
-     ~GDataPrivate();
-     bool authenticate();
--    virtual void slotFetchProfileIdData( KIO::Job *, const QByteArray & );
-     virtual void slotFetchProfileId( KJob * );
-     virtual void slotListBlogs( Syndication::Loader *,
-                                 Syndication::FeedPtr, Syndication::ErrorCode );
-@@ -76,15 +69,10 @@
-     virtual void slotFetchPost( Syndication::Loader *,
-                                 Syndication::FeedPtr, Syndication::ErrorCode );
-     virtual void slotCreatePost( KJob * );
--    virtual void slotCreatePostData( KIO::Job *, const QByteArray & );
-     virtual void slotModifyPost( KJob * );
--    virtual void slotModifyPostData( KIO::Job *, const QByteArray & );
-     virtual void slotRemovePost( KJob * );
--    virtual void slotRemovePostData( KIO::Job *, const QByteArray & );
-     virtual void slotCreateComment( KJob * );
--    virtual void slotCreateCommentData( KIO::Job *, const QByteArray & );
-     virtual void slotRemoveComment( KJob * );
--    virtual void slotRemoveCommentData( KIO::Job *, const QByteArray & );
-     Q_DECLARE_PUBLIC( GData )
- };
- 
-Index: kblog/tests/data.h
+     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 );
+   }
+ }
+Index: kcal/incidenceformatter.cpp
 ===================================================================
---- kblog/tests/data.h	(.../tags/KDE/4.2.2/kdepimlibs)	(wersja 956244)
-+++ kblog/tests/data.h	(.../branches/KDE/4.2/kdepimlibs)	(wersja 956244)
-@@ -28,15 +28,10 @@
- #include <ktimezone.h>
- #include <QtCore/QDateTime>
- 
--//   KUrl mUrl( "http://soctest.wordpress.com/xmlrpc.php" );
--//   QString mUsername( "socapitest" );
--//   QString mPassword( "k0nt4ctbl0g" );
--//   QString mBlogId( "1" );
+--- kcal/incidenceformatter.cpp	(.../tags/KDE/4.2.3/kdepimlibs)	(wersja 974231)
++++ kcal/incidenceformatter.cpp	(.../branches/KDE/4.2/kdepimlibs)	(wersja 974231)
+@@ -402,11 +402,12 @@
+     tmpStr += "<td>" + eventViewerFormatAttachments( event ) + "</td>";
+     tmpStr += "</tr>";
+   }
 -
--KUrl mUrl( "http://sandbox2.monkey-corp.com/xmlrpc.php" );
-+KUrl mUrl( "http://soctest.wordpress.com/xmlrpc.php" );
- QString mUsername( "socapitest" );
- QString mPassword( "k0nt4ctbl0g" );
--QString mBlogId( "blog" );
-+QString mBlogId( "1" );
- 
- QDateTime mCreationDateTime( QDateTime::currentDateTime() );
- QDateTime mModificationDateTime( QDateTime::currentDateTime() );
-Index: kblog/gdata.h
-===================================================================
---- kblog/gdata.h	(.../tags/KDE/4.2.2/kdepimlibs)	(wersja 956244)
-+++ kblog/gdata.h	(.../branches/KDE/4.2/kdepimlibs)	(wersja 956244)
-@@ -302,8 +302,6 @@
-     Q_PRIVATE_SLOT( d_func(),
-                     void slotFetchProfileId( KJob * ) )
-     Q_PRIVATE_SLOT( d_func(),
--                    void slotFetchProfileIdData( KIO::Job *, const QByteArray & ) )
--    Q_PRIVATE_SLOT( d_func(),
-                     void slotListBlogs( Syndication::Loader *,
-                                         Syndication::FeedPtr, Syndication::ErrorCode ) )
-     Q_PRIVATE_SLOT( d_func(),
-@@ -321,23 +319,13 @@
-     Q_PRIVATE_SLOT( d_func(),
-                     void slotCreatePost( KJob * ) )
-     Q_PRIVATE_SLOT( d_func(),
--                    void slotCreatePostData( KIO::Job *, const QByteArray & ) )
--    Q_PRIVATE_SLOT( d_func(),
-                     void slotModifyPost( KJob * ) )
-     Q_PRIVATE_SLOT( d_func(),
--                    void slotModifyPostData( KIO::Job *, const QByteArray & ) )
--    Q_PRIVATE_SLOT( d_func(),
-                     void slotRemovePost( KJob * ) )
-     Q_PRIVATE_SLOT( d_func(),
--                    void slotRemovePostData( KIO::Job *, const QByteArray & ) )
--    Q_PRIVATE_SLOT( d_func(),
-                     void slotCreateComment( KJob * ) )
-     Q_PRIVATE_SLOT( d_func(),
--                    void slotCreateCommentData( KIO::Job *, const QByteArray & ) )
--    Q_PRIVATE_SLOT( d_func(),
-                     void slotRemoveComment( KJob * ) )
--    Q_PRIVATE_SLOT( d_func(),
--                    void slotRemoveCommentData( KIO::Job *, const QByteArray & ) )
- };
- 
- } //namespace KBlog
-Index: kblog/wordpressbuggy.cpp
-===================================================================
---- kblog/wordpressbuggy.cpp	(.../tags/KDE/4.2.2/kdepimlibs)	(wersja 956244)
-+++ kblog/wordpressbuggy.cpp	(.../branches/KDE/4.2/kdepimlibs)	(wersja 956244)
-@@ -122,7 +122,7 @@
-   QDataStream stream( &postData, QIODevice::WriteOnly );
-   stream.writeRawData( xmlMarkup.toUtf8(), xmlMarkup.toUtf8().length() );
- 
--  KIO::TransferJob *job = KIO::http_post( url(), postData, KIO::HideProgressInfo );
-+  KIO::StoredTransferJob *job = KIO::storedHttpPost( postData, url(), KIO::HideProgressInfo );
- 
-   d->mCreatePostMap[ job ] = post;
- 
-@@ -137,8 +137,6 @@
-   job->addMetaData( "ConnectTimeout", "50" );
-   job->addMetaData( "UserAgent", userAgent() );
- 
--  connect( job, SIGNAL(data(KIO::Job *,const QByteArray &)),
--           this, SLOT(slotCreatePostData(KIO::Job *,const QByteArray &)) );
-   connect( job, SIGNAL(result(KJob *)),
-            this, SLOT(slotCreatePost(KJob *)) );
++  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;
  }
-@@ -218,7 +216,7 @@
-   QDataStream stream( &postData, QIODevice::WriteOnly );
-   stream.writeRawData( xmlMarkup.toUtf8(), xmlMarkup.toUtf8().length() );
- 
--  KIO::TransferJob *job = KIO::http_post( url(), postData, KIO::HideProgressInfo );
-+  KIO::StoredTransferJob *job = KIO::storedHttpPost( postData, url(), KIO::HideProgressInfo );
- 
-   d->mModifyPostMap[ job ] = post;
- 
-@@ -233,8 +231,6 @@
-   job->addMetaData( "ConnectTimeout", "50" );
-   job->addMetaData( "UserAgent", userAgent() );
- 
--  connect( job, SIGNAL(data(KIO::Job*,const QByteArray&)),
--           this, SLOT(slotModifyPostData(KIO::Job*,const QByteArray&)) );
-   connect( job, SIGNAL(result(KJob*)),
-            this, SLOT(slotModifyPost(KJob*)) );
- }
-@@ -265,21 +261,13 @@
-   return args;
- }
- 
--void WordpressBuggyPrivate::slotCreatePostData( KIO::Job *job, const QByteArray &data )
--{
--  kDebug() << "slotCreatePostData()";
--  unsigned int oldSize = mCreatePostBuffer[ job ].size();
--  mCreatePostBuffer[ job ].resize( oldSize + data.size() );
--  memcpy( mCreatePostBuffer[ job ].data() + oldSize, data.data(), data.size() );
--}
--
- void WordpressBuggyPrivate::slotCreatePost( KJob *job )
- {
-   kDebug() << "slotCreatePost()";
--  const QString data = QString::fromUtf8( mCreatePostBuffer[ job ].data(),
--                                          mCreatePostBuffer[ job ].size() );
--  mCreatePostBuffer[ job ].resize( 0 );
  
-+  KIO::StoredTransferJob *stj = qobject_cast<KIO::StoredTransferJob*>(job);
-+  const QString data = QString::fromUtf8( stj->data(), stj->data().size() );
+@@ -449,8 +450,10 @@
+   }
+   tmpStr += eventViewerFormatAttendees( todo );
+   tmpStr += eventViewerFormatAttachments( todo );
 +
-   Q_Q( WordpressBuggy );
- 
-   KBlog::BlogPost *post = mCreatePostMap[ job ];
-@@ -317,20 +305,12 @@
-   emit q->createdPost( post );
- }
- 
--void WordpressBuggyPrivate::slotModifyPostData( KIO::Job *job, const QByteArray &data )
--{
--  kDebug() << "slotModifyPostData()";
--  unsigned int oldSize = mModifyPostBuffer[ job ].size();
--  mModifyPostBuffer[ job ].resize( oldSize + data.size() );
--  memcpy( mModifyPostBuffer[ job ].data() + oldSize, data.data(), data.size() );
--}
--
- void WordpressBuggyPrivate::slotModifyPost( KJob *job )
- {
-   kDebug() << "slotModifyPost()";
--  const QString data = QString::fromUtf8( mModifyPostBuffer[ job ].data(),
--                                          mModifyPostBuffer[ job ].size() );
--  mModifyPostBuffer[ job ].resize( 0 );
-+  
-+  KIO::StoredTransferJob *stj = qobject_cast<KIO::StoredTransferJob*>(job);
-+  const QString data = QString::fromUtf8( stj->data(), stj->data().size() );
- 
-   KBlog::BlogPost *post = mModifyPostMap[ job ];
-   mModifyPostMap.remove( job );
-Index: kblog/wordpressbuggy_p.h
-===================================================================
---- kblog/wordpressbuggy_p.h	(.../tags/KDE/4.2.2/kdepimlibs)	(wersja 956244)
-+++ kblog/wordpressbuggy_p.h	(.../branches/KDE/4.2/kdepimlibs)	(wersja 956244)
-@@ -41,18 +41,14 @@
- class WordpressBuggyPrivate : public MovableTypePrivate
- {
-   public:
--    QMap<KJob *,QByteArray> mCreatePostBuffer;
-     QMap<KJob *,KBlog::BlogPost *> mCreatePostMap;
--    QMap<KJob *,QByteArray> mModifyPostBuffer;
-     QMap<KJob *,KBlog::BlogPost *> mModifyPostMap;
-     WordpressBuggyPrivate();
-     virtual ~WordpressBuggyPrivate();
-     virtual QList<QVariant> defaultArgs( const QString &id = QString() );
- 
-     virtual void slotCreatePost( KJob * );
--    virtual void slotCreatePostData( KIO::Job *, const QByteArray & );
-     virtual void slotModifyPost( KJob * );
--    virtual void slotModifyPostData( KIO::Job *, const QByteArray & );
-     Q_DECLARE_PUBLIC( WordpressBuggy )
- };
- 
-Index: kblog/gdata.cpp
-===================================================================
---- kblog/gdata.cpp	(.../tags/KDE/4.2.2/kdepimlibs)	(wersja 956244)
-+++ kblog/gdata.cpp	(.../branches/KDE/4.2/kdepimlibs)	(wersja 956244)
-@@ -90,10 +90,8 @@
- {
-   kDebug();
-   QByteArray data;
--  KIO::Job *job = KIO::get( url(), KIO::NoReload, KIO::HideProgressInfo );
<<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.12&r2=1.13&f=u
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/kde4-kdepimlibs/kde4-kdepimlibs.spec?r1=1.80&r2=1.81&f=u

More information about the pld-cvs-commit mailing list