Merge pull request #1275 from bilelmoussaoui/bilelmoussaoui/gir

gir: fix per emit_by_name change
gtk-rs · Nov 21, 2021 · a69abbe · a69abbe
2 parents 768c48d + 6a4acae
commit a69abbe
Showing 1 changed file with 11 additions and 15 deletions.
diff --git a/src/codegen/signal.rs b/src/codegen/signal.rs
@@ -131,25 +131,21 @@ pub fn generate(
                 args.push_str(&par.name);
             }
 
-            writeln!(
-                w,
-                "{}let {} = self.emit_by_name(\"{}\", &[{}]);",
-                tabs(indent + 1),
-                if trampoline.ret.typ != Default::default() {
-                    "res"
-                } else {
-                    "_"
-                },
-                analysis.signal_name,
-                args,
-            )?;
-
             if trampoline.ret.typ != Default::default() {
                 writeln!(
                     w,
-                    "{}res.unwrap().get().expect(\"Return Value for `{}`\")",
+                    "{}self.emit_by_name(\"{}\", &[{}])",
+                    tabs(indent + 1),
+                    analysis.signal_name,
+                    args,
+                )?;
+            } else {
+                writeln!(
+                    w,
+                    "{}self.emit_by_name::<()>(\"{}\", &[{}]);",
                     tabs(indent + 1),
-                    emit_name,
+                    analysis.signal_name,
+                    args,
                 )?;
             }
             writeln!(w, "{}}}", tabs(indent))?;