diff options
| author | albator <[email protected]> | 2011-10-21 20:16:07 +0200 |
|---|---|---|
| committer | albator <[email protected]> | 2011-10-21 20:16:07 +0200 |
| commit | 7a0adf35896618a7570e425941fc1b74c54def47 (patch) | |
| tree | 16dab9d8bfbd93575440f357c70907cbb5480980 /mandriva/2010.2/kdepim/kdepim-3.5.9-kitchensync-handle-synce.patch | |
| parent | cd71be65dc30c8007ec54becdf6c50260ed8e908 (diff) | |
| parent | a8707e2a9f22d082cecb8ea6079175076f983c55 (diff) | |
| download | tde-packaging-7a0adf35896618a7570e425941fc1b74c54def47.tar.gz tde-packaging-7a0adf35896618a7570e425941fc1b74c54def47.zip | |
Merge branch 'master' of http://scm.trinitydesktop.org/scm/git/tde-packaging
Diffstat (limited to 'mandriva/2010.2/kdepim/kdepim-3.5.9-kitchensync-handle-synce.patch')
| -rw-r--r-- | mandriva/2010.2/kdepim/kdepim-3.5.9-kitchensync-handle-synce.patch | 37 |
1 files changed, 37 insertions, 0 deletions
diff --git a/mandriva/2010.2/kdepim/kdepim-3.5.9-kitchensync-handle-synce.patch b/mandriva/2010.2/kdepim/kdepim-3.5.9-kitchensync-handle-synce.patch new file mode 100644 index 000000000..df74f8a10 --- /dev/null +++ b/mandriva/2010.2/kdepim/kdepim-3.5.9-kitchensync-handle-synce.patch @@ -0,0 +1,37 @@ +diff -bur kdepim-3.5.10/kitchensync/src/configgui.cpp kdepim-3.5.10-new/kitchensync/src/configgui.cpp +--- kdepim-3.5.10/kitchensync/src/configgui.cpp 2007-10-08 09:50:47.000000000 +0000 ++++ kdepim-3.5.10-new/kitchensync/src/configgui.cpp 2009-11-16 12:27:21.000000000 +0000 +@@ -108,7 +108,9 @@ + } else if ( name == "moto-sync" ) { + return new ConfigGuiMoto( member, parent ); + } else if ( name == "synce-plugin" ) { +- return new ConfigGuiSynce( member, parent ); ++ return new ConfigGuiBlank( member, parent ); ++ } else if ( name == "synce-opensync-plugin" ) { ++ return new ConfigGuiBlank( member, parent ); + } else if ( name == "sunbird-sync" ) { + return new ConfigGuiSunbird( member, parent ); + } else { +Only in kdepim-3.5.10-new/kitchensync/src: configgui.cpp.orig +diff -bur kdepim-3.5.10/kitchensync/src/memberinfo.cpp kdepim-3.5.10-new/kitchensync/src/memberinfo.cpp +--- kdepim-3.5.10/kitchensync/src/memberinfo.cpp 2007-10-08 09:50:47.000000000 +0000 ++++ kdepim-3.5.10-new/kitchensync/src/memberinfo.cpp 2009-11-16 12:27:21.000000000 +0000 +@@ -65,7 +65,8 @@ + nameMap.insert( "gpe-sync", i18n( "Handheld" ) ); + nameMap.insert( "sunbird-sync", i18n( "Sunbird Calendar" ) ); + nameMap.insert( "jescs-sync", i18n( "Java Enterprise System Calendar" ) ); +- nameMap.insert( "synce-plugin", i18n( "WinCE Devices" ) ); ++ nameMap.insert( "synce-plugin", i18n( "Windows Mobile 2003 and earlier Devices" ) ); ++ nameMap.insert( "synce-opensync-plugin", i18n( "Windows Mobile 5 and later Devices" ) ); + } + + if ( mMember.name().isEmpty() ) +@@ -84,6 +85,7 @@ + if ( pluginName == "evo2-sync" ) return "evolution"; + if ( pluginName == "opie-sync" ) return "pda_blue"; + if ( pluginName == "synce-plugin" ) return "pda_blue"; ++ if ( pluginName == "synce-opensync-plugin" ) return "pda_blue"; + if ( pluginName == "ldap-sync" ) return "contents2"; + if ( pluginName == "syncml-obex-client" ) return "mobile_phone"; + if ( pluginName == "syncml-http-server" ) return "pda_blue"; +Only in kdepim-3.5.10-new/kitchensync/src: memberinfo.cpp.orig |