Merge branch 'situare_interact' of https://vcs.maemo.org/git/situare into situare_int...

Conflicts:
	images.qrc
	res/images/chat.png
	res/images/chat_btn.png
	res/images/chat_btn_d.png
	res/images/chat_btn_s.png
	res/images/contact_btn.png
	res/images/contact_btn_d.png
	res/images/contact_btn_s.png
	res/images/tag.png
	res/images/tag_btn.png
	res/images/tag_btn_d.png
	res/images/tag_btn_s.png
	src/ui/mainwindow.cpp
	src/ui/userinfo.cpp
	src/ui/userinfo.h

diff --cc src/ui/userinfo.cpp
index 570cb8d,0564057..dc00392
--- 1/src/ui/userinfo.cpp
--- 2/src/ui/userinfo.cpp
+++ b/src/ui/userinfo.cpp
@@@ -351,37 -339,6 +339,17 @@@ void UserInfo::showTagsDialog(
      m_tagsDialog->show();
  }
  
- QString UserInfo::splitWord(const QString &word) const
- {
-     qDebug() << __PRETTY_FUNCTION__;
- 
-     QString result;
-     QString temp;
- 
-     for (int i = 0; i < word.length(); i++) {
-         if (fontMetrics().width(temp.append(word.at(i))) > LABEL_MAX_WIDTH) {
-             result.append(temp.left(temp.length() - 1));
-             result.append(" ");
-             temp.remove(0, temp.length() - 1);
-         }
-     }
- 
-     result.append(temp);
- 
-     return result;
- }
- 
 +void UserInfo::tagsDialogFinished(int reason)
 +{
-     qDebug() << __PRETTY_FUNCTION__;
++qDebug() << __PRETTY_FUNCTION__;
 +
 +    if (reason == QDialog::Accepted) {
 +        QStringList userTags = m_tagsDialog->userTags();
 +    }
 +
 +    m_tagsDialog->deleteLater();
 +}
 +
  void UserInfo::updateLocationDialogFinished(int reason)
  {
      qDebug() << __PRETTY_FUNCTION__;