3 commits - src/kolabformat.i src/php src/xcalconversions.h

Christian Mollekopf mollekopf at kolabsys.com
Fri Apr 12 13:39:33 CEST 2013


 src/kolabformat.i     |    2 --
 src/php/test.php      |    3 +++
 src/xcalconversions.h |    3 ---
 3 files changed, 3 insertions(+), 5 deletions(-)

New commits:
commit e30363f8ee800290d56cde2dcdd176d694a2016b
Merge: e330a4a 8927089
Author: Christian Mollekopf <mollekopf at kolabsys.com>
Date:   Fri Apr 12 13:39:28 2013 +0200

    Merge remote-tracking branch 'origin/master'



commit e330a4acc6c871e5730ce697247655a0e467d5d2
Author: Christian Mollekopf <mollekopf at kolabsys.com>
Date:   Fri Apr 12 13:39:02 2013 +0200

    Make php tests pass with older libcurl versions.

diff --git a/src/php/test.php b/src/php/test.php
index 3e4f28f..22fd6ca 100755
--- a/src/php/test.php
+++ b/src/php/test.php
@@ -27,6 +27,9 @@ function assertequal($got, $expect, $name) {
 function assertcontains($haystack, $needle, $name) {
 	// remove whitespace
 	$haystack = preg_replace('/\n\s*/ims', '', $haystack);
+	// The following two statements are only required with older libcurl versions which erroneusly encode - and .
+	$haystack = preg_replace('/%2D/', '-', $haystack);
+	$haystack = preg_replace('/%2E/', '.', $haystack);
 	$needle = preg_replace('/\n\s*/ims', '', $needle);
 
 	return assertequal(substr(strstr($haystack, $needle), 0, strlen($needle)), $needle, $name);


commit 78f024d71fdd42923417e3dc03d5a35ab1313efa
Author: Christian Mollekopf <mollekopf at kolabsys.com>
Date:   Wed Apr 10 13:06:25 2013 +0200

    cleanup

diff --git a/src/kolabformat.i b/src/kolabformat.i
index 4ac54c9..6a51ccf 100644
--- a/src/kolabformat.i
+++ b/src/kolabformat.i
@@ -43,8 +43,6 @@ namespace std {
     %template(vectorurl) vector<Kolab::Url>;
     %template(vectorkey) vector<Kolab::Key>;
     %template(vectorcategorycolor) vector<Kolab::CategoryColor>;
-/*     %template(vectorevent) vector<Kolab::Event>;*/
-/*     %template(vectorevent2) vector< vector<Kolab::Event> >;*/
 };
 
 %rename(readKolabFile) Kolab::readFile;
diff --git a/src/xcalconversions.h b/src/xcalconversions.h
index 82c7699..6dfbc9c 100644
--- a/src/xcalconversions.h
+++ b/src/xcalconversions.h
@@ -144,9 +144,6 @@ std::string toString(const icalendar_2_0::TextPropertyType &s)
     return s.text();
 }
 
-
-
-
 std::string fromDayPos(const Kolab::DayPos &d)
 {   
     std::string s;





More information about the commits mailing list