Update for ObjectImpl::get_property() being infallible now

5 files changed, 20 insertions, 20 deletions

diff --git a/tutorial/src/progressbin/imp.rs b/tutorial/src/progressbin/imp.rs
index 3198d2711..2546039e5 100644
--- a/tutorial/src/progressbin/imp.rs
+++ b/tutorial/src/progressbin/imp.rs
@@ -168,13 +168,13 @@ impl ObjectImpl for ProgressBin {
 
     // Called whenever a value of a property is read. It can be called
     // at any time from any thread.
-    fn get_property(&self, _obj: &Self::Type, id: usize) -> Result<glib::Value, ()> {
+    fn get_property(&self, _obj: &Self::Type, id: usize) -> glib::Value {
         let prop = &PROPERTIES[id];
 
         match *prop {
             subclass::Property("output", ..) => {
                 let output_type = self.output_type.lock().unwrap();
-                Ok(output_type.to_value())
+                output_type.to_value()
             }
             _ => unimplemented!(),
         }
diff --git a/tutorial/src/rgb2gray/imp.rs b/tutorial/src/rgb2gray/imp.rs
index 4dbacbdd4..17c875907 100644
--- a/tutorial/src/rgb2gray/imp.rs
+++ b/tutorial/src/rgb2gray/imp.rs
@@ -276,17 +276,17 @@ impl ObjectImpl for Rgb2Gray {
 
     // Called whenever a value of a property is read. It can be called
     // at any time from any thread.
-    fn get_property(&self, _obj: &Self::Type, id: usize) -> Result<glib::Value, ()> {
+    fn get_property(&self, _obj: &Self::Type, id: usize) -> glib::Value {
         let prop = &PROPERTIES[id];
 
         match *prop {
             subclass::Property("invert", ..) => {
                 let settings = self.settings.lock().unwrap();
-                Ok(settings.invert.to_value())
+                settings.invert.to_value()
             }
             subclass::Property("shift", ..) => {
                 let settings = self.settings.lock().unwrap();
-                Ok(settings.shift.to_value())
+                settings.shift.to_value()
             }
             _ => unimplemented!(),
         }
diff --git a/tutorial/src/sinesrc/imp.rs b/tutorial/src/sinesrc/imp.rs
index 6f4b933fd..c98e50ae0 100644
--- a/tutorial/src/sinesrc/imp.rs
+++ b/tutorial/src/sinesrc/imp.rs
@@ -369,29 +369,29 @@ impl ObjectImpl for SineSrc {
 
     // Called whenever a value of a property is read. It can be called
     // at any time from any thread.
-    fn get_property(&self, _obj: &Self::Type, id: usize) -> Result<glib::Value, ()> {
+    fn get_property(&self, _obj: &Self::Type, id: usize) -> glib::Value {
         let prop = &PROPERTIES[id];
 
         match *prop {
             subclass::Property("samples-per-buffer", ..) => {
                 let settings = self.settings.lock().unwrap();
-                Ok(settings.samples_per_buffer.to_value())
+                settings.samples_per_buffer.to_value()
             }
             subclass::Property("freq", ..) => {
                 let settings = self.settings.lock().unwrap();
-                Ok(settings.freq.to_value())
+                settings.freq.to_value()
             }
             subclass::Property("volume", ..) => {
                 let settings = self.settings.lock().unwrap();
-                Ok(settings.volume.to_value())
+                settings.volume.to_value()
             }
             subclass::Property("mute", ..) => {
                 let settings = self.settings.lock().unwrap();
-                Ok(settings.mute.to_value())
+                settings.mute.to_value()
             }
             subclass::Property("is-live", ..) => {
                 let settings = self.settings.lock().unwrap();
-                Ok(settings.is_live.to_value())
+                settings.is_live.to_value()
             }
             _ => unimplemented!(),
         }
diff --git a/tutorial/tutorial-1.md b/tutorial/tutorial-1.md
index 39ade8afb..1573578d8 100644
--- a/tutorial/tutorial-1.md
+++ b/tutorial/tutorial-1.md
@@ -855,17 +855,17 @@ impl ObjectImpl for Rgb2Gray {
         }
     }
 
-    fn get_property(&self, _obj: &Self::Type, id: usize) -> Result<glib::Value, ()> {
+    fn get_property(&self, _obj: &Self::Type, id: usize) -> glib::Value {
         let prop = &PROPERTIES[id];
 
         match *prop {
             subclass::Property("invert", ..) => {
                 let settings = self.settings.lock().unwrap();
-                Ok(settings.invert.to_value())
+                settings.invert.to_value()
             }
             subclass::Property("shift", ..) => {
                 let settings = self.settings.lock().unwrap();
-                Ok(settings.shift.to_value())
+                settings.shift.to_value()
             }
             _ => unimplemented!(),
         }
diff --git a/tutorial/tutorial-2.md b/tutorial/tutorial-2.md
index 9bc43ea6a..14b444177 100644
--- a/tutorial/tutorial-2.md
+++ b/tutorial/tutorial-2.md
@@ -320,29 +320,29 @@ impl ObjectImpl for SineSrc {
 
     // Called whenever a value of a property is read. It can be called
     // at any time from any thread.
-    fn get_property(&self, _obj: &Self::Type, id: u32) -> Result<glib::Value, ()> {
+    fn get_property(&self, _obj: &Self::Type, id: u32) -> glib::Value {
         let prop = &PROPERTIES[id as usize];
 
         match *prop {
             Property::UInt("samples-per-buffer", ..) => {
                 let settings = self.settings.lock().unwrap();
-                Ok(settings.samples_per_buffer.to_value())
+                settings.samples_per_buffer.to_value()
             }
             Property::UInt("freq", ..) => {
                 let settings = self.settings.lock().unwrap();
-                Ok(settings.freq.to_value())
+                settings.freq.to_value()
             }
             Property::Double("volume", ..) => {
                 let settings = self.settings.lock().unwrap();
-                Ok(settings.volume.to_value())
+                settings.volume.to_value()
             }
             Property::Boolean("mute", ..) => {
                 let settings = self.settings.lock().unwrap();
-                Ok(settings.mute.to_value())
+                settings.mute.to_value()
             }
             Property::Boolean("is-live", ..) => {
                 let settings = self.settings.lock().unwrap();
-                Ok(settings.is_live.to_value())
+                settings.is_live.to_value()
             }
             _ => unimplemented!(),
         }