maryjane
/
syncevolution
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

config templates: Funambol URLs 

Funambol turned of the URL redirect from my.funambol.com to
onemedia.com. The Funambol template now uses the current URL.  Users
with existing Funambol configs must updated the syncURL property
manually to https://onemediahub.com/sync

Kudos to Daniel Clement for reporting the change.
This commit is contained in:
Patrick Ohly 2014-05-16 09:32:58 +02:00
parent 1dcbf3988d
commit e71b925f17
5 changed files with 11 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/syncevo/Cmdline.cpp
View File

@ -3038,7 +3038,7 @@ protected:
CPPUNIT_ASSERT_EQUAL_DIFF("Available configuration templates (servers):\n"
" template name = template description\n"
" eGroupware = http://www.egroupware.org\n"
" Funambol = http://my.funambol.com\n"
" Funambol = https://onemediahub.com\n"
" Google_Calendar = event sync via CalDAV, use for the 'target-config@google-calendar' config\n"
" Google_Contacts = contact sync via SyncML, see http://www.google.com/support/mobile/bin/topic.py?topic=22181\n"
" Goosync = http://www.goosync.com/\n"
@ -4767,11 +4767,11 @@ private:
boost::replace_first(config,
"syncURL = http://sync.scheduleworld.com/funambol/ds",
"syncURL = http://my.funambol.com/sync");
"syncURL = https://onemediahub.com/sync");
boost::replace_first(config,
"WebURL = http://www.scheduleworld.com",
"WebURL = http://my.funambol.com");
"WebURL = https://onemediahub.com");
boost::replace_first(config,
"IconURI = image://themedimage/icons/services/scheduleworld",

4
src/syncevo/SyncConfig.cpp
View File

@ -1302,9 +1302,7 @@ static ConfigProperty syncPropSyncURL("syncURL",
"Identifies how to contact the peer,\n"
"best explained with some examples.\n\n"
"HTTP(S) SyncML servers::\n\n"
" http://my.funambol.com/sync\n"
" http://sync.scheduleworld.com/funambol/ds\n"
" https://m.google.com/syncml\n\n"
" http://example.com/sync\n"
"OBEX over Bluetooth uses the MAC address, with\n"
"the channel chosen automatically::\n\n"
" obex-bt://00:0A:94:03:F3:7E\n\n"

6
src/templates/servers/Funambol.ini
View File

@ -1,10 +1,10 @@
=== template.ini ===
fingerprint = Funambol
description = http://my.funambol.com
description = https://onemediahub.com
=== config.ini ===
syncURL = http://my.funambol.com/sync
WebURL = http://my.funambol.com
syncURL = https://onemediahub.com/sync
WebURL = https://onemediahub.com
PeerName = Funambol
enableWBXML = FALSE
enableRefreshSync = TRUE

6
test/test-dbus.py
View File

@ -6039,10 +6039,10 @@ sources/todo/config.ini:# databasePassword = '''.format(
config = config.replace("PeerName = ScheduleWorld",
"PeerName = Funambol")
config = config.replace("syncURL = http://sync.scheduleworld.com/funambol/ds",
"syncURL = http://my.funambol.com/sync",
"syncURL = https://onemediahub.com/sync",
1)
config = config.replace("WebURL = http://www.scheduleworld.com",
"WebURL = http://my.funambol.com",
"WebURL = https://onemediahub.com",
1)
config = config.replace("IconURI = image://themedimage/icons/services/scheduleworld",
"IconURI = image://themedimage/icons/services/funambol",
@ -6498,7 +6498,7 @@ spds/sources/todo/config.txt:# evolutionpassword =
expected = "Available configuration templates (servers):\n" \
" template name = template description\n" \
" eGroupware = http://www.egroupware.org\n" \
" Funambol = http://my.funambol.com\n" \
" Funambol = https://onemediahub.com\n" \
" Google_Calendar = event sync via CalDAV, use for the 'target-config@google-calendar' config\n" \
" Google_Contacts = contact sync via SyncML, see http://www.google.com/support/mobile/bin/topic.py?topic=22181\n" \
" Goosync = http://www.goosync.com/\n" \

4
test/test-dbus/auto-sync/config/syncevolution/default/peers/scheduleworld/config.ini
View File

@ -3,9 +3,7 @@
#
# HTTP(S) SyncML servers::
#
# http://my.funambol.com/sync
# http://sync.scheduleworld.com/funambol/ds
# https://m.google.com/syncml
# http://example.com/sync
#
# OBEX over Bluetooth uses the MAC address, with
# the channel chosen automatically::