Merge pull request #828 from GuillaumeGomez/add-missing-import

Fix compilation

Author: GuillaumeGomez

src/pad_action_entry.rs

@@ -2,18 +2,15 @@
 // See the COPYRIGHT file at the top-level directory of this distribution.
 // Licensed under the MIT license, see the LICENSE file or <http://opensource.org/licenses/MIT>
 
-use glib::translate::*;
-use gtk_sys;
-use std::ffi::CStr;
 use PadActionType;
 
 #[derive(Debug, Clone)]
 pub struct PadActionEntry {
-    pub(crate) type_: PadActionType,
-    pub(crate) index: i32,
-    pub(crate) mode: i32,
-    pub(crate) label: String,
-    pub(crate) action_name: String,
+    type_: PadActionType,
+    index: i32,
+    mode: i32,
+    label: String,
+    action_name: String,
 }
 
 impl PadActionEntry {
@@ -46,11 +43,11 @@ impl PadActionEntry {
         self.mode
     }
 
-    pub fn get_label(&self) -> Option<&str> {
-        Some(&self.label)
+    pub fn get_label(&self) -> &str {
+        &self.label
     }
 
-    pub fn get_action_name(&self) -> Option<&str> {
-        Some(&self.action_name)
+    pub fn get_action_name(&self) -> &str {
+        &self.action_name
     }
 }

src/pad_controller.rs

@@ -9,27 +9,25 @@ use PadActionEntry;
 use PadController;
 
 pub trait PadControllerExtManual: 'static {
-    #[cfg(any(feature = "v3_22", feature = "dox"))]
     fn set_action_entries(&self, entries: &[PadActionEntry]);
 }
 
 impl<O: IsA<PadController>> PadControllerExtManual for O {
-    #[cfg(any(feature = "v3_22", feature = "dox"))]
     fn set_action_entries(&self, entries: &[PadActionEntry]) {
         let n_entries = entries.len() as i32;
         let entry_strings = entries
             .iter()
-            .map(|e| (CString::new(&e.label), CString::new(&e.action_name)))
-            .collect::<Vec<_>>();
+            .map(|e| (e.get_label().to_glib_none(), e.get_action_name().to_glib_none()))
+            .collect::<Vec<(Stash<_, _>, Stash<_, _>)>>();
         let entries = entries
             .iter()
             .zip(entry_strings.iter())
             .map(|(e, (label, action_name))| gtk_sys::GtkPadActionEntry {
-                type_: e.type_.to_glib(),
-                index: e.index,
-                mode: e.mode,
-                label: label.as_ptr() as *mut _,
-                action_name: action_name.as_ptr() as *mut _,
+                type_: e.get_type().to_glib(),
+                index: e.get_index(),
+                mode: e.get_mode(),
+                label: label.0,
+                action_name: action_name.0,
             })
             .collect::<Vec<_>>();
         unsafe {