From cf0340c1c76400b82261bc81126004fcb53876c2 Mon Sep 17 00:00:00 2001
From: Richard van der Hoff <richard@matrix.org>
Date: Tue, 29 Mar 2016 16:45:24 +0100
Subject: [PATCH 1/2] RoomDirectory: use SimpleRoomHeader instead of RoomHeader

SimpleRoomHeader and RoomHeader are now separate things
(https://github.com/matrix-org/matrix-react-sdk/pull/252), so update Vector
accordingly.
---
 src/components/structures/RoomDirectory.js | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/src/components/structures/RoomDirectory.js b/src/components/structures/RoomDirectory.js
index 6e04ce4f33..3c47fcaa92 100644
--- a/src/components/structures/RoomDirectory.js
+++ b/src/components/structures/RoomDirectory.js
@@ -180,10 +180,12 @@ module.exports = React.createClass({
             );
         }
 
-        var RoomHeader = sdk.getComponent('rooms.RoomHeader');
+        var SimpleRoomHeader = sdk.getComponent('rooms.SimpleRoomHeader');
         return (
             <div className="mx_RoomDirectory">
-                <RoomHeader simpleHeader="Directory" />
+                <SimpleRoomHeader>
+                    Directory
+                </SimpleRoomHeader>
                 <div className="mx_RoomDirectory_list">
                     <input ref="roomAlias" placeholder="Join a room (e.g. #foo:domain.com)" className="mx_RoomDirectory_input" size="64" onKeyUp={ this.onKeyUp }/>
                     <GeminiScrollbar className="mx_RoomDirectory_tableWrapper">

From 851b601d2cf90cb384c081c506b55f33d1af3ee1 Mon Sep 17 00:00:00 2001
From: Richard van der Hoff <richard@matrix.org>
Date: Tue, 29 Mar 2016 23:25:26 +0100
Subject: [PATCH 2/2] Pass SimpleRoomHeader topic in as a named prop

---
 src/components/structures/RoomDirectory.js | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/src/components/structures/RoomDirectory.js b/src/components/structures/RoomDirectory.js
index 3c47fcaa92..5c6042c240 100644
--- a/src/components/structures/RoomDirectory.js
+++ b/src/components/structures/RoomDirectory.js
@@ -183,9 +183,7 @@ module.exports = React.createClass({
         var SimpleRoomHeader = sdk.getComponent('rooms.SimpleRoomHeader');
         return (
             <div className="mx_RoomDirectory">
-                <SimpleRoomHeader>
-                    Directory
-                </SimpleRoomHeader>
+                <SimpleRoomHeader title="Directory" />
                 <div className="mx_RoomDirectory_list">
                     <input ref="roomAlias" placeholder="Join a room (e.g. #foo:domain.com)" className="mx_RoomDirectory_input" size="64" onKeyUp={ this.onKeyUp }/>
                     <GeminiScrollbar className="mx_RoomDirectory_tableWrapper">