[SCM] ktp-contact-list packaging branch, master, updated. debian/15.12.1-2-1070-g6c56f91

[Maximiliano Curia]

Gitweb-URL: http://git.debian.org/?p=pkg-kde/applications/ktp-contact-list.git;a=commitdiff;h=6e5cdec

The following commit has been merged in the master branch:
commit 6e5cdec43c02ae14133f8fca4c78adf30437ddbc
Author: David Edmundson <kde at davidedmundson.co.uk>
Date:   Mon Apr 29 01:03:22 2013 +0000

    Rearrange GlobalPresence startup to avoid crash
    
    BUG: 319040
    REVIEW: 110235
---
 global-presence-chooser.cpp | 11 +++++------
 1 file changed, 5 insertions(+), 6 deletions(-)

diff --git a/global-presence-chooser.cpp b/global-presence-chooser.cpp
index f5d5939..161476b 100644
--- a/global-presence-chooser.cpp
+++ b/global-presence-chooser.cpp
@@ -177,7 +177,8 @@ GlobalPresenceChooser::GlobalPresenceChooser(QWidget *parent) :
     m_globalPresence(new KTp::GlobalPresence(this)),
     m_model(new PresenceModel(this)),
     m_modelExtended(new PresenceModelExtended(m_model, this)),
-    m_busyOverlay(new KPixmapSequenceOverlayPainter(this))
+    m_busyOverlay(new KPixmapSequenceOverlayPainter(this)),
+    m_changePresenceMessageButton(new QPushButton(this))
 {
     this->setModel(m_modelExtended);
     //needed for mousemove events
@@ -186,11 +187,6 @@ GlobalPresenceChooser::GlobalPresenceChooser(QWidget *parent) :
     m_busyOverlay->setSequence(KPixmapSequence("process-working"));
     setEditable(false);
 
-    onPresenceChanged(m_globalPresence->currentPresence());
-    //we need to check if there is some account connecting and if so, spin the spinner
-    onConnectionStatusChanged(m_globalPresence->connectionStatus());
-
-    m_changePresenceMessageButton = new QPushButton(this);
     m_changePresenceMessageButton->setIcon(KIcon("document-edit"));
     m_changePresenceMessageButton->setFlat(true);
     m_changePresenceMessageButton->setToolTip(i18n("Click to change your presence message"));
@@ -200,6 +196,9 @@ GlobalPresenceChooser::GlobalPresenceChooser(QWidget *parent) :
     connect(m_globalPresence, SIGNAL(connectionStatusChanged(Tp::ConnectionStatus)), SLOT(onConnectionStatusChanged(Tp::ConnectionStatus)));
     connect(m_changePresenceMessageButton, SIGNAL(clicked(bool)), this, SLOT(onChangePresenceMessageClicked()));
 
+    onPresenceChanged(m_globalPresence->currentPresence());
+    //we need to check if there is some account connecting and if so, spin the spinner
+    onConnectionStatusChanged(m_globalPresence->connectionStatus());
 }
 
 void GlobalPresenceChooser::setAccountManager(const Tp::AccountManagerPtr &accountManager)

-- 
ktp-contact-list packaging