New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Regen with GQuark #684

Merged
merged 3 commits into from Aug 1, 2018

Conversation

Projects
None yet
3 participants
@GuillaumeGomez
Member

GuillaumeGomez commented Jul 30, 2018

@sdroege

👍

@EPashkin

This comment has been minimized.

Show comment
Hide comment
@EPashkin

EPashkin Jul 31, 2018

Member

Gir need updated to generate to_glib for quarks,
I will do it today

Member

EPashkin commented Jul 31, 2018

Gir need updated to generate to_glib for quarks,
I will do it today

@GuillaumeGomez

This comment has been minimized.

Show comment
Hide comment
@GuillaumeGomez

GuillaumeGomez Jul 31, 2018

Member

@EPashkin: still:

   |
86 | from_glib(ffi::gtk_accel_group_activate(self.to_glib_none().0, accel_quark, acceleratable.to_glib_none().0, accel_key, accel_mods.to_glib()))
   |                                                                ^^^^^^^^^^^ expected u32, found struct `glib::Quark`
Member

GuillaumeGomez commented Jul 31, 2018

@EPashkin: still:

   |
86 | from_glib(ffi::gtk_accel_group_activate(self.to_glib_none().0, accel_quark, acceleratable.to_glib_none().0, accel_key, accel_mods.to_glib()))
   |                                                                ^^^^^^^^^^^ expected u32, found struct `glib::Quark`
@GuillaumeGomez

This comment has been minimized.

Show comment
Hide comment
@GuillaumeGomez

GuillaumeGomez Jul 31, 2018

Member

Ah damn, I need to regen I assume...

Member

GuillaumeGomez commented Jul 31, 2018

Ah damn, I need to regen I assume...

@GuillaumeGomez

This comment has been minimized.

Show comment
Hide comment
@GuillaumeGomez

GuillaumeGomez Jul 31, 2018

Member

@EPashkin with the last gir version, shouldn't .to_glib() be generated on GQuark variables?

Member

GuillaumeGomez commented Jul 31, 2018

@EPashkin with the last gir version, shouldn't .to_glib() be generated on GQuark variables?

@EPashkin

This comment has been minimized.

Show comment
Hide comment
@EPashkin

EPashkin Jul 31, 2018

Member

Version 3e102be generate .to_glib() for me:

--- a/src/auto/accel_group.rs
+++ b/src/auto/accel_group.rs
@@ -83,7 +83,7 @@ pub trait AccelGroupExt {
 impl<O: IsA<AccelGroup> + IsA<glib::object::Object>> AccelGroupExt for O {
     fn activate<P: IsA<glib::Object>>(&self, accel_quark: glib::Quark, acceleratable: &P, accel_key: u32, accel_mods: gdk::ModifierType) -> bool {
         unsafe {
-            from_glib(ffi::gtk_accel_group_activate(self.to_glib_none().0, accel_quark, acceleratable.to_glib_none().0, accel_key, accel_mods.to_glib()))
+            from_glib(ffi::gtk_accel_group_activate(self.to_glib_none().0, accel_quark.to_glib(), acceleratable.to_glib_none().0, accel_key, accel_mods.to_glib()))
         }
     }
Member

EPashkin commented Jul 31, 2018

Version 3e102be generate .to_glib() for me:

--- a/src/auto/accel_group.rs
+++ b/src/auto/accel_group.rs
@@ -83,7 +83,7 @@ pub trait AccelGroupExt {
 impl<O: IsA<AccelGroup> + IsA<glib::object::Object>> AccelGroupExt for O {
     fn activate<P: IsA<glib::Object>>(&self, accel_quark: glib::Quark, acceleratable: &P, accel_key: u32, accel_mods: gdk::ModifierType) -> bool {
         unsafe {
-            from_glib(ffi::gtk_accel_group_activate(self.to_glib_none().0, accel_quark, acceleratable.to_glib_none().0, accel_key, accel_mods.to_glib()))
+            from_glib(ffi::gtk_accel_group_activate(self.to_glib_none().0, accel_quark.to_glib(), acceleratable.to_glib_none().0, accel_key, accel_mods.to_glib()))
         }
     }
@GuillaumeGomez

This comment has been minimized.

Show comment
Hide comment
@GuillaumeGomez

GuillaumeGomez Jul 31, 2018

Member

I assume I failed my update then...

Member

GuillaumeGomez commented Jul 31, 2018

I assume I failed my update then...

@EPashkin

This comment has been minimized.

Show comment
Hide comment
@EPashkin

EPashkin Jul 31, 2018

Member

@GuillaumeGomez You need update your local gir-files too (not in gtk):
you have 47c69e6 active, while gtk set to last b8f5ef1

Member

EPashkin commented Jul 31, 2018

@GuillaumeGomez You need update your local gir-files too (not in gtk):
you have 47c69e6 active, while gtk set to last b8f5ef1

@sdroege

Looks good now

@EPashkin

This comment has been minimized.

Show comment
Hide comment
@EPashkin

EPashkin Aug 1, 2018

Member

@GuillaumeGomez Thanks, 👍

Member

EPashkin commented Aug 1, 2018

@GuillaumeGomez Thanks, 👍

@GuillaumeGomez GuillaumeGomez merged commit 0533370 into gtk-rs:master Aug 1, 2018

2 checks passed

continuous-integration/appveyor/pr AppVeyor build succeeded
Details
continuous-integration/travis-ci/pr The Travis CI build passed
Details

@GuillaumeGomez GuillaumeGomez deleted the GuillaumeGomez:quark branch Aug 1, 2018

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment