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

Unignore markup_escape_text. Fixes #280. #286

Merged
merged 1 commit into from Jan 23, 2018

Conversation

Projects
None yet
4 participants
@tmiasko
Contributor

tmiasko commented Jan 23, 2018

No description provided.

@GuillaumeGomez

This comment has been minimized.

Member

GuillaumeGomez commented Jan 23, 2018

Seems good to me. Strange we didn't generate it earlier.

cc @EPashkin @sdroege

@@ -786,6 +786,13 @@ pub fn main_depth() -> i32 {
// unsafe { TODO: call ffi::g_markup_collect_attributes() }
//}
pub fn markup_escape_text(text: &str) -> Option<String> {

This comment has been minimized.

@sdroege

sdroege Jan 23, 2018

Member

This can't return NULL AFAIU

Maybe some of the other markup related functions can also be enabled now?

This comment has been minimized.

@tmiasko

tmiasko Jan 23, 2018

Contributor

I presume that following should get rid of Option:

[object.function.return]
nullable = false

In this case this doesn't work correctly right now.

This comment has been minimized.

@EPashkin

EPashkin Jan 23, 2018

Member

It works correctly for me

    [[object.function]]
    name = "markup_escape_text"
        [object.function.return]
        nullable = false

This comment has been minimized.

@GuillaumeGomez

GuillaumeGomez Jan 23, 2018

Member

@EPashkin: Please don't break indent! 😱

This comment has been minimized.

@EPashkin

EPashkin Jan 23, 2018

Member

Oh yes, I will fix comment

@EPashkin

This comment has been minimized.

Member

EPashkin commented Jan 23, 2018

@tmiasko can you also remove "#gsize" comment for "convert" and other 3 next? Its just not usable in rust?

@tmiasko

This comment has been minimized.

Contributor

tmiasko commented Jan 23, 2018

I made return type non nullable (it seems I had put two brackets around
object.function.return so it didn't work earlier).

@EPashkin my impression is that default codegen doesn't do the right thing
for those above. I don't want to spend time on them as I don't need them so far.

@EPashkin

This comment has been minimized.

Member

EPashkin commented Jan 23, 2018

I want remove comment as it meant: "This function ignored due gir works bad with gsize type" and that wrong for this 4 function and its ignored for different reason.

But if you totally don't want do this, no problem, you have 👍 for merge as is.

@GuillaumeGomez

This comment has been minimized.

Member

GuillaumeGomez commented Jan 23, 2018

Then once CI is done, I merge.

@EPashkin

This comment has been minimized.

Member

EPashkin commented Jan 23, 2018

CI passed

@EPashkin EPashkin referenced this pull request Jan 23, 2018

Merged

Simplify KeyFile::to_data #287

@GuillaumeGomez GuillaumeGomez merged commit a4fbebe into gtk-rs:master Jan 23, 2018

2 checks passed

continuous-integration/appveyor/pr AppVeyor build succeeded
Details
continuous-integration/travis-ci/pr The Travis CI build passed
Details
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment