glib: Have GString deref to GStr

gtk-rs · Mar 11, 2022 · fe45283 · fe45283
1 parent c0f177b
commit fe45283
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 7 deletions.
diff --git a/gio/src/dbus_proxy.rs b/gio/src/dbus_proxy.rs
@@ -45,9 +45,9 @@ impl<O: IsA<DBusProxy>> DBusProxyExtManual for O {
             let f: &F = &*(f as *const F);
             f(
                 DBusProxy::from_glib_borrow(this).unsafe_cast_ref(),
-                Option::<glib::GString>::from_glib_borrow(sender_name)
+                (*Option::<glib::GString>::from_glib_borrow(sender_name))
                     .as_ref()
-                    .as_deref(),
+                    .map(|s| s.as_str()),
                 &glib::GString::from_glib_borrow(signal_name),
                 &from_glib_borrow(parameters),
             )
@@ -86,9 +86,9 @@ impl<O: IsA<DBusProxy>> DBusProxyExtManual for O {
             let f: &F = &*(f as *const F);
             f(
                 DBusProxy::from_glib_borrow(this).unsafe_cast_ref(),
-                Option::<glib::GString>::from_glib_borrow(sender_name)
+                (*Option::<glib::GString>::from_glib_borrow(sender_name))
                     .as_ref()
-                    .as_deref(),
+                    .map(|s| s.as_str()),
                 &glib::GString::from_glib_borrow(signal_name),
                 &from_glib_borrow(parameters),
             )

diff --git a/glib/src/gstring.rs b/glib/src/gstring.rs
@@ -617,10 +617,10 @@ impl AsRef<[u8]> for GString {
 }
 
 impl Deref for GString {
-    type Target = str;
+    type Target = GStr;
 
-    fn deref(&self) -> &str {
-        self.as_str()
+    fn deref(&self) -> &GStr {
+        self.as_gstr()
     }
 }