Implement pushing/popping a thread default main context in a panic-sa…

Gir.toml

@@ -329,6 +329,16 @@ concurrency = "send+sync"
        # source id is a newtype
        ignore = true
 
+       [[object.function]]
+       name = "push_thread_default"
+       # panic-safe popping
+       ignore = true
+
+       [[object.function]]
+       name = "pop_thread_default"
+       # panic-safe popping
+       ignore = true
+
 [[object]]
 name = "GLib.MainLoop"
 status = "generate"

src/auto/main_context.rs

@@ -84,18 +84,6 @@ impl MainContext {
         }
     }
 
-    pub fn pop_thread_default(&self) {
-        unsafe {
-            ffi::g_main_context_pop_thread_default(self.to_glib_none().0);
-        }
-    }
-
-    pub fn push_thread_default(&self) {
-        unsafe {
-            ffi::g_main_context_push_thread_default(self.to_glib_none().0);
-        }
-    }
-
     //pub fn query(&self, max_priority: i32, fds: /*Ignored*/Vec<PollFD>) -> (i32, i32) {
     //    unsafe { TODO: call ffi::g_main_context_query() }
     //}

src/lib.rs

@@ -175,6 +175,7 @@ pub mod value;
 pub mod variant;
 mod variant_type;
 mod main_context;
+pub use main_context::MainContextThreadDefault;
 mod date_time;
 mod date;
 pub use date::Date;

src/main_context.rs

@@ -45,6 +45,27 @@ impl MainContext {
                 func as gpointer, Some(destroy_closure::<F>))
         }
     }
+
+    fn pop_thread_default(&self) {
+        unsafe {
+            ffi::g_main_context_pop_thread_default(self.to_glib_none().0);
+        }
+    }
+
+    pub fn push_thread_default(&self) -> MainContextThreadDefault {
+        unsafe {
+            ffi::g_main_context_push_thread_default(self.to_glib_none().0);
+        }
+        MainContextThreadDefault(self)
+    }
+}
+
+pub struct MainContextThreadDefault<'a>(&'a MainContext);
+
+impl<'a> Drop for MainContextThreadDefault<'a> {
+    fn drop(&mut self) {
+        self.0.pop_thread_default();
+    }
 }
 
 #[cfg_attr(feature = "cargo-clippy", allow(transmute_ptr_to_ref))]