[SCM] ktp-contact-list packaging branch, master, updated. debian/15.12.1-2-1070-g6c56f91

[Maximiliano Curia]

Gitweb-URL: http://git.debian.org/?p=pkg-kde/applications/ktp-contact-list.git;a=commitdiff;h=61000ba

The following commit has been merged in the master branch:
commit 61000bae702520a4a93eb1c7639dec3506160e3e
Author: Rohan Garg <rohangarg at kubuntu.org>
Date:   Fri Oct 7 20:09:24 2011 +0530

    Make it possible to remove custom presence's from the config file
---
 presence-model.cpp | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/presence-model.cpp b/presence-model.cpp
index 755ed37..064704e 100644
--- a/presence-model.cpp
+++ b/presence-model.cpp
@@ -32,6 +32,7 @@ PresenceModel::~PresenceModel()
             m_presenceGroup.writeEntry(id, presenceVariant);
         }
     }
+    m_presenceGroup.sync();
 }
 
 QVariant PresenceModel::data(const QModelIndex &index, int role) const
@@ -138,7 +139,11 @@ void PresenceModel::removePresence(const Tp::Presence &presence)
     beginRemoveRows(QModelIndex(), row, row);
     m_presences.removeOne(presence);
     endRemoveRows();
+    QString id = QString::number(presence.type()).append(presence.statusMessage());
 
-    //FIXME edit the config file too
+    if(m_presenceGroup.keyList().contains(id)) {
+        m_presenceGroup.deleteEntry(id);
+        m_presenceGroup.sync();
+    }
 }
 

-- 
ktp-contact-list packaging