From: Sami Rämö <sami.ramo@ixonos.com>
Date: Fri, 18 Jun 2010 13:28:59 +0000 (+0300)
Subject: Merge branch 'kinetic'
X-Git-Tag: v1.0~8^2~4^2~3
X-Git-Url: https://vcs.maemo.org/git/?a=commitdiff_plain;h=51017dd7aa8b66928cc12cb8c60de3ca03ef5cdb;hp=1a1d8f86412b0480cdbfe711671a561d95b9e49e;p=situare

Merge branch 'kinetic'
---

diff --git a/src/ui/updatelocation/updatelocationdialog.cpp b/src/ui/updatelocation/updatelocationdialog.cpp
index 935c738..d7a73c4 100644
--- a/src/ui/updatelocation/updatelocationdialog.cpp
+++ b/src/ui/updatelocation/updatelocationdialog.cpp
@@ -35,7 +35,8 @@ UpdateLocationDialog::UpdateLocationDialog(const QString &userMessage, bool publ
 
     QGridLayout *gridLayout = new QGridLayout();
 
-    m_textEdit = new QTextEdit;
+    m_textEdit = new QTextEdit();
+    m_charCountLabel = new QLabel();
 
     if (userMessage.isEmpty())
     {
@@ -49,6 +50,7 @@ UpdateLocationDialog::UpdateLocationDialog(const QString &userMessage, bool publ
     {
         m_textEdit->setText(userMessage);
         m_textEdit->document()->setModified(true);
+        textChanged();
     }
 
     QScrollArea *scrollArea = new QScrollArea();
@@ -66,7 +68,7 @@ UpdateLocationDialog::UpdateLocationDialog(const QString &userMessage, bool publ
     scrollArea->setWidgetResizable(true);
     scrollArea->setFrameShape(QScrollArea::NoFrame);
 
-    m_locationLabel = new QLabel;
+    m_locationLabel = new QLabel();
     m_locationLabel->setWordWrap(true);
     m_checkBox = new QCheckBox(tr("Publish on Facebook"));
     m_checkBox->setChecked(publishOnFacebook);
@@ -76,7 +78,6 @@ UpdateLocationDialog::UpdateLocationDialog(const QString &userMessage, bool publ
     QPushButton *cancelButton = buttonBox->addButton(QDialogButtonBox::Cancel);
     sendButton->setText(tr("Send"));
 
-    m_charCountLabel = new QLabel;
     m_charCountLabel->setNum(MESSAGE_MAX_LENGTH);
 
     gridLayout->addWidget(new QLabel(tr("Location:")), 0, 0, 1, 1, Qt::AlignTop | Qt::AlignLeft);