SOURCES: kdepim-bug-140207.patch - update from svn

[glen]

Author: glen                         Date: Thu Jan 18 12:31:39 2007 GMT
Module: SOURCES                       Tag: HEAD
---- Log message:
- update from svn

---- Files affected:
SOURCES:
   kdepim-bug-140207.patch (1.1 -> 1.2) 

---- Diffs:

================================================================
Index: SOURCES/kdepim-bug-140207.patch
diff -u SOURCES/kdepim-bug-140207.patch:1.1 SOURCES/kdepim-bug-140207.patch:1.2
--- SOURCES/kdepim-bug-140207.patch:1.1	Wed Jan 17 22:26:40 2007
+++ SOURCES/kdepim-bug-140207.patch	Thu Jan 18 13:31:34 2007
@@ -1,26 +1,13 @@
-very loose fix to http://bugs.kde.org/show_bug.cgi?id=140207
+http://bugs.kde.org/show_bug.cgi?id=140207
 
-according to
-http://websvn.kde.org/branches/KDE/3.5/kdepim/kpilot/conduits/vcalconduit/vcal-conduit.cc?rev=612579&sortby=date&view=diff&r1=612579&r2=612578&p1=branches/KDE/3.5/kdepim/kpilot/conduits/vcalconduit/vcal-conduit.cc&p2=/branches/KDE/3.5/kdepim/kpilot/conduits/vcalconduit/vcal-conduit.cc
-
-QString VCalConduit::_getCat(...) returned QString::null in case of "Unfiled" category
-
---- kdepim-3.5.6/kpilot/conduits/vcalconduit/vcalRecord.cc~	2007-01-17 21:23:56.000000000 +0200
-+++ kdepim-3.5.6/kpilot/conduits/vcalconduit/vcalRecord.cc	2007-01-17 21:23:58.000000000 +0200
+--- branches/KDE/3.5/kdepim/kpilot/conduits/vcalconduit/vcalRecord.cc	2006/12/11 21:43:32	612579
++++ branches/KDE/3.5/kdepim/kpilot/conduits/vcalconduit/vcalRecord.cc	2007/01/17 23:13:09	624745
 @@ -584,7 +584,7 @@
  	if (eventCategories.size() < 1)
  	{
  		// This event has no categories.
 -		de->setCategory(Pilot::Unfiled);
-+		de->setCategory(QString::null);
++		(PilotRecordBase *)de->setCategory(Pilot::Unfiled);
  		return;
  	}
- 
-@@ -623,6 +623,6 @@
- 		}
- 	}
- 
--	de->setCategory(Pilot::Unfiled);
-+	de->setCategory(QString::null);
- }
  
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/SOURCES/kdepim-bug-140207.patch?r1=1.1&r2=1.2&f=u