Skip to content

  • Projects
  • Groups
  • Snippets
  • Help
  • This project
    • Loading...
  • Sign in / Register
gjs
gjs
  • Overview
    • Overview
    • Details
    • Activity
    • Cycle Analytics
  • Repository
    • Repository
    • Files
    • Commits
    • Branches
    • Tags
    • Contributors
    • Graph
    • Compare
    • Charts
  • Issues 20
    • Issues 20
    • List
    • Board
    • Labels
    • Milestones
  • Merge Requests 2
    • Merge Requests 2
  • CI / CD
    • CI / CD
    • Pipelines
    • Jobs
    • Schedules
    • Charts
  • Wiki
    • Wiki
  • Snippets
    • Snippets
  • Members
    • Members
  • Collapse sidebar
  • Activity
  • Graph
  • Charts
  • Create a new issue
  • Jobs
  • Commits
  • Issue Boards
  • GNOME
  • gjsgjs
  • Merge Requests
  • !33

Merged
Opened Dec 11, 2017 by Marco Trevisan@3v1n0 
  • Report abuse
Report abuse

object: remove ObjectInstance from disassociate_list if object is finalized

Closes: #23 (closed)

After some debugging, instead of reverting commit 05810c9a, I noticed we could just do this.

However, since the combo of

priv->keep_alive.reset();
dissociate_list_remove(priv);

Is done multiple times, if you prefer it can be moved to a single function or adding an unrooting notify to GjsMaybeOwned, if you don't mind some more refactory, otherwise this should be enough.

Edited Dec 11, 2017 by Marco Trevisan
×

Check out, review, and merge locally

Step 1. Fetch and check out the branch for this merge request

git fetch https://gitlab.gnome.org/3v1n0/gjs.git fix-test-crash-gnome-3-26
git checkout -b 3v1n0/gjs-fix-test-crash-gnome-3-26 FETCH_HEAD

Step 2. Review the changes locally

Step 3. Merge the branch and fix any conflicts that come up

git checkout gnome-3-26
git merge --no-ff 3v1n0/gjs-fix-test-crash-gnome-3-26

Step 4. Push the result of the merge to GitLab

git push origin gnome-3-26

Note that pushing to GitLab requires write access to this repository.

Tip: You can also checkout merge requests locally by following these guidelines.

  • Discussion 2
  • Commits 1
  • Changes 1
{{ resolvedDiscussionCount }}/{{ discussionCount }} {{ resolvedCountText }} resolved
  • Marco Trevisan @3v1n0

    changed the description

    Dec 11, 2017

    changed the description

    changed the description
    Toggle commit list
  • Marco Trevisan @3v1n0

    changed the description

    Dec 11, 2017

    changed the description

    changed the description
    Toggle commit list
  • Marco Trevisan @3v1n0 commented Dec 11, 2017
    Developer

    Otherwise we could also just backport commit a1956017 I guess.

    Otherwise we could also just backport commit a195601 I guess.
  • Philip Chimento @ptomato commented Dec 24, 2017
    Master

    Good find. I don't think it's worth doing the refactor, though, since this is the stable branch.

    Good find. I don't think it's worth doing the refactor, though, since this is the stable branch.
  • Philip Chimento @ptomato

    changed milestone to GNOME 3.26 bugfixes

    Dec 24, 2017

    changed milestone to GNOME 3.26 bugfixes

    changed milestone to %5
    Toggle commit list
  • Philip Chimento @ptomato

    mentioned in commit f343bf9b

    Dec 24, 2017

    mentioned in commit f343bf9b

    mentioned in commit f343bf9b0749c84b9f91725a00516a0685f1b505
    Toggle commit list
  • Philip Chimento @ptomato

    merged

    Dec 24, 2017

    merged

    merged
    Toggle commit list
  • Write
  • Preview
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or sign in to comment
Philip Chimento
Assignee
Philip Chimento @ptomato
Assign to
GNOME 3.26 bugfixes
Milestone
GNOME 3.26 bugfixes
Assign milestone
Time tracking
0
Labels
None
Assign labels
  • View labels
Reference: GNOME/gjs!33
×

Revert this merge request

Switch branch
Cancel
A new branch will be created in your fork and a new merge request will be started.
×

Cherry-pick this merge request

Switch branch
Cancel
A new branch will be created in your fork and a new merge request will be started.