[SCM] ktp-contact-applet packaging branch, master, updated. debian/15.12.1-1-966-gde83ac5

[Maximiliano Curia]

Gitweb-URL: http://git.debian.org/?p=pkg-kde/applications/ktp-desktop-applets.git;a=commitdiff;h=f736999

The following commit has been merged in the master branch:
commit f73699905759f0c428aa8bf1a009548acc4fa151
Author: David Edmundson <kde at davidedmundson.co.uk>
Date:   Sat Oct 1 09:19:45 2011 +0100

    Hack in drag + drop support
---
 src/telepathy-contact.cpp        | 30 ++++++++++++++++++++++++++----
 src/telepathy-contact.h          |  3 ++-
 telepathy-contact-applet.desktop |  1 +
 3 files changed, 29 insertions(+), 5 deletions(-)

diff --git a/src/telepathy-contact.cpp b/src/telepathy-contact.cpp
index 378e4c2..a78724a 100644
--- a/src/telepathy-contact.cpp
+++ b/src/telepathy-contact.cpp
@@ -49,6 +49,11 @@ TelepathyContact::TelepathyContact(QObject* parent, const QVariantList& args)
 
     connect(m_config, SIGNAL(setNewContact(Tp::ContactPtr, Tp::AccountPtr)), this, SLOT(setContact(Tp::ContactPtr, Tp::AccountPtr)));
     connect(m_config, SIGNAL(loadConfig()), this, SLOT(loadConfig()));
+
+    if (args.length() == 1) {
+        m_fileToLoad = args.first().toString();
+    }
+
 }
 
 TelepathyContact::~TelepathyContact()
@@ -86,9 +91,25 @@ void TelepathyContact::loadConfig()
 {
     KConfigGroup group = Plasma::Applet::config();
 
-    QString contactId = group.readEntry("id", QString());
-    QString relatedAcc = group.readEntry("relatedAccount", QString());
-    QString tempAvatar = group.readEntry("tempAvatar", QString());
+    QString contactId;
+    QString relatedAcc;
+    QString tempAvatar;
+
+    //if provided with a file to load data from.
+    //otherwise load from configs
+    if (m_fileToLoad.isEmpty()) {
+        contactId = group.readEntry("id", QString());
+        relatedAcc = group.readEntry("relatedAccount", QString());
+        tempAvatar = group.readEntry("tempAvatar", QString());
+    } else {
+        QFile file(m_fileToLoad);
+        if (file.open(QFile::ReadOnly)) {
+            QDataStream ds(&file);
+            ds >> contactId;
+            ds >> relatedAcc ;
+            file.close();
+        }
+    }
 
     if (!contactId.isEmpty() && !relatedAcc.isEmpty()) {
         Tp::AccountPtr account = m_config->accountFromUniqueId(relatedAcc);
@@ -122,6 +143,7 @@ void TelepathyContact::loadConfig()
             m_contact->setAccount(account);
         }
     }
+    saveConfig();
 }
 
 void TelepathyContact::paintInterface(QPainter* p, const QStyleOptionGraphicsItem* option, const QRect& contentsRect)
@@ -163,4 +185,4 @@ void TelepathyContact::showConfigurationInterface()
 }
 
 // This is the command that links your applet to the .desktop file
-K_EXPORT_PLASMA_APPLET(telepathy-contact, TelepathyContact)
\ No newline at end of file
+K_EXPORT_PLASMA_APPLET(telepathy-contact, TelepathyContact)
diff --git a/src/telepathy-contact.h b/src/telepathy-contact.h
index 1b575af..ce7632f 100644
--- a/src/telepathy-contact.h
+++ b/src/telepathy-contact.h
@@ -56,10 +56,11 @@ private slots:
 private:
     void saveConfig();
 
+    QString m_fileToLoad;
     Config *m_config;
     Plasma::DeclarativeWidget *m_declarative;
     ContactWrapper *m_contact;
     QObject *m_qmlObject;
 };
 
-#endif  // TELEPATHY_CONTACT_H
\ No newline at end of file
+#endif  // TELEPATHY_CONTACT_H
diff --git a/telepathy-contact-applet.desktop b/telepathy-contact-applet.desktop
index 869b36b..79b881d 100644
--- a/telepathy-contact-applet.desktop
+++ b/telepathy-contact-applet.desktop
@@ -41,3 +41,4 @@ X-KDE-PluginInfo-Website=http://telepathy.freedesktop.org/
 X-KDE-PluginInfo-Depends=
 X-KDE-PluginInfo-License=GPL
 X-KDE-PluginInfo-EnabledByDefault=true
+X-Plasma-DropMimeTypes=application/vnd.telepathy.contact
\ No newline at end of file

-- 
ktp-contact-applet packaging