Add stream Lock to avoid emitting events when needed

Author: antoyo

examples/buttons.rs

@@ -69,7 +69,7 @@ impl Widget for Win {
     // Specify the type of the root widget.
     type Root = Window;
 
-    fn model(_: ()) -> Model {
+    fn model(_: &Relm<Self>, _: ()) -> Model {
         Model {
             counter: 0,
         }

examples/child-prop.rs

@@ -60,7 +60,7 @@ impl Widget for Button {
     type Msg = ButtonMsg;
     type Root = gtk::Button;
 
-    fn model(_: ()) -> () {
+    fn model(_: &Relm<Self>, _: ()) -> () {
     }
 
     fn root(&self) -> Self::Root {
@@ -107,7 +107,7 @@ impl Widget for Win {
     type Msg = Msg;
     type Root = gtk::Window;
 
-    fn model(_: ()) -> () {
+    fn model(_: &Relm<Self>, _: ()) -> () {
     }
 
     fn root(&self) -> Self::Root {

examples/clock-nightly.rs

@@ -57,7 +57,7 @@ impl Widget for Win {
     type Msg = Msg;
     type Root = Window;
 
-    fn model(_: ()) -> () {
+    fn model(_: &Relm<Self>, _: ()) -> () {
         ()
     }
 

examples/clock.rs

@@ -55,7 +55,7 @@ impl Widget for Win {
     type Msg = Msg;
     type Root = Window;
 
-    fn model(_: ()) -> () {
+    fn model(_: &Relm<Self>, _: ()) -> () {
         ()
     }
 

examples/communication-attribute.rs

@@ -183,11 +183,11 @@ impl Widget for Win {
 }
 
 impl Win {
-    fn inc(&self) -> Option<CounterMsg> {
+    fn inc(&mut self) -> Option<CounterMsg> {
         Some(Increment)
     }
 
-    fn text_change(&self, input: String) -> Msg {
+    fn text_change(&mut self, input: String) -> Msg {
         TextChange(input)
     }
 }

examples/communication.rs

@@ -69,7 +69,7 @@ impl Widget for Text {
     type Msg = TextMsg;
     type Root = gtk::Box;
 
-    fn model(_: ()) -> TextModel {
+    fn model(_: &Relm<Self>, _: ()) -> TextModel {
         TextModel {
             content: String::new(),
         }
@@ -130,7 +130,7 @@ impl Widget for Counter {
     type Msg = CounterMsg;
     type Root = gtk::Box;
 
-    fn model(_: ()) -> CounterModel {
+    fn model(_: &Relm<Self>, _: ()) -> CounterModel {
         CounterModel {
             counter: 0,
         }
@@ -203,7 +203,7 @@ impl Widget for Win {
     type Msg = Msg;
     type Root = Window;
 
-    fn model(_: ()) -> Model {
+    fn model(_: &Relm<Self>, _: ()) -> Model {
         Model {
             counter: 0,
         }
@@ -253,7 +253,7 @@ impl Widget for Win {
             let Win { ref counter1, ref counter2, ref text, ref window, .. } = *win.borrow();
             connect!(text@Change(text), relm, TextChange(text));
             connect!(text@Change(_), counter1, with win_clone win_clone.inc());
-            connect!(counter1@Increment, counter2, Increment);
+            connect!(counter1@Increment, counter2, Decrement);
             connect!(button, connect_clicked(_), counter1, Decrement);
 
             window.add(&hbox);
@@ -268,7 +268,7 @@ impl Widget for Win {
 }
 
 impl Win {
-    fn inc(&self) -> CounterMsg {
+    fn inc(&mut self) -> CounterMsg {
         Increment
     }
 }

examples/container.rs

@@ -55,7 +55,7 @@ impl Widget for Button {
     type Msg = ();
     type Root = gtk::Button;
 
-    fn model(_: ()) -> () {
+    fn model(_: &Relm<Self>, _: ()) -> () {
     }
 
     fn root(&self) -> Self::Root {
@@ -92,7 +92,7 @@ impl Widget for VBox {
     type Msg = ();
     type Root = EventBox;
 
-    fn model(_: ()) -> () {
+    fn model(_: &Relm<Self>, _: ()) -> () {
         ()
     }
 
@@ -131,7 +131,7 @@ impl Widget for Win {
     type Msg = Msg;
     type Root = Window;
 
-    fn model(_: ()) -> () {
+    fn model(_: &Relm<Self>, _: ()) -> () {
     }
 
     fn root(&self) -> Self::Root {

examples/generic-widget.rs

@@ -88,7 +88,7 @@ impl<T: Clone + IncDec + Display + 'static> Widget for Counter<T> {
     type Msg = CounterMsg<T>;
     type Root = gtk::Box;
 
-    fn model(value: T) -> Self::Model {
+    fn model(_: &Relm<Self>, value: T) -> Self::Model {
         Model {
             counter: value,
         }
@@ -153,7 +153,7 @@ impl Widget for Win {
     type Msg = Msg;
     type Root = Window;
 
-    fn model(_: ()) -> () {
+    fn model(_: &Relm<Self>, _: ()) -> () {
         ()
     }
 

examples/key-events.rs

@@ -60,7 +60,7 @@ impl Widget for Win {
     type Msg = Msg;
     type Root = Window;
 
-    fn model(_: ()) -> Model {
+    fn model(_: &Relm<Self>, _: ()) -> Model {
         Model {
             press_count: 0,
         }

examples/model-param.rs

@@ -69,7 +69,7 @@ impl Widget for Win {
     // Specify the type of the root widget.
     type Root = Window;
 
-    fn model(counter: i32) -> Model {
+    fn model(_: &Relm<Self>, counter: i32) -> Model {
         Model {
             counter: counter,
         }