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

List:       kde-commits
Subject:    [kdepim/KDE/4.14] kaddressbook/merge/widgets: Minor
From:       Montel Laurent <montel () kde ! org>
Date:       2015-02-22 17:43:27
Message-ID: E1YPaYx-0003DN-QN () scm ! kde ! org
[Download RAW message or body]

Git commit ced00b5e7c98eb4193e5585ea1dd14e9cba39f31 by Montel Laurent.
Committed on 22/02/2015 at 17:43.
Pushed by mlaurent into branch 'KDE/4.14'.

Minor

M  +3    -2    kaddressbook/merge/widgets/mergecontactselectlistwidget.cpp
M  +2    -2    kaddressbook/merge/widgets/mergecontactshowresulttabwidget.cpp

http://commits.kde.org/kdepim/ced00b5e7c98eb4193e5585ea1dd14e9cba39f31

diff --git a/kaddressbook/merge/widgets/mergecontactselectlistwidget.cpp \
b/kaddressbook/merge/widgets/mergecontactselectlistwidget.cpp index a701aac..93c30c5 \
                100644
--- a/kaddressbook/merge/widgets/mergecontactselectlistwidget.cpp
+++ b/kaddressbook/merge/widgets/mergecontactselectlistwidget.cpp
@@ -58,6 +58,7 @@ void MergeContactSelectListWidget::updateTitle()
     QString title;
     switch(mConflictType) {
     case MergeContacts::None:
+        // it's not possible.
         break;
     case MergeContacts::Birthday:
         title = Addressee::birthdayLabel();
@@ -157,10 +158,10 @@ void MergeContactSelectListWidget::fillList(const \
KABC::Addressee::List &lst)  break;
         }
         case MergeContacts::Photo:
-            //FIXME
+            //FIXME add icon ?
             break;
         case MergeContacts::Logo:
-            //FIXME
+            //FIXME add icon ?
             break;
         case MergeContacts::Anniversary: {
             const QString newBlog = addr.custom(QLatin1String( "KADDRESSBOOK" ), \
                QLatin1String( "X-Anniversary" ));
diff --git a/kaddressbook/merge/widgets/mergecontactshowresulttabwidget.cpp \
b/kaddressbook/merge/widgets/mergecontactshowresulttabwidget.cpp index \
                fe82576..5186e47 100644
--- a/kaddressbook/merge/widgets/mergecontactshowresulttabwidget.cpp
+++ b/kaddressbook/merge/widgets/mergecontactshowresulttabwidget.cpp
@@ -61,10 +61,10 @@ void MergeContactShowResultTabWidget::addMergedContact(const \
Akonadi::Item &item  MergeContactInfoWidget *infoWidget = new MergeContactInfoWidget;
         infoWidget->setContact(item);
         addTab(infoWidget, address.name());
+        if (updateTab)
+            updateTabWidget();
     } else {
         qDebug()<<" don't have address";
     }
-    if (updateTab)
-        updateTabWidget();
 }
 


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