Merge pull request #449 from sdroege/source-ids

Fix up some Source API to work with SourceId instead of raw u32

Author: sdroege

Gir.toml

@@ -494,6 +494,21 @@ concurrency = "send+sync"
         # while GSource itself is
         ignore = true
 
+        [[object.function]]
+        pattern = "attach"
+        # return type
+        ignore = true
+
+        [[object.function]]
+        pattern = "get_id"
+        # unsafe as it would allow multiple times to remove
+        ignore = true
+
+        [[object.function]]
+        pattern = "remove"
+        # parameter type
+        ignore = true
+
 [[object]]
 name = "GLib.TimeZone"
 status = "generate"

src/auto/source.rs

@@ -37,13 +37,6 @@ impl Source {
     //    unsafe { TODO: call ffi::g_source_add_unix_fd() }
     //}
 
-    pub fn attach<'a, P: Into<Option<&'a MainContext>>>(&self, context: P) -> u32 {
-        let context = context.into();
-        unsafe {
-            ffi::g_source_attach(self.to_glib_none().0, context.to_glib_none().0)
-        }
-    }
-
     pub fn destroy(&self) {
         unsafe {
             ffi::g_source_destroy(self.to_glib_none().0);
@@ -62,12 +55,6 @@ impl Source {
         }
     }
 
-    pub fn get_id(&self) -> u32 {
-        unsafe {
-            ffi::g_source_get_id(self.to_glib_none().0)
-        }
-    }
-
     pub fn get_name(&self) -> Option<GString> {
         unsafe {
             from_glib_none(ffi::g_source_get_name(self.to_glib_none().0))
@@ -120,12 +107,6 @@ impl Source {
     //    unsafe { TODO: call ffi::g_source_remove_unix_fd() }
     //}
 
-    pub fn remove(tag: u32) -> bool {
-        unsafe {
-            from_glib(ffi::g_source_remove(tag))
-        }
-    }
-
     //pub fn remove_by_funcs_user_data(funcs: /*Ignored*/&mut SourceFuncs, user_data: /*Unimplemented*/Option<Fundamental: Pointer>) -> bool {
     //    unsafe { TODO: call ffi::g_source_remove_by_funcs_user_data() }
     //}

src/main_context_channel.rs

@@ -13,6 +13,7 @@ use Continue;
 use MainContext;
 use Priority;
 use Source;
+use SourceId;
 
 use get_thread_id;
 
@@ -295,7 +296,7 @@ impl<T> Receiver<T> {
         mut self,
         context: P,
         func: F,
-    ) -> u32 {
+    ) -> SourceId {
         let context = context.into();
         unsafe {
             let source = self.0.take().expect("No Source anymore");

src/source.rs

@@ -551,3 +551,18 @@ where F: FnMut(RawFd, IOCondition) -> Continue + Send + 'static {
         from_glib_full(source)
     }
 }
+
+impl Source {
+    pub fn attach<'a, P: Into<Option<&'a MainContext>>>(&self, context: P) -> SourceId {
+        let context = context.into();
+        unsafe {
+            from_glib(ffi::g_source_attach(self.to_glib_none().0, context.to_glib_none().0))
+        }
+    }
+
+    pub fn remove(tag: SourceId) -> Result<(), ::BoolError> {
+        unsafe {
+            glib_result_from_gboolean!(ffi::g_source_remove(tag.to_glib()), "Failed to remove source")
+        }
+    }
+}