Merge branch 'master' into kitsune-gtad

1 files changed, 4 insertions, 0 deletions

diff --git a/user.h b/user.h
index a2d58908..79a6f5db 100644
--- a/user.h
+++ b/user.h
@@ -60,11 +60,15 @@ namespace QMatrixClient
 
         public slots:
             void requestAvatar();
+            void rename(const QString& newName);
 
         signals:
             void nameChanged(User*, QString);
             void avatarChanged(User* user);
 
+        private slots:
+            void updateName(const QString& newName);
+
         private:
             class Private;
             Private* d;