Merge branch 'rockwork'

Conflicts:
	po/de.po
	po/en_GB.po
	po/eu.po
	po/fr.po
	po/hu.po
	po/it.po
	po/pt.po
	po/rockwork.mzanetti.pot
	po/ru.po
	po/template.pot
	rockwork/InfoPage.qml
	rockwork/Main.qml
	rockwork/NotificationsPage.qml
	rockworkd/rockworkd.pro
	version.pri

1 files changed, 2 insertions, 0 deletions

diff --git a/rockworkd/libpebble/appmsgmanager.h b/rockworkd/libpebble/appmsgmanager.h
index 77ee480..374ed98 100644
--- a/rockworkd/libpebble/appmsgmanager.h
+++ b/rockworkd/libpebble/appmsgmanager.h
@@ -67,6 +67,7 @@ private:
 
 private slots:
     void handleWatchConnectedChanged();
+    void handlePebbleConnected();
     void handleTimeout();
 
     void handleAppLaunchMessage(const QByteArray &data);
@@ -79,6 +80,7 @@ private:
     WatchConnection *m_connection;
     QHash<QUuid, MessageHandlerFunc> _handlers;
     quint8 _lastTransactionId;
+    QUuid m_currentUuid;
 
     struct PendingTransaction {
         quint8 transactionId;