summaryrefslogtreecommitdiff
Unidiff
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--core/pim/addressbook/TODO1
-rw-r--r--core/pim/addressbook/contacteditor.cpp8
-rw-r--r--core/pim/addressbook/version.h2
3 files changed, 6 insertions, 5 deletions
diff --git a/core/pim/addressbook/TODO b/core/pim/addressbook/TODO
index 906b462..719b720 100644
--- a/core/pim/addressbook/TODO
+++ b/core/pim/addressbook/TODO
@@ -37,6 +37,7 @@ ContactEditor:
37- Category is on the wrong position after changing to personal and back to normal 37- Category is on the wrong position after changing to personal and back to normal
38 ( Temporarily workaround: Category is never deactivated.. :S ) 38 ( Temporarily workaround: Category is never deactivated.. :S )
39 39
40- Fix handling of 3 Firstnames
40 41
41Important: 42Important:
42---------- 43----------
diff --git a/core/pim/addressbook/contacteditor.cpp b/core/pim/addressbook/contacteditor.cpp
index 97573af..b60f2dd 100644
--- a/core/pim/addressbook/contacteditor.cpp
+++ b/core/pim/addressbook/contacteditor.cpp
@@ -1491,10 +1491,10 @@ void ContactEditor::setEntry( const OContact &entry ) {
1491 1491
1492 // Get combo-settings from contact and set preset.. 1492 // Get combo-settings from contact and set preset..
1493 contactfields.loadFromRecord( ent ); 1493 contactfields.loadFromRecord( ent );
1494 cmbChooserField1->setCurrentItem( contactfields.getFieldOrder(0, 0) ); 1494 cmbChooserField1->setCurrentItem( contactfields.getFieldOrder(0, 7) );
1495 cmbChooserField2->setCurrentItem( contactfields.getFieldOrder(1, 1) ); 1495 cmbChooserField2->setCurrentItem( contactfields.getFieldOrder(1, 9) );
1496 cmbChooserField3->setCurrentItem( contactfields.getFieldOrder(2, 2) ); 1496 cmbChooserField3->setCurrentItem( contactfields.getFieldOrder(2, 0) );
1497 cmbChooserField4->setCurrentItem( contactfields.getFieldOrder(3, 5) ); 1497 cmbChooserField4->setCurrentItem( contactfields.getFieldOrder(3, 6) );
1498 cmbAddress->setCurrentItem( contactfields.getFieldOrder(4, 1) ); 1498 cmbAddress->setCurrentItem( contactfields.getFieldOrder(4, 1) );
1499 slotCmbChooser1Change( cmbChooserField1->currentItem() ); 1499 slotCmbChooser1Change( cmbChooserField1->currentItem() );
1500 slotCmbChooser2Change( cmbChooserField2->currentItem() ); 1500 slotCmbChooser2Change( cmbChooserField2->currentItem() );
diff --git a/core/pim/addressbook/version.h b/core/pim/addressbook/version.h
index e716fe4..3c1e5ee 100644
--- a/core/pim/addressbook/version.h
+++ b/core/pim/addressbook/version.h
@@ -3,7 +3,7 @@
3 3
4#define MAINVERSION "0" 4#define MAINVERSION "0"
5#define SUBVERSION "2" 5#define SUBVERSION "2"
6#define PATCHVERSION "0" 6#define PATCHVERSION "1"
7 7
8#define APPNAME "OPIE_ADDRESSBOOK" 8#define APPNAME "OPIE_ADDRESSBOOK"
9 9