File GW-groupwarewizard-soappath.diff of Package kdepim3

Index: wizards/groupwisewizard.h
===================================================================
--- wizards/groupwisewizard.h	(.../3.4/kdepim/wizards)	(revision 442285)
+++ wizards/groupwisewizard.h	(.../3.5/kdepim/wizards)	(revision 442437)
@@ -15,7 +15,7 @@
 
     You should have received a copy of the GNU General Public License
     along with this program; if not, write to the Free Software
-    Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
+    Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
 */
 #ifndef GROUPWISEWIZARD_H
 #define GROUPWISEWIZARD_H
@@ -44,6 +44,7 @@
 
   private:
     KLineEdit *mServerEdit;
+    KLineEdit *mPathEdit;
     QSpinBox *mPortEdit;
     KLineEdit *mUserEdit;
     KLineEdit *mPasswordEdit;
Index: wizards/groupwise.kcfg
===================================================================
--- wizards/groupwise.kcfg	(.../3.4/kdepim/wizards)	(revision 442285)
+++ wizards/groupwise.kcfg	(.../3.5/kdepim/wizards)	(revision 442437)
@@ -16,6 +16,10 @@
     <entry key="User" type="String" >
       <label>User name</label>
     </entry>
+    <entry key="Path" type="String" >
+      <label>Path to SOAP interface</label>
+      <default>/soap</default>
+    </entry>
     <entry key="Password" type="String" >
       <label>User password</label>
     </entry>
Index: wizards/groupwisemain.cpp
===================================================================
--- wizards/groupwisemain.cpp	(.../3.4/kdepim/wizards)	(revision 442285)
+++ wizards/groupwisemain.cpp	(.../3.5/kdepim/wizards)	(revision 442437)
@@ -15,7 +15,7 @@
 
     You should have received a copy of the GNU General Public License
     along with this program; if not, write to the Free Software
-    Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
+    Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
 */
 
 #include "groupwisewizard.h"
Index: wizards/groupwisewizard.cpp
===================================================================
--- wizards/groupwisewizard.cpp	(.../3.4/kdepim/wizards)	(revision 442285)
+++ wizards/groupwisewizard.cpp	(.../3.5/kdepim/wizards)	(revision 442437)
@@ -15,7 +15,7 @@
 
     You should have received a copy of the GNU General Public License
     along with this program; if not, write to the Free Software
-    Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
+    Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
 */
 
 #include "groupwisewizard.h"
@@ -46,7 +46,7 @@
   if ( GroupwiseConfig::self()->useHttps() ) url = "https";
   else url = "http";
   url += "://" + GroupwiseConfig::self()->host() + ":" +
-    QString::number( GroupwiseConfig::self()->port() ) + "/soap/";
+    QString::number( GroupwiseConfig::self()->port() ) + GroupwiseConfig::self()->path();
   return url;
 }
 
@@ -196,7 +196,7 @@
       c->file = "korganizerrc";
       c->group = "FreeBusy";
       c->name = "FreeBusyRetrieveUrl";
-      c->value = "groupwise://" + GroupwiseConfig::self()->host() +
+      c->value = "groupwise://" + GroupwiseConfig::self()->host() + GroupwiseConfig::self()->path() +
         "/freebusy/";
       changes.append( c );
 
@@ -278,24 +278,29 @@
   mServerEdit = new KLineEdit( page );
   topLayout->addWidget( mServerEdit, 0, 1 );
 
+  label = new QLabel( i18n("Path to SOAP interface:"), page );
+  topLayout->addWidget( label, 1, 0 );
+  mPathEdit = new KLineEdit( page );
+  topLayout->addWidget( mPathEdit, 1, 1 );
+
   label = new QLabel( i18n("Port:"), page );
-  topLayout->addWidget( label, 1, 0 );
+  topLayout->addWidget( label, 2, 0 );
   mPortEdit = new QSpinBox( 1, 65536, 1, page );
-  topLayout->addWidget( mPortEdit, 1, 1 );
+  topLayout->addWidget( mPortEdit, 2, 1 );
 
   label = new QLabel( i18n("User name:"), page );
-  topLayout->addWidget( label, 2, 0 );
+  topLayout->addWidget( label, 3, 0 );
   mUserEdit = new KLineEdit( page );
-  topLayout->addWidget( mUserEdit, 2, 1 );
+  topLayout->addWidget( mUserEdit, 3, 1 );
 
   label = new QLabel( i18n("Password:"), page );
-  topLayout->addWidget( label, 3, 0 );
+  topLayout->addWidget( label, 4, 0 );
   mPasswordEdit = new KLineEdit( page );
   mPasswordEdit->setEchoMode( KLineEdit::Password );
-  topLayout->addWidget( mPasswordEdit, 3, 1 );
+  topLayout->addWidget( mPasswordEdit, 4, 1 );
 
   mSavePasswordCheck = new QCheckBox( i18n("Save password"), page );
-  topLayout->addMultiCellWidget( mSavePasswordCheck, 4, 4, 0, 1 );
+  topLayout->addMultiCellWidget( mSavePasswordCheck, 5, 5, 0, 1 );
 
   mSecureCheck = new QCheckBox( i18n("Encrypt communication with server"),
                                 page );
@@ -352,6 +357,7 @@
 QString GroupwiseWizard::validate()
 {
   if( mServerEdit->text().isEmpty() ||
+      mPathEdit->text().isEmpty() ||
       mPortEdit->text().isEmpty() ||
       mUserEdit->text().isEmpty() ||
       mPasswordEdit->text().isEmpty() )
@@ -370,6 +376,7 @@
 void GroupwiseWizard::usrReadConfig()
 {
   mServerEdit->setText( GroupwiseConfig::self()->host() );
+  mPathEdit->setText( GroupwiseConfig::self()->path() );
   mPortEdit->setValue( GroupwiseConfig::self()->port() );
   mUserEdit->setText( GroupwiseConfig::self()->user() );
   mPasswordEdit->setText( GroupwiseConfig::self()->password() );
@@ -383,6 +390,7 @@
 void GroupwiseWizard::usrWriteConfig()
 {
   GroupwiseConfig::self()->setHost( mServerEdit->text() );
+  GroupwiseConfig::self()->setPath( mPathEdit->text() );
   GroupwiseConfig::self()->setPort( mPortEdit->value() );
   GroupwiseConfig::self()->setUser( mUserEdit->text() );
   GroupwiseConfig::self()->setPassword( mPasswordEdit->text() );