From 2b7d4c59e1c7af8fc23b60f6569529a03064acd0 Mon Sep 17 00:00:00 2001
From: Ed Page <eopage@byu.net>
Date: Thu, 24 Mar 2011 20:28:29 -0500
Subject: [PATCH] Adding support for PySide's handling of QVariant

---
 src/dialogs.py        |    2 +-
 src/gv_views.py       |    8 ++++----
 src/util/qt_compat.py |    2 +-
 3 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/src/dialogs.py b/src/dialogs.py
index 77aa100..417b8b8 100644
--- a/src/dialogs.py
+++ b/src/dialogs.py
@@ -344,7 +344,7 @@ class AccountDialog(object):
 	@property
 	def selectedCallback(self):
 		index = self._callbackSelector.currentIndex()
-		data = str(self._callbackSelector.itemData(index).toPyObject())
+		data = str(self._callbackSelector.itemData(index))
 		return data
 
 	def set_callbacks(self, choices, default):
diff --git a/src/gv_views.py b/src/gv_views.py
index 1698907..6508a4c 100644
--- a/src/gv_views.py
+++ b/src/gv_views.py
@@ -436,7 +436,7 @@ class History(object):
 			row = index.row()
 			detailsItem = self._categoryManager.get_item(timeRow, row, self.DETAILS_IDX)
 			fromItem = self._categoryManager.get_item(timeRow, row, self.FROM_IDX)
-			contactDetails = detailsItem.data().toPyObject()
+			contactDetails = detailsItem.data()
 
 			title = unicode(fromItem.text())
 			number = str(contactDetails["number"])
@@ -447,7 +447,7 @@ class History(object):
 				randomTimeItem = self._itemStore.item(t, 0)
 				for i in xrange(randomTimeItem.rowCount()):
 					iItem = randomTimeItem.child(i, 0)
-					iContactDetails = iItem.data().toPyObject()
+					iContactDetails = iItem.data()
 					iNumber = str(iContactDetails["number"])
 					if number != iNumber:
 						continue
@@ -695,7 +695,7 @@ class Messages(object):
 			timeRow = timeIndex.row()
 			row = index.row()
 			item = self._categoryManager.get_item(timeRow, row, 0)
-			contactDetails = item.data().toPyObject()
+			contactDetails = item.data()
 
 			name = unicode(contactDetails["name"])
 			number = str(contactDetails["number"])
@@ -928,7 +928,7 @@ class Contacts(object):
 			letterItem = self._alphaItem[letter]
 			rowIndex = index.row()
 			item = letterItem.child(rowIndex, 0)
-			contactDetails = item.data().toPyObject()
+			contactDetails = item.data()
 
 			name = unicode(contactDetails["name"])
 			if not name:
diff --git a/src/util/qt_compat.py b/src/util/qt_compat.py
index 1a7e8c2..3ab17c8 100644
--- a/src/util/qt_compat.py
+++ b/src/util/qt_compat.py
@@ -10,6 +10,7 @@ try:
 except ImportError:
 	import sip
 	sip.setapi('QString', 2)
+	sip.setapi('QVariant', 2)
 	import PyQt4.QtCore as _QtCore
 	QtCore = _QtCore
 	USES_PYSIDE = False
@@ -39,7 +40,6 @@ else:
 	Property = QtCore.pyqtProperty
 
 
-
 if __name__ == "__main__":
 	pass
 
-- 
1.7.9.5