From 066b22efc5f8e187b14ebe5a3f08ffbe90880643 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?V=C3=ADctor=20Manuel=20J=C3=A1quez=20Leal?=
 <vjaquez@igalia.com>
Date: Wed, 27 Feb 2019 21:10:49 +0100
Subject: [PATCH] Fix examples and tutorial with GTK API updates

---
 examples/src/bin/gtksink.rs           |  2 +-
 examples/src/bin/gtkvideooverlay.rs   |  2 +-
 examples/src/bin/pango-cairo.rs       |  2 +-
 tutorials/src/bin/basic-tutorial-5.rs | 18 ++++++++++++------
 4 files changed, 15 insertions(+), 9 deletions(-)

diff --git a/examples/src/bin/gtksink.rs b/examples/src/bin/gtksink.rs
index 0f9c77831..f7f984ab2 100644
--- a/examples/src/bin/gtksink.rs
+++ b/examples/src/bin/gtksink.rs
@@ -66,7 +66,7 @@ fn create_ui(app: &gtk::Application) {
     let vbox = gtk::Box::new(gtk::Orientation::Vertical, 0);
     // Add our widget to the gui
     vbox.pack_start(&widget, true, true, 0);
-    let label = gtk::Label::new("Position: 00:00:00");
+    let label = gtk::Label::new(Some("Position: 00:00:00"));
     vbox.pack_start(&label, true, true, 5);
     window.add(&vbox);
     window.show_all();
diff --git a/examples/src/bin/gtkvideooverlay.rs b/examples/src/bin/gtkvideooverlay.rs
index e36642c4e..5292cb6ff 100644
--- a/examples/src/bin/gtkvideooverlay.rs
+++ b/examples/src/bin/gtkvideooverlay.rs
@@ -170,7 +170,7 @@ fn create_ui(app: &gtk::Application) {
 
     vbox.pack_start(&video_window, true, true, 0);
 
-    let label = gtk::Label::new("Position: 00:00:00");
+    let label = gtk::Label::new(Some("Position: 00:00:00"));
     vbox.pack_start(&label, true, true, 5);
     window.add(&vbox);
 
diff --git a/examples/src/bin/pango-cairo.rs b/examples/src/bin/pango-cairo.rs
index 2f714ed83..11e5a99e8 100644
--- a/examples/src/bin/pango-cairo.rs
+++ b/examples/src/bin/pango-cairo.rs
@@ -114,7 +114,7 @@ fn create_pipeline() -> Result<gst::Pipeline, Error> {
 
     // Select the text content and the font we want to use for the piece of text.
     let font_desc = pango::FontDescription::from_string("Sans Bold 26");
-    layout.set_font_description(&font_desc);
+    layout.set_font_description(Some(&font_desc));
     layout.set_text("GStreamer");
 
     // The following is a context struct (containing the pango layout and the configured video info).
diff --git a/tutorials/src/bin/basic-tutorial-5.rs b/tutorials/src/bin/basic-tutorial-5.rs
index eec810d4b..8c775ffc9 100644
--- a/tutorials/src/bin/basic-tutorial-5.rs
+++ b/tutorials/src/bin/basic-tutorial-5.rs
@@ -112,8 +112,10 @@ mod tutorial5 {
             Inhibit(false)
         });
 
-        let play_button =
-            gtk::Button::new_from_icon_name("media-playback-start", gtk::IconSize::SmallToolbar);
+        let play_button = gtk::Button::new_from_icon_name(
+            Some("media-playback-start"),
+            gtk::IconSize::SmallToolbar,
+        );
         let pipeline = playbin.clone();
         play_button.connect_clicked(move |_| {
             let pipeline = &pipeline;
@@ -122,8 +124,10 @@ mod tutorial5 {
                 .expect("Unable to set the pipeline to the `Playing` state");
         });
 
-        let pause_button =
-            gtk::Button::new_from_icon_name("media-playback-pause", gtk::IconSize::SmallToolbar);
+        let pause_button = gtk::Button::new_from_icon_name(
+            Some("media-playback-pause"),
+            gtk::IconSize::SmallToolbar,
+        );
         let pipeline = playbin.clone();
         pause_button.connect_clicked(move |_| {
             let pipeline = &pipeline;
@@ -132,8 +136,10 @@ mod tutorial5 {
                 .expect("Unable to set the pipeline to the `Paused` state");
         });
 
-        let stop_button =
-            gtk::Button::new_from_icon_name("media-playback-stop", gtk::IconSize::SmallToolbar);
+        let stop_button = gtk::Button::new_from_icon_name(
+            Some("media-playback-stop"),
+            gtk::IconSize::SmallToolbar,
+        );
         let pipeline = playbin.clone();
         stop_button.connect_clicked(move |_| {
             let pipeline = &pipeline;