diff -r 5de72ea7a065 -r 579cc610882e clock/clockui/clockcityselectionlist/src/clockcityselectionlist_p.cpp
--- a/clock/clockui/clockcityselectionlist/src/clockcityselectionlist_p.cpp	Wed Jun 23 18:11:28 2010 +0300
+++ b/clock/clockui/clockcityselectionlist/src/clockcityselectionlist_p.cpp	Tue Jul 06 14:14:56 2010 +0300
@@ -40,7 +40,7 @@
 #include "clockcityselectionlist.h"
 #include "clockcitylistproxymodel.h"
 #include "clockcityselectionlistcommon.h"
-#include "clockcityselectionlistprototype.h"
+
 #include "timezoneclient.h"
 #include "clockdatatypes.h"
 
@@ -77,7 +77,7 @@
  */
 ClockCitySelectionListPrivate::~ClockCitySelectionListPrivate()
 {
-	if (mOwnsClient && !mClient->isNull()) {
+	if (mOwnsClient) {
 		mClient->deleteInstance();
 	}
 	if (mLoader) {
@@ -123,6 +123,7 @@
 		displayString += info.cityName;
 		displayString += ", ";
 		displayString += info.countryName;
+		mListModel->setData(index, displayString, Qt::DisplayRole);
 		mListModel->setData(index, displayString, Qt::UserRole + 100);
 
 		// Now save the timezone and city group ids.
@@ -402,15 +403,6 @@
 	mProxyModel->setSourceModel(mListModel);
 	mProxyModel->setFilterRole(Qt::UserRole + 100);
 
-	// Construct the custom list item prototype.
-	ClockCitySelectionListPrototype *prototype =
-			new ClockCitySelectionListPrototype;
-
-	// Loader the custom list view layout.
-	HbStyleLoader::registerFilePath(":/style/");
-	mListView->setLayoutName("cityselectionlist-default");
-	mListView->setItemPrototype(prototype);
-
 	// Construct the model for the list.
 	QTimer::singleShot(1, this, SLOT(populateListModel()));