[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-commits
Subject:    KDE/kdepim/wizards
From:       Laurent Montel <montel () kde ! org>
Date:       2010-03-01 8:31:18
Message-ID: 1267432278.632054.6113.nullmailer () svn ! kde ! org
[Download RAW message or body]

SVN commit 1097389 by mlaurent:

Forward port:
Korganizer config items were renaming but wizards were never adapting.
MERGE: e4/e5/ not sur for 3.5


 M  +4 -4      groupwise.kcfg  
 M  +1 -1      groupwisewizard.cpp  
 M  +8 -8      kolab.kcfg  
 M  +3 -3      kolabwizard.cpp  
 M  +1 -1      slox.kcfg  


--- trunk/KDE/kdepim/wizards/groupwise.kcfg #1097388:1097389
@@ -72,14 +72,14 @@
   </group>
 
   <propagation source="groupwiserc/Constants/EnableFreeBusy"
-               target="korganizerrc/FreeBusy/FreeBusyRetrieveAuto" />
+               target="korganizerrc/FreeBusy Retrieve/FreeBusyRetrieveAuto" />
 
   <propagation source="groupwiserc/General/User"
-               target="korganizerrc/FreeBusy/FreeBusyRetrieveUser" />
+               target="korganizerrc/FreeBusy Retrieve/FreeBusyRetrieveUser" />
   <propagation source="groupwiserc/General/Password"
-               target="korganizerrc/FreeBusy/FreeBusyRetrievePassword"
+               target="korganizerrc/FreeBusy Retrieve/FreeBusyRetrievePassword"
                hidevalue="true" />
   <propagation source="groupwiserc/General/SavePassword"
-               target="korganizerrc/FreeBusy/FreeBusyRetrieveSavePassword" />
+               target="korganizerrc/FreeBusy Retrieve/FreeBusyRetrieveSavePassword" />
 
 </kcfg>
--- trunk/KDE/kdepim/wizards/groupwisewizard.cpp #1097388:1097389
@@ -195,7 +195,7 @@
     {
       ChangeConfig *c = new ChangeConfig;
       c->file = "korganizerrc";
-      c->group = "FreeBusy";
+      c->group = "FreeBusy Retrieve";
       c->name = "FreeBusyRetrieveUrl";
       c->value = "groupwise://" + GroupwiseConfig::self()->host() + GroupwiseConfig::self()->path() +
         "/freebusy/";
--- trunk/KDE/kdepim/wizards/kolab.kcfg #1097388:1097389
@@ -45,24 +45,24 @@
   </group>
 
   <propagation source="kolabrc/General/Kolab1Legacy"
-               target="korganizerrc/FreeBusy/FreeBusyPublishAuto" />
+               target="korganizerrc/FreeBusy Publish/FreeBusyPublishAuto" />
   <propagation source="kolabrc/Constants/EnableFreeBusy"
-               target="korganizerrc/FreeBusy/FreeBusyRetrieveAuto" />
+               target="korganizerrc/FreeBusy Publish/FreeBusyRetrieveAuto" />
 
   <propagation source="kolabrc/General/User"
-               target="korganizerrc/FreeBusy/FreeBusyPublishUser" />
+               target="korganizerrc/FreeBusy Publish/FreeBusyPublishUser" />
   <propagation source="kolabrc/General/Password"
-               target="korganizerrc/FreeBusy/FreeBusyPublishPassword"
+               target="korganizerrc/FreeBusy Publish/FreeBusyPublishPassword"
                hidevalue="true" />
   <propagation source="kolabrc/General/SavePassword"
-               target="korganizerrc/FreeBusy/FreeBusyPublishSavePassword" />
+               target="korganizerrc/FreeBusy Publish/FreeBusyPublishSavePassword" />
 
   <propagation source="kolabrc/General/User"
-               target="korganizerrc/FreeBusy/FreeBusyRetrieveUser" />
+               target="korganizerrc/FreeBusy Retrieve/FreeBusyRetrieveUser" />
   <propagation source="kolabrc/General/Password"
-               target="korganizerrc/FreeBusy/FreeBusyRetrievePassword"
+               target="korganizerrc/FreeBusy Retrieve/FreeBusyRetrievePassword"
                hidevalue="true" />
   <propagation source="kolabrc/General/SavePassword"
-               target="korganizerrc/FreeBusy/FreeBusyRetrieveSavePassword" />
+               target="korganizerrc/FreeBusy Retrieve/FreeBusyRetrieveSavePassword" />
 
 </kcfg>
--- trunk/KDE/kdepim/wizards/kolabwizard.cpp #1097388:1097389
@@ -176,7 +176,7 @@
 
       ChangeConfig *c = new ChangeConfig;
       c->file = "korganizerrc";
-      c->group = "FreeBusy";
+      c->group = "FreeBusy Publish";
 
       c->name = "FreeBusyPublishUrl";
 
@@ -201,7 +201,7 @@
 
       ChangeConfig *c = new ChangeConfig;
       c->file = "korganizerrc";
-      c->group = "FreeBusy";
+      c->group = "FreeBusy Retrieve";
       c->name = "FreeBusyRetrieveUrl";
       c->value = freeBusyBaseUrl.url();
       changes.append( c );
@@ -209,7 +209,7 @@
       // Use full email address for retrieval of free/busy lists
       c = new ChangeConfig;
       c->file = "korganizerrc";
-      c->group = "FreeBusy";
+      c->group = "FreeBusy Retrieve";
       c->name = "FreeBusyFullDomainRetrieval";
       c->value = "true";
       changes.append( c );
--- trunk/KDE/kdepim/wizards/slox.kcfg #1097388:1097389
@@ -47,6 +47,6 @@
   </group>
 
   <propagation source="sloxrc/Constants/EnableFreeBusy"
-               target="korganizerrc/FreeBusy/FreeBusyRetrieveAuto" />
+               target="korganizerrc/FreeBusy Retrieve/FreeBusyRetrieveAuto" />
 
 </kcfg>
[prev in list] [next in list] [prev in thread] [next in thread]