From 7df4497e7292427e5305d4ea366c807c49f140d3 Mon Sep 17 00:00:00 2001
From: Christian Prochaska <christian.prochaska@genode-labs.com>
Date: Tue, 9 May 2017 17:57:59 +0200
Subject: [PATCH] wm: use 'Expanding_ram_session_client'

Use 'env().ram()' instead of a non-expanding 'Ram_session_client'
for 'env().ram_session_cap()'.

Fixes #2408
---
 repos/gems/src/server/wm/decorator_nitpicker.h |  4 ++--
 repos/gems/src/server/wm/main.cc               |  2 +-
 repos/gems/src/server/wm/nitpicker.h           | 12 ++++++------
 3 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/repos/gems/src/server/wm/decorator_nitpicker.h b/repos/gems/src/server/wm/decorator_nitpicker.h
index 3d482cb668..e862a47319 100644
--- a/repos/gems/src/server/wm/decorator_nitpicker.h
+++ b/repos/gems/src/server/wm/decorator_nitpicker.h
@@ -161,7 +161,7 @@ struct Wm::Decorator_nitpicker_session : Genode::Rpc_object<Nitpicker::Session>,
 
 	Genode::Heap _heap { _env.ram(), _env.rm() };
 
-	Ram_session_client _ram;
+	Genode::Ram_session &_ram;
 
 	Nitpicker::Connection _nitpicker_session { _env, "decorator" };
 
@@ -200,7 +200,7 @@ struct Wm::Decorator_nitpicker_session : Genode::Rpc_object<Nitpicker::Session>,
 	 * \param ep  entrypoint used for dispatching signals
 	 */
 	Decorator_nitpicker_session(Genode::Env &env,
-	                            Ram_session_capability ram,
+	                            Genode::Ram_session &ram,
 	                            Allocator &md_alloc,
 	                            Reporter &pointer_reporter,
 	                            Last_motion &last_motion,
diff --git a/repos/gems/src/server/wm/main.cc b/repos/gems/src/server/wm/main.cc
index 88cc360954..dd42a8a6d2 100644
--- a/repos/gems/src/server/wm/main.cc
+++ b/repos/gems/src/server/wm/main.cc
@@ -62,7 +62,7 @@ struct Wm::Main
 	Nitpicker::Connection focus_nitpicker_session { env };
 
 	Nitpicker::Root nitpicker_root { env, window_registry,
-	                                 heap, env.ram_session_cap(),
+	                                 heap, env.ram(),
 	                                 pointer_reporter, focus_request_reporter,
 	                                 focus_nitpicker_session };
 
diff --git a/repos/gems/src/server/wm/nitpicker.h b/repos/gems/src/server/wm/nitpicker.h
index 5d0d5bd5ab..9473952a41 100644
--- a/repos/gems/src/server/wm/nitpicker.h
+++ b/repos/gems/src/server/wm/nitpicker.h
@@ -434,9 +434,9 @@ class Wm::Nitpicker::Session_component : public Rpc_object<Nitpicker::Session>,
 
 		Genode::Env &_env;
 
-		Session_label         _session_label;
-		Ram_session_client    _ram;
-		Nitpicker::Connection _session { _env, _session_label.string() };
+		Session_label          _session_label;
+		Genode::Ram_session   &_ram;
+		Nitpicker::Connection  _session { _env, _session_label.string() };
 
 		Window_registry             &_window_registry;
 		Session_control_fn          &_session_control_fn;
@@ -710,7 +710,7 @@ class Wm::Nitpicker::Session_component : public Rpc_object<Nitpicker::Session>,
 		 * \param ep  entrypoint used for managing the views
 		 */
 		Session_component(Genode::Env &env,
-		                  Ram_session_capability ram,
+		                  Genode::Ram_session   &ram,
 		                  Window_registry       &window_registry,
 		                  Allocator             &session_alloc,
 		                  Session_label   const &session_label,
@@ -991,7 +991,7 @@ class Wm::Nitpicker::Root : public Genode::Rpc_object<Genode::Typed_root<Session
 
 		Allocator &_md_alloc;
 
-		Ram_session_capability _ram;
+		Genode::Ram_session &_ram;
 
 		enum { STACK_SIZE = 1024*sizeof(long) };
 
@@ -1086,7 +1086,7 @@ class Wm::Nitpicker::Root : public Genode::Rpc_object<Genode::Typed_root<Session
 		 */
 		Root(Genode::Env &env,
 		     Window_registry &window_registry, Allocator &md_alloc,
-		     Ram_session_capability ram,
+		     Genode::Ram_session &ram,
 		     Reporter &pointer_reporter, Reporter &focus_request_reporter,
 		     Nitpicker::Session &focus_nitpicker_session)
 		: